133 Commits
0.4 ... 0.5

Author SHA1 Message Date
0baf2d8be5 0.5 release. 2014-04-05 20:40:11 +02:00
62f9142478 Updating the TODO in preparating for 0.5. 2014-04-05 20:39:46 +02:00
a495fce128 There is no need for a full dirt redraw. 2014-04-05 20:34:57 +02:00
6f4cfa5136 Fixing a compiler warning with the assignment. 2014-04-02 09:26:28 +02:00
672e4e4b03 Fix segfault when pressing PrintScr without a selection 2014-03-27 07:48:32 +01:00
45b808b88e new utf decoder
This patch replaces current utf decoder with a new one, which is ~50
lines shorter and should be easier to understand. Parsing 5 and 6
sequences, if necessary, requires trivial modification of UTF_SIZ
constant and utfbyte, utfmask, utfmin, utfmax arrays.
2014-03-27 07:19:37 +01:00
71328cbcdc Merge branch 'master' of ssh://suckless.org/gitrepos/st 2014-03-10 15:16:26 +01:00
85f8a414be Add terminfo entries for printer
These capabilities inform to programs how print in local printer
of the terminal.
2014-03-06 07:55:21 +01:00
78f8843bc7 Add sequence for printing the current selection
This is very usefull in order to can select what is sent
to the plumber.
2014-03-06 07:55:07 +01:00
96c230e476 Add key definition for printer sequences
These new combinations generate the same behaviour (basically) of
vt102. It is a good way of communicating st with other programs.

