JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
code polishing, removed unnecessary newlines
[dwm.git] / event.c
diff --git a/event.c b/event.c
index e948cb3..e959917 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,74 +1,45 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <stdlib.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
-
-/********** CUSTOMIZE **********/
+/* static */
 
-const char *term[] = { 
-       "urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-fn",
-       "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*",NULL
-};
-const char *browse[] = { "firefox", NULL };
-const char *xlock[] = { "xlock", NULL };
-
-Key key[] = {
-       /* modifier                             key                     function        arguments */
-       { Mod1Mask,                             XK_Return,      zoom,           { 0 } },
-       { Mod1Mask,                             XK_k,           focusprev,              { 0 } },
-       { Mod1Mask,                             XK_j,           focusnext,              { 0 } }, 
-       { Mod1Mask,                             XK_m,           maximize,               { 0 } }, 
-       { Mod1Mask,                             XK_0,           view,           { .i = Tscratch } }, 
-       { Mod1Mask,                             XK_1,           view,           { .i = Tdev } }, 
-       { Mod1Mask,                             XK_2,           view,           { .i = Twww } }, 
-       { Mod1Mask,                             XK_3,           view,           { .i = Twork } }, 
-       { Mod1Mask,                             XK_space,       dotile,         { 0 } }, 
-       { Mod1Mask|ShiftMask,   XK_space,       dofloat,        { 0 } }, 
-       { Mod1Mask|ShiftMask,   XK_0,           replacetag,             { .i = Tscratch } }, 
-       { Mod1Mask|ShiftMask,   XK_1,           replacetag,             { .i = Tdev } }, 
-       { Mod1Mask|ShiftMask,   XK_2,           replacetag,             { .i = Twww } }, 
-       { Mod1Mask|ShiftMask,   XK_3,           replacetag,             { .i = Twork } }, 
-       { Mod1Mask|ShiftMask,   XK_c,           killclient,             { 0 } }, 
-       { Mod1Mask|ShiftMask,   XK_q,           quit,           { 0 } },
-       { Mod1Mask|ShiftMask,   XK_Return,      spawn,          { .argv = term } },
-       { Mod1Mask|ShiftMask,   XK_w,           spawn,          { .argv = browse } },
-       { Mod1Mask|ShiftMask,   XK_l,           spawn,          { .argv = xlock } },
-       { ControlMask,                  XK_0,           appendtag,      { .i = Tscratch } }, 
-       { ControlMask,                  XK_1,           appendtag,      { .i = Tdev } }, 
-       { ControlMask,                  XK_2,           appendtag,      { .i = Twww } }, 
-       { ControlMask,                  XK_3,           appendtag,      { .i = Twork } }, 
-};
+typedef struct {
+       unsigned long mod;
+       KeySym keysym;
+       void (*func)(Arg *arg);
+       Arg arg;
+} Key;
 
-/********** CUSTOMIZE **********/
+KEYS
 
-/* static functions */
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 
 static void
-movemouse(Client *c)
-{
-       XEvent ev;
+movemouse(Client *c) {
        int x1, y1, ocx, ocy, di;
        unsigned int dui;
        Window dummy;
+       XEvent ev;
 
        ocx = c->x;
        ocy = c->y;
-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
-                               None, cursor[CurMove], CurrentTime) != GrabSuccess)
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+                       None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
+       c->ismax = False;
        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 ButtonRelease:
+                       resize(c, True, TopLeft);
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
                case Expose:
                        handler[Expose](&ev);
                        break;
@@ -76,96 +47,110 @@ movemouse(Client *c)
                        XSync(dpy, False);
                        c->x = ocx + (ev.xmotion.x - x1);
                        c->y = ocy + (ev.xmotion.y - y1);
-                       resize(c, False);
+                       resize(c, False, TopLeft);
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
 
 static void
