Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
leavenotify also don't needs the check
[dwm.git] / event.c
diff --git a/event.c b/event.c
index 59c9bb9..0133889 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,232 +1,178 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
  * See LICENSE file for license details.
  */
-
-#include <fcntl.h>
-#include <stdio.h>
+#include "dwm.h"
 #include <stdlib.h>
 #include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#include "dwm.h"
-
-#define ButtonMask      (ButtonPressMask | ButtonReleaseMask)
-#define MouseMask       (ButtonMask | PointerMotionMask)
-
-/********** CUSTOMIZE **********/
-
-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 } }, 
-};
-
-/********** CUSTOMIZE **********/
-
-/* local functions */
-static void buttonpress(XEvent *e);
-static void configurerequest(XEvent *e);
-static void destroynotify(XEvent *e);
-static void enternotify(XEvent *e);
-static void leavenotify(XEvent *e);
-static void expose(XEvent *e);
-static void keypress(XEvent *e);
-static void maprequest(XEvent *e);
-static void propertynotify(XEvent *e);
-static void unmapnotify(XEvent *e);
-
-void (*handler[LASTEvent]) (XEvent *) = {
-       [ButtonPress] = buttonpress,
-       [ConfigureRequest] = configurerequest,
-       [DestroyNotify] = destroynotify,
-       [EnterNotify] = enternotify,
-       [LeaveNotify] = leavenotify,
-       [Expose] = expose,
-       [KeyPress] = keypress,
-       [MapRequest] = maprequest,
-       [PropertyNotify] = propertynotify,
-       [UnmapNotify] = unmapnotify
-};
-
-void
-grabkeys()
-{
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 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);
-               XGrabKey(dpy, code, key[i].mod, root, True,
-                               GrabModeAsync, GrabModeAsync);
-       }
-}
+/* static */
 
 
-static void
-keypress(XEvent *e)
-{
-       XKeyEvent *ev = &e->xkey;
-       static unsigned int len = key ? sizeof(key) / sizeof(key[0]) : 0;
-       unsigned int i;
+typedef struct {
+       unsigned long mod;
        KeySym keysym;
        KeySym keysym;
+       void (*func)(Arg *arg);
+       Arg arg;
+} Key;
 
 
-       keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-       for(i = 0; i < len; i++)
-               if((keysym == key[i].keysym) && (key[i].mod == ev->state)) {
-                       if(key[i].func)
-                               key[i].func(&key[i].arg);
-                       return;
-               }
-}
+KEYS
+
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static void
 
 static void
-resizemouse(Client *c)
-{
+movemouse(Client *c) {
+       int x1, y1, ocx, ocy, di;
+       unsigned int dui;
+       Window dummy;
        XEvent ev;
        XEvent ev;
-       int ocx, ocy;
 
        ocx = c->x;
        ocy = c->y;
 
        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[CurMove], CurrentTime) != GrabSuccess)
                return;
                return;
-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
+       c->ismax = False;
+       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
        for(;;) {
-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
-               switch(ev.type) {
-               default: break;
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+               switch (ev.type) {
+               case ButtonRelease:
+                       resize(c, True, TopLeft);
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
-                       XFlush(dpy);
-                       c->w = abs(ocx - ev.xmotion.x);
-                       c->h = abs(ocy - ev.xmotion.y);
-                       c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
-                       c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
-                       resize(c, True);
+                       XSync(dpy, False);
+                       c->x = ocx + (ev.xmotion.x - x1);
+                       c->y = ocy + (ev.xmotion.y - y1);
+                       if(abs(wax + c->x) < SNAP)
+                               c->x = wax;
+                       else if(abs((wax + waw) - (c->x + c->w)) < SNAP)
+                               c->x = wax + waw - c->w - 2 * BORDERPX;
+                       if(abs(way - c->y) < SNAP)
+                               c->y = way;
+                       else if(abs((way + wah) - (c->y + c->h)) < SNAP)
+                               c->y = way + wah - c->h - 2 * BORDERPX;
+                       resize(c, False, TopLeft);
                        break;
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
 
 static void
                }
        }
 }
 
 static void