[0] http://www.vt100.net/docs/vt102-ug/chapter2.html
2014-03-06 07:53:15 +01:00
6166a1afc8 Add MC for the full screen
This sequence is very useful because allows comunicate the content
of the terminal to another program.
2014-03-06 07:51:58 +01:00
cf332a325d Add MC for a single line
This sequence print the current line. It is different to the
'printer on' sequence, where all the characters that arrive to the
terminal are printer. Here only the ascii characters are printed.
2014-03-06 07:50:34 +01:00
1584956a60 Style cleanup.
Add some note about the main reason why st is still that big.
2014-03-01 11:04:03 +01:00
d2ec39f0ef Style matters. 2014-03-01 09:22:57 +01:00
1f0d981bd7 Add MC sequence
This sequence control when the printer is enabled or disabled. This
sequence control the behaviour of the -o option.
2014-02-22 11:54:30 +01:00
cdb3b1892a Add xstrdup function
Since we are using xmalloc, xrealloc ..., then it is not logical
call directly to strdup.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
2014-02-08 19:58:37 +01:00
315b7ee9ce Merge remote-tracking branch 'origin/master' 2014-02-04 11:46:45 +01:00
c2026a4950 Removing the w3img support.
The patch to add w3img support destroys our way to handle fps and so stop
wasting resources on fast scrolling. Due to w3img being a hack to display
images in an ugly way, is there no need to support this. Use some real way to
display images.
2014-02-03 20:54:25 +01:00
6521b5dc32 Remove non defined behaviour in selcopy
It is not defined when lateral effects of expressions are
calculated, so an expression as:

	--last >= gp && !(selected(last - gp, y)

is non portable.
2014-02-02 19:42:01 +01:00
a8d5870073 Remove duplicated code in strhandle
The error condition was duplicated in two different switches.
This new version centralized the error handling in only one place.
2014-02-02 19:42:01 +01:00
21d905c076 Make Shift+Home equal to CLS in ascii mode 2014-02-02 19:40:38 +01:00
9523233e25 Make CONTROL + DELETE delete a line
If CONTROL + INSERT inserts a line then it seems natural CONTROL + DELETE
removes a line.
2014-02-02 19:30:38 +01:00
d2173cd716 Fix SHIFT+DEL definition
The AppMode and AsciiMode were inverted in the definition of this
combination.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2014-01-31 12:41:37 +01:00
9559100130 Use character scaling in XCopyArea 2014-01-21 19:20:17 +01:00
c0a56ef4be Make w3mimgdisplay work with st
Before this patch draw() calls drawregion which calls xdraws and then
updates whole window in one call thus overdrawing anything drawn by
w3mimgdisplay. After moving XCopyArea to xdraws it only updates the
regions which are being updated by XftDraw* functions. It may do a few
more calls to XCopyArea with this patch.

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
2014-01-16 10:20:20 +01:00
9df9a4723d Fix truecolor escapes, when both bg and fg are set
for example
echo -e "\e[48;2;255;0;0m\e[38;2;0;0;255m test "
should render on red bg with blue fg

also now elinks works correctly when using 'truecolor' option
in preferences

Signed-off-by: Amadeusz Sławiński <amade@asmblr.net>
2014-01-03 15:28:16 +01:00
e8dba89164 query pixel size from matched font
Sorry for another duplicated mail. I found the patch is malformed
significantly. I've been away from my laptop for a while, so I'm quite
unfamiliar with the settings on this system...
2014-01-03 15:26:25 +01:00
33da67dac0 Update arg.h from sbase
sbase did some interesting modifications to arg.h (basically it
was fixed an incorrect use of the _ namespace), and this commit
take this last version for st.
2013-12-18 08:29:28 +01:00
d60ee7337b Prevent resizing stdin
This fixes a bug that the parent tty gets resized whenever you launch
st through command line.

The problem was that ioctl was resizing cmdfd before it gets
initialized in ttynew. Since cmdfd is a global variable, its initial
value is 0, and consequently stdin was being resized.
2013-12-18 08:11:22 +01:00
ef1dc9fc4b Replace alignment tabs with spaces. 2013-12-18 08:11:14 +01:00
6162d63151 Fix comments in config.def.h to match field names. 2013-12-18 08:10:44 +01:00
fb8e3f67f7 Fix definition of F28 key.
Shitf modifier adds 12 to the function number of the function keys,
while Control adds 24, so Control + F4 generates F28
2013-12-18 08:10:22 +01:00
39f28b18b7 Set _NET_WM_PID attribute 2013-12-11 21:33:52 +01:00
2738592de6 Fix rmul definition
rmul means "exit underline mode", so a full reset of all
the attributes is not the correct way of exiting from
underline mode, because it is going to modify also another
attributes not related.
2013-12-10 17:21:12 +01:00
08a3eea571 Add stdint include
Since st is using now int32_t and uint32_t the inclusion of
stdint or inttype is mandatory, because in other case the
definition of these new types will not be known by the
compiler.
2013-11-25 16:08:01 +01:00
53474391bc Fix stupid bug in tdefcolor returning -1 in unsigned function
k0ga misktook applying patch of others. Sorry guys!!!!
2013-11-25 14:09:53 +01:00
1fe0a5f39a Use int instead of long for color
This patch replaces long by int32_t. It saves
some memory on 64bit systems.
2013-11-24 10:43:35 +01:00
4435e0ee67 add _NET_WM_NAME 2013-11-23 10:54:57 +01:00
7263820759 Simplify logic in kmap(). 2013-10-28 19:28:52 +01:00
1fa27b93f9 Simplify logic in match(). 2013-10-28 19:28:35 +01:00
3d3c37bc70 Merge remote-tracking branch 'origin/master' into omaster 2013-10-28 19:18:24 +01:00
489982d4b8 Fixed lock up when system time jumps backwards
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-10-27 13:17:11 +01:00
297c886b72 Ignore numlock (Mod2Mask) for button events too.
Conflicts:
	config.def.h
	st.c
2013-10-20 09:53:34 +02:00
0f6942cdf6 Avoid buffer overrun in bpress()
Use correct type for Mousekey.b (XButtonEvent.button).
2013-10-15 17:46:17 +02:00
8e577322a3 New ttysend() function calls ttywrite() and techo(). Honor MODE_ECHO when pasting in selnotify(). 2013-10-07 21:05:21 +02:00
939e149544 Avoid buffer overrun in kpress() and remove limit on shortcut strings. 2013-10-07 21:03:51 +02:00
02ae3ce6fd Simplify Mod1 logic in kpress(), eliminating locals and a memcpy. 2013-10-07 20:56:51 +02:00
7a4eefe87c Add support for multiple charset definitions
vt100 has support for two defined charset, G0 and G1. Each charset
can be defined, but in each moment is selected only one of both
charset. This is usually used selecting a national charset in G0
and graphic charset in G1, so you can switch between graphic
charset and text charset without losing the national charset
already defined.

st hasn't support for national charsets, because it is an utf8
based terminal emulator, but it has support for graphic
charset because it is heavily used, but it only supports G0,
without understanding G1 selection sequences, which causes some
programs in some moments can print some garbage in the screen.

This patch adds a fake support for multiple charset definitions,
where we only support graphic charset and us-ascii charset, but
we allow more of one charset definition.

This patch allow define G0 until G3 charsets, but only accepts
select G0 or G1, and it accepts some national charset definitions
but all of them are mapped to us-ascii.
2013-10-02 21:22:15 +02:00
c5c2365ab7 People, learn to keep to styles. Thanks. 2013-10-02 21:06:50 +02:00
62ab938965 Fix save/restore cursor
st was assuming that save/restore cursor position was independent
of the screen that was shown in each moment, but it is not true,
because each screen has a different save/restore buffer. This
patch fixes it.
2013-10-02 20:47:19 +02:00
2b1bc8087f Add DSR cursor position sequence 2013-10-02 20:45:19 +02:00
eeae9b0cee Fix core in multi-line selection on OpenBSD
OpenBSD 5.3 amd64 release version with the most current st
version from git, crash and dump core when selecting multiple
lines whith the cursor.  This happens, because on line 964
of st.c (gp-1)->mode is accessed, although gp is still
pointing at the beginning of the array term.line[y] (see
line 939 for initialization of gp).
2013-09-23 19:26:24 +02:00
8ac0a5f872 Add bracketed paste mode
This patch enables bracketed paste mode (
http://invisible-island.net/xterm/ctlseqs/ctlseqs.html#Bracketed%20Paste%20Mode
).

It's mainly useful for text editors to disable line wrapping and auto
indentation when text is being pasted, rather than typed from keyboard.

On the emulator side, it is supported by at least xterm, urxvt,
gnome-terminal, putty, iterm2; and I have a patch for konsole.

On the application side, vim can be configured easily to handle this, and
I have pending patches for mcedit and joe. Probably many others also
support it.
2013-09-23 09:27:55 +02:00
eae31a532e Fix some bugs in mouse tracking logic
* Button number in X10 mode:

  I believe the button - 1 came from "C b is button - 1" from [0].
  However, above this section, it states

    "Normally, parameters (such as pointer poisition and button number)
     for all mouse tracking escape sequences generated by xterm encode
     numeric parameters in a single character as value+32. For example, !
     specifies the value 1."

  Also, from the description of SGR,

    "The encoded button value in this case does not add 32 since that
     was useful only in the X10 scheme for ensuring that the byte
     containing the button value is a printable code."

  This suggests that we should still add 32 to the button value when in
  MODE_MOUSEX10.

* No button release reporting in X10 mode:

    "X10 compatibility mode sends an escape sequence only on button press,
     encoding the location and the mouse button pressed."

* Fix MODE_MOUSEMOTION:

  Currently, motion reporting is skipped when oldbutton == 3
  (corresponding to no button being pressed). However, oldbutton is
  only set on a button press, which will never be 3.

[0]: http://invisible-island.net/xterm/ctlseqs/ctlseqs.html
2013-09-13 19:49:25 +02:00
cc2ea3147a Default volume of the bell is 0. 2013-09-12 20:52:10 +02:00
bef599bb27 Add audible bell
\a is the character for bell, and st is only marking the window as urgent
if it is not active. This patch adds an audible bell which can be disable
with bellvolume variable.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-09-12 20:47:41 +02:00
210dda9570 Wide character support.
Thanks "Eon S. Jeon" <esjeon@hyunmu.am>!
2013-09-07 12:41:36 +02:00
a4358a1fbd Adding some contributors. Thanks to you all! 2013-09-07 12:29:44 +02:00
4245ba0d12 Correctly initialize altscreen when defaultbg is not 0.
The alternate screen is not properly initialized when st starts. To see
this, set defaultbg in config.h to anything other than 0 (for example, swap
defaultfg and defaultbg), and run:

./st -e sh -c 'tput smcup; read'

You should see that the top-left 80x24 rectangle is black (or whatever
colorname[0] is), while the rest of the screen (if any) has the desired
colorname[defaultbg] color.

The attached patch fixes this by initializing term.c.attr in tnew() before
calling tresize(). It also removes the unnecessary xcalloc() calls, which
misled me on this bug hunt since it is really tclearregion() which
initializes term.lines and term.alt in tresize().
2013-09-04 18:33:02 +02:00
f3d438b101 Regarding commit 7e3cff3
Hello.

I reviewed and tested commit 7e3cff3, and made a patch that fixes some
problems in it.

1. There's a semicolon after an if statement, which is obviously a
typo.

2. The current way of calculating text position in "xdraws" yields
inconsistent results in some cases. This is due to the use of
"font->width", which varies. Instead, "xw.cw" has to be used as the
character width.

Sincerely,
Eon
2013-08-30 07:50:05 +02:00
587bc939f6 Tmux is using C-b by default.
Thanks for noticing Fidel Barrera Cruz!
2013-08-22 19:32:49 +02:00
8d21ced085 Correcting the bitmask value check. 2013-08-20 18:18:48 +02:00
4579693818 Add terminfo definitions for terminals with meta key
Some programs don't check the value of km and use smm and rmm
capabilites, and they cause the terminal change to meta enabled
mode even in cases where is not desirable.

Allmost all people is using the terminal waiting that meta sends
escape, so rmm and smm are not needed. If someone needs meta
sets 8 bit he can use the correct terminfo definition in TERM.
2013-08-12 16:53:09 +02:00
347a45c352 Fix signess of tdefcolor
tdefcolor() returns -1 on error, while its return type is
unsigned long. At the same time, line 1724 and 1731 are checking the
positivity of its unsigned return value.
2013-08-06 08:32:11 +02:00
22eeda56b7 Fixed memory leak in xsettitle(). 2013-08-05 11:45:53 +02:00
86c03ddc82 Fix blink mode check
ATTR_BLINK is an attribute for a Glyph and will not be set in term.mode.
2013-08-05 11:45:52 +02:00
7e3cff33ff Use character size scaling factors
The bounding boxes for characters can be scaled using "cwscale" and "chscale"
to scale the width and height respectively.
2013-08-05 11:44:18 +02:00
aaee0e8b28 Reload colors in reset
Colors definition can be changed using a OSC sequence, so
we have to reload them if we want be sure all the colors
are the correct.

Could be desirable free the colors allocated due to rgb
colors and inverse colors (XftColorAllocValues in xdraws),
but it is impossible due we use the same structure for all
of them.
2013-07-20 23:25:46 +02:00
8dde8cde41 Add RGB color definition
This patch uses the bit 24 in the color descriptor as an indicator
of RGB color, so we can take the values and generating the XftColour
directly in xdraws.
2013-07-20 23:25:38 +02:00
33ad83d492 Improved font caching
I made a patch that improves the performance of font caching mechanism.
This is based on a funny behaviour of FontConfig: it was handling
FcCharSet in a somewhat unexpected way.

So, we are currently adding "a character" to a new FcCharSet, and then
add it to a FcPattern. However, if we toss the FcPattern to FontConfig,
it loads the entire language(charset) that contains the character we
gave. That is, we don't always have to load a new font for each unknown
character. Instead, we can reused cached fonts, and this significantly
reduces the number of calls to extremely slow FontConfig matching
functions.

One more thing. I found that, in libXft, there's a function called
XftCharExists. XftCharIndex internally calls this function, and
does more stuffs if the character does exist. Since the returned index
is never used in st, we should call XftCharExists instead of
XftCharIndex. Please note that I already made this change in the patch.
2013-07-19 08:38:10 +02:00
40e4d76d22 fix: whitespace 2013-07-04 09:58:14 +02:00
fbc589d506 Remove long text being cropped/wrapped to standard 80x24 on launch.
To be more specific, now tty creation is delayed until X window is
actually mapped; last ConfigureNotify before mapping determines
initial tty size.
Please report problems if there are any.
2013-07-04 09:36:22 +02:00
6fc471ccc6 fix: consistent usage of bitmask operations on unicode functions 2013-07-04 09:28:19 +02:00
8b602a37a6 fix: do not need an extra variable for a single read 2013-07-04 09:26:18 +02:00
6e1c7c8afc Fix match function bugs
There were two problems with match denfinition.

1) There was a forward declaration in the form:

	static inline bool match(uint, uint);

