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.
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.
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.
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.
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>
The commit b78c5085f7 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>
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>
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>
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!
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.
People sending me patches against strange revisions and basing on their own
revisions make me having to reapply them. Then such errors appear.
Thanks Alexander Sedov <alex0player@gmail.com> for noticing this.
The specified font[] pattern need not have a medium weight. It could be
specified as a number too or have a different weight other than medium.
Signed-off-by: Christoph Lohmann <20h@r-36.net>
Keypad will generate keycodes when keypad application mode is enabled. It
can cause problems with some programs like vi, which operates in such
mode.
This patch change by default don't generate the keycodes never, but this
behaviour can be changed using the combination Alt + NumLock.
---
config.def.h | 34 ++++++++++++++++++----------------
st.c | 17 +++++++++++++++--
2 files changed, 33 insertions(+), 18 deletions(-)
This patch apply the same code for shortcuts that it is used now for defined
keys. So it is possible use now XK_NO_MOD and XK_ANY_MOD for defining shortcuts.
---
st.c | 35 ++++++++++++++++++++---------------
1 file changed, 20 insertions(+), 15 deletions(-)
XK_NO_MOD match a key without modifiers and XK_ANY_MOD match a key does not
matter what modifiers are pressed to. Like they are mask the best value for
XK_ANY_MOD is all the bits to 1, so the and with any state will be equal to
the state. This also imply that is necessary check the case for XK_NO_MOD
(no modifiers at all) with some modifier in state, and the inverse
(some mask different to XK_ANY_MOD or XK_NO_MOD and no modifiers in state).
---
st.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
When Shift + Tab is pressed X server send the event XK_ISO_Left_Tab with
ShiftMask, so this is the entry we need in config.def.h
This patch also revert the previous patch for this issue because it breaks
the keyboard.
---
config.def.h | 2 +-
st.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
Some keys were in the Key array while others were hardcoded in
kpress().This cause some problems with some keys which can generate more of
one string based in the configuration of the terminal.
---
config.def.h | 70 ++++++++++++++++++++++++++++++++++++++++-----------------
st.c | 71 +++++++++++++++++++++++++---------------------------------
2 files changed, 79 insertions(+), 62 deletions(-)
Shift + Insert is used like a hot key for paste the selection, so it is more
logical move it to shortcut array instead of having special code for it.
---
config.def.h | 1 +
st.c | 13 +++----------
2 files changed, 4 insertions(+), 10 deletions(-)
Keypad mode is used for detecting when keys in the auxiliary keypad are
pressed, while cursor mode is used for detecting when a cursor is pressed,
but they are different modes.
St was mixing both modes and DECPAM and DECPNM modified the cursor mode, and
this was incorrect.
---
st.c | 5 +++--
st.info | 4 ++--
2 files changed, 5 insertions(+), 4 deletions(-)
These sequences will be never implemented and in this moment they are
generating a lot of noise.
---
st.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
DECARM modify the auto repeat settings in the keyboard, and since we can not
modify this setting in the Xserver the best solution is only ignore it.
---
st.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
VPR stands for Move cursor down a number of rows, and the code was moving
the cursor up instead of moving it down.
---
st.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
DECOM sequence allows to the user defines a new home position. The home
position is used as base for all the movement commands except HVP and
VPA. It is important notice than DECSLM moves cursor to absolute position
0,0.
---
st.c | 33 ++++++++++++++++++++++++++-------
1 file changed, 26 insertions(+), 7 deletions(-)
After terminal reset saved terminal position is reset to 0, allowing know
where cursor will go in next restore cursor operation.
---
st.c | 2 ++
1 file changed, 2 insertions(+)
Since relational expresions are always evaluated to 0 or 1, we can use
bitwise xor operator instead of using more complex boolean expressions.
---
st.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
Sequences like DECSC, DECRC, ESC [?1047l or ESC [?1047h save and restore
cursor attributes, than taken from vt100 manual are:
Save Cursor (DECSC) ESC 7
===========================
Saves the following in terminal memory.
- cursor position
- graphic rendition
- character set shift state
- state of wrap flag
- state of origin mode
Restore Cursor (DECRC) ESC 8
===========================
Restores the states described for (DECSC) above. If none of these
characteristics were saved, the cursor moves to home position; origin
mode is reset; no character attributes are assigned; and the default
character set mapping is established.
This implies that hide attribute of the cursor should not be saved/restored
in these sequences. The best way to fix this problem is moving hide
attribute into the terminal mode, instead of having it in the cursor state.
---
st.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
write can write less bytes than we request, so it is necessary check the
return value, in case of error print a message and don't continnue writing
in the file.
---
st.c | 39 ++++++++++++++++++++++++++++++---------
1 file changed, 30 insertions(+), 9 deletions(-)
This sequence was used by DEC personal in to for verifying the screen adjust
of terminals. It is the unique test sequence implemented by all the
emulators, and I think it is because they want be conforms with vttest which
uses this sequence in some tests.
---
st.c | 31 +++++++++++++++++++++++--------
1 file changed, 23 insertions(+), 8 deletions(-)
If vt100_0 is a automatic variable then it is initializated in each call to
tsetchar, but if the variable is static it is initializated only in compile
time.
---
st.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Do not send NUL character in the identification (use (sizeof(VT102ID) - 1),
and finish the sequence once you execute it.
---
st.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
These sequences are used by the host in order to can detect which kind of
terminal is connected. St will answer like a vt102 terminal with this patch.
---
st.c | 9 +++++++++
1 file changed, 9 insertions(+)
Non handled codes must be ignored, except in graphic mode. Also STR
sequences have higher priority than control codes, so they must be handled
before of them.
---
st.c | 160 ++++++++++++++++++++++++++++++++++++------------------------------
1 file changed, 87 insertions(+), 73 deletions(-)
SI and SO allows change the G0 and G1 selection. This implementation is not
full vt100 compatible, but it is complatible with linux virtual terminal
implementation. For full vt100 compatibility we need remake a lot of stuff
relate to the different charmaps.
---
st.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
Add the documentation from the vt100 manual programmer:
Control Octal Action Taken
Character Code
-------------------------------------------
NUL 000 Ignored on input (not stored in input buffer;
see full duplex protocol).
ENQ 005 Transmit answerback message.
BEL 007 Sound bell tone from keyboard.
BS 010 Move the cursor to the left one character position,
unless it is at the left margin,
in which case no action occurs.
HT 011 Move the cursor to the next tab stop,
or to the right margin if no further tab stops
are present on the line.
LF 012 This code causes a line feed or
a new line operation. (See new line mode).
VT 013 Interpreted as LF.
FF 014 Interpreted as LF.
CR 015 Move cursor to the left margin on the current line.
SO 016 Invoke G1 character set, as designated by SCS
control sequence.
SI 017 Select G0 character set, as selected by ESC ( sequence.
XON 021 Causes terminal to resume transmission.
XOFF 023 Causes terminal to stop transmitted all codes
except XOFF and XON.
CAN 030 If sent during a control sequence, the sequence is
immediately terminated and not executed. It also causes
the error character to be displayed.
SUB 032 Interpreted as CAN.
ESC 033 Invokes a control sequence.
DEL 177 Ignored on input (not stored in input buffer).
--------------------------------------------
---
st.c | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
sequences, so we have to support escape sequences in escape sequences that
escape sequences in escape sequences – setting a title won't notify you
anymore.
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(-)
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(-)
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(-)
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(-)
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(-)
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(+)
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(-)
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(-)
Markus Teich
Alexander Sedov
Roberto E. Vargas Caballero
Christoph Lohmann
joe9
Aurélien Aptel