sowm

commit df34385548519e56a65b7ba14edf11d1dbb34e08
parent d37d04ef324c788258a5c16a1593ab2d77bcfc68
Author: Dylan Araps <dylan.araps@gmail.com>
Date:   Mon, 25 Nov 2019 14:30:00 +0000

sowm: revert key change

Diffstat:
M
sowm.c
 | 
6
+-----

1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/sowm.c b/sowm.c
@@ -71,9 +71,6 @@ static void (*events[LASTEvent])(XEvent *e) = {
 #define ws_save(W) ws_list[W] = list
 #define ws_sel(W)  list = ws_list[ws = W]
 
-#define mask(m)    (m & ~(LockMask) & \
-       (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
-
 #define win_size(W, gx, gy, gw, gh) \
     XGetGeometry(d, W, &(Window){0}, gx, gy, gw, gh, \
                  &(unsigned int){0}, &(unsigned int){0})
@@ -114,8 +111,7 @@ void key_press(XEvent *e) {
     KeySym keysym = XkbKeycodeToKeysym(d, e->xkey.keycode, 0, 0);
 
     for (unsigned int i=0; i < sizeof(keys)/sizeof(*keys); ++i)
-        if (keys[i].keysym    == keysym &&
-            mask(keys[i].mod) == mask(e->xkey.state))
+        if (keys[i].mod == e->xkey.state && keys[i].keysym == keysym)
             keys[i].function(keys[i].arg);
 }