now dwm enforces max screen size also in tiled mode on non-floating clients which...

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 85205d9..5a1c68e 100644 (file)
--- a/event.c
+++ b/event.c
@@ -18,7 +18,7 @@ typedef struct {
 
 KEYS
 
-#define CLEANMASK(mask) (mask & ~(NUMLOCKMASK | LockMask))
+#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask))
 
 static void
 movemouse(Client *c)
@@ -109,16 +109,22 @@ buttonpress(XEvent *e)
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
-                               if(ev->button == Button3)
-                                       toggleview(&a);
-                               else
+                               if(ev->button == Button1)
                                        view(&a);
+                               else if(ev->button == Button3)
+                                       toggleview(&a);
                                return;
                        }
                }
+               if(ev->x < x + bmw) {
+                       if(ev->button == Button1)
+                               togglemode(NULL);
+               }
        }
        else if((c = getclient(ev->window))) {
                focus(c);
+               if(CLEANMASK(ev->state) != MODKEY)
+                       return;
                switch(ev->button) {
                default:
                        break;
@@ -144,13 +150,27 @@ buttonpress(XEvent *e)
 static void
 configurerequest(XEvent *e)
 {
+       unsigned long newmask;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
        XEvent synev;
        XWindowChanges wc;
-       unsigned long newmask;
 
        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;
@@ -181,7 +201,6 @@ configurerequest(XEvent *e)
                        synev.xconfigure.height = c->h;
                        synev.xconfigure.border_width = c->border;
                        synev.xconfigure.above = None;
-                       /* Send synthetic ConfigureNotify */
                        XSendEvent(dpy, c->win, True, NoEventMask, &synev);
                }
                XSync(dpy, False);
@@ -378,10 +397,22 @@ grabkeys()
                                GrabModeAsync, GrabModeAsync);
                XGrabKey(dpy, code, key[i].mod | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK, root, True,
+               XGrabKey(dpy, code, key[i].mod | numlockmask, root, True,
                                GrabModeAsync, GrabModeAsync);
-               XGrabKey(dpy, code, key[i].mod | NUMLOCKMASK | LockMask, root, True,
+               XGrabKey(dpy, code, key[i].mod | numlockmask | LockMask, root, True,
                                GrabModeAsync, GrabModeAsync);
-               XSync(dpy, False);
        }
 }
+
+void
+procevent()
+{
+       XEvent ev;
+
+       while(XPending(dpy)) {
+               XNextEvent(dpy, &ev);
+               if(handler[ev.type])
+                       (handler[ev.type])(&ev); /* call handler */
+       }
+}
+