Fix XK_NO_MOD and XK_ANY_MOD behavior

[st.git] / st.c

diff --git a/st.c b/st.c
index 02a3502..b8b2bbf 100644 (file)
--- a/st.c
+++ b/st.c
@@ -59,8 +59,8 @@
 #define STR_ARG_SIZ   16
 #define DRAW_BUF_SIZ  20*1024
 #define UTF_SIZ       4
-#define XK_NO_MOD     UINT_MAX
-#define XK_ANY_MOD    0
+#define XK_ANY_MOD    UINT_MAX
+#define XK_NO_MOD     0
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 
@@ -228,6 +228,10 @@ typedef struct {
        KeySym k;
        uint mask;
        char s[ESC_BUF_SIZ];
+       /* three valued logic variables: 0 indifferent, 1 on, -1 off */
+       signed char appkey;             /* application keypad */
+       signed char appcursor;          /* application cursor */
+       signed char crlf;               /* crlf mode          */
 } Key;
 
 /* TODO: use better name for vars... */
@@ -2686,18 +2690,41 @@ focus(XEvent *ev) {
 
 char*
 kmap(KeySym k, uint state) {
-       int i;
        uint mask;
+       Key *kp;
 
        state &= ~Mod2Mask;
-       for(i = 0; i < LEN(key); i++) {
-               mask = key[i].mask;
+       for(kp = key; kp < key + LEN(key); kp++) {
+               mask = kp->mask;
+
+               if(kp->k != k)
+                       continue;
+
+               if(mask == XK_NO_MOD && state)
+                       continue;
+               if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
+                       continue;
+               if((state & mask) != state)
+                       continue;
+
+               if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
+                               (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {
+                       continue;
+               }
+
+               if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
+                               (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {
+                       continue;
+               }
 
-               if(key[i].k == k && ((state & mask) == mask
-                               || (mask == XK_NO_MOD && !state))) {
-                       return (char*)key[i].s;
+               if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
+                               (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {
+                       continue;
                }
+
+               return kp->s;
        }
+
        return NULL;
 }
 
@@ -2706,14 +2733,12 @@ kpress(XEvent *ev) {
        XKeyEvent *e = &ev->xkey;
        KeySym ksym;
        char xstr[31], buf[32], *customkey, *cp = buf;
-       int len, meta, shift, i;
+       int len, i;
        Status status;
 
        if (IS_SET(MODE_KBDLOCK))
                return;
 
-       meta = e->state & Mod1Mask;
-       shift = e->state & ShiftMask;
        len = XmbLookupString(xw.xic, e, xstr, sizeof(xstr), &ksym, &status);
 
        /* 1. shortcuts */
@@ -2732,40 +2757,16 @@ kpress(XEvent *ev) {
                memcpy(buf, customkey, len);
        /* 2. hardcoded (overrides X lookup) */
        } else {
-               switch(ksym) {
-               case XK_Up:
-               case XK_Down:
-               case XK_Left:
-               case XK_Right:
-                       /* XXX: shift up/down doesn't work */
-                       sprintf(buf, "\033%c%c",
-                               IS_SET(MODE_APPKEYPAD) ? 'O' : '[',
-                               (shift ? "dacb":"DACB")[ksym - XK_Left]);
-                       len = 3;
-                       break;
-               case XK_Return:
-                       len = 0;
-                       if(meta)
-                               *cp++ = '\033', len++;
-
-                       *cp++ = '\r', len++;
-
-                       if(IS_SET(MODE_CRLF))
-                               *cp = '\n', len++;
-                       break;
-                       /* 3. X lookup  */
-               default:
-                       if(len == 0)
-                               return;
+               if(len == 0)
+                       return;
 
-                       if (len == 1 && meta)
-                               *cp++ = '\033';
+               if (len == 1 && e->state & Mod1Mask)
+                       *cp++ = '\033';
 
-                       memcpy(cp, xstr, len);
-                       len = cp - buf + len;
-                       break;
-               }
+               memcpy(cp, xstr, len);
+               len = cp - buf + len;
        }
+
        ttywrite(buf, len);
        if(IS_SET(MODE_ECHO))
                techo(buf, len);
@@ -2880,7 +2881,7 @@ main(int argc, char *argv[]) {
                                opt_class = argv[i];
                        break;
                case 'e':
-                       /* eat every remaining arguments */
+                       /* eat all remaining arguments */
                        if(++i < argc)
                                opt_cmd = &argv[i];
                        goto run;
@@ -2935,6 +2936,7 @@ run:
        ttynew();
        selinit();
        run();
+
        return 0;
 }