simplified configurerequest

[dwm.git] / event.c

diff --git a/event.c b/event.c
index 86fb43b..bdf4071 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:
@@ -145,16 +147,38 @@ buttonpress(XEvent *e)
        }
 }
 
+static void
+synconfig(Client *c, int x, int y, int w, int h, unsigned int border)
+{
+       XEvent synev;
+
+       synev.type = ConfigureNotify;
+       synev.xconfigure.display = dpy;
+       synev.xconfigure.event = c->win;
+       synev.xconfigure.window = c->win;
+       synev.xconfigure.x = x;
+       synev.xconfigure.y = y;
+       synev.xconfigure.width = w;
+       synev.xconfigure.height = h;
+       synev.xconfigure.border_width = border;
+       synev.xconfigure.above = None;
+       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
+}
+
 static void
 configurerequest(XEvent *e)
 {
        unsigned long newmask;
        Client *c;
        XConfigureRequestEvent *ev = &e->xconfigurerequest;
-       XEvent synev;
        XWindowChanges wc;
 
        if((c = getclient(ev->window))) {
+               if(!c->isfloat && (arrange != dofloat) && c->ismax) {
+                       synconfig(c, sx, sy + bh, sw - 2, sh - 2 - bh, ev->border_width);
+                       XSync(dpy, False);
+                       return;
+               }
                gravitate(c, True);
                if(ev->value_mask & CWX)
                        c->x = ev->x;
@@ -174,20 +198,8 @@ configurerequest(XEvent *e)
                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;
-                       /* Send synthetic ConfigureNotify */
-                       XSendEvent(dpy, c->win, True, NoEventMask, &synev);
-               }
+               else
+                       synconfig(c, c->x, c->y, c->w, c->h, c->border);
                XSync(dpy, False);
                if(c->isfloat)
                        resize(c, False, TopLeft);