simplifying regexps in config samples

[dwm.git] / client.c

diff --git a/client.c b/client.c
index b9c519b..486efe9 100644 (file)
--- a/client.c
+++ b/client.c
@@ -148,7 +148,7 @@ killclient(Arg *arg) {
 
 void
 manage(Window w, XWindowAttributes *wa) {
 
 void
 manage(Window w, XWindowAttributes *wa) {

-       Client *c;
+       Client *c, *t;

        Window trans;
 
        c = emallocz(sizeof(Client));
        Window trans;
 
        c = emallocz(sizeof(Client));


@@ -181,9 +181,10 @@ manage(Window w, XWindowAttributes *wa) {
        grabbuttons(c, False);
        XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
        updatetitle(c);
        grabbuttons(c, False);
        XSetWindowBorder(dpy, c->win, dc.norm[ColBorder]);
        updatetitle(c);

-       settags(c, getclient(trans));
+       t = getclient(trans);
+       settags(c, t);

        if(!c->isfloat)
        if(!c->isfloat)

-               c->isfloat = trans || c->isfixed;
+               c->isfloat = (t != 0) || c->isfixed;

        if(clients)
                clients->prev = c;
        c->next = clients;
        if(clients)
                clients->prev = c;
        c->next = clients;


@@ -303,8 +304,8 @@ updatesizehints(Client *c) {
        }
        else
                c->minax = c->minay = c->maxax = c->maxay = 0;
        }
        else
                c->minax = c->minay = c->maxax = c->maxay = 0;

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

 }
 
 void
 }
 
 void


@@ -324,7 +325,7 @@ updatetitle(Client *c) {
                strncpy(c->name, (char *)name.value, sizeof c->name);
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success
                strncpy(c->name, (char *)name.value, sizeof c->name);
        else {
                if(XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success

-                               && n > 0 && *list)
+               && n > 0 && *list)

                {
                        strncpy(c->name, *list, sizeof c->name);
                        XFreeStringList(list);
                {
                        strncpy(c->name, *list, sizeof c->name);
                        XFreeStringList(list);