Commit Graph

283 Commits

Author SHA1 Message Date
Christoph Lohmann 21a0c4a2e0 Merging xft and current st heads. 2012-09-24 10:24:36 +02:00
Christoph Lohmann 2b3c1219c8 Initial Xft support for st. More to follow. 2012-09-24 10:20:45 +02:00
Aurélien Aptel 816a70c01b use typedef'd unsigned type and regular bool type. 2012-09-19 16:03:16 +02:00
Christoph Lohmann e4bf2679c1 Fixing the redrawing patch of k0ga, so it's using xclear() in redraw() too. 2012-09-17 22:44:27 +02:00
Roberto E. Vargas Caballero 4876d6e05b Clean windows display after resizing
Some times the size after a resizing is not an exact multiply of a number of
characters, so redrawn the screen using the lines and columns of the neww
size can cause that some old graphics keep in the screen. Solution is clean
all the windows with the background color.
---
 st.c |    3 +++
 1 file changed, 3 insertions(+)
2012-09-17 22:13:17 +02:00
Roberto E. Vargas Caballero 88a8f85a8a 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 111199cf22 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 e3671006db 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 426887ccec Applying a shortening proposal for the run loop of k0ga. 2012-09-16 20:43:51 +02:00
Roberto E. Vargas Caballero 58a57a2305 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 9fbafe55c9 Preliminary solution to the stuttering problem. 2012-09-16 13:22:23 +02:00
Roberto E. Vargas Caballero d81250e5f9 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 c5a9b799d4 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 85849ce72a 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 15cc8754c2 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 ba1e9daeef 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 a62789788c Implementing italic-bold. This will require an increase of the avgWdth. 2012-09-14 19:46:07 +02:00
Christoph Lohmann b156352656 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 776a022e39 Importing the patch of Roberto Vargas to inherit signal handlers. 2012-09-13 23:19:57 +02:00
Christoph Lohmann fe2ba95b3d Reset window title on terminal reset too. 2012-09-13 07:16:38 +02:00
Christoph Lohmann d018c9c8ef Adding another bold off sequence. 2012-09-13 07:04:34 +02:00
Roberto E. Vargas Caballero 720cb816dc 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 b9d5fec4f2 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 8f1144edee Make nyancat(1) work. Important release feature! 2012-09-12 13:20:10 +02:00
Christoph Lohmann 121d9109e8 Add preliminary blink stubs. Real implementation is still missing. 2012-09-12 13:08:26 +02:00
Christoph Lohmann c092bce366 Add another obscure way to set a window title. 2012-09-12 13:00:39 +02:00
Christoph Lohmann af29fb2a50 Fixing the too small window in non-tiling window managers. 2012-09-10 13:39:41 +02:00
Christoph Lohmann 122ed57702 Making the selection work again. 2012-09-06 08:02:56 +02:00
Christoph Lohmann a1cd28f809 Allow simpler stdout -f handling. 2012-09-06 00:00:50 +02:00
Christoph Lohmann f2da43a0b6 Adding instantenous debug output and fixing italic with a reset. 2012-09-05 23:38:57 +02:00
Christoph Lohmann 4a4ae19158 Removing masks for unhandled enter and leaving events. 2012-09-05 22:39:09 +02:00
Christoph Lohmann dd0b7a077f 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 f471a32d29 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 017af76f5c Forcing the parameter limit to xcopy() and selpaste(). Thanks to Rob Pilling. 2012-09-05 21:54:52 +02:00
Christoph Lohmann 42505c5215 Removing unneeded arguments to copy(). Thanks to Andrew Hills. 2012-09-05 21:52:01 +02:00
Christoph Lohmann 462a966ee2 Implement italic font support. 2012-09-05 21:48:26 +02:00
Christoph Lohmann 67c1a23053 Fixing the resizing behaviour. 2012-09-05 00:08:13 +02:00
Christoph Lohmann e09709d92d Forgot one line. It's late. 2012-09-04 22:51:29 +02:00
Christoph Lohmann b1d383a0a3 Cleaning up the fixed window size and the resizing of clients. 2012-09-04 22:44:33 +02:00
Christoph Lohmann 6e88c7f602 CUP == HVP; CHA == HPA; 2012-09-04 21:56:55 +02:00
Christoph Lohmann 59fe59d3d1 Unifying the old style. 2012-09-04 20:34:43 +02:00
Roberto E. Vargas Caballero 98b6f84bfc 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 66669a5585 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 1d6702024b Fixing the border pixel when there is a negative position. 2012-09-03 23:09:34 +02:00
Christoph Lohmann 579f12d47b Add -g geometry to st and the manpage. 2012-09-03 23:02:29 +02:00
Roberto E. Vargas Caballero 930b2c4a7f 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 a984ffc4cb 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 b11d85c9be Add standout mode. 2012-09-02 19:53:50 +02:00
Christoph Lohmann 7f17a70834 Cleaning up lonely tabs. 2012-09-02 19:43:29 +02:00
Christoph Lohmann 588ba51a53 Make it more obvious where the wrong attribute is used. 2012-09-02 19:42:00 +02:00
Roberto E. Vargas Caballero c79df9f78d 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 81c678e53e 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 c58950f2ef Applying the CBT patch of Roberto Vargas. Thanks. 2012-08-30 21:17:54 +02:00
Christoph Lohmann 91fa81dbac Never trust terminfo fata morganas. And adding other xterm compatibility. 2012-08-30 07:38:47 +02:00
Christoph Lohmann 6696ef8563 Add OSC, DSC, PM, APC and settitle. 2012-08-29 23:14:20 +02:00
Roberto E. Vargas Caballero aaef13aaaa 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 c084c06b40 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 93901ca4fe 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 ee7fd748ac 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 c6853fe185 apply post-XDBE patch BORDER fix 2012-08-03 14:46:40 +02:00
Brandon Invergo 94771d0588 Implement Xdbe-based double-buffering 2012-07-28 14:27:26 +02:00
Aurélien Aptel cfea72c7b4 cleanup. refactored dirt-related function. 2012-02-27 12:44:02 +01:00
Aurélien Aptel 6c0a1eff2f use SHELL as default shell. 2012-02-16 19:24:46 +01:00
Aurélien Aptel ff5edcfd70 replace fwrite by printf. 2012-02-16 00:59:26 +01:00
Aurélien Aptel cb2e0e9c31 rewrite csidump(). 2012-02-16 00:58:16 +01:00
Aurélien Aptel 53ac69e90d clean and name enum definitions. 2012-02-16 00:33:11 +01:00
Aurélien Aptel 751fb765e4 fix default color overwriten bug. 2012-02-16 00:10:32 +01:00
Aurélien Aptel be2877cd04 show dark cursor when unfocused. 2012-02-15 19:33:48 +01:00
Aurélien Aptel 33558ca042 handle dim/bright colors. 2012-02-15 19:10:31 +01:00
Aurélien Aptel 6de1ba6e74 merge 2012-02-13 01:01:41 +01:00
anselm@garbe.us b11e22df7d some minor fixes 2012-02-11 10:48:18 +01:00
Aurélien Aptel cee6ccc6ee reduce size of each glyph for faster copy. 2012-02-08 16:45:52 +01:00
Aurélien Aptel bcb7ec68c2 cosmetic, whitespace, etc. 2012-01-21 23:43:03 +01:00
Aurélien Aptel df54ab0405 fix PRINT/DRAW _TIMEOUT and fix redrawing bug. 2012-01-21 23:26:53 +01:00
Aurélien Aptel 896310e592 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 13a8eeb810 fix segfault in selection. (thx Martti Kühne) 2012-01-10 22:21:03 +01:00
Aurélien Aptel ab9c9a4e3a merge. 2011-11-01 16:37:16 +01:00
Aurélien Aptel a20125a3d1 fix selection. (thx Tarmo Heiskanen) 2011-11-01 16:33:43 +01:00
Aurélien Aptel 23bb97d9f3 drawregion() only copies region on screen. 2011-10-20 23:26:58 +02:00
Aurélien Aptel 0dbf9c8c12 add dirty flag for lines 2011-10-20 23:20:59 +02:00
Aurélien Aptel 907cb8bfa6 no palette limit (thx Nick) 2011-10-06 21:32:34 +02:00
Aurélien Aptel 9d613092d6 simplify version format. 2011-09-22 10:04:58 +02:00
Aurélien Aptel 4bd087766f selection is removed or scrolled properly. (thx Rafa Garcia Gallego) 2011-09-16 18:48:16 +02:00
Aurélien Aptel b032814e25 working on old repo, merging recent changesets. 2011-09-16 18:24:13 +02:00
Aurélien Aptel 8e66b5cc16 move xembedatom in XWindow struct, add link to xembed specs. 2011-09-16 18:21:48 +02:00
Aurélien Aptel 8d2d8848e8 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 d5f3d120ea remove dup of default window size. 2011-09-16 17:57:56 +02:00
Aurélien Aptel 6f260ba164 fix custom key handling. 2011-08-14 17:13:59 +02:00
Aurélien Aptel 8503f954a1 fix focus state when embed in another window. 2011-06-09 18:25:56 +02:00
Aurélien Aptel cddbd6eee5 fix segfault with mouse selection. (thx anonymous) 2011-06-09 14:27:07 +02:00
Aurélien Aptel 3959a99293 add -w option to embed st. (thx nodus cursorius) 2011-06-08 21:35:58 +02:00
Aurélien Aptel 4736edd469 applied parts of "anonymous" cleanup patch. 2011-06-08 20:26:00 +02:00
Aurélien Aptel 189a81caa1 add altscreen escseq alias & caps to terminfo entry. (thx Bert Münnich) 2011-06-08 20:22:38 +02:00
Aurélien Aptel 9b404c0dfb disable mouse highlight when mouse report enabled. (thx Bert Münnich) 2011-06-08 19:32:10 +02:00
Aurélien Aptel d59f92d6f1 reverse video mode. (thx Bert Münnich) 2011-06-08 12:40:35 +02:00
Aurélien Aptel 6734de9b6e set title before mapping window (thx Kamil Cholewiński). 2011-05-22 16:57:27 +02:00
Aurélien Aptel 7d352f1436 applied parts of Connor Lane Smith's cleanup patch. 2011-05-14 17:47:37 +02:00
Aurélien Aptel 5beae6a62e macro cleanup. 2011-05-10 22:55:35 +02:00
Aurélien Aptel 80da37203e support for x11 xterm mouse reporting 2011-05-10 22:22:44 +02:00
Aurélien Aptel 8eaed2cdda whitespace. 2011-04-26 20:29:28 +02:00