Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
changed some odering in config*.h
[dwm.git] / event.c
diff --git a/event.c b/event.c
index 5a1c68e..b6a77fd 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,5 +1,4 @@
-/*
- * (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.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"
@@ -19,86 +18,100 @@ typedef struct {
 KEYS
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 KEYS
 
 #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
+
+static Client *
+getclient(Window w) {
+       Client *c;
+
+       for(c = clients; c && c->win != w; c = c->next);
+       return c;
+}
 
 static void
 
 static void
-movemouse(Client *c)
-{
-       int x1, y1, ocx, ocy, di;
+movemouse(Client *c) {
+       int x1, y1, ocx, ocy, di, nx, ny;
        unsigned int dui;
        Window dummy;
        XEvent ev;
 
        unsigned int dui;
        Window dummy;
        XEvent ev;
 
-       ocx = c->x;
-       ocy = c->y;
+       ocx = nx = c->x;
+       ocy = ny = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
                        None, cursor[CurMove], CurrentTime) != GrabSuccess)
                return;
        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(;;) {
        XQueryPointer(dpy, root, &dummy, &dummy, &x1, &y1, &di, &di, &dui);
        for(;;) {
-               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask, &ev);
                switch (ev.type) {
                switch (ev.type) {
-               default: break;
+               case ButtonRelease:
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
+               case ConfigureRequest:
                case Expose:
                case Expose:
-                       handler[Expose](&ev);
+               case MapRequest:
+                       handler[ev.type](&ev);
                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);
-                       c->x = ocx + (ev.xmotion.x - x1);
-                       c->y = ocy + (ev.xmotion.y - y1);
-                       resize(c, False, TopLeft);
+                       nx = ocx + (ev.xmotion.x - x1);
+                       ny = ocy + (ev.xmotion.y - y1);
+                       if(abs(wax + nx) < SNAP)
+                               nx = wax;
+                       else if(abs((wax + waw) - (nx + c->w + 2 * c->border)) < SNAP)
+                               nx = wax + waw - c->w - 2 * c->border;
+                       if(abs(way - ny) < SNAP)
+                               ny = way;
+                       else if(abs((way + wah) - (ny + c->h + 2 * c->border)) < SNAP)
+                               ny = way + wah - c->h - 2 * c->border;
+                       resize(c, nx, ny, c->w, c->h, False);
                        break;
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
 
 static void
                }
        }
 }
 
 static void
-resizemouse(Client *c)
-{
+resizemouse(Client *c) {
        int ocx, ocy;
        int nw, nh;
        int ocx, ocy;
        int nw, nh;
-       Corner sticky;
        XEvent ev;
 
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
        XEvent ev;
 
        ocx = c->x;
        ocy = c->y;
        if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                               None, cursor[CurResize], CurrentTime) != GrabSuccess)
+                       None, cursor[CurResize], CurrentTime) != GrabSuccess)
                return;
                return;
-       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w, c->h);
+       c->ismax = False;
+       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->border - 1, c->h + c->border - 1);
        for(;;) {
        for(;;) {
-               XMaskEvent(dpy, MOUSEMASK | ExposureMask, &ev);
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
                switch(ev.type) {
                switch(ev.type) {
-               default: break;
+               case ButtonRelease:
+                       XWarpPointer(dpy, None, c->win, 0, 0, 0, 0,
+                                       c->w + c->border - 1, c->h + c->border - 1);
+                       XUngrabPointer(dpy, CurrentTime);
+                       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+                       return;
+               case ConfigureRequest:
                case Expose:
                case Expose:
-                       handler[Expose](&ev);
+               case MapRequest:
+                       handler[ev.type](&ev);
                        break;
                case MotionNotify:
                        XSync(dpy, False);
                        break;
                case MotionNotify:
                        XSync(dpy, False);
-                       if((nw = abs(ocx - ev.xmotion.x)))
-                               c->w = abs(ocx - ev.xmotion.x);
-                       if((nh = abs(ocy - ev.xmotion.y)))
-                               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;
-                       if(ocx <= ev.xmotion.x)
-                               sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
-                       else
-                               sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
-                       resize(c, True, sticky);
+                       if((nw = ev.xmotion.x - ocx - 2 * c->border + 1) <= 0)
+                               nw = 1;
+                       if((nh = ev.xmotion.y - ocy - 2 * c->border + 1) <= 0)
+                               nh = 1;
+                       resize(c, c->x, c->y, nw, nh, True);
                        break;
                        break;
-               case ButtonRelease:
-                       XUngrabPointer(dpy, CurrentTime);
-                       return;
                }
        }
 }
 
 static void
                }
        }
 }
 
 static void
-buttonpress(XEvent *e)
-{
+buttonpress(XEvent *e) {
        int x;
        Arg a;
        Client *c;
        int x;
        Arg a;
        Client *c;
@@ -109,105 +122,82 @@ buttonpress(XEvent *e)
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
-                               if(ev->button == Button1)
-                                       view(&a);
-                               else if(ev->button == Button3)
-                                       toggleview(&a);
+                               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;
                        }
                }
                                return;
                        }
                }
-               if(ev->x < x + bmw) {
-                       if(ev->button == Button1)
-                               togglemode(NULL);
-               }
+               if(ev->x < x + blw)
+                       switch(ev->button) {
+                       case Button1:
+                               togglelayout(NULL);
+                               break;
+                       case Button4:
+                               a.i = 1;
+                               incnmaster(&a);
+                               break;
+                       case Button5:
+                               a.i = -1;
+                               incnmaster(&a);
+                               break;
+                       }
        }
        else if((c = getclient(ev->window))) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
        }
        else if((c = getclient(ev->window))) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
-               switch(ev->button) {
-               default:
-                       break;
-               case Button1:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               restack(c);
-                               movemouse(c);
-                       }
-                       break;
-               case Button2:
+               if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
+                       restack();
+                       movemouse(c);
+               }
+               else if(ev->button == Button2)
                        zoom(NULL);
                        zoom(NULL);
-                       break;
-               case Button3:
-                       if(!c->ismax && (arrange == dofloat || c->isfloat)) {
-                               restack(c);
-                               resizemouse(c);
-                       }
-                       break;
+               else if(ev->button == Button3
+               && (lt->arrange == versatile || c->isversatile) && !c->isfixed)
+               {
+                       restack();
+                       resizemouse(c);
                }
        }
 }
 
 static void
                }
        }
 }
 
 static void
-configurerequest(XEvent *e)
-{
-       unsigned long newmask;
+configurerequest(XEvent *e) {
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
-       XEvent synev;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
-               if(!c->isfloat && (arrange != dofloat) && c->ismax) {
-                       synev.type = ConfigureNotify;
-                       synev.xconfigure.display = dpy;
-                       synev.xconfigure.event = c->win;
-                       synev.xconfigure.window = c->win;
-                       synev.xconfigure.x = sx;
-                       synev.xconfigure.y = sy + bh;
-                       synev.xconfigure.width = sw - 2;
-                       synev.xconfigure.height = sw - 2 - bh;
-                       synev.xconfigure.border_width = ev->border_width;
-                       synev.xconfigure.above = None;
-                       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-                       return;
-               }
-               gravitate(c, True);
-               if(ev->value_mask & CWX)
-                       c->x = ev->x;
-               if(ev->value_mask & CWY)
-                       c->y = ev->y;
-               if(ev->value_mask & CWWidth)
-                       c->w = ev->width;
-               if(ev->value_mask & CWHeight)
-                       c->h = ev->height;
+               c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
-               gravitate(c, False);
-               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 {
-                       synev.type = ConfigureNotify;
-                       synev.xconfigure.display = dpy;
-                       synev.xconfigure.event = c->win;
-                       synev.xconfigure.window = c->win;
-                       synev.xconfigure.x = c->x;
-                       synev.xconfigure.y = c->y;
-                       synev.xconfigure.width = c->w;
-                       synev.xconfigure.height = c->h;
-                       synev.xconfigure.border_width = c->border;
-                       synev.xconfigure.above = None;
-                       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+               if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {
+                       if(ev->value_mask & CWX)
+                               c->x = ev->x;
+                       if(ev->value_mask & CWY)
+                               c->y = ev->y;
+                       if(ev->value_mask & CWWidth)
+                               c->w = ev->width;
+                       if(ev->value_mask & CWHeight)
+                               c->h = ev->height;
+                       if((ev->value_mask & (CWX | CWY))
+                       && !(ev->value_mask & (CWWidth | CWHeight)))
+                               configure(c);
+                       if(isvisible(c))
+                               XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
                }
                }
-               XSync(dpy, False);
-               if(c->isfloat)
-                       resize(c, False, TopLeft);
                else
                else
-                       arrange(NULL);
+                       configure(c);
        }
        else {
                wc.x = ev->x;
        }
        else {
                wc.x = ev->x;
@@ -218,13 +208,12 @@ configurerequest(XEvent *e)
                wc.sibling = ev->above;
                wc.stack_mode = ev->detail;
                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
                wc.sibling = ev->above;
                wc.stack_mode = ev->detail;
                XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-               XSync(dpy, False);
        }
        }
+       XSync(dpy, False);
 }
 
 static void
 }
 
 static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -233,71 +222,60 @@ destroynotify(XEvent *e)
 }
 
 static void
 }
 
 static void
-enternotify(XEvent *e)
-{
+enternotify(XEvent *e) {
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
        Client *c;
        XCrossingEvent *ev = &e->xcrossing;
 
        if(ev->mode != NotifyNormal || ev->detail == NotifyInferior)
                return;
-
-       if((c = getclient(ev->window)) || (c = getctitle(ev->window)))
+       if((c = getclient(ev->window)) && isvisible(c))
                focus(c);
        else if(ev->window == root) {
                focus(c);
        else if(ev->window == root) {
-               issel = True;
-               XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-               drawall();
+               selscreen = True;
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
        }
 }
 
 static void
        }
 }
 
 static void
-expose(XEvent *e)
-{
-       Client *c;
+expose(XEvent *e) {
        XExposeEvent *ev = &e->xexpose;
 
        if(ev->count == 0) {
                if(barwin == ev->window)
                        drawstatus();
        XExposeEvent *ev = &e->xexpose;
 
        if(ev->count == 0) {
                if(barwin == ev->window)
                        drawstatus();
-               else if((c = getctitle(ev->window)))
-                       drawtitle(c);
        }
 }
 
 static void
        }
 }
 
 static void
-keypress(XEvent *e)
-{
-       static unsigned int len = sizeof(key) / sizeof(key[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);
        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))
+       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);
                {
                        if(key[i].func)
                                key[i].func(&key[i].arg);
-                       return;
                }
                }
-       }
 }
 
 static void
 }
 
 static void
-leavenotify(XEvent *e)
-{
+leavenotify(XEvent *e) {
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen) {
        XCrossingEvent *ev = &e->xcrossing;
 
        if((ev->window == root) && !ev->same_screen) {
-               issel = False;
-               drawall();
+               selscreen = False;
+               focus(NULL);
        }
 }
 
 static void
        }
 }
 
 static void
-mappingnotify(XEvent *e)
-{
+mappingnotify(XEvent *e) {
        XMappingEvent *ev = &e->xmapping;
 
        XRefreshKeyboardMapping(ev);
        XMappingEvent *ev = &e->xmapping;
 
        XRefreshKeyboardMapping(ev);
@@ -306,60 +284,48 @@ mappingnotify(XEvent *e)
 }
 
 static void
 }
 
 static void
-maprequest(XEvent *e)
-{
+maprequest(XEvent *e) {
        static XWindowAttributes wa;
        XMapRequestEvent *ev = &e->xmaprequest;
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
        static XWindowAttributes wa;
        XMapRequestEvent *ev = &e->xmaprequest;
 
        if(!XGetWindowAttributes(dpy, ev->window, &wa))
                return;
-
-       if(wa.override_redirect) {
-               XSelectInput(dpy, ev->window,
-                               (StructureNotifyMask | PropertyChangeMask));
+       if(wa.override_redirect)
                return;
                return;
-       }
-
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }
 
 static void
        if(!getclient(ev->window))
                manage(ev->window, &wa);
 }
 
 static void
-propertynotify(XEvent *e)
-{
+propertynotify(XEvent *e) {
        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
        Client *c;
        Window trans;
        XPropertyEvent *ev = &e->xproperty;
 
        if(ev->state == PropertyDelete)
                return; /* ignore */
