Commit Graph

245 Commits

Author SHA1 Message Date
Roberto E. Vargas Caballero
3af49e34f6 Allow control characters inside escape sequences
Taken from vt100 manual programmer:

	Control characters (codes \0 to \37 inclusive) are specifically
	excluded from the control sequence syntax, but may be embedded
	within a control sequence. Embedded control characters are executed
	as soon as they are encountered by the VT100. The processing of the
	control sequence then continues with the next character received.
---
 st.c |   68 +++++++++++++++++++++++++++++++++---------------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)
2012-09-26 20:55:18 +02:00
Roberto E. Vargas Caballero
a7d7e29300 Ignore all control characters not handled
Taken from vt100 programmer manual:

	Control characters have values of \000 - \037, and \177. The control
	characters recognized by the VT100 are shown in Table 3-10. All
	other control codes cause no action to be taken.

We have to take attention when we are using alternate charset, because in
this cases they are not used as control characters.
---
 st.c |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
2012-09-26 20:53:46 +02:00
Christoph Lohmann
3a095984b0 Implementing line drawing right. 2012-09-26 20:21:08 +02:00
Christoph Lohmann
c3b0e2202b A reset should reset the line drawing too. 2012-09-25 21:39:25 +02:00
Christoph Lohmann
980c5956ed Enabling enacs and adding compatibility to xterm and urxvt for alternative
charsets.
2012-09-25 21:17:43 +02:00
Roberto E. Vargas Caballero
eb360e5fd1 Fix bug in tputc writing to io file
If -f options is enabled then tputc() writes all the data to a file. Actual
code assumes that all the strings in 'c' parameters have always 1 byte
length, but this is not always true, because due to utf-8 encoding some
characters can have a diferent length. So it is necessary pass string length
to tputc in order it can call to write() correctly.
---
 st.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
2012-09-25 21:04:35 +02:00
Christoph Lohmann
055a4f6d2c The xinit() call needs to be behind all the tty init, otherwise all the
allocated structures are wrong. The xclear() is now done on purpose. Please
keep X11 calls out of the way of pure tty-related calls.
2012-09-24 11:04:26 +02:00
Roberto E. Vargas Caballero
74d6abfee5 Add some documentetion to tsetmode
The names of the terminal modes supported by vt102 are (taken from the VT220
programmer reference manual):

Table 4-7 ANSI-Standardized Modes
Name  Mnemonic		    Parameter (Ps)
Error (ignored)		    -         0 (3/0)
Keyboard action		    KAM	      2 (3/2)
Insert/replace		    IRM	      4 (3/4)
Send/receive		    SRM	      12 (3/1 3/2)
Line feed/new line	    LNM       20 (3/2 3/0)

Table 4-8 ANSI-Compatible DEC Private Modes
Name  Mnemonic		  Parameter (Ps)
Error (ignored)		  -	    0 (3/0)
Cursor key		  DECCKM    1 (3/1)
ANSI/VT52		  DECANM    2 (3/2)
Column			  DECCOLM   3 (3/3)
Scroll			  DECSCLM   4 (3/4)
Screen			  DECSCNM   5 (3/5)
Origin			  DECOM	    6 (3/6)
Auto wrap		  DECAWM    7 (3/7)
Auto repeat		  DECARM    8 (3/8)
Printer form feed	  DECPFF    18 (3/1 3/8)
Printer extent		  DECPEX    19 (3/1 3/9)
Text cursor enable	  DECTCEM   25 (3/2 3/5)
National replacement character sets DECNRCM 42 (3/4 3/2)

This patch adds a comment for each one of these sequences.
---
 st.c |   26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
2012-09-24 10:29:37 +02:00
Roberto E. Vargas Caballero
c3b6345595 Fix LNM sequence
LNM sequence is a standard ANSI mode, not a DEC private mode.
---
 st.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
2012-09-24 10:28:35 +02:00
Roberto E. Vargas Caballero
2f215654a4 Add KAM sequence
This sequence lock/unlock the keyboard ignoring all the key pressing events
from X server.
---
 st.c |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
2012-09-24 10:28:05 +02:00
Roberto E. Vargas Caballero
11bec67875 Remove unused parameters in ttyresize
---
 st.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
2012-09-24 10:27:22 +02:00
Roberto E. Vargas Caballero
b6cfff1625 Clear X window in tsetreset()
tsetreset() is called when it is necessary a full initialization of the
terminal, so it also should clean the full X window and not only the
terminal content. It is necessary change the order of the
initialization in main(), and put xinit before of tnew(), because tnew()
calls to tsetreset(), and  this can cause a call to xreset() with
incorrect values.
---
 st.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
2012-09-24 10:26:50 +02:00
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