but later the function was defined as:

	inline bool
	match(uint mask, uint state) {

This causes that there were two different functions in the code, one local
and inline, and other inline but extern. All was working without problems
due to we were using -Os, and the compiler was using the extern definition
and it was no expanding the static declaration. If you removed the -Os flag,
then you got linker errors due it was no able to find the static definition
of the static declaration.

2) The mask checking was incorrect because we were doing the test:

	(state & mask) != state

and this test only was saying that at least all the enabled bits of state
were enabled also in mask, but no all the possible bits in mask. This was
the origin of the bug reported by Xavier Cartron, where he said it was
possible activated some shortcuts with some of the modifiers defined in the
config.h file.
2013-07-04 09:21:57 +02:00
90c6f055b6 Remove unneded call to draw
draw is the function which update the Xwindow with the information st has,
and it is designed in a way that it must be called once in the main loop
(run function), and calling it in other places it is a waste of time.
2013-07-04 09:14:50 +02:00
ebbac77d74 Fix selection clearing
The way st knows if there is a selection activated is checking if sel.ob.x
is equal to -1. In some parts of the code the way of disabling the selection
was only setting it to -1, but after it you can't be sure if the selection
is clearing from the terminal representation, because it is necessary mark
all the lines affected by the selection as dirty. Already there is a functon
which perform this task, selclear.
2013-07-04 09:14:50 +02:00
7af030c999 fix PageUp Modifier Mask in config.def.h
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-06-22 16:45:03 +02:00
5d3318c0c7 Fixing title setting with the title argument. 2013-06-09 15:52:35 +02:00
369734c80c Adding xterm behaviour to setting the title.
Thanks Airwave!
2013-06-06 19:09:18 +02:00
2cf4f366d6 Bumping up the xfps so mouse motion won't reap the CPU. 2013-06-01 14:39:13 +02:00
7530694987 Adding true mouse motion support. 2013-06-01 14:37:30 +02:00
d743b93fda This is a shorter bit handling in MODE_MOUSE. 2013-06-01 13:17:20 +02:00
317b785921 Add some comments about the other mouse reporting modes. 2013-06-01 13:13:01 +02:00
405fd89ac1 Implementing mouse focus and all events. 2013-06-01 13:06:53 +02:00
8315dc4179 Fixing bad highlighting on first SNAP_WORD multiline select. 2013-06-01 12:23:55 +02:00
b5144100a5 Fixing the selection in a single line again.
Thanks p37sitdu@lavabit.com!
2013-05-26 16:10:22 +02:00
8f1bef0502 Fixing the selection scrolling and the selection naming.
Thanks p37sitdu@lavabit.com!
2013-05-26 13:07:26 +02:00
8f47c4a4de Lazy font unloading too. 2013-05-11 21:59:55 +02:00
62502a88e9 Lazy fontset loading.
Thanks Johannes Hofmann <Johannes.Hofmann@gmx.de>!
2013-05-11 08:54:26 +02:00
678eff6e18 Removing an old select() regression. 2013-05-06 19:50:14 +02:00
8e968739c3 Allow more complex delimiters for word selections.
Thanks Alexander Rezinsky <alexrez@gmail.com>!
2013-05-04 19:04:20 +02:00
0c2b513d01 Expand the last line with '\n' in case of overselection.
Thanks Alexander Rezinsky <alexrez@gmail.com>!
2013-05-04 19:00:32 +02:00
634c247fa7 Select to the end of row if end of line is reached.
Thanks Alexander Rezinsky <alexrez@gmail.com>!
2013-05-04 08:05:11 +02:00
5938fa9d32 Better comments for the snapping code. 2013-05-04 08:01:17 +02:00
8618386de9 More stable blinking. 2013-05-01 13:14:46 +02:00
e1458ef467 Explaining blinking for the dummies. 2013-04-28 21:32:42 +02:00
911ba5674b Selection snapping is now considering wrapping.
Thanks Alexander Rezinsky <alexrez@gmail.com> for mentioning this!
2013-04-28 18:14:15 +02:00
a53017c8b4 Add a possibility to modify the string sent by mouse buttons.
Thanks Alexander Rezinsky <alexrez@gmail.com> for the suggestion!
2013-04-28 17:42:30 +02:00
a77b01176a Be more efficient in blinking. 2013-04-26 18:55:40 +02:00
1e09726518 Enable blinking in st. 2013-04-26 18:41:54 +02:00
1b2751f5c2 Fixing the selection handling to allow one char selection.
Thanks Alexander Sedov <alex0player@gmail.com> for suggesting the fix!
2013-04-25 06:28:11 +02:00
0851f2be2a Fixing the selection issue in altscreens. 2013-04-24 21:30:59 +02:00
011c0f9e5b Removed redundant check in draw code.
We're now clearing empty areas with spaces, so there is no point to check
if character contains non-empty string.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-24 21:27:56 +02:00
048c54fd5b Fix selecting clearing and BCE
The commit b78c5085f72 changed the st behaviour enabling BCE capability,
that means erase regions using background color. Problem comes when you
clear a region with a selection, because in this case the real mode of the
Glyph is not the value of term.line[y][x], due in drawregion we had enabled
the ATTR_REVERSE bit.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-23 20:36:30 +02:00
6b03bb769a Now clipping is more clear. 2013-04-23 19:37:28 +02:00
db6f796ecf Removing the overdrawing of some fonts. 2013-04-23 19:17:50 +02:00
7ea6863208 Yes, rs2 != is2. 2013-04-23 15:38:48 +02:00
8037dac847 There is no 8bit by default and reset 8bit too. 2013-04-23 15:33:21 +02:00
2bd6afd1c9 Implementing 8 bit mode for meta. 2013-04-23 15:22:14 +02:00
b596d6ba3c Adding wrap handling in selection. 2013-04-21 13:01:16 +02:00
872a7f18ea Added support for double/triple click+dragging.
Now double-click+dragging automatically snaps both ends to word boundaries
(unless on series of spaces), and triple-click selects whole lines.
As a side effect, snapping now occurs on button press, not button release
like it previously was, but I hope that won't be inconvenient for anyone.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-20 15:54:19 +02:00
3c546ae739 0.4.1 release. 2013-04-20 15:29:39 +02:00
645c1b0afc Making st compile on OpenBSD again. 2013-04-19 21:11:29 +02:00
e5ff746430 Selection now handles empty lines less counter-intuitively.
Now, when you are selecting a region, you will get all empty lines that happen
to be in it, including trailing ones. Last line terminator is omitted as it previously
was, though.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-18 16:51:52 +02:00
da182612b7 Removing trailing whitespace. 2013-04-18 06:51:18 +02:00
b7e6a5c825 Got rid of redundant Glyph state.
Now, newly allocated Glyphs are set to spaces and current cursor colors
with tclearregion() routine.

Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-18 06:48:06 +02:00
3ae0299064 Removing unneeded comments. 2013-04-18 06:41:54 +02:00
fed9968ba5 Got rid of code duplication in tnew() and tresize().
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-18 06:39:43 +02:00
0ca0dd8b11 Strip trailing spaces from lines when copying selection.
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-14 21:32:53 +02:00
c371fe58a3 Enable BCE everywhere. 2013-04-14 18:30:10 +02:00
44db38a5f8 Fix the geometry handling. 2013-04-13 15:24:26 +02:00
4de64fa4d2 \033 should be used in printf in the FAQ.
Never apply patches of Apple users without shouting at them. The basic rule of
nature is that when you apply Appl users patches without shouting at them that
something will go horribly wrong.
2013-04-13 12:26:17 +02:00
de4cd2f6af Resize now uses xclear(). 2013-04-13 09:49:11 +02:00
1e7816c202 Drawing a more visible rectangle as cursor on unfocus.
To have a more visible cursor on unfocused windows this patch makes st draw a
rectangle around the terminal cell.

