Fix XK_NO_MOD and XK_ANY_MOD behavior

[st.git] / st.c

diff --git a/st.c b/st.c
index 14408c5..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 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 */
 
 
 #define REDRAW_TIMEOUT (80*1000) /* 80 ms */
 


@@ -2699,21 +2699,32 @@ kmap(KeySym k, uint state) {
 
                if(kp->k != k)
                        continue;
 
                if(kp->k != k)
                        continue;

-               if((state & mask) != mask &&
-                  (mask == XK_NO_MOD && state))
+
+               if(mask == XK_NO_MOD && state)
+                       continue;
+               if(mask != XK_ANY_MOD && mask != XK_NO_MOD && !state)
+                       continue;
+               if((state & mask) != state)

                        continue;
                        continue;

+

                if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
                if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||

-                  (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD)))
+                               (kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {

                        continue;
                        continue;

+               }
+

                if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||
                if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) ||

-                  (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR)))
+                               (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) {

                        continue;
                        continue;

+               }
+

                if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||
                if((kp->crlf < 0 && IS_SET(MODE_CRLF)) ||

-                  (kp->crlf > 0 && !IS_SET(MODE_CRLF)))
+                               (kp->crlf > 0 && !IS_SET(MODE_CRLF))) {

                        continue;
                        continue;

+               }

 
                return kp->s;
        }
 
                return kp->s;
        }

+

        return NULL;
 }
 
        return NULL;
 }
 


@@ -2755,6 +2766,7 @@ kpress(XEvent *ev) {
                memcpy(cp, xstr, len);
                len = cp - buf + len;
        }
                memcpy(cp, xstr, len);
                len = cp - buf + len;
        }

+

        ttywrite(buf, len);
        if(IS_SET(MODE_ECHO))
                techo(buf, len);
        ttywrite(buf, len);
        if(IS_SET(MODE_ECHO))
                techo(buf, len);


@@ -2869,7 +2881,7 @@ main(int argc, char *argv[]) {
                                opt_class = argv[i];
                        break;
                case 'e':
                                opt_class = argv[i];
                        break;
                case 'e':

-                       /* eat every remaining arguments */
+                       /* eat all remaining arguments */

                        if(++i < argc)
                                opt_cmd = &argv[i];
                        goto run;
                        if(++i < argc)
                                opt_cmd = &argv[i];
                        goto run;


@@ -2924,6 +2936,7 @@ run:
        ttynew();
        selinit();
        run();
        ttynew();
        selinit();
        run();

+

        return 0;
 }
 
        return 0;
 }