X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=st.c;h=b8b2bbff7a2af2cc4367a65c52d4327ba458dce7;hb=4389f2eb1b27f7a210e1f631e703c48a8ca8d50b;hp=ca4248a301eba50ba78ed2bf9b848417b43d9a21;hpb=461aac159cf3dbb8514e645df6387e03e7c26084;p=st.git

diff --git a/st.c b/st.c
index ca4248a..b8b2bbf 100644
--- 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 */
 
@@ -2700,10 +2700,12 @@ kmap(KeySym k, uint state) {
 		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;
-		}
 
 		if((kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) ||
 				(kp->appkey > 0 && !IS_SET(MODE_APPKEYPAD))) {