Commit Graph

278 Commits

Author SHA1 Message Date
Roberto E. Vargas Caballero
40be64cff8 Copy non set positions as spaces
st selection don't insert in the selection position whose value is not
set. This is correct for the positions in the end of the line, but cause
some problems in the beginning. For example echo -e 'a\tb' will print in the
screen:

a	b

but after selecting and copying in some place you get:

ab

because positions from 1 to 7 don't have any value. This patch deals all
positions without value as blank (even at the end of the line).
---
 st.c |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)
2012-09-17 22:13:09 +02:00
Roberto E. Vargas Caballero
63cab32d05 Add newline in error messages
---
 st.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
2012-09-17 22:11:28 +02:00
Roberto E. Vargas Caballero
cf7edb2641 Add xcalloc wrapper
malloc and realloc are called through xmalloc and xrealloc, so calloc should
be called through xcalloc.
---
 st.c |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)
2012-09-17 22:11:20 +02:00
Christoph Lohmann
8a9c8b7502 Applying a shortening proposal for the run loop of k0ga. 2012-09-16 20:43:51 +02:00
Roberto E. Vargas Caballero
7d54d35a95 Remove call to draw in resize
In previous commits draw was removed from all the X events, but I forgot do
it in resize.
---
 st.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
2012-09-16 14:02:35 +02:00
Christoph Lohmann
d41d383aad Preliminary solution to the stuttering problem. 2012-09-16 13:22:23 +02:00
Roberto E. Vargas Caballero
6bf6ef46f2 Fix selection bug
After the commit named "Remove timeout in the main loop", selection is not
working in the proper way. After selecting something, press mouse button in
a line outside of selection causes an incorrect highlight. This patch fix
the problem forcing a draw after the press event, but this is only a fast
hack. Real solution means rewriting selection code.
---
 st.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
2012-09-16 10:49:12 +02:00
Roberto E. Vargas Caballero
c624bb5703 Render only once in each main loop iteration
draw() runs over all lines of the screen and renders only the dirty lines,
this avoids render lines which are not modified since last draw() call. In
this moment the main loop is something like:

     - Wait something to read from file descriptors
     - Read from pseudo tty
     - Call draw() for rending
     - Read X events

This cause the problem that all the X events that have to update the screen
have to call draw() (because draw() is called before of X events handling),
so you can have multiples renderings in only one iteration, that will waste
a lot of resources.

This patch change the main loop to:

     - Wait something to read from file descriptors
     - Read from pseudo tty
     - Read X events
     - Call draw() for rending

So X events don't have to worry about rendering, because draw() is called
after them.

The only place where draw is called outside of the main loop is in redraw(),
but it is necessary for getting a good tput flash.
---
 st.c |   29 ++++++-----------------------
 1 file changed, 6 insertions(+), 23 deletions(-)
2012-09-16 10:48:38 +02:00
Roberto E. Vargas Caballero
f3704e6553 Remove timeout in the main loop
The main loop waits until there is some data to read in file descriptors of
the X server or the pseudo tty. But it uses a timeout in select(), which
causes that st awake each 20 ms, even it doesn't have something to do. This
patch removes this problem removing the timeout, which is not needed.
---
 TODO |    1 -
 st.c |   27 +++------------------------
 2 files changed, 3 insertions(+), 25 deletions(-)
2012-09-16 10:47:21 +02:00
Roberto E. Vargas Caballero
9c04eb529f Call XSync in redraw
It is necessary call to XSync if you want a good tput flash, because in
other way you can not be sure that white screen will be shown.
---
 st.c |    1 +
 1 file changed, 1 insertion(+)
2012-09-16 10:46:08 +02:00
Roberto E. Vargas Caballero
6b42002e1a Call XdbeQueryExtension before of calling any Xdbe function
XdbeQueryExtension() tells to the caller if the Xdbe extension is present in
the X server, so it should be called for sanity. But like is said in
XdbeQueryExtension(3):

	No other Xdbe functions may be called before this function.  If a
	client violates this rule, the effects of all subsequent Xdbe calls
	that it makes are undefined.