Thanks Mark Hills <mark@xwax.org> for the suggestion!
2013-04-13 09:44:00 +02:00
5dc48af29e Patching while not really woken up. 2013-04-13 08:51:30 +02:00
5984657c00 Minor naming issue fixed. 2013-04-13 08:50:38 +02:00
4018b2c507 Making the copy and pasting consistent.
The copying and pasting in the terminald and GUI world is flawed. Due to the
discussion on the mailinglist it seems that sending '\n' is what GUIs expect
and '\r' what terminal applications want. St now implements that behaviour.
2013-04-13 08:48:17 +02:00
ddd429ea24 Convert FAQ into Markdown, to make it easier to integrate it into http://st.suckless.org/
Signed-off-by: Christoph Lohmann <20h@r-36.net>
2013-04-13 08:25:07 +02:00
684cf55a0d Make st work with a plain -e command. 2013-04-10 17:48:32 +02:00
b1813b14d9 Adopting arg.h with more flexible cmd handling. 2013-04-03 21:00:38 +02:00
580c8bbd46 Add an option to disable alternative screens. 2013-04-03 20:42:27 +02:00
502911e554 Updating the TODO file for after 0.4. 2013-03-29 19:44:37 +01:00
9 changed files with 1469 additions and 837 deletions

58
FAQ
View File

