applied Peter Hartlichs aspect revert fix

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index d7d8bff..4ed5760 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -250,21 +250,21 @@ applyrules(Client *c) {
        XClassHint ch = { 0 };
 
        /* rule matching */
-       if(XGetClassHint(dpy, c->win, &ch) == 0)
-               return;
-       for(i = 0; i < LENGTH(rules); i++) {
-               r = &rules[i];
-               if((!r->title || strstr(c->name, r->title))
-               && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
-               && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
-                       c->isfloating = r->isfloating;
-                       c->tags |= r->tags & TAGMASK;
+       if(XGetClassHint(dpy, c->win, &ch)) {
+               for(i = 0; i < LENGTH(rules); i++) {
+                       r = &rules[i];
+                       if((!r->title || strstr(c->name, r->title))
+                       && (!r->class || (ch.res_class && strstr(ch.res_class, r->class)))
+                       && (!r->instance || (ch.res_name && strstr(ch.res_name, r->instance)))) {
+                               c->isfloating = r->isfloating;
+                               c->tags |= r->tags & TAGMASK;
+                       }
                }
+               if(ch.res_class)
+                       XFree(ch.res_class);
+               if(ch.res_name)
+                       XFree(ch.res_name);
        }
-       if(ch.res_class)
-               XFree(ch.res_class);
-       if(ch.res_name)
-               XFree(ch.res_name);
        if(!c->tags)
                c->tags = tagset[seltags];
 }
@@ -331,7 +331,7 @@ buttonpress(XEvent *e) {
        for(i = 0; i < LENGTH(buttons); i++)
                if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
                   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-                       buttons[i].func(click == ClkTagBar ? &arg : &buttons[i].arg);
+                       buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
 }
 
 void
@@ -763,10 +763,10 @@ grabkeys(void) {
 
                XUngrabKey(dpy, AnyKey, AnyModifier, root);
                for(i = 0; i < LENGTH(keys); i++) {
-                       code = XKeysymToKeycode(dpy, keys[i].keysym);
-                       for(j = 0; j < LENGTH(modifiers); j++)
-                               XGrabKey(dpy, code, keys[i].mod | modifiers[j], root, True,
-                                        GrabModeAsync, GrabModeAsync);
+                       if((code = XKeysymToKeycode(dpy, keys[i].keysym)))
+                               for(j = 0; j < LENGTH(modifiers); j++)
+                                       XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
+                                                True, GrabModeAsync, GrabModeAsync);
                }
        }
 }
@@ -1056,9 +1056,9 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
                /* adjust for aspect limits */
                if(c->mina > 0 && c->maxa > 0) {
-                       if(c->maxa < (float)(w / h))
+                       if(c->maxa < (float)w / h)
                                w = h * c->maxa;
-                       else if(c->mina < (float)(h / w))
+                       else if(c->mina < (float)h / w)
                                h = w * c->mina;
                }