replaced togglelayout with setlayout

[dwm.git] / screen.c

diff --git a/screen.c b/screen.c
index 8086bd0..8abe3d7 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -19,7 +19,7 @@ Layout *lt = NULL;
 typedef struct {
        const char *prop;
        const char *tags;
-       Bool swimming;
+       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->swimming)
+                       if(c->isversatile)
                                continue;
                        c->ismax = False;
                        nx = wax;
@@ -175,10 +175,10 @@ restack(void) {
        drawstatus();
        if(!sel)
                return;
-       if(sel->swimming || lt->arrange == swim)
+       if(sel->isversatile || lt->arrange == versatile)
                XRaiseWindow(dpy, sel->win);
-       if(lt->arrange != swim) {
-               if(!sel->swimming)
+       if(lt->arrange != versatile) {
+               if(!sel->isversatile)
                        XLowerWindow(dpy, sel->win);
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
@@ -190,6 +190,28 @@ restack(void) {
        while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
+void
+setlayout(Arg *arg) {
+       unsigned int i;
+
+       if(arg->i == -1) {
+               for(i = 0; i < nlayouts && lt != &layout[i]; i++);
+               if(i == nlayouts - 1)
+                       lt = &layout[0];
+               else
+                       lt = &layout[++i];
+       }
+       else {
+               if(arg->i < 0 || arg->i >= nlayouts)
+                       return;
+               lt = &layout[arg->i];
+       }
+       if(sel)
+               lt->arrange();
+       else
+               drawstatus();
+}
+
 void
 settags(Client *c, Client *trans) {
        char prop[512];
@@ -208,7 +230,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->swimming = rule[i].swimming;
+                               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;
@@ -226,29 +248,6 @@ settags(Client *c, Client *trans) {
                        c->tags[i] = seltag[i];
 }
 
-void
-swim(void) {
-       Client *c;
-
-       for(c = clients; c; c = c->next) {
-               if(isvisible(c)) {
-                       if(c->isbanned)
-                               XMoveWindow(dpy, c->win, c->x, c->y);
-                       c->isbanned = False;
-                       resize(c, c->x, c->y, c->w, c->h, True);
-               }
-               else {
-                       c->isbanned = True;
-                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-               }
-       }
-       if(!sel || !isvisible(sel)) {
-               for(c = stack; c && !isvisible(c); c = c->snext);
-               focus(c);
-       }
-       restack();
-}
-
 void
 tag(Arg *arg) {
        unsigned int i;
@@ -262,14 +261,6 @@ tag(Arg *arg) {
        lt->arrange();
 }
 
-void
-toggleswimming(Arg *arg) {
-       if(!sel || lt->arrange == swim)
-               return;
-       sel->swimming = !sel->swimming;
-       lt->arrange();
-}
-
 void
 toggletag(Arg *arg) {
        unsigned int i;
@@ -284,18 +275,11 @@ toggletag(Arg *arg) {
 }
 
 void
-togglelayout(Arg *arg) {
-       unsigned int i;
-
-       for(i = 0; i < nlayouts && lt != &layout[i]; i++);
-       if(i == nlayouts - 1)
-               lt = &layout[0];
-       else
-               lt = &layout[++i];
-       if(sel)
-               lt->arrange();
-       else
-               drawstatus();
+toggleversatile(Arg *arg) {
+       if(!sel || lt->arrange == versatile)
+               return;
+       sel->isversatile = !sel->isversatile;
+       lt->arrange();
 }
 
 void
@@ -309,6 +293,29 @@ toggleview(Arg *arg) {
        lt->arrange();
 }
 
+void
+versatile(void) {
+       Client *c;
+
+       for(c = clients; c; c = c->next) {
+               if(isvisible(c)) {
+                       if(c->isbanned)
+                               XMoveWindow(dpy, c->win, c->x, c->y);
+                       c->isbanned = False;
+                       resize(c, c->x, c->y, c->w, c->h, True);
+               }
+               else {
+                       c->isbanned = True;
+                       XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+               }
+       }
+       if(!sel || !isvisible(sel)) {
+               for(c = stack; c && !isvisible(c); c = c->snext);
+               focus(c);
+       }
+       restack();
+}
+
 void
 view(Arg *arg) {
        unsigned int i;