grab all keys so kbspawn buffering actually works

diff --git a/dwm.c b/dwm.c
index 82bf8b7..e1a7870 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -177,7 +177,6 @@ static long getstate(Window w);
 static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
 static void grabbuttons(Client *c, Bool focused);
 static void grabkeys(void);
-static void grab_typing_keys(void);
 static void incnmaster(const Arg *arg);
 static void keypress(XEvent *e);
 static void killclient(const Arg *arg);
@@ -201,7 +200,7 @@ static void restack(Monitor *m);
 static void run(void);
 static void scan(void);
 static Bool sendevent(Client *c, Atom proto);
-static void send_keycode(KeyCode key);
+static void send_keycode(KeyCode key, unsigned int state);
 static void sendmon(Client *c, Monitor *m);
 static void setclientstate(Client *c, long state);
 static void setfocus(Client *c);
@@ -243,7 +242,11 @@ static int xerrorstart(Display *dpy, XErrorEvent *ee);
 static void zoom(const Arg *arg);
 
 /* variables */
-static KeyCode key_buffer[100];
+typedef struct {
+       KeyCode keycode;
+       unsigned int state;
+} BufferedKey;
+static BufferedKey key_buffer[200];
 static int key_buffer_len = 0;
 static Bool key_buffering = False;
 static const char broken[] = "broken";
@@ -1042,44 +1045,8 @@ grabbuttons(Client *c, Bool focused) {
 void
 grabkeys(void) {
        updatenumlockmask();
-       {
-               unsigned int i, j;
-               unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-               KeyCode code;
-
-               XUngrabKey(dpy, AnyKey, AnyModifier, root);
-               for(i = 0; i < LENGTH(keys); i++)
-                       if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
-                               for(j = 0; j < LENGTH(modifiers); j++)
-                                       XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
-                                                True, GrabModeAsync, GrabModeAsync);
-               if(key_buffering)
-                       grab_typing_keys();
-       }
-}
-
-void
-grab_typing_keys(void) {
-       updatenumlockmask();
-       {
-               unsigned int i, j;
-               unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-               KeySym typing_keys[] = {
-                       XK_space, XK_Return, XK_period, XK_slash, XK_minus, XK_apostrophe,
-                       XK_A, XK_B, XK_C, XK_D, XK_E, XK_F, XK_G, XK_H, XK_I, XK_J, XK_K,
-                       XK_L, XK_M, XK_N, XK_O, XK_P, XK_Q, XK_R, XK_S, XK_T, XK_U, XK_V,
-                       XK_W, XK_X, XK_Y, XK_Z, XK_0, XK_1, XK_2, XK_3, XK_4, XK_5, XK_6,
-                       XK_7, XK_8, XK_9,
-               };
-
-               KeyCode code;
-
-               for(i = 0; i < LENGTH(typing_keys); i++)
-                       if((code = XKeysymToKeycode(dpy, typing_keys[i])))
-                               for(j = 0; j < LENGTH(modifiers); j++)
-                                       XGrabKey(dpy, code, modifiers[j], root,
-                                                True, GrabModeAsync, GrabModeAsync);
-       }
+       //XUngrabKey(dpy, AnyKey, AnyModifier, root);
+       XGrabKey(dpy, AnyKey, AnyModifier, root, True, GrabModeAsync, GrabModeAsync);
 }
 
 void
@@ -1100,7 +1067,7 @@ isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info) {
 #endif /* XINERAMA */
 
 void
-send_keycode(KeyCode key) {
+send_keycode(KeyCode key, unsigned int state) {
        XKeyEvent event;
        if(!selmon->sel) {
                return;
@@ -1115,7 +1082,7 @@ send_keycode(KeyCode key) {
        event.x_root = 1;
        event.y_root = 1;
        event.time = CurrentTime;
-       event.state = 0; // modifiers
+       event.state = state; // modifiers
        event.keycode = key;
        event.type = KeyPress;
        XSendEvent(event.display, event.window, True, KeyPressMask, (XEvent *)&event);
@@ -1145,13 +1112,13 @@ keypress(XEvent *e) {
                                // buffer full, bail
                                key_buffer_len = 0;
                                key_buffering = False;
-                               grabkeys(); // stop grabbing typing keys
                        } else {
-                               key_buffer[key_buffer_len] = (KeyCode)ev->keycode;
+                               key_buffer[key_buffer_len].keycode = (KeyCode)ev->keycode;
+                               key_buffer[key_buffer_len].state = (KeyCode)ev->state;
                                key_buffer_len += 1;
                        }
                } else {
-                       send_keycode(ev->keycode);
+                       send_keycode(ev->keycode, ev->state);
                }
        }
 }
@@ -1239,16 +1206,13 @@ manage(Window w, XWindowAttributes *wa) {
        XMapWindow(dpy, c->win);
        focus(c);
        if(key_buffering) {
-               // FIXME: try turning off buffering below where we send the virt keypresses
-               key_buffering = False;
-               grabkeys(); // stop grabbing typing keys
                if(key_buffer_len > 0) {
                        for(i = 0; i < key_buffer_len; ++i) {
-                               send_keycode(key_buffer[i]);
+                               send_keycode(key_buffer[i].keycode, key_buffer[i].state);
                        }
                }
                key_buffer_len = 0;
-               // FIXME ie here
+               key_buffering = False;
        }
 }
 
@@ -1800,7 +1764,6 @@ void
 kbspawn(const Arg *arg) {
        key_buffering = True;
        key_buffer_len = 0;
-       grab_typing_keys();
        spawn(arg);
 }