-
        if((c = getclient(ev->window))) {
        if((c = getclient(ev->window))) {
-               if(ev->atom == wmatom[WMProtocols]) {
-                       c->proto = getproto(c->win);
-                       return;
-               }
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->isfloat && (c->isfloat = (trans != 0)))
-                                       arrange(NULL);
+                               if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
+                                       lt->arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:
                                break;
                        case XA_WM_NORMAL_HINTS:
-                               setsize(c);
+                               updatesizehints(c);
                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
                                break;
                }
                if(ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-                       settitle(c);
-                       drawtitle(c);
+                       updatetitle(c);
+                       if(c == sel)
+                               drawstatus();
                }
        }
 }
 
 static void
                }
        }
 }
 
 static void
-unmapnotify(XEvent *e)
-{
+unmapnotify(XEvent *e) {
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
        Client *c;
        XUnmapEvent *ev = &e->xunmap;
 
@@ -384,9 +350,8 @@ void (*handler[LASTEvent]) (XEvent *) = {
 };
 
 void
 };
 
 void
-grabkeys()
-{
-       static unsigned int len = sizeof(key) / sizeof(key[0]);
+grabkeys(void) {
+       static unsigned int len = sizeof key / sizeof key[0];
        unsigned int i;
        KeyCode code;
 
        unsigned int i;
        KeyCode code;
 
@@ -403,16 +368,3 @@ grabkeys()
                                GrabModeAsync, GrabModeAsync);
        }
 }
                                GrabModeAsync, GrabModeAsync);
        }
 }
-
-void
-procevent()
-{
-       XEvent ev;
-
-       while(XPending(dpy)) {
-               XNextEvent(dpy, &ev);
-               if(handler[ev.type])
-                       (handler[ev.type])(&ev); /* call handler */
-       }
-}
-