Added tag 5.2 for changeset e4bcaca8e6ef

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index d7d8bff..09f3ae1 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -180,6 +180,7 @@ static void setclientstate(Client *c, long state);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);

+static void showhide(Client *c);

 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static int textnw(const char *text, unsigned int len);
 static void spawn(const Arg *arg);
 static void tag(const Arg *arg);
 static int textnw(const char *text, unsigned int len);


@@ -250,39 +251,28 @@ applyrules(Client *c) {
        XClassHint ch = { 0 };
 
        /* rule matching */
        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];
 }
 
 void
 arrange(void) {
        if(!c->tags)
                c->tags = tagset[seltags];
 }
 
 void
 arrange(void) {

-       Client *c;
-
-       for(c = clients; c; c = c->next)
-               if(ISVISIBLE(c)) {
-                       XMoveWindow(dpy, c->win, c->x, c->y);
-                       if(!lt[sellt]->arrange || c->isfloating)
-                               resize(c, c->x, c->y, c->w, c->h, True);
-               }
-               else {
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-               }
-
+       showhide(stack);

        focus(NULL);
        if(lt[sellt]->arrange)
                lt[sellt]->arrange();
        focus(NULL);
        if(lt[sellt]->arrange)
                lt[sellt]->arrange();


@@ -331,21 +321,20 @@ 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))
        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
 checkotherwm(void) {
        otherwm = False;
 }
 
 void
 checkotherwm(void) {
        otherwm = False;

-       XSetErrorHandler(xerrorstart);
+       xerrorxlib = XSetErrorHandler(xerrorstart);

 
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
        if(otherwm)
                die("dwm: another window manager is already running\n");
 
        /* this causes an error if some other window manager is running */
        XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
        XSync(dpy, False);
        if(otherwm)
                die("dwm: another window manager is already running\n");

-       XSetErrorHandler(NULL);
-       xerrorxlib = XSetErrorHandler(xerror);
+       XSetErrorHandler(xerror);

        XSync(dpy, False);
 }
 
        XSync(dpy, False);
 }
 


@@ -763,10 +752,10 @@ grabkeys(void) {
 
                XUngrabKey(dpy, AnyKey, AnyModifier, root);
                for(i = 0; i < LENGTH(keys); i++) {
 
                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);

                }
        }
 }
                }
        }
 }


@@ -857,12 +846,14 @@ killclient(const Arg *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
 
 void
 manage(Window w, XWindowAttributes *wa) {

+       static Client cz;

        Client *c, *t = NULL;
        Window trans = None;
        XWindowChanges wc;
 
        Client *c, *t = NULL;
        Window trans = None;
        XWindowChanges wc;
 

-       if(!(c = calloc(1, sizeof(Client))))
-               die("fatal: could not calloc() %u bytes\n", sizeof(Client));
+       if(!(c = malloc(sizeof(Client))))
+               die("fatal: could not malloc() %u bytes\n", sizeof(Client));
+       *c = cz;

        c->win = w;
 
        /* geometry */
        c->win = w;
 
        /* geometry */


@@ -1056,9 +1047,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) {
 
                /* 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;
                                w = h * c->maxa;

-                       else if(c->mina < (float)(h / w))
+                       else if(c->mina < (float)h / w)

                                h = w * c->mina;
                }
 
                                h = w * c->mina;
                }
 


@@ -1377,6 +1368,22 @@ setup(void) {
        grabkeys();
 }
 
        grabkeys();
 }
 

+void
+showhide(Client *c) {
+       if(!c)
+               return;
+       if(ISVISIBLE(c)) { /* show clients top down */
+               XMoveWindow(dpy, c->win, c->x, c->y);
+               if(!lt[sellt]->arrange || c->isfloating)
+                       resize(c, c->x, c->y, c->w, c->h, True);
+               showhide(c->snext);
+       }
+       else { /* hide clients bottom up */
+               showhide(c->snext);
+               XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+       }
+}
+

 void
 spawn(const Arg *arg) {
        /* The double-fork construct avoids zombie processes and keeps the code
 void
 spawn(const Arg *arg) {
        /* The double-fork construct avoids zombie processes and keeps the code


@@ -1585,7 +1592,9 @@ updatesizehints(Client *c) {
        long msize;
        XSizeHints size;
 
        long msize;
        XSizeHints size;
 

-       XGetWMNormalHints(dpy, c->win, &size, &msize);
+       if(!XGetWMNormalHints(dpy, c->win, &size, &msize))
+               /* size is uninitialized, ensure that size.flags aren't used */
+               size.flags = PSize; 

        if(size.flags & PBaseSize) {
                c->basew = size.base_width;
                c->baseh = size.base_height;
        if(size.flags & PBaseSize) {
                c->basew = size.base_width;
                c->baseh = size.base_height;


@@ -1625,7 +1634,7 @@ updatesizehints(Client *c) {
        else
                c->maxa = c->mina = 0.0;
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
        else
                c->maxa = c->mina = 0.0;
        c->isfixed = (c->maxw && c->minw && c->maxh && c->minh

-                       && c->maxw == c->minw && c->maxh == c->minh);
+                    && c->maxw == c->minw && c->maxh == c->minh);

 }
 
 void
 }
 
 void