-resizemouse(Client *c)
-{
-       XEvent ev;
+resizemouse(Client *c) {
        int ocx, ocy;
+       int nw, nh;
+       Corner sticky;
+       XEvent ev;
 
        ocx = c->x;
        ocy = c->y;
-       if(XGrabPointer(dpy, root, False, MouseMask, GrabModeAsync, GrabModeAsync,
-                               None, cursor[CurResize], CurrentTime) != GrabSuccess)
+       if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
+                       None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
+       c->ismax = False;
        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 ButtonRelease:
+                       resize(c, True, TopLeft);
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
                        XSync(dpy, False);
-                       c->w = abs(ocx - ev.xmotion.x);
-                       c->h = abs(ocy - ev.xmotion.y);
+                       if((nw = abs(ocx - ev.xmotion.x)))
+                               c->w = nw;
+                       if((nh = abs(ocy - ev.xmotion.y)))
+                               c->h = nh;
                        c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
                        c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
-                       resize(c, True);
+                       if(ocx <= ev.xmotion.x)
+                               sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
+                       else
+                               sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
+                       resize(c, True, sticky);
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
 
 static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
        int x;
        Arg a;
-       XButtonPressedEvent *ev = &e->xbutton;
        Client *c;
+       XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {
                x = 0;
-               for(a.i = 0; a.i < TLast; a.i++) {
+               for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
-                               view(&a);
-                               break;
+                               if(ev->button == Button1) {
+                                       if(ev->state & MODKEY)
+                                               tag(&a);
+                                       else
+                                               view(&a);
+                               }
+                               else if(ev->button == Button3) {
+                                       if(ev->state & MODKEY)
+                                               toggletag(&a);
+                                       else
+                                               toggleview(&a);
+                               }
+                               return;
                        }
                }
+               if((ev->x < x + bmw) && (ev->button == Button1))
+                       togglemode(NULL);
        }
        else if((c = getclient(ev->window))) {
-               if(arrange == dotile && !c->dofloat)
+               focus(c);
+               if(CLEANMASK(ev->state) != MODKEY)
                        return;
-               higher(c);
-               switch(ev->button) {
-               default:
-                       break;
-               case Button1:
+               if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+                       restack();
                        movemouse(c);
-                       break;
-               case Button2:
-                       lower(c);
-                       break;
-               case Button3:
+               }
+               else if(ev->button == Button2)
+                       zoom(NULL);
+               else if(ev->button == Button3 && (arrange == dofloat || c->isfloat)) {
+                       restack();
                        resizemouse(c);
-                       break;
                }
        }
 }
 
 static void
-configurerequest(XEvent *e)
-{
+configurerequest(XEvent *e) {
+       unsigned long newmask;
+       Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
-       Client *c;
 
-       ev->value_mask &= ~CWSibling;
        if((c = getclient(ev->window))) {
+               c->ismax = False;
                gravitate(c, True);
                if(ev->value_mask & CWX)
                        c->x = ev->x;
@@ -176,27 +161,41 @@ configurerequest(XEvent *e)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
-                       c->border = 1;
+                       c->border = ev->border_width;
                gravitate(c, False);
-               resize(c, True);
+               wc.x = c->x;
+               wc.y = c->y;
+               wc.width = c->w;
+               wc.height = c->h;
+               newmask = ev->value_mask & (~(CWSibling | CWStackMode | CWBorderWidth));
+               if(newmask)
+                       XConfigureWindow(dpy, c->win, newmask, &wc);
+               else
+                       configure(c);
+               XSync(dpy, False);
+               if(c->isfloat) {
+                       resize(c, False, TopLeft);
+                       if(!isvisible(c))
+                               ban(c);
+               }
+               else
+                       arrange(NULL);
+       }
+       else {
+               wc.x = ev->x;
+               wc.y = ev->y;
+               wc.width = ev->width;
+               wc.height = ev->height;
+               wc.border_width = ev->border_width;
+               wc.sibling = ev->above;
+               wc.stack_mode = ev->detail;
+               XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
+               XSync(dpy, False);
        }
-
-       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);
 }
 
 static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -205,25 +204,25 @@ destroynotify(XEvent *e)
 }
 
 static void
