Xinqi Bao's Git

projects / dwm.git / blobdiff
summary | log | commit | diff | tree
raw | inline | side by side
fixed configurerequest according to Jukkas complains
[dwm.git] / event.c
diff --git a/event.c b/event.c
index f29038a..153b49a 100644 (file)
--- a/event.c
+++ b/event.c
@@ -1,109 +1,218 @@
-/*
- * (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 "dwm.h"
 #include <stdlib.h>
 #include <stdlib.h>
-#include <string.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
 
-#include "wm.h"
+/* static */
 
 
-/* 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 keymapnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void propertynotify(XEvent *e);
-static void unmapnotify(XEvent *e);
+typedef struct {
+       unsigned long mod;
+       KeySym keysym;
+       void (*func)(Arg *arg);
+       Arg arg;
+} Key;
 
 
-void (*handler[LASTEvent]) (XEvent *) = {
-       [ButtonPress] = buttonpress,
-       [ConfigureRequest] = configurerequest,
-       [DestroyNotify] = destroynotify,
-       [EnterNotify] = enternotify,
-       [LeaveNotify] = leavenotify,
-       [Expose] = expose,
-       [KeyPress] = keypress,
-       [KeymapNotify] = keymapnotify,
-       [MapRequest] = maprequest,
-       [PropertyNotify] = propertynotify,
-       [UnmapNotify] = unmapnotify
-};
+KEYS
 
 
-unsigned int
-discard_events(long even_mask)
-{
-       XEvent ev;
-       unsigned int n = 0;
-       while(XCheckMaskEvent(dpy, even_mask, &ev)) n++;
-       return n;
-}
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
+#define MOUSEMASK              (BUTTONMASK | PointerMotionMask)
 
 static void
 
 static void
-buttonpress(XEvent *e)
-{
-       XButtonPressedEvent *ev = &e->xbutton;
-       Client *c;
+movemouse(Client *c) {
+       int x1, y1, ocx, ocy, di, nx, ny;
+       unsigned int dui;
+       Window dummy;
+       XEvent ev;
 
 
-       if((c = getclient(ev->window))) {
-               switch(ev->button) {
-               default:
+       ocx = nx = c->x;
+       ocy = ny = c->y;
+       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 | SubstructureRedirectMask, &ev);
+               switch (ev.type) {
+               case ButtonRelease:
+                       XUngrabPointer(dpy, CurrentTime);
+                       return;
+               case ConfigureRequest:
+               case Expose:
+               case MapRequest:
+                       handler[ev.type](&ev);
                        break;
                        break;
-               case Button1:
-                       mmove(c);
+               case MotionNotify:
+                       XSync(dpy, False);
+                       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 Button2:
-                       XLowerWindow(dpy, c->win);
+               }
+       }
+}
+
+static void
+resizemouse(Client *c) {
+       int ocx, ocy;
+       int nw, nh;
+       XEvent ev;
+
+       ocx = c->x;
+       ocy = c->y;
+       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->border - 1, c->h + c->border - 1);
+       for(;;) {
+               XMaskEvent(dpy, MOUSEMASK | ExposureMask | SubstructureRedirectMask , &ev);
+               switch(ev.type) {
+               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 MapRequest:
+                       handler[ev.type](&ev);
                        break;
                        break;
-               case Button3:
-                       mresize(c);
+               case MotionNotify:
+                       XSync(dpy, False);
+                       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;
                }
        }
 }
 
 static void
                        break;
                }
        }
 }
 
 static void
-configurerequest(XEvent *e)
-{
+buttonpress(XEvent *e) {
+       int x;
+       Arg a;
+       Client *c;
+       XButtonPressedEvent *ev = &e->xbutton;
+
+       if(barwin == ev->window) {
+               x = 0;
+               for(a.i = 0; a.i < ntags; a.i++) {
+                       x += textw(tags[a.i]);
+                       if(ev->x < x) {
+                               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))) {
+               focus(c);
+               if(CLEANMASK(ev->state) != MODKEY)
+                       return;
+               if(ev->button == Button1 && (arrange == dofloat || c->isfloat)) {
+                       restack();
+                       movemouse(c);
+               }
+               else if(ev->button == Button2)
+                       zoom(NULL);
+               else if(ev->button == Button3
+               && (arrange == dofloat || c->isfloat) && !c->isfixed)
+               {
+                       restack();
+                       resizemouse(c);
+               }
+       }
+}
+
+static void
+configurerequest(XEvent *e) {
+       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))) {
-               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(c->isfixed || c->isfloat || (arrange == dofloat)) {
+                       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))
+                                       XMoveWindow(dpy, c->win, c->x, c->y);
+                       }
+                       else {
+                               XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+                               if(!isvisible(c))
+                                       ban(c);
+                       }
+               }
+               else
+                       configure(c);
        }
        }
-
-       wc.x = ev->x;
-       wc.y = ev->y;
-       wc.width = ev->width;
-       wc.height = ev->height;
-       wc.border_width = 0;
-       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);
+       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);
 }
 
 static void
 }
 
 static void
-destroynotify(XEvent *e)
-{
+destroynotify(XEvent *e) {
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
        Client *c;
        XDestroyWindowEvent *ev = &e->xdestroywindow;
 
@@ -112,108 +221,160 @@ 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);
        else if(ev->window == root) {
                focus(c);
        else if(ev->window == root) {
-               sel_screen = True;
-               /*draw_frames();*/
+               selscreen = True;
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
        }
 }
 
 static void
        }
 }
 
 static void
