allow XF86XK_... keysyms in config.h

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 7b017cb..b42fb73 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -32,6 +32,7 @@
 #include <sys/wait.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
+#include <X11/XF86keysym.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xproto.h>
@@ -177,7 +178,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 +201,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 +243,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";
@@ -364,6 +368,9 @@ applyrules(Client *c) {
                && (!r->instance || strstr(instance, r->instance)))
                {
                        c->isfloating = r->isfloating;
+                       if(r->isfloating) {
+                               c->x = -1; c->y = -2; // secret code for centered
+                       }
                        c->tags |= r->tags;
                        c->screen_hog = r->screen_hog;
                        for(m = mons; m && m->num != r->monitor; m = m->next);
@@ -488,7 +495,7 @@ attachstack(Client *c) {
 
 void
 buttonpress(XEvent *e) {
-       unsigned int i, x, click;
+       unsigned int i, click;
        Arg arg = {0};
        Client *c;
        Monitor *m;
@@ -502,20 +509,7 @@ buttonpress(XEvent *e) {
                focus(NULL);
        }
        if(ev->window == selmon->barwin) {
-               i = x = 0;
-               do
-                       x += TEXTW(tags[i]);
-               while(ev->x >= x && ++i < LENGTH(tags));
-               if(i < LENGTH(tags)) {
-                       click = ClkTagBar;
-                       arg.ui = 1 << i;
-               }
-               else if(ev->x < x + blw)
-                       click = ClkLtSymbol;
-               else if(ev->x > selmon->ww - TEXTW(stext))
-                       click = ClkStatusText;
-               else
-                       click = ClkWinTitle;
+               return;
        }
        else if((c = wintoclient(ev->window))) {
                focus(c);
@@ -758,10 +752,11 @@ detachstack(Client *c) {
                for(i = nextvisible(c->mon->clients); i && i != c; i = nextvisible(i->next))
                        next_sel = i;
                // failing that, find first visible window (besides c)
-               if (!next_sel)
+               if (!next_sel) {
                        for(i = nextvisible(c->mon->clients); i && i == c; i = nextvisible(i->next));
                        if (i != c)
                                next_sel = i;
+               }
                c->mon->sel = next_sel;
        }
        if (prev) {
@@ -1051,44 +1046,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
@@ -1109,7 +1068,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;
@@ -1124,7 +1083,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);
@@ -1154,13 +1113,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);
                }
        }
 }
@@ -1201,8 +1160,13 @@ manage(Window w, XWindowAttributes *wa) {
                applyrules(c);
        }
        /* geometry */
-       c->x = c->oldx = wa->x;
-       c->y = c->oldy = wa->y;
+       if(c->x == -1 && c->y == -2) { // secret code for centered
+               c->x = c->oldx = (c->mon->ww - wa->width) / 2;
+               c->y = c->oldy = (c->mon->wh - wa->height) / 2;
+       } else {
+               c->x = c->oldx = wa->x;
+               c->y = c->oldy = wa->y;
+       }
        c->w = c->oldw = wa->width;
        c->h = c->oldh = wa->height;
        c->oldbw = wa->border_width;
@@ -1243,14 +1207,13 @@ manage(Window w, XWindowAttributes *wa) {
        XMapWindow(dpy, c->win);
        focus(c);
        if(key_buffering) {
-               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;
+               key_buffering = False;
        }
 }
 
@@ -1802,7 +1765,6 @@ void
 kbspawn(const Arg *arg) {
        key_buffering = True;
        key_buffer_len = 0;
-       grab_typing_keys();
        spawn(arg);
 }