-movemouse(Client *c)
-{
+resizemouse(Client *c) {
+       int ocx, ocy;
+       int nw, nh;
+       Corner sticky;
        XEvent ev;
        XEvent ev;
-       int x1, y1, ocx, ocy, di;
-       unsigned int dui;
-       Window dummy;
 
        ocx = c->x;
        ocy = c->y;
 
        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[CurResize], CurrentTime) != GrabSuccess)
                return;
                return;
-       XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
+       c->ismax = False;
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
        for(;;) {
        for(;;) {
-               XMaskEvent(dpy, MouseMask | ExposureMask, &ev);
-               switch (ev.type) {
-               default: break;
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+               switch(ev.type) {
+               case ButtonRelease:
+                       resize(c, True, TopLeft);
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
                case Expose:
                        handler[Expose](&ev);
                        break;
                case MotionNotify:
-                       XFlush(dpy);
-                       c->x = ocx + (ev.xmotion.x - x1);
-                       c->y = ocy + (ev.xmotion.y - y1);
-                       resize(c, False);
+                       XSync(dpy, False);
+                       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;
+                       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;
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
 
 static void
                }
        }
 }
 
 static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
        int x;
        Arg a;
        int x;
        Arg a;
-       XButtonPressedEvent *ev = &e->xbutton;
        Client *c;
        Client *c;
+       XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {
 
        if(barwin == ev->window) {
-               x = (arrange == dofloat) ? textw("~") : 0;
-               for(a.i = 0; a.i < TLast; a.i++) {
+               x = 0;
+               for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
                        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)
+                       switch(ev->button) {
+                       case Button1:
+                               togglemode(NULL);
+                               break;
+                       case Button4:
+                               a.i = 1;
+                               incnmaster(&a);
+                               break;
+                       case Button5:
+                               a.i = -1;
+                               incnmaster(&a);
+                               break;
+                       }
        }
        else if((c = getclient(ev->window))) {
        }
        else if((c = getclient(ev->window))) {
-               if(arrange == dotile && !c->dofloat)
+               focus(c);
+               if(CLEANMASK(ev->state) != MODKEY)
                        return;
                        return;
-               higher(c);
-               switch(ev->button) {
-               default:
-                       break;
-               case Button1:
+               if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+                       restack();
                        movemouse(c);
                        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) &&
+                               !c->isfixed) {
+                       restack();
                        resizemouse(c);
                        resizemouse(c);
-                       break;
                }
        }
 }
 
 static void
                }
        }
 }
 
 static void
-configurerequest(XEvent *e)
-{
+configurerequest(XEvent *e) {
+       unsigned long newmask;
+       Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XWindowChanges wc;
-       Client *c;
 
 
-       ev->value_mask &= ~CWSibling;
        if((c = getclient(ev->window))) {
        if((c = getclient(ev->window))) {
-               gravitate(c, True);
+               c->ismax = False;
                if(ev->value_mask & CWX)
                        c->x = ev->x;
                if(ev->value_mask & CWY)
                if(ev->value_mask & CWX)
                        c->x = ev->x;
                if(ev->value_mask & CWY)
@@ -236,27 +182,40 @@ configurerequest(XEvent *e)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
                if(ev->value_mask & CWHeight)
                        c->h = ev->height;
                if(ev->value_mask & CWBorderWidth)
-                       c->border = 1;
-               gravitate(c, False);
-               resize(c, True);
+                       c->border = ev->border_width;
+               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))
+                               XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+               }
+               else
+                       arrange();
+       }
+       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);
-       XFlush(dpy);
 }
 
 static void
 }
 
 static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -265,74 +224,93 @@ destroynotify(XEvent *e)
 }
 
 static void
 }
 
 static void
-enternotify(XEvent *e)
-{
-       XCrossingEvent *ev = &e->xcrossing;
+enternotify(XEvent *e) {
        Client *c;
        Client *c;
+       XCrossingEvent *ev = &e->xcrossing;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-
-       if((c = getclient(ev->window)))
+       if((c = getclient(ev->window)) && isvisible(c))
                focus(c);
                focus(c);
-       else if(ev->window == root)
-               issel = True;
-}
-
-static void
-leavenotify(XEvent *e)
-{
-       XCrossingEvent *ev = &e->xcrossing;
-
-       if((ev->window == root) && !ev->same_screen)
+       else if(ev->window == root) {
                issel = True;
                issel = True;
+               focus(sel);
+       }
 }
 
 static void
 }
 
 static void
