renamed Client->versatile and Rule->versatile into Client->isversatile resp. Rule...

diff --git a/client.c b/client.c
index 2aa1955d4a2591500de12dacf07f27a685c580da..fdb973c408162dbd57f44b819647ce548d5d1254 100644 (file)
--- a/client.c
+++ b/client.c
@@ -253,8 +253,8 @@ manage(Window w, XWindowAttributes *wa) {
        updatetitle(c);
        for(t = clients; t && t->win != trans; t = t->next);
        settags(c, t);
-       if(!c->versatile)
-               c->versatile = (t != NULL) || c->isfixed;
+       if(!c->isversatile)
+               c->isversatile = (t != NULL) || c->isfixed;
        attach(c);
        attachstack(c);
        c->isbanned = True;
@@ -268,7 +268,7 @@ manage(Window w, XWindowAttributes *wa) {
 
 Client *
 nexttiled(Client *c) {
-       for(; c && (c->versatile || !isvisible(c)); c = c->next);
+       for(; c && (c->isversatile || !isvisible(c)); c = c->next);
        return c;
 }
 
@@ -440,7 +440,7 @@ zoom(Arg *arg) {
 
        if(!sel)
                return;
-       if(sel->versatile || (lt->arrange == versatile)) {
+       if(sel->isversatile || (lt->arrange == versatile)) {
                togglemax(sel);
                return;
        }

diff --git a/config.arg.h b/config.arg.h
index 05bcd07e3cca52442479fb23c46f1434f21e95eb..fec7a12b6cec64250a78a009a0fa821267c9d4ad 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -89,7 +89,7 @@ static Key key[] = { \
 
 #define RULES \
 static Rule rule[] = { \
-       /* class:instance:title regex   tags regex      versatile */ \
+       /* class:instance:title regex   tags regex      isversatile */ \
        { "Firefox",                    "3",            False }, \
        { "Gimp",                       NULL,           True }, \
        { "MPlayer",                    NULL,           True }, \

diff --git a/dwm.h b/dwm.h
index 8e68776d257778f8f3cc630917cb796a8a6a5d9a..c8546d8d7bd9a903ec5f1ba3f6c08b5b5c8d7c57 100644 (file)
--- a/dwm.h
+++ b/dwm.h
@@ -72,7 +72,7 @@ struct Client {
        int minax, minay, maxax, maxay;
        long flags; 
        unsigned int border;
-       Bool isbanned, isfixed, ismax, versatile;
+       Bool isbanned, isfixed, ismax, isversatile;
        Bool *tags;
        Client *next;
        Client *prev;

diff --git a/event.c b/event.c
index 00c53b6487f4d4e09b7201014699c58e5b4eb0fe..b6a77fdea55d10e069d9f3050470645caa29ed58 100644 (file)
--- a/event.c
+++ b/event.c
@@ -156,14 +156,14 @@ buttonpress(XEvent *e) {
                focus(c);
                if(CLEANMASK(ev->state) != MODKEY)
                        return;
-               if(ev->button == Button1 && (lt->arrange == versatile || c->versatile)) {
+               if(ev->button == Button1 && (lt->arrange == versatile || c->isversatile)) {
                        restack();
                        movemouse(c);
                }
                else if(ev->button == Button2)
                        zoom(NULL);
                else if(ev->button == Button3
-               && (lt->arrange == versatile || c->versatile) && !c->isfixed)
+               && (lt->arrange == versatile || c->isversatile) && !c->isfixed)
                {
                        restack();
                        resizemouse(c);
@@ -181,7 +181,7 @@ configurerequest(XEvent *e) {
                c->ismax = False;
                if(ev->value_mask & CWBorderWidth)
                        c->border = ev->border_width;
-               if(c->isfixed || c->versatile || (lt->arrange == versatile)) {
+               if(c->isfixed || c->isversatile || (lt->arrange == versatile)) {
                        if(ev->value_mask & CWX)
                                c->x = ev->x;
                        if(ev->value_mask & CWY)
@@ -309,7 +309,7 @@ propertynotify(XEvent *e) {
                        default: break;
                        case XA_WM_TRANSIENT_FOR:
                                XGetTransientForHint(dpy, c->win, &trans);
-                               if(!c->versatile && (c->versatile = (getclient(trans) != NULL)))
+                               if(!c->isversatile && (c->isversatile = (getclient(trans) != NULL)))
                                        lt->arrange();
                                break;
                        case XA_WM_NORMAL_HINTS:

diff --git a/screen.c b/screen.c
index e0da2cfd02999343e38fe4a835261516d349bf62..5907ba7ab8985a077840b633742087cb91058dc7 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -19,7 +19,7 @@ Layout *lt = NULL;
 typedef struct {
        const char *prop;
        const char *tags;
-       Bool versatile;
+       Bool isversatile;
 } Rule;
 
 typedef struct {
@@ -52,7 +52,7 @@ tile(void) {
                        if(c->isbanned)
                                XMoveWindow(dpy, c->win, c->x, c->y);
                        c->isbanned = False;
-                       if(c->versatile)
+                       if(c->isversatile)
                                continue;
                        c->ismax = False;
                        nx = wax;
@@ -175,10 +175,10 @@ restack(void) {
        drawstatus();
        if(!sel)
                return;
-       if(sel->versatile || lt->arrange == versatile)
+       if(sel->isversatile || lt->arrange == versatile)
                XRaiseWindow(dpy, sel->win);
        if(lt->arrange != versatile) {
-               if(!sel->versatile)
+               if(!sel->isversatile)
                        XLowerWindow(dpy, sel->win);
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
@@ -208,7 +208,7 @@ settags(Client *c, Client *trans) {
                                ch.res_name ? ch.res_name : "", c->name);
                for(i = 0; i < nrules; i++)
                        if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
-                               c->versatile = rule[i].versatile;
+                               c->isversatile = rule[i].isversatile;
                                for(j = 0; regs[i].tagregex && j < ntags; j++) {
                                        if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
                                                matched = True;
@@ -271,7 +271,7 @@ void
 toggleversatile(Arg *arg) {
        if(!sel || lt->arrange == versatile)
                return;
-       sel->versatile = !sel->versatile;
+       sel->isversatile = !sel->isversatile;
        lt->arrange();
 }