it is mandatory call this function.
---
 st.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
2012-09-16 10:45:36 +02:00
Christoph Lohmann
dccba949b5 Implementing italic-bold. This will require an increase of the avgWdth. 2012-09-14 19:46:07 +02:00
Christoph Lohmann
30e167c457 Ignore NUL character as a padding character. Telnet may use this. Patch of
Roberto Vargas.
2012-09-13 23:21:40 +02:00
Christoph Lohmann
184c38c88b Importing the patch of Roberto Vargas to inherit signal handlers. 2012-09-13 23:19:57 +02:00
Christoph Lohmann
12516e2181 Reset window title on terminal reset too. 2012-09-13 07:16:38 +02:00
Christoph Lohmann
42ebd8ef7f Adding another bold off sequence. 2012-09-13 07:04:34 +02:00
Roberto E. Vargas Caballero
d254935875 Remove buffering to fileio instead of calling fflush
By default text files are line buffered, and this means that -f option will
not write the line until a \n is printed. This is not very useful for
debugging, so a call to fflush was added. This patch substitute this call
(which will be done by each character painted) by the full remove of the
buffering in the file.
---
 st.c |   12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)
2012-09-12 21:51:55 +02:00
Roberto E. Vargas Caballero
adc4631574 Add xmalloc and xrealloc wrappers
If malloc  or realloc fail they return NULL. Theorically this condition
should be tested in the code, but it's a strange condition today (basically
if this is hapenning thenyou have a big problem), and even Linux never returns
NULL in the default configuration (only if the process don't have room in
the space address, something a bit impossible in the case of st). But stis
enough small for being executed in low resources computers where this can be
a real problem. So the easy way is creating a wrappers function for them and
call to die in case of error.
---
 st.c |   44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)
2012-09-12 21:25:35 +02:00
Christoph Lohmann
91d32161fc Make nyancat(1) work. Important release feature! 2012-09-12 13:20:10 +02:00
Christoph Lohmann
04b6bee980 Add preliminary blink stubs. Real implementation is still missing. 2012-09-12 13:08:26 +02:00
Christoph Lohmann
1e334a1469 Add another obscure way to set a window title. 2012-09-12 13:00:39 +02:00
Christoph Lohmann
10cb169ede Fixing the too small window in non-tiling window managers. 2012-09-10 13:39:41 +02:00
Christoph Lohmann
e5588098c0 Making the selection work again. 2012-09-06 08:02:56 +02:00
Christoph Lohmann
25cdfc8483 Allow simpler stdout -f handling. 2012-09-06 00:00:50 +02:00
Christoph Lohmann
b576d2c551 Adding instantenous debug output and fixing italic with a reset. 2012-09-05 23:38:57 +02:00
Christoph Lohmann
fd7f78f2c7 Removing masks for unhandled enter and leaving events. 2012-09-05 22:39:09 +02:00
Christoph Lohmann
001b0152a4 If the selection is cleared, draw() and do it on button press too. 2012-09-05 22:17:42 +02:00
Roberto E. Vargas Caballero
62c5abf2a7 Unhighlight selection when selection is owner by other window
st marks the active selection using reverse colors in the box selection, but
once that another window becomes owner of the selection, it is very
confusing that st keeps highlight the old selection. Usually terminal
emulators remove the highlight when it is not valid anymore.

X sends a SelectionClear event in this situation, so we only have to add a
callback which unhighlight the selectin box.
---
 st.c |    9 +++++++++
 1 file changed, 9 insertions(+)
