[hackers] [st] working on old repo, merging recent changesets. || Aurélien Aptel

changeset: 212:8b81c6b5ad66
tag: tip
parent: 211:65f34fa802fd
parent: 208:1c8e6796c6fe
user: Aurélien Aptel <aurelien.aptel_AT_gmail.com>
date: Fri Sep 16 18:24:13 2011 +0200
files: st.c
description:
working on old repo, merging recent changesets.

diff -r 65f34fa802fd -r 8b81c6b5ad66 config.def.h
--- a/config.def.h Fri Sep 16 18:21:48 2011 +0200
+++ b/config.def.h Fri Sep 16 18:24:13 2011 +0200
@@ -25,34 +25,40 @@
         "white"
 };
 
-/* Default colors (colorname index) */
-/* foreground, background, cursor */
+/* Default colors (colorname index)
+ foreground, background, cursor */
 #define DefaultFG 7
 #define DefaultBG 0
 #define DefaultCS 1
 
-/* Special keys (change & recompile st.info accordingly) */
-/* key, mask, output */
+/* Special keys (change & recompile st.info accordingly)
+ Keep in mind that kpress() in st.c hardcodes some keys.
+
+ Mask value:
+ * Use XK_ANY_MOD to match the key no matter modifiers state
+ * Use XK_NO_MOD to match the key alone (no modifiers)
+
+ key, mask, output */
 static Key key[] = {
- { XK_BackSpace, 0, "\177" },
- { XK_Insert, 0, "\033[2~" },
- { XK_Delete, 0, "\033[3~" },
- { XK_Home, 0, "\033[1~" },
- { XK_End, 0, "\033[4~" },
- { XK_Prior, 0, "\033[5~" },
- { XK_Next, 0, "\033[6~" },
- { XK_F1, 0, "\033OP" },
- { XK_F2, 0, "\033OQ" },
- { XK_F3, 0, "\033OR" },
- { XK_F4, 0, "\033OS" },
- { XK_F5, 0, "\033[15~" },
- { XK_F6, 0, "\033[17~" },
- { XK_F7, 0, "\033[18~" },
- { XK_F8, 0, "\033[19~" },
- { XK_F9, 0, "\033[20~" },
- { XK_F10, 0, "\033[21~" },
- { XK_F11, 0, "\033[23~" },
- { XK_F12, 0, "\033[24~" },
+ { XK_BackSpace, XK_NO_MOD, "\177" },
+ { XK_Insert, XK_NO_MOD, "\033[2~" },
+ { XK_Delete, XK_NO_MOD, "\033[3~" },
+ { XK_Home, XK_NO_MOD, "\033[1~" },
+ { XK_End, XK_NO_MOD, "\033[4~" },
+ { XK_Prior, XK_NO_MOD, "\033[5~" },
+ { XK_Next, XK_NO_MOD, "\033[6~" },
+ { XK_F1, XK_NO_MOD, "\033OP" },
+ { XK_F2, XK_NO_MOD, "\033OQ" },
+ { XK_F3, XK_NO_MOD, "\033OR" },
+ { XK_F4, XK_NO_MOD, "\033OS" },
+ { XK_F5, XK_NO_MOD, "\033[15~" },
+ { XK_F6, XK_NO_MOD, "\033[17~" },
+ { XK_F7, XK_NO_MOD, "\033[18~" },
+ { XK_F8, XK_NO_MOD, "\033[19~" },
+ { XK_F9, XK_NO_MOD, "\033[20~" },
+ { XK_F10, XK_NO_MOD, "\033[21~" },
+ { XK_F11, XK_NO_MOD, "\033[23~" },
+ { XK_F12, XK_NO_MOD, "\033[24~" },
 };
 
 /* Line drawing characters (sometime specific to each font...) */
diff -r 65f34fa802fd -r 8b81c6b5ad66 st.c
--- a/st.c Fri Sep 16 18:21:48 2011 +0200
+++ b/st.c Fri Sep 16 18:24:13 2011 +0200
@@ -47,6 +47,8 @@
 #define ESC_ARG_SIZ 16
 #define DRAW_BUF_SIZ 1024
 #define UTF_SIZ 4
+#define XK_NO_MOD UINT_MAX
+#define XK_ANY_MOD 0
 
 #define SERRNO strerror(errno)
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
@@ -1840,9 +1842,12 @@
 char*
 kmap(KeySym k, unsigned int state) {
         int i;
- for(i = 0; i < LEN(key); i++)
- if(key[i].k == k && (key[i].mask == 0 || key[i].mask & state))
+ state &= ~Mod2Mask;
+ for(i = 0; i < LEN(key); i++) {
+ unsigned int mask = key[i].mask;
+ if(key[i].k == k && ((state & mask) == mask || (mask == XK_NO_MOD && !state)))
                         return (char*)key[i].s;
+ }
         return NULL;
 }
 
diff -r 65f34fa802fd -r 8b81c6b5ad66 st.info
--- a/st.info Fri Sep 16 18:21:48 2011 +0200
+++ b/st.info Fri Sep 16 18:24:13 2011 +0200
@@ -79,7 +79,7 @@
         mir,
         msgr,
         ncv#3,
- op=\E[37;40m,
+ op=\E[39;49m,
         pairs#64,
         rc=\E8,
         rev=\E[7m,
Received on Fri Sep 16 2011 - 18:24:19 CEST