Commit graph

422 commits

Author SHA1 Message Date
Christoph Lohmann
cf04354e06 Restoring the Alt + Backspace functionality. Thanks Brandon Invergo! 2012-11-19 17:22:32 +01:00
Roberto E. Vargas Caballero
55087ec2c7 Add application cursor sequences for Home
The commit 'Fixing some key issues with mc' fix the problem where mc didn't
recognize home key because the generated code and the terminfo entry were
different (terminfo khome = \E[1~ but generates \033[H).

Home key in ansi mode should generate the sequence CUP (\033[H) to 0,0 (home
position), but it is also interesting generate a application code which
identifies the key. Real vt520 only generates the ansi sequence CUP, linux
console generates only the application code \033[1~, xterm generates CUP in
ansi mode and \033OH in cursor application mode, rxvt only generates the
application code \033[7~.

This patch sets CUP in ansi mode and \033[1~ in cursor application mode, so
it can be used in both modes and the application mode value is similar to
near values (insert = \033[2~, Prior = \033[5~, Next = \033[6~, End =
\033[4~, Supr = \033[3).
---
 config.def.h |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
2012-11-16 11:32:17 +01:00
Christoph Lohmann
1cbe56026b Fixing some key issues with mc. Thanks nsz! 2012-11-16 05:43:00 +01:00
Christoph Lohmann
440a19a662 Getbuttoninfo is always used the same and just a helper function. Shrinking it
a bit. Thanks nsz!
2012-11-15 21:42:58 +01:00
Roberto E. Vargas Caballero
6312f76ca4 Fix speech error in comment
---
 st.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
2012-11-15 20:57:37 +01:00
Roberto E. Vargas Caballero
0df350cd0b Remove unused fields in cursor_movement
---
 st.c |    4 ----
 1 file changed, 4 deletions(-)
2012-11-15 20:57:33 +01:00
Christoph Lohmann
1cea02be8d Removing my debug fprintf(). 2012-11-15 20:25:16 +01:00
Christoph Lohmann
2b6521f5d2 Optimizing the key lookup to the X11 function key. It is still possible to
remap other keys.
2012-11-15 20:19:35 +01:00
Christoph Lohmann
927d8fb459 Making all function keys accessible. 2012-11-15 20:03:18 +01:00
Christoph Lohmann
a29ab30f25 Adding support for XK_F35. 2012-11-15 20:00:46 +01:00
Roberto E. Vargas Caballero
90e1427632 Fix Shift + Insert shortcut
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(-)
2012-11-15 19:01:16 +01:00
Christoph Lohmann
cc86d148cb Changing the TODO to the current state. 2012-11-15 16:36:48 +01:00
Christoph Lohmann
d5640c7729 Fixing the return and keypad enter sent characters. Terminals produce \r. And
some minor style changes.
2012-11-15 16:26:50 +01:00
Christoph Lohmann
801ea034b6 Import the patch of Eckehard Berns to add insert mode. Thanks! 2012-11-15 16:21:23 +01:00
Christoph Lohmann
e87d21bb3d The crlf mode was reversed. 2012-11-15 15:57:01 +01:00
Christoph Lohmann
e7bb14e03e Fixing Return in non-crlf mode. 2012-11-15 15:54:34 +01:00
Roberto E. Vargas Caballero
4389f2eb1b Use XK_ANY_MOD instead of XK_NO_MOD in key definition
Usually terminal emulators don't generate any sequence for a combination
they don't have registered, for example Shift + Next, but st behavior
previous to the keyboard patch generates the sequence without the modifier,
in this example Next. This patch uses the XK_ANY_MOD in order to get this
same behaviour.
---
 config.def.h |  114 ++++++++++++++++++++++++++++++----------------------------
 1 file changed, 59 insertions(+), 55 deletions(-)
2012-11-15 15:36:20 +01:00
Roberto E. Vargas Caballero
88bb76c1bc Fix XK_NO_MOD and XK_ANY_MOD behavior
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(-)
2012-11-15 15:36:13 +01:00
Roberto E. Vargas Caballero
16ccf344de Fix tab key
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(-)
2012-11-14 11:14:29 +01:00
Christoph Lohmann
461aac159c Fixing the tab key, when no mask is wanted. 2012-11-14 06:37:24 +01:00
Christoph Lohmann
7474a2fc37 The style inquisition was here again. 2012-11-13 20:13:39 +01:00
Roberto E. Vargas Caballero
620e3bb39e Add missed key definitions
This patch adds the keys for the keypad (in both modes, application mode or
ansi mode) and function keys. It uses the same convention than xterm and
instead of using the XK_Fxx values it generates them using F1-F12 and
modifiers. For example:

   F1 -> ^[OP
   F1 + Shift = F13 -> ^[[1;2P
   F1 + Control = F25 -> ^[[1;5P
   F1 + Mod2 = F37 -> ^[[1;6P
   F1 + Mod1 = F49 -> ^[[1;3P
   F1 + Mod3 = F61 -> ^[[1;4P

It is also important notice than the terminfo capability kIC (shifted insert
key) only can be generated using the keypad keyboard, because the shorcut
for selection paste is using the same combination.

After this path the number of elements in the Key array becomes high, and
maybe a sequencial search is not enough efficient now.
---
 TODO         |    6 +---
 config.def.h |  102 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 st.info      |   70 ++++++++++++++++++++++++++++++++++++++--
 3 files changed, 169 insertions(+), 9 deletions(-)
2012-11-13 20:05:02 +01:00
Roberto E. Vargas Caballero
44597b359e Add control and meta combinations for arrow keys
Since there isn't any terminfo capability for control and meta modifiers for
arrows keys it is necessary use the same that almost terminal emulators use,
because there are a lot of programs which have these codes hardcoded.

This cause also that shift combinations are also changed, but in this case
this is not a problem since there are terminfo capabilities for them. After
this patch shift-up and shift-down continue not working in emacs with
TERM=st, but they work with TERM=xterm, so it is possible some other changes
are necessary in the terminfo entry.
---
 config.def.h |   16 ++++++++++++----
 st.info      |    8 ++++----
 2 files changed, 16 insertions(+), 8 deletions(-)
2012-11-13 20:04:54 +01:00
Roberto E. Vargas Caballero
3b16695f4e Fix arrow keys terminfo capabilities
Usually the arrow keys generate the ANSI sequence which terminal will
understand like a movement, so it is not necessary any dealing for them, the
program can not know if the sequence is generate for a echo key or directly
from the program. If you need really know if the key was pressed then you
need activate the keypad mode where the keys will generate a special code
for each keypad key.

The terminfo capabilities kcub1, kcud1, kcuf1 and kcuu1 are used for this
keypad code, not for the sequence generate in the ansi mode.
---
 st.info |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
2012-11-13 20:04:50 +01:00
Roberto E. Vargas Caballero
ea782bfc5d Remove hardcoded keys form kpress
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(-)
2012-11-13 20:04:45 +01:00
Roberto E. Vargas Caballero
93f31166bf Move Shift + Insert to shortcut
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(-)
2012-11-13 20:04:39 +01:00
Roberto E. Vargas Caballero
69ee3ba3a7 Fix keypad mode and cursor mode
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(-)
2012-11-13 20:04:34 +01:00
Roberto E. Vargas Caballero
73177ba366 Add SRM sequence
This sequence enable/disable the local echo.
---
 st.c |   76 ++++++++++++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 56 insertions(+), 20 deletions(-)
2012-11-13 20:04:26 +01:00
Christoph Lohmann
ace789a79f Gc is not used anymore. 2012-11-11 19:46:34 +01:00
Christoph Lohmann
c4a9ccec19 Removing some xft naming cruft. 2012-11-11 19:38:41 +01:00
Christoph Lohmann
5d5a7c627a Moving the alt declaration to the beginning of the function. 2012-11-08 17:22:48 +01:00
Roberto E. Vargas Caballero
8665905216 Move unsupported sequences to ignored.
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(-)
2012-11-08 17:22:04 +01:00
Roberto E. Vargas Caballero
27468403cc Ignore DECARM sequence
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(-)
2012-11-08 17:21:41 +01:00
Roberto E. Vargas Caballero
d5b80e05e8 Fix VPR sequence
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(-)
2012-11-08 17:21:24 +01:00
Roberto E. Vargas Caballero
5260a9ea22 Add DECOM sequence
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(-)
2012-11-08 17:21:10 +01:00
Roberto E. Vargas Caballero
ee3e0a9fd0 Save cursor position in terminal reset
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(+)
2012-11-08 17:20:15 +01:00
Roberto E. Vargas Caballero
ba9d0365ac Clarify some or exclusive expressions
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(-)
2012-11-08 17:17:26 +01:00
Roberto E. Vargas Caballero
950ff21e17 Fix bug restoring cursor position
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(-)
2012-11-08 17:15:26 +01:00
Christoph Lohmann
5d39afc902 Adding scrollwheel support. Thanks Brandon Invergo! 2012-11-06 23:44:37 +01:00
Christoph Lohmann
9df1e56142 Changing the license to MIT/X. 2012-11-05 04:02:20 +01:00
Christoph Lohmann
0fbe1559c8 Fixing meta+return. Thanks Szabolcs Nagy! 2012-11-04 00:04:56 +01:00
Christoph Lohmann
86261187ab Removing the debugging for the last fix too. 2012-11-03 14:05:45 +01:00
Christoph Lohmann
9888c5064b Fixing a resize bug, if a smaller amount than the lineheight is resized.
Thanks c00kiemon5ter!
2012-11-03 14:05:15 +01:00
Christoph Lohmann
f8db65439a Fixing bold fonts in reverse mode. 2012-11-03 13:43:20 +01:00
Christoph Lohmann
76a8e5f72b Now italic and bold works. 2012-11-03 08:35:32 +01:00
Christoph Lohmann
abe85c0e99 Fixing an out-of-bound bug in the selection code. Thanks Szabolczs Nagy! 2012-11-03 03:24:22 +01:00
Christoph Lohmann
091ae143ce Fixing the italic-bold font check. Thanks nsz. 2012-11-02 23:19:56 +01:00
Christoph Lohmann
cd90969cab Added tag 0.3 for changeset 9d54ce4daf34 2012-11-02 20:08:51 +01:00
Christoph Lohmann
b0ed3e2897 0.3 release. 2012-11-02 20:08:27 +01:00
Christoph Lohmann
c631e9bb91 Make it possible to use the corefont font description too. It is not very
useful, but easy to implement.
2012-11-02 20:07:11 +01:00