2012-09-05 21:55:45 +02:00
Christoph Lohmann
a683de5364 Forcing the parameter limit to xcopy() and selpaste(). Thanks to Rob Pilling. 2012-09-05 21:54:52 +02:00
Christoph Lohmann
d0973d19da Removing unneeded arguments to copy(). Thanks to Andrew Hills. 2012-09-05 21:52:01 +02:00
Christoph Lohmann
f5c6bcf03a Implement italic font support. 2012-09-05 21:48:26 +02:00
Christoph Lohmann
76a86e1612 Fixing the resizing behaviour. 2012-09-05 00:08:13 +02:00
Christoph Lohmann
a9550744b5 Forgot one line. It's late. 2012-09-04 22:51:29 +02:00
Christoph Lohmann
b9567a9b18 Cleaning up the fixed window size and the resizing of clients. 2012-09-04 22:44:33 +02:00
Christoph Lohmann
870be23e28 CUP == HVP; CHA == HPA; 2012-09-04 21:56:55 +02:00
Christoph Lohmann
1f7896ae9c Unifying the old style. 2012-09-04 20:34:43 +02:00
Roberto E. Vargas Caballero
ec8262e106 Check alternative screen before drawing box selection
Some programs use the alternative screen (vi, less, ...), whose
content is different of the main screen. If you select text in one of
the screen, you don't wait the box selection is painted in the other
screen, so it is necessary check if the selection was done in the same
screen we are going to paint. Before to this commit, you could do
something like:

	$ LESS="" ls | less
	(select some code)
	q

and selection box remains drawing in the main screen, but the content
of selection keeps text of the alternate screen.
---
 st.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)
2012-09-04 20:33:01 +02:00
Roberto E. Vargas Caballero
684a6b59ee Add newline to stderr message
---
 st.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2012-09-04 20:31:21 +02:00
Christoph Lohmann
59eaf3ce56 Fixing the border pixel when there is a negative position. 2012-09-03 23:09:34 +02:00
Christoph Lohmann
31c71cddb9 Add -g geometry to st and the manpage. 2012-09-03 23:02:29 +02:00
Roberto E. Vargas Caballero
e135e96f35 Force redisplay of all lines in DECSCNM
When it is called DECSCNM all lines become dirty, because it is necessary
redraw all lines for getting the new colors. It is easy see the problem
running 'echo ^[[?5h'.

In order to get a correct flash when running tput flash is necessary wait
after DECSCNM, until the changes are displayed, because in other case the
switch between reverse on/reverse off will be too much fast and nothing will
happen.
---
 st.c |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
2012-09-03 21:52:34 +02:00
Roberto E. Vargas Caballero
ee4a9934ab Add write I/O to file
This is a theorical feature listed in http://st.suckless.org/goals. All the
input/output of the terminal will be written to a file, which can be very
useful for debugging, and also allow interconnect st to other process
through named pipes.
---
 st.1 |    6 ++++++
 st.c |   14 +++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
2012-09-03 21:52:21 +02:00
Christoph Lohmann
b3d8986489 Add standout mode. 2012-09-02 19:53:50 +02:00
Christoph Lohmann
6f336ce8f2 Cleaning up lonely tabs. 2012-09-02 19:43:29 +02:00
Christoph Lohmann
e2f6df0d17 Make it more obvious where the wrong attribute is used. 2012-09-02 19:42:00 +02:00
Roberto E. Vargas Caballero
7988713b35 Enable multiple arguments in SM and RM
SM and RM can receive multiple parameters, but the code only was accepting
only one. This patch join the code of set and reset modes (SM and RM) in a
common function and uses a loop which deals with all the arguments of the
sequence. This patch improves xterm and vt100 compability.
---
 st.c |  180 ++++++++++++++++++++++++++++--------------------------------------
 1 file changed, 76 insertions(+), 104 deletions(-)
2012-09-02 19:09:35 +02:00
Christoph Lohmann
1da81ff23e Silencing the compiler but keeping strparse.
This will really be needed when there is a full 256 color support.
2012-08-30 21:19:53 +02:00
Christoph Lohmann
4675c14758 Applying the CBT patch of Roberto Vargas. Thanks. 2012-08-30 21:17:54 +02:00
Christoph Lohmann
1175c4be7a Never trust terminfo fata morganas. And adding other xterm compatibility. 2012-08-30 07:38:47 +02:00
Christoph Lohmann
06963a1dc7 Add OSC, DSC, PM, APC and settitle. 2012-08-29 23:14:20 +02:00
Roberto E. Vargas Caballero
6590664fa0 Add CHT sequence
This sequence performs "Cursor Forward Tabulation <n> tab stops", which
although is not present in vt100 or vt102, xterm accepts it.
---
 st.c |    5 +++++
 1 file changed, 5 insertions(+)