-leavenotify(XEvent *e)
-{
-       XCrossingEvent *ev = &e->xcrossing;
+expose(XEvent *e) {
+       XExposeEvent *ev = &e->xexpose;
 
 
-       if((ev->window == root) && !ev->same_screen) {
-               sel_screen = True;
-               /*draw_frames();*/
+       if(ev->count == 0) {
+               if(barwin == ev->window)
+                       drawstatus();
        }
 }
 
 static void
        }
 }
 
 static void
-expose(XEvent *e)
-{
-       XExposeEvent *ev = &e->xexpose;
-       Client *c;
+keypress(XEvent *e) {
+       static unsigned int len = sizeof key / sizeof key[0];
+       unsigned int i;
+       KeySym keysym;
+       XKeyEvent *ev = &e->xkey;
 
 
-       if(ev->count == 0) {
-               if((c = getclient(ev->window)))
-                       draw_client(c);
-               else if(ev->window == barwin)
-                       draw_bar();
+       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) {
+               selscreen = False;
+               focus(NULL);
        }
 }
 
 static void
        }
 }
 
 static void
-keymapnotify(XEvent *e)
-{
-       update_keys();
+mappingnotify(XEvent *e) {
+       XMappingEvent *ev = &e->xmapping;
+
+       XRefreshKeyboardMapping(ev);
+       if(ev->request == MappingKeyboard)
+               grabkeys();
 }
 
 static void
 }
 
 static void
-maprequest(XEvent *e)
-{
-       XMapRequestEvent *ev = &e->xmaprequest;
+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));
+       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)
-{
-       XPropertyEvent *ev = &e->xproperty;
+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(ev->atom == wm_atom[WMProtocols]) {
-               c->proto = win_proto(c->win);
-               return;
-       }
        if((c = getclient(ev->window))) {
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
        if((c = getclient(ev->window))) {
                switch (ev->atom) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
-                               XGetTransientForHint(dpy, c->win, &c->trans);
+                               XGetTransientForHint(dpy, c->win, &trans);
+                               if(!c->isfloat && (c->isfloat = (trans != 0)))
+                                       arrange();
                                break;
                                break;
-                               update_size(c);
                        case XA_WM_NORMAL_HINTS:
                        case XA_WM_NORMAL_HINTS:
-                               update_size(c);
+                               updatesizehints(c);
                                break;
                }
                                break;
                }
-               if(ev->atom == XA_WM_NAME || ev->atom == net_atom[NetWMName]) {
-                       update_name(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 */
+       }
+}