-expose(XEvent *e)
-{
+expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
        XExposeEvent *ev = &e->xexpose;
-       Client *c;
 
        if(ev->count == 0) {
                if(barwin == ev->window)
                        drawstatus();
 
        if(ev->count == 0) {
                if(barwin == ev->window)
                        drawstatus();
-               else if((c = getctitle(ev->window)))
-                       drawtitle(c);
        }
 }
 
 static void
        }
 }
 
 static void
-maprequest(XEvent *e)
-{
-       XMapRequestEvent *ev = &e->xmaprequest;
+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
+                       && CLEANMASK(key[i].mod) == CLEANMASK(ev->state))
+               {
+                       if(key[i].func)
+                               key[i].func(&key[i].arg);
+               }
+       }
+}
+
+static void
+leavenotify(XEvent *e) {
+       XCrossingEvent *ev = &e->xcrossing;
+
+       if((ev->window == root) && !ev->same_screen) {
+               focus(NULL);
+               issel = False;
+       }
+}
+
+static void
+mappingnotify(XEvent *e) {
+       XMappingEvent *ev = &e->xmapping;
+
+       XRefreshKeyboardMapping(ev);
+       if(ev->request == MappingKeyboard)
+               grabkeys();
+}
+
+static void
+maprequest(XEvent *e) {
        static XWindowAttributes wa;
        static XWindowAttributes wa;
+       XMapRequestEvent *ev = &e->xmaprequest;
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-
        if(wa.override_redirect) {
                XSelectInput(dpy, ev->window,
                                (StructureNotifyMask | PropertyChangeMask));
                return;
        }
        if(wa.override_redirect) {
                XSelectInput(dpy, ev->window,
                                (StructureNotifyMask | PropertyChangeMask));
                return;
        }
-
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }
 
 static void
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }
 
 static void
-propertynotify(XEvent *e)
-{
-       XPropertyEvent *ev = &e->xproperty;
-       Window trans;
+propertynotify(XEvent *e) {
        Client *c;
        Client *c;
+       Window trans;
+       XPropertyEvent *ev = &e->xproperty;
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
-
        if((c = getclient(ev->window))) {
        if((c = getclient(ev->window))) {
-               if(ev->atom == wm_atom[WMProtocols]) {
+               if(ev->atom == wmatom[WMProtocols]) {
                        c->proto = getproto(c->win);
                        return;
                }
                        c->proto = getproto(c->win);
                        return;
                }
@@ -340,26 +318,73 @@ propertynotify(XEvent *e)
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->dofloat && (c->dofloat = (trans != 0)))
-                                       arrange(NULL);
+                               if(!c->isfloat && (c->isfloat = (trans != 0)))
+                                       arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                break;
                        case XA_WM_NORMAL_HINTS:
-                               setsize(c);
+                               updatesizehints(c);
                                break;
                }
                                break;
                }
-               if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
-                       settitle(c);
-                       drawtitle(c);
+               if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
+                       updatetitle(c);
+                       if(c == sel)
+                               drawstatus();
                }
        }
 }
 
 static void
                }
        }
 }
 
 static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
        if((c = getclient(ev->window)))
                unmanage(c);
 }
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
        if((c = getclient(ev->window)))
                unmanage(c);
 }
+
+/* extern */
+
+void (*handler[LASTEvent]) (XEvent *) = {
+       [ButtonPress] = buttonpress,
+       [ConfigureRequest] = configurerequest,
+       [DestroyNotify] = destroynotify,
+       [EnterNotify] = enternotify,
+       [LeaveNotify] = leavenotify,
+       [Expose] = expose,
+       [KeyPress] = keypress,
+       [MappingNotify] = mappingnotify,
+       [MapRequest] = maprequest,
+       [PropertyNotify] = propertynotify,
+       [UnmapNotify] = unmapnotify
+};
+
+void
+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);
+               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 */
+       }
+}