2012-08-29 20:05:25 +02:00
Roberto E. Vargas Caballero
67d809776f Add TBC sequence
This sequence clears tab stops in the terminal. If the argument is not present
or is zero, then removes the tab stop of the current horizontal position. If
the argument is 3 then removes all the tab stops of the terminal. It was
necessary modify the terminfo entry tbc, because it has \E[2g instead of the
correct \E[3g.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
---
 st.c    |   12 ++++++++++++
 st.info |    2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
2012-08-29 19:59:47 +02:00
Roberto E. Vargas Caballero
94ce8a7184 Add HTS sequence
This sequence adds a new tab stop in the current horizontal position. This
means that tputtab must be look for the next tab stop in the tabs array
instead of using a hard coded value offset. Also, CHT sequence XXX message
is removed because it is not a vt10x sequence (as far as I know it is a
vt50x sequence), and it is not implemented by linux virtual terminal neither
by xterm.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
---
 st.c |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
2012-08-29 19:59:43 +02:00
Roberto E. Vargas Caballero
2d061761f9 Add tabs field into Term struct
Tabs stop are simulated in st using a fixed size of 8, always, without be
worried about sequences changing the tab stops. A user can put a tab stop in
each horizontal position of the screen, so we need at least one flag for
each column of the screen. In the same way as dirty flags is used for the
rows, it is used a bool dinamic array.

Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
---
 st.c |   22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)
2012-08-29 19:59:37 +02:00
Brandon Invergo
4eeb3aded3 apply post-XDBE patch BORDER fix 2012-08-03 14:46:40 +02:00
Brandon Invergo
9e48ff64e2 Implement Xdbe-based double-buffering 2012-07-28 14:27:26 +02:00
Aurélien Aptel
0e2bd2db06 cleanup. refactored dirt-related function. 2012-02-27 12:44:02 +01:00
Aurélien Aptel
62c5a5a60a use SHELL as default shell. 2012-02-16 19:24:46 +01:00
Aurélien Aptel
664c40f6bc replace fwrite by printf. 2012-02-16 00:59:26 +01:00
Aurélien Aptel
6cd5c3dab7 rewrite csidump(). 2012-02-16 00:58:16 +01:00
Aurélien Aptel
8ebab41592 clean and name enum definitions. 2012-02-16 00:33:11 +01:00
Aurélien Aptel
1ec0515e75 fix default color overwriten bug. 2012-02-16 00:10:32 +01:00
Aurélien Aptel
adf5d2e32a show dark cursor when unfocused. 2012-02-15 19:33:48 +01:00
Aurélien Aptel
5705e5dfd1 handle dim/bright colors. 2012-02-15 19:10:31 +01:00
Aurélien Aptel
45971204a2 merge 2012-02-13 01:01:41 +01:00
anselm@garbe.us
e478f91c10 some minor fixes 2012-02-11 10:48:18 +01:00
Aurélien Aptel
284430538d reduce size of each glyph for faster copy. 2012-02-08 16:45:52 +01:00
Aurélien Aptel
ae0966484c cosmetic, whitespace, etc. 2012-01-21 23:43:03 +01:00
Aurélien Aptel
156ce77645 fix PRINT/DRAW _TIMEOUT and fix redrawing bug. 2012-01-21 23:26:53 +01:00
Aurélien Aptel
96c22e1604 copy dirty lines to screen, add select() timeout & min time between draw() calls.
* add a timeout value (SELECT_TIMEOUT) of 20ms in the select() call
* wait at least 20ms (DRAW_TIMEOUT) between draw() calls
* only copy dirty lines from the buffer to the screen

what draw() does:
* clears dirty lines in the buffer
* draws the longest same-attributes string of each
  dirty line to the buffer with multiple xdraws() call
* copies the current dirty line from buffer to the screen with a single
  xcopy() call

this changeset makes st run ~10x faster.
2012-01-21 23:14:41 +01:00
Aurélien Aptel
281174445b fix segfault in selection. (thx Martti Kühne) 2012-01-10 22:21:03 +01:00
Aurélien Aptel
197c466864 merge. 2011-11-01 16:37:16 +01:00
Aurélien Aptel
5ca0d3d2fa fix selection. (thx Tarmo Heiskanen) 2011-11-01 16:33:43 +01:00
Aurélien Aptel
b1b9dc7eb5 drawregion() only copies region on screen. 2011-10-20 23:26:58 +02:00
Aurélien Aptel
44c83397af add dirty flag for lines 2011-10-20 23:20:59 +02:00
Aurélien Aptel
7c350025b2 no palette limit (thx Nick) 2011-10-06 21:32:34 +02:00
Aurélien Aptel
4a421ffbbc simplify version format. 2011-09-22 10:04:58 +02:00
Aurélien Aptel
62a92ca1aa selection is removed or scrolled properly. (thx Rafa Garcia Gallego) 2011-09-16 18:48:16 +02:00
Aurélien Aptel
98042a1a2d working on old repo, merging recent changesets. 2011-09-16 18:24:13 +02:00
Aurélien Aptel
5c6df8b3c3 move xembedatom in XWindow struct, add link to xembed specs. 2011-09-16 18:21:48 +02:00
Aurélien Aptel
43a4c5ebb2 tweak focus to support XEMBED client message and remove focus on EnterNotify. (thx Adrian) 2011-09-16 18:03:44 +02:00
Aurélien Aptel
bf2e23f535 remove dup of default window size. 2011-09-16 17:57:56 +02:00
Aurélien Aptel
54adc7ee50 fix custom key handling. 2011-08-14 17:13:59 +02:00
Aurélien Aptel
e2809f3976 fix focus state when embed in another window. 2011-06-09 18:25:56 +02:00
Aurélien Aptel
ce547d3060 fix segfault with mouse selection. (thx anonymous) 2011-06-09 14:27:07 +02:00
Aurélien Aptel
4259a3ba3a add -w option to embed st. (thx nodus cursorius) 2011-06-08 21:35:58 +02:00
Aurélien Aptel
fb32d01a18 applied parts of "anonymous" cleanup patch. 2011-06-08 20:26:00 +02:00
Aurélien Aptel
986670d080 add altscreen escseq alias & caps to terminfo entry. (thx Bert Münnich) 2011-06-08 20:22:38 +02:00
Aurélien Aptel
6eaec4732f disable mouse highlight when mouse report enabled. (thx Bert Münnich) 2011-06-08 19:32:10 +02:00
Aurélien Aptel
2edb412b6b reverse video mode. (thx Bert Münnich) 2011-06-08 12:40:35 +02:00
Aurélien Aptel
a05423cb6a set title before mapping window (thx Kamil Cholewiński). 2011-05-22 16:57:27 +02:00
Aurélien Aptel
cdd993c39e applied parts of Connor Lane Smith's cleanup patch. 2011-05-14 17:47:37 +02:00
Aurélien Aptel
a7f4af0139 macro cleanup. 2011-05-10 22:55:35 +02:00
Aurélien Aptel
9760a7a831 support for x11 xterm mouse reporting 2011-05-10 22:22:44 +02:00
Aurélien Aptel
9a3cc64f9d whitespace. 2011-04-26 20:29:28 +02:00
Aurélien Aptel
3d0eeac7a8 cleanup. 2011-04-26 20:22:15 +02:00
Aurélien Aptel
31ba817cc3 update TODO 2011-04-22 00:42:58 +02:00
Aurélien Aptel
e4dd367a4f selection clicks, shift+arrow keys, fast(er) redraw, key mask in config.h (thx Magnus Leuthner) 2011-04-22 00:18:53 +02:00
Aurélien Aptel
55c8d82eb1 take BORDER into account for selection. (thx Petr Sabata) 2011-04-03 21:03:48 +02:00
Aurélien Aptel
d679267c46 fix utf8 clipboard. (thx Petr Sabata) 2011-04-03 21:00:55 +02:00