-enternotify(XEvent *e)
-{
-       XCrossingEvent *ev = &e->xcrossing;
+enternotify(XEvent *e) {
        Client *c;
+       XCrossingEvent *ev = &e->xcrossing;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-
-       if((c = getclient(ev->window)))
+       if(((c = getclient(ev->window)) || (c = getctitle(ev->window))) && isvisible(c))
                focus(c);
-       else if(ev->window == root)
+       else if(ev->window == root) {
                issel = True;
+               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+               drawall();
+       }
 }
 
 static void
-expose(XEvent *e)
-{
-       XExposeEvent *ev = &e->xexpose;
+expose(XEvent *e) {
        Client *c;
+       XExposeEvent *ev = &e->xexpose;
 
        if(ev->count == 0) {
                if(barwin == ev->window)
@@ -234,60 +233,67 @@ expose(XEvent *e)
 }
 
 static void
-keypress(XEvent *e)
-{
-       XKeyEvent *ev = &e->xkey;
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+keypress(XEvent *e) {
+       static unsigned int len = sizeof(key) / sizeof(key[0]);
        unsigned int i;
        KeySym keysym;
+       XKeyEvent *ev = &e->xkey;
 
        keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-       for(i = 0; i < len; i++)
-               if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
+       for(i = 0; i < len; i++) {
+               if(keysym == key[i].keysym
+                       && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
                        return;
                }
+       }
 }
 
 static void
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
        XCrossingEvent *ev = &e->xcrossing;
 
-       if((ev->window == root) && !ev->same_screen)
-               issel = True;
+       if((ev->window == root) && !ev->same_screen) {
+               issel = False;
+               drawall();
+       }
 }
 
 static void
-maprequest(XEvent *e)
-{
-       XMapRequestEvent *ev = &e->xmaprequest;
+mappingnotify(XEvent *e) {
+       XMappingEvent *ev = &e->xmapping;
+
+       XRefreshKeyboardMapping(ev);
+       if(ev->request == MappingKeyboard)
+               grabkeys();
+}
+
+static void
+maprequest(XEvent *e) {
        static XWindowAttributes wa;
+       XMapRequestEvent *ev = &e->xmaprequest;
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-
        if(wa.override_redirect) {
                XSelectInput(dpy, ev->window,
                                (StructureNotifyMask | PropertyChangeMask));
                return;
        }
-
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }
 
 static void
-propertynotify(XEvent *e)
-{
-       XPropertyEvent *ev = &e->xproperty;
-       Window trans;
+propertynotify(XEvent *e) {
        Client *c;
+       Window trans;
+       XPropertyEvent *ev = &e->xproperty;
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
-
        if((c = getclient(ev->window))) {
                if(ev->atom == wmatom[WMProtocols]) {
                        c->proto = getproto(c->win);
@@ -297,23 +303,23 @@ propertynotify(XEvent *e)
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->dofloat && (c->dofloat = (trans != 0)))
+                               if(!c->isfloat && (c->isfloat = (trans != 0)))
                                        arrange(NULL);
                                break;
                        case XA_WM_NORMAL_HINTS:
-                               setsize(c);
+                               updatesize(c);
                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-                       settitle(c);
+                       updatetitle(c);
+                       resizetitle(c);
                        drawtitle(c);
                }
        }
 }
 
 static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
@@ -321,7 +327,7 @@ unmapnotify(XEvent *e)
                unmanage(c);
 }
 
-/* extern functions */
+/* extern */
 
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
@@ -331,22 +337,39 @@ void (*handler[LASTEvent]) (XEvent *) = {
        [LeaveNotify] = leavenotify,
        [Expose] = expose,
        [KeyPress] = keypress,
+       [MappingNotify] = mappingnotify,
        [MapRequest] = maprequest,
        [PropertyNotify] = propertynotify,
        [UnmapNotify] = unmapnotify
 };
 
 void
-grabkeys()
-{
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
+grabkeys(void) {
+       static unsigned int len = sizeof(key) / sizeof(key[0]);
        unsigned int i;
        KeyCode code;
 
+       XUngrabKey(dpy, AnyKey, AnyModifier, root);
        for(i = 0; i < len; i++) {
                code = XKeysymToKeycode(dpy, key[i].keysym);
-               XUngrabKey(dpy, code, key[i].mod, root);
                XGrabKey(dpy, code, key[i].mod, root, True,
                                GrabModeAsync, GrabModeAsync);
+               XGrabKey(dpy, code, key[i].mod | LockMask, 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);
+       }
+}
+
+void
+procevent(void) {
+       XEvent ev;
+
+       while(XPending(dpy)) {
+               XNextEvent(dpy, &ev);
+               if(handler[ev.type])
+                       (handler[ev.type])(&ev); /* call handler */
        }
 }