@ -1,43 +1,35 @@
--
Why does st not handle utmp entries?
## Why does st not handle utmp entries?
Use the excellent tool of utmp[0] for this task.
Use the excellent tool of [utmp](http://git.suckless.org/utmp/) for this task.
[0] http://git.suckless.org/utmp/
--
Some _random program_ complains that st is unknown/not
recognised/unsupported/whatever!
## Some _random program_ complains that st is unknown/not recognised/unsupported/whatever!
It means that st doesnt have any terminfo entry on your system. Chances are
you did not make install. If you just want to test it without installing it,
you can manualy run tic -s st.info in st dir. It will compile st.info into a
fully working local terminfo description. You can delete it when youre done.
--
Nothing works, and nothing is said about an unknown terminal!
you did not `make install`. If you just want to test it without installing it,
you can manualy run `tic -s st.info`.
## Nothing works, and nothing is said about an unknown terminal!
* Some programs just assume theyre running in xterm i.e. they dont rely on
terminfo. What you see is the current state of the “xterm compliance”.
* Some programs dont complain about the lacking st description and default to
another terminal. In that case see the question about terminfo.
--
I get some weird glitches/visual bug on _random program_!
Try lauching it with a different TERM: $ TERM=xterm myapp. toe(1) will give
you a list of available terminals, but youll most likely switch between
xterm, st or st-256color. The default value for TERM can be changed in
config.h (TNAME).
--
How do I scroll back up?
## I get some weird glitches/visual bug on _random program_!
Invoke st with a screen multiplexer like GNU screen[0] or tmux[1].
st -e screen works better for text reflowing. To enter screens scroll
back mode aka “copy mode”, its C-a ESC. You probably want defscrollback
10000 in your ~/.screenrc too.
Try launching it with a different TERM: $ TERM=xterm myapp. toe(1) will give
you a list of available terminals, but youll most likely switch between xterm,
st or st-256color. The default value for TERM can be changed in config.h
(TNAME).
[0] http://en.wikipedia.org/wiki/GNU_Screen
[1] http://en.wikipedia.org/wiki/Tmux
--
Why doesn't the Del key work in some programs?
## How do I scroll back up?
Using a terminal multiplexer.
* `st -e tmux` using C-b [
* `st -e screen` using C-a ESC
## Why doesn't the Del key work in some programs?
Taken from the terminfo manpage:
@ -49,7 +41,7 @@ Taken from the terminfo manpage:
codes as smkx and rmkx. Otherwise the keypad is assumed to
always transmit.
In the st case smkx=\E[?1h\E= and rmkx=\E[?1l\E>, so it is mandatory that
In the st case smkx=E[?1hE= and rmkx=E[?1lE>, so it is mandatory that
applications which want to test against keypad keys, have to send these
sequences.
@ -73,7 +65,7 @@ Adding this option to your .inputrc will fix the keypad problem for all
applications using readline.
If you are using zsh, then read the zsh FAQ
(http://zsh.sourceforge.net/FAQ/zshfaq03.html#l25):
<http://zsh.sourceforge.net/FAQ/zshfaq03.html#l25>:
It should be noted that the O / [ confusion can occur with other keys
such as Home and End. Some systems let you query the key sequences
@ -91,5 +83,9 @@ If you are using zsh, then read the zsh FAQ
zle -N zle-line-finish
Putting these lines into your .zshrc will fix the problems.
--
## How can use meta in 8bit mode?
St support meta in 8bit mode, but the default terminfo entry doesn't
use this capability. If you want it, you have to use st-meta value
in TERM.

View File

@ -1,9 +1,15 @@
MIT/X Consortium License
© 2009-2012 Aurélien APTEL <aurelien dot aptel at gmail dot com>
© 2009 Anselm R Garbe <garbeam at gmail dot com>
© 2012 Roberto E. Vargas Caballero <k0ga at shike2 dot com>
© 2012 Christoph Lohmann <20h at r-36 dot net>
© 2009 Anselm R Garbe <garbeam at gmail dot com>
© 2013 Eon S. Jeon <esjeon at hyunmu dot am>
© 2013 Alexander Sedov <alex0player at gmail dot com>
© 2013 Mark Edgar <medgar123 at gmail dot com>
© 2013 Eric Pruitt <eric.pruitt at gmail dot com>
© 2013 Michael Forney <mforney at mforney dot org>
© 2013 Markus Teich <markus dot teich at stusta dot mhn dot de>
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),

20
TODO
View File

@ -1,32 +1,24 @@
vt emulation
------------
* color definition in CSI
* implement CSI parsing
* wide-character support in conjunction with fallback xft code
* mouse selection support
* double-height support
code & interface
----------------
* clean and complete terminfo entry
* add fallback fonts for the restricted xft code
* add a simple way to do multiplexing
drawing
-------
* add diacritics support to xdraws()
* make the font cache simpler
bugs
----
* fix shift up/down (shift selection in emacs)
* fix selection paste for xatom STRING
* fix rows and column definition in fixed geometry
* fix -e handling
* remove DEC test sequence when appropriate
* reverse cursor when drawin light on light background
* text should be readable
* When some application outputting long text is run in the shell init scripts,
then this text might be stripped to the standard 80x25 due to st running the
virtual terminal at first priority. Maybe the vt initialisation could be
moved somewhere after knowing the right window size.
misc
----

63
arg.h Normal file
View File

@ -0,0 +1,63 @@
/*
* Copy me if you can.
* by 20h
*/
#ifndef ARG_H__
#define ARG_H__
extern char *argv0;
/* use main(int argc, char *argv[]) */
#define ARGBEGIN for (argv0 = *argv, argv++, argc--;\
argv[0] && argv[0][1]\
&& argv[0][0] == '-';\
argc--, argv++) {\
char argc_;\
char **argv_;\
int brk_;\
if (argv[0][1] == '-' && argv[0][2] == '\0') {\
argv++;\
argc--;\
break;\
}\
for (brk_ = 0, argv[0]++, argv_ = argv;\
argv[0][0] && !brk_;\
argv[0]++) {\
if (argv_ != argv)\
break;\
argc_ = argv[0][0];\
switch (argc_)
/* Handles obsolete -NUM syntax */
#define ARGNUM case '0':\
case '1':\
case '2':\
case '3':\
case '4':\
case '5':\
case '6':\
case '7':\
case '8':\
case '9'
#define ARGEND }\
}
#define ARGC() argc_
#define ARGNUMF(base) (brk_ = 1, estrtol(argv[0], (base)))
#define EARGF(x) ((argv[0][1] == '\0' && argv[1] == NULL)?\
((x), abort(), (char *)0) :\
(brk_ = 1, (argv[0][1] != '\0')?\
(&argv[0][1]) :\
(argc--, argv++, argv[0])))
#define ARGF() ((argv[0][1] == '\0' && argv[1] == NULL)?\
(char *)0 :\
(brk_ = 1, (argv[0][1] != '\0')?\
(&argv[0][1]) :\
(argc--, argv++, argv[0])))
#endif

View File

@ -9,14 +9,40 @@ static char font[] = "Liberation Mono:pixelsize=12:antialias=false:autohint=fals
static int borderpx = 2;
static char shell[] = "/bin/sh";
/* timeouts (in milliseconds) */
/* Kerning / character bounding-box mutlipliers */
float cwscale = 1.0;
float chscale = 1.0;
/*
* word delimiter string
*
* More advanced example: " `'\"()[]{}"
*/
static char worddelimiters[] = " ";
/* selection timeouts (in milliseconds) */
static unsigned int doubleclicktimeout = 300;
static unsigned int tripleclicktimeout = 600;
/* alt screens */
static bool allowaltscreen = true;
/* frames per second st should at maximum draw to the screen */
static unsigned int xfps = 60;
static unsigned int xfps = 120;
static unsigned int actionfps = 30;
/*
* blinking timeout (set to 0 to disable blinking) for the terminal blinking
* attribute.
*/
static unsigned int blinktimeout = 800;
/*
* bell volume. It must be a value between -100 and 100. Use 0 for disabling
* it
*/
static int bellvolume = 0;
/* TERM value */
static char termname[] = "st-256color";
@ -49,18 +75,16 @@ static const char *colorname[] = {
/* more colors can be added after 255 to use with DefaultXX */
"#cccccc",
"#333333",
};
/*
* Default colors (colorname index)
* foreground, background, cursor, unfocused cursor
* foreground, background, cursor
*/
static unsigned int defaultfg = 7;
static unsigned int defaultbg = 0;
static unsigned int defaultcs = 256;
static unsigned int defaultucs = 257;
/*
* Colors used, when the specific fg == defaultfg. So in reverse mode this
@ -70,16 +94,27 @@ static unsigned int defaultucs = 257;
static unsigned int defaultitalic = 11;
static unsigned int defaultunderline = 7;
/* Internal shortcuts. */
/* Internal mouse shortcuts. */
/* Beware that overloading Button1 will disable the selection. */
static Mousekey mshortcuts[] = {
/* button mask string */
{ Button4, XK_ANY_MOD, "\031" },
{ Button5, XK_ANY_MOD, "\005" },
};
/* Internal keyboard shortcuts. */
#define MODKEY Mod1Mask
static Shortcut shortcuts[] = {
/* modifier key function argument */
{ MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} },
{ MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
{ MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
/* mask keysym function argument */
{ ControlMask, XK_Print, toggleprinter, {.i = 0} },
{ ShiftMask, XK_Print, printscreen, {.i = 0} },
{ XK_ANY_MOD, XK_Print, printsel, {.i = 0} },
{ MODKEY|ShiftMask, XK_Prior, xzoom, {.i = +1} },
{ MODKEY|ShiftMask, XK_Next, xzoom, {.i = -1} },
{ ShiftMask, XK_Insert, selpaste, {.i = 0} },
{ MODKEY|ShiftMask, XK_Insert, clippaste, {.i = 0} },
{ MODKEY, XK_Num_Lock, numlock, {.i = 0} },
};
/*
@ -88,12 +123,12 @@ static Shortcut shortcuts[] = {
* Mask value:
* * Use XK_ANY_MOD to match the key no matter modifiers state
* * Use XK_NO_MOD to match the key alone (no modifiers)
* keypad value:
* appkey value:
* * 0: no value
* * > 0: keypad application mode enabled
* * = 2: term.numlock = 1
* * < 0: keypad application mode disabled
* cursor value:
* appcursor value:
* * 0: no value
* * > 0: cursor application mode enabled
* * < 0: cursor application mode disabled
@ -103,26 +138,26 @@ static Shortcut shortcuts[] = {
* * < 0: crlf mode is disabled
*
* Be careful with the order of the definitons because st searchs in
* this table sequencially, so any XK_ANY_MOD must be in the last
* this table sequentially, so any XK_ANY_MOD must be in the last
* position for a key.
*/
/*
* If you want something else but the function keys of X11 (0xFF00 - 0xFFFF)
* mapped below, add them to this array.
* If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
* to be mapped below, add them to this array.
*/
static KeySym mappedkeys[] = { -1 };
/*
* Which bits of the state should be ignored. By default the state bit for the
* keyboard layout (XK_SWITCH_MOD) is ignored.
* State bits to ignore when matching key or button events. By default,
* numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
*/
uint ignoremod = XK_SWITCH_MOD;
static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
/* key, mask, output, keypad, cursor, crlf */
static Key key[] = {
/* keysym mask string keypad cursor crlf */
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
/* keysym mask string appkey appcursor crlf */
{ XK_KP_Home, ShiftMask, "\033[2J", 0, -1, 0},
{ XK_KP_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
{ XK_KP_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
{ XK_KP_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
{ XK_KP_Up, XK_ANY_MOD, "\033Ox", +1, 0, 0},
@ -138,7 +173,7 @@ static Key key[] = {
{ XK_KP_Right, XK_ANY_MOD, "\033[C", 0, -1, 0},
{ XK_KP_Right, XK_ANY_MOD, "\033OC", 0, +1, 0},
{ XK_KP_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
{ XK_KP_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
{ XK_KP_Begin, XK_ANY_MOD, "\033[E", 0, 0, 0},
{ XK_KP_End, ControlMask, "\033[J", -1, 0, 0},
{ XK_KP_End, ControlMask, "\033[1;5F", +1, 0, 0},
@ -153,10 +188,10 @@ static Key key[] = {
{ XK_KP_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
{ XK_KP_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
{ XK_KP_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
{ XK_KP_Delete, ControlMask, "\033[2J", -1, 0, 0},
{ XK_KP_Delete, ControlMask, "\033[M", -1, 0, 0},
{ XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
{ XK_KP_Delete, ShiftMask, "\033[2K", +1, 0, 0},
{ XK_KP_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
{ XK_KP_Delete, ShiftMask, "\033[2K", -1, 0, 0},
{ XK_KP_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
{ XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
{ XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
{ XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0},
@ -191,7 +226,7 @@ static Key key[] = {
{ XK_Left, ShiftMask, "\033[1;2D", 0, 0, 0},
{ XK_Left, ControlMask, "\033[1;5D", 0, 0, 0},
{ XK_Left, Mod1Mask, "\033[1;3D", 0, 0, 0},
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
{ XK_Left, XK_ANY_MOD, "\033[D", 0, -1, 0},
{ XK_Left, XK_ANY_MOD, "\033OD", 0, +1, 0},
{ XK_Right, ShiftMask, "\033[1;2C", 0, 0, 0},
{ XK_Right, ControlMask, "\033[1;5C", 0, 0, 0},
@ -209,13 +244,14 @@ static Key key[] = {
{ XK_Insert, ControlMask, "\033[2;5~", +1, 0, 0},
{ XK_Insert, XK_ANY_MOD, "\033[4h", -1, 0, 0},
{ XK_Insert, XK_ANY_MOD, "\033[2~", +1, 0, 0},
{ XK_Delete, ControlMask, "\033[2J", -1, 0, 0},
{ XK_Delete, ControlMask, "\033[M", -1, 0, 0},
{ XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0},
{ XK_Delete, ShiftMask, "\033[2K", +1, 0, 0},
{ XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0},
{ XK_Delete, ShiftMask, "\033[2K", -1, 0, 0},
{ XK_Delete, ShiftMask, "\033[3;2~", +1, 0, 0},
{ XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0},
{ XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0},
{ XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0},
{ XK_Home, ShiftMask, "\033[2J", 0, -1, 0},
{ XK_Home, ShiftMask, "\033[1;2H", 0, +1, 0},
{ XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0},
{ XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0},
{ XK_End, ControlMask, "\033[J", -1, 0, 0},
@ -225,7 +261,7 @@ static Key key[] = {
{ XK_End, XK_ANY_MOD, "\033[4~", 0, 0, 0},
{ XK_Prior, ControlMask, "\033[5;5~", 0, 0, 0},
{ XK_Prior, ShiftMask, "\033[5;2~", 0, 0, 0},
{ XK_Prior, XK_NO_MOD, "\033[5~", 0, 0, 0},
{ XK_Prior, XK_ANY_MOD, "\033[5~", 0, 0, 0},
{ XK_Next, ControlMask, "\033[6;5~", 0, 0, 0},
{ XK_Next, ShiftMask, "\033[6;2~", 0, 0, 0},
{ XK_Next, XK_ANY_MOD, "\033[6~", 0, 0, 0},
@ -249,7 +285,7 @@ static Key key[] = {
{ XK_F3, /* F63 */ Mod3Mask, "\033[1;4R", 0, 0, 0},
{ XK_F4, XK_NO_MOD, "\033OS" , 0, 0, 0},
{ XK_F4, /* F16 */ ShiftMask, "\033[1;2S", 0, 0, 0},
{ XK_F4, /* F28 */ ShiftMask, "\033[1;5S", 0, 0, 0},
{ XK_F4, /* F28 */ ControlMask, "\033[1;5S", 0, 0, 0},
{ XK_F4, /* F40 */ Mod4Mask, "\033[1;6S", 0, 0, 0},
{ XK_F4, /* F52 */ Mod1Mask, "\033[1;3S", 0, 0, 0},
{ XK_F5, XK_NO_MOD, "\033[15~", 0, 0, 0},

View File

@ -1,5 +1,5 @@
# st version
VERSION = 0.4
VERSION = 0.5
# Customize below to fit your system
@ -12,11 +12,11 @@ X11LIB = /usr/X11R6/lib
# includes and libs
INCS = -I. -I/usr/include -I${X11INC} \
$(shell pkg-config --cflags fontconfig) \
$(shell pkg-config --cflags freetype2)
`pkg-config --cflags fontconfig` \
`pkg-config --cflags freetype2`
LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 -lutil -lXext -lXft \
$(shell pkg-config --libs fontconfig) \
$(shell pkg-config --libs freetype2)
`pkg-config --libs fontconfig` \
`pkg-config --libs freetype2`
# flags
CPPFLAGS = -DVERSION=\"${VERSION}\" -D_BSD_SOURCE -D_XOPEN_SOURCE=600

7
st.1
View File

@ -3,6 +3,7 @@
st \- simple terminal
.SH SYNOPSIS
.B st
.RB [ \-a ]
.RB [ \-c
.IR class ]
.RB [ \-f
@ -23,6 +24,9 @@ st \- simple terminal
is a simple terminal emulator.
.SH OPTIONS
.TP
.B \-a
disable alternate screens in terminal
.TP
.BI \-c " class"
defines the window class (default $TERM).
.TP
@ -33,6 +37,9 @@ to use when st is run.
.TP
.BI \-g " geometry"
defines the X11 geometry string, which will fixate the height and width of st.
The form is [=][<width>{xX}<height>][{+-}<xoffset>{+-}<yoffset>]. See
.BR XParseGeometry (3)
for further details.
.TP
.BI \-o " file"
writes all the I/O to

2007
st.c

File diff suppressed because it is too large Load Diff

29
st.info
View File

@ -1,11 +1,9 @@
# unsupported xterm caps are (getting) commented.
# as soon as they work, uncomment them.
st| simpleterm,
acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
am,
bce,
bel=^G,
# blink=\E[5m,
blink=\E[5m,
bold=\E[1m,
cbt=\E[Z,
cvvis=\E[?25h,
@ -47,7 +45,7 @@ st| simpleterm,
ind=^J,
indn=\E[%p1%dS,
invis=\E[8m,
is2=\E[4l\E>,
is2=\E[4l\E>\E[?1034l,
it#8,
kel=\E[1;2F,
ked=\E[1;5F,
@ -154,6 +152,9 @@ st| simpleterm,
ncv#3,
op=\E[39;49m,
pairs#64,
mc0=\E[i,
mc4=\E[4i,
mc5=\E[5i,
rc=\E8,
rev=\E[7m,
ri=\EM,
@ -163,9 +164,9 @@ st| simpleterm,
rmir=\E[4l,
rmkx=\E[?1l\E>,
rmso=\E[27m,
rmul=\E[m,
rmul=\E[24m,
rs1=\Ec,
rs2=\E[4l\E>,
rs2=\E[4l\E>\E[?1034l,
sc=\E7,
setab=\E[4%p1%dm,
setaf=\E[3%p1%dm,
@ -194,3 +195,19 @@ st-256color| simpleterm with 256 colors,
# Nicked from xterm-256color
setab=\E[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m,
setaf=\E[%?%p1%{8}%<%t3%p1%d%e%p1%{16}%<%t9%p1%{8}%-%d%e38;5;%p1%d%;m,
st-meta| simpleterm with meta key,
use=st,
km,
rmm=\E[?1034l,
smm=\E[?1034h,
rs2=\E[4l\E>\E[?1034h,
is2=\E[4l\E>\E[?1034h,
st-meta-256color| simpleterm with meta key and 256 colors,
use=st-256color,
km,
rmm=\E[?1034l,
smm=\E[?1034h,
rs2=\E[4l\E>\E[?1034h,
is2=\E[4l\E>\E[?1034h,