[hackers] [st] Fix XK_NO_MOD and XK_ANY_MOD behavior || "Roberto E. Vargas Caballero"

From: <hg_AT_suckless.org>
Date: Thu, 15 Nov 2012 15:41:17 +0100 (CET)

changeset: 408:4dcabef7a582
user: "Roberto E. Vargas Caballero" <k0ga_AT_shike2.com>
date: Thu Nov 15 15:36:13 2012 +0100
files: st.c
description:
Fix XK_NO_MOD and XK_ANY_MOD behavior
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 -r cf3bfed749a8 -r 4dcabef7a582 st.c
--- a/st.c	Wed Nov 14 11:14:29 2012 +0100
+++ b/st.c	Thu Nov 15 15:36:13 2012 +0100
_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 @@
 		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))) {

Received on Thu Nov 15 2012 - 15:41:17 CET