Fix XK_NO_MOD and XK_ANY_MOD behavior

From: Roberto E. Vargas Caballero <k0ga_AT_shike2.com>
Date: Thu, 15 Nov 2012 10:59:07 +0100

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(-)
diff --git a/st.c b/st.c
index 932253c..b8b2bbf 100644
--- a/st.c
+++ b/st.c
_AT_@ -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 */
 
_AT_@ -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))) {
-- 
1.7.10.4
--zhXaljGHf11kAtnf
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="0003-Use-XK_ANY_MOD-instead-of-XK_NO_MOD-in-key-definitio.patch"

Received on Mon Sep 17 2001 - 00:00:00 CEST