X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=event.c;h=4008a73b1751e7e35bb64c1f2804cdf44bf5a287;hb=52021851d1fd78970dfe63380d51b87f57d1ee1b;hp=aa074275ccc300a2554dfcbd803a4af5e64fbe1d;hpb=0c7bcc24cbd0d721a4e7d152c05886ac30cc4af3;p=dwm.git diff --git a/event.c b/event.c index aa07427..4008a73 100644 --- a/event.c +++ b/event.c @@ -8,10 +8,7 @@ #include #include -#define ButtonMask (ButtonPressMask | ButtonReleaseMask) -#define MouseMask (ButtonMask | PointerMotionMask) - -/* CUSTOMIZE */ +/* static */ typedef struct { unsigned long mod; @@ -20,47 +17,9 @@ typedef struct { Arg arg; } Key; -const char *browse[] = { "firefox", NULL }; -const char *gimp[] = { "gimp", NULL }; -const char *term[] = { - "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white", - "-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL -}; -const char *xlock[] = { "xlock", NULL }; - -static Key key[] = { - /* modifier key function arguments */ - { MODKEY, XK_0, view, { .i = Tfnord } }, - { MODKEY, XK_1, view, { .i = Tdev } }, - { MODKEY, XK_2, view, { .i = Tnet } }, - { MODKEY, XK_3, view, { .i = Twork } }, - { MODKEY, XK_4, view, { .i = Tmisc} }, - { MODKEY, XK_j, focusnext, { 0 } }, - { MODKEY, XK_k, focusprev, { 0 } }, - { MODKEY, XK_m, togglemax, { 0 } }, - { MODKEY, XK_space, togglemode, { 0 } }, - { MODKEY, XK_Return, zoom, { 0 } }, - { MODKEY|ControlMask, XK_0, appendtag, { .i = Tfnord } }, - { MODKEY|ControlMask, XK_1, appendtag, { .i = Tdev } }, - { MODKEY|ControlMask, XK_2, appendtag, { .i = Tnet } }, - { MODKEY|ControlMask, XK_3, appendtag, { .i = Twork } }, - { MODKEY|ControlMask, XK_4, appendtag, { .i = Tmisc } }, - { MODKEY|ShiftMask, XK_0, replacetag, { .i = Tfnord } }, - { MODKEY|ShiftMask, XK_1, replacetag, { .i = Tdev } }, - { MODKEY|ShiftMask, XK_2, replacetag, { .i = Tnet } }, - { MODKEY|ShiftMask, XK_3, replacetag, { .i = Twork } }, - { MODKEY|ShiftMask, XK_4, replacetag, { .i = Tmisc } }, - { MODKEY|ShiftMask, XK_c, killclient, { 0 } }, - { MODKEY|ShiftMask, XK_g, spawn, { .argv = gimp } }, - { MODKEY|ShiftMask, XK_l, spawn, { .argv = xlock } }, - { MODKEY|ShiftMask, XK_q, quit, { 0 } }, - { MODKEY|ShiftMask, XK_w, spawn, { .argv = browse } }, - { MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } }, -}; - -/* END CUSTOMIZE */ +KEYS -/* static */ +static unsigned int valid_mask = 255 & ~(NUMLOCKMASK | LockMask); static void movemouse(Client *c) @@ -72,12 +31,12 @@ movemouse(Client *c) ocx = c->x; ocy = c->y; - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, + if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurMove], CurrentTime) != GrabSuccess) return; XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui); for(;;) { - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); + XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); switch (ev.type) { default: break; case Expose: @@ -105,12 +64,12 @@ resizemouse(Client *c) ocx = c->x; ocy = c->y; - if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync, + if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync, None, cursor[CurResize], CurrentTime) != GrabSuccess) return; XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h); for(;;) { - XMaskEvent(dpy, MouseMask | ExposureMask, &ev); + XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev); switch(ev.type) { default: break; case Expose: @@ -156,16 +115,15 @@ buttonpress(XEvent *e) } break; case Button4: - a.i = (tsel + 1 < TLast) ? tsel + 1 : 0; - view(&a); + viewnext(&a); break; case Button5: - a.i = (tsel - 1 >= 0) ? tsel - 1 : TLast - 1; - view(&a); + viewprev(&a); break; } } else if((c = getclient(ev->window))) { + focus(c); switch(ev->button) { default: break; @@ -195,7 +153,6 @@ configurerequest(XEvent *e) XConfigureRequestEvent *ev = &e->xconfigurerequest; XWindowChanges wc; - ev->value_mask &= ~CWSibling; if((c = getclient(ev->window))) { gravitate(c, True); if(ev->value_mask & CWX) @@ -211,18 +168,16 @@ configurerequest(XEvent *e) gravitate(c, False); resize(c, True, TopLeft); } - - wc.x = ev->x; - wc.y = ev->y; - wc.width = ev->width; - wc.height = ev->height; - wc.border_width = 1; - wc.sibling = None; - wc.stack_mode = Above; - ev->value_mask &= ~CWStackMode; - ev->value_mask |= CWBorderWidth; - XConfigureWindow(dpy, ev->window, ev->value_mask, &wc); - XSync(dpy, False); + else { + wc.x = ev->x; + wc.y = ev->y; + wc.width = ev->width; + wc.height = ev->height; + wc.border_width = 1; + XConfigureWindow(dpy, ev->window, + CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc); + XSync(dpy, False); + } } static void @@ -241,7 +196,7 @@ enternotify(XEvent *e) Client *c; XCrossingEvent *ev = &e->xcrossing; - if(ev->mode != NotifyNormal || ev->detail == NotifyInferior) + if(ev->detail == NotifyInferior) return; if((c = getclient(ev->window))) @@ -267,14 +222,15 @@ expose(XEvent *e) static void keypress(XEvent *e) { - static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; + static unsigned int len = sizeof(key) / sizeof(key[0]); unsigned int i; KeySym keysym; XKeyEvent *ev = &e->xkey; + ev->state &= valid_mask; keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0); for(i = 0; i < len; i++) - if((keysym == key[i].keysym) && (key[i].mod == ev->state)) { + if((keysym == key[i].keysym) && ((key[i].mod & valid_mask) == ev->state)) { if(key[i].func) key[i].func(&key[i].arg); return; @@ -370,14 +326,20 @@ void (*handler[LASTEvent]) (XEvent *) = { void grabkeys() { - static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0; + static unsigned int len = sizeof(key) / sizeof(key[0]); unsigned int i; KeyCode code; for(i = 0; i < len; i++) { code = XKeysymToKeycode(dpy, key[i].keysym); XUngrabKey(dpy, code, key[i].mod, root); + XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root); + XUngrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root); XGrabKey(dpy, code, key[i].mod, root, True, GrabModeAsync, GrabModeAsync); + XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True, + GrabModeAsync, GrabModeAsync); + XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True, + GrabModeAsync, GrabModeAsync); } }