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 86fb43b..5a1c68e 100644 (file)
--- a/event.c
+++ b/event.c
@@ -105,9 +105,7 @@ buttonpress(XEvent *e)
        XButtonPressedEvent *ev = &e->xbutton;
 
        if(barwin == ev->window) {
-               if(ev->x < modew)
-                       return;
-               x = modew;
+               x = 0;
                for(a.i = 0; a.i < ntags; a.i++) {
                        x += textw(tags[a.i]);
                        if(ev->x < x) {
@@ -118,10 +116,14 @@ buttonpress(XEvent *e)
                                return;
                        }
                }
+               if(ev->x < x + bmw) {
+                       if(ev->button == Button1)
+                               togglemode(NULL);
+               }
        }
        else if((c = getclient(ev->window))) {
                focus(c);
-               if(CLEANMASK(ev->state) == 0)
+               if(CLEANMASK(ev->state) != MODKEY)
                        return;
                switch(ev->button) {
                default:
@@ -155,6 +157,20 @@ configurerequest(XEvent *e)
        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;
@@ -185,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);