applied Peter Hartlich's simplification patch of setmfact and his revival of MFACT...

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index ed7fc0d..91b0149 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -212,6 +212,7 @@ char stext[256], buf[256];
 int screen, sx, sy, sw, sh;
 int (*xerrorxlib)(Display *, XErrorEvent *);
 int bx, by, bw, bh, blw, bgw, mx, my, mw, mh, mox, moy, mow, moh, tx, ty, tw, th, wx, wy, ww, wh;
+double mfact;
 unsigned int numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
        [ButtonPress] = buttonpress,
@@ -330,7 +331,7 @@ buttonpress(XEvent *e) {
                x = bgw;
                for(i = 0; i < LENGTH(tags); i++) {
                        x += textw(tags[i]);
-                       if(ev->x > bgw && ev->x < x) {
+                       if(ev->x >= bgw && ev->x < x) {
                                if(ev->button == Button1) {
                                        if(ev->state & MODKEY)
                                                tag(tags[i]);
@@ -805,39 +806,20 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 
 void
 grabbuttons(Client *c, Bool focused) {
-       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       int i, j;
+       unsigned int buttons[]   = { Button1, Button2, Button3 };
+       unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
+                                    MODKEY|numlockmask|LockMask} ;
 
-       if(focused) {
-               XGrabButton(dpy, Button1, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY|LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY|numlockmask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button1, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-
-               XGrabButton(dpy, Button2, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY|LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY|numlockmask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button2, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-
-               XGrabButton(dpy, Button3, MODKEY, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY|LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY|numlockmask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-               XGrabButton(dpy, Button3, MODKEY|numlockmask|LockMask, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
-       }
+       XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
+       if(focused)
+               for(i = 0; i < LENGTH(buttons); i++)
+                       for(j = 0; j < LENGTH(modifiers); j++)
+                               XGrabButton(dpy, buttons[i], modifiers[j], c->win, False,
+                                           BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
        else
-               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False, BUTTONMASK,
-                               GrabModeAsync, GrabModeSync, None, None);
+               XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
+                           BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
 }
 
 void
@@ -1196,9 +1178,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
        if(sizehints) {
                /* set minimum possible */
-               if (w < 1)
+               if(w < 1)
                        w = 1;
-               if (h < 1)
+               if(h < 1)
                        h = 1;
 
                /* temporarily remove base dimensions */
@@ -1206,7 +1188,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
                h -= c->baseh;
 
                /* adjust for aspect limits */
-               if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
+               if(c->minax != c->maxax && c->minay != c->maxay 
+               && c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 0)
+               {
                        if (w * c->maxay > h * c->maxax)
                                w = h * c->maxax / c->maxay;
                        else if (w * c->minay < h * c->minax)
@@ -1465,20 +1449,19 @@ setlayout(const char *arg) {
 
 void
 setmfact(const char *arg) {
-       double delta;
+       double d;
 
-       if(!arg)
+       if(lt->isfloating)
                return;
-       delta = strtod(arg, NULL);
-       if(arg[0] == '-' || arg[0] == '+') {
-               if(mfact + delta < 0.1 || mfact + delta > 0.9)
-                       return;
-               mfact += delta;
-       }
+       if(!arg)
+               mfact = MFACT;
        else {
-               if(delta < 0.1 || delta > 0.9)
+               d = strtod(arg, NULL);
+               if(arg[0] == '-' || arg[0] == '+')
+                       d += mfact;
+               if(d < 0.1 || d > 0.9)
                        return;
-               mfact = delta;
+               mfact = d;
        }
        setgeom(geom->symbol);
 }
@@ -1499,6 +1482,7 @@ setup(void) {
        sw = DisplayWidth(dpy, screen);
        sh = DisplayHeight(dpy, screen);
        bh = dc.font.height + 2;
+       mfact = MFACT;
        geom = &geoms[0];
        geom->apply();