JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
renames swim[ming] into versatile
[dwm.git] / screen.c
index 4e97f09..e0da2cf 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -9,83 +9,33 @@
 #include <sys/types.h>
 #include <X11/Xutil.h>
 
-void (*arrange)(void) = DEFMODE;
 unsigned int master = MASTER;
 unsigned int nmaster = NMASTER;
+unsigned int blw = 0;
+Layout *lt = NULL;
 
 /* static */
 
 typedef struct {
        const char *prop;
        const char *tags;
-       Bool isfloat;
+       Bool versatile;
 } Rule;
 
 typedef struct {
        regex_t *propregex;
        regex_t *tagregex;
-} Regexps;
+} Regs;
 
 TAGS
 RULES
 
-static Regexps *regexps = NULL;
-static unsigned int len = 0;
+static Regs *regs = NULL;
+static unsigned int nrules = 0;
+static unsigned int nlayouts = 0;
 
-/* extern */
-
-void
-compileregexps(void) {
-       unsigned int i;
-       regex_t *reg;
-
-       if(regexps)
-               return;
-       len = sizeof rule / sizeof rule[0];
-       regexps = emallocz(len * sizeof(Regexps));
-       for(i = 0; i < len; i++) {
-               if(rule[i].prop) {
-                       reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rule[i].prop, REG_EXTENDED))
-                               free(reg);
-                       else
-                               regexps[i].propregex = reg;
-               }
-               if(rule[i].tags) {
-                       reg = emallocz(sizeof(regex_t));
-                       if(regcomp(reg, rule[i].tags, REG_EXTENDED))
-                               free(reg);
-                       else
-                               regexps[i].tagregex = reg;
-               }
-       }
-}
-
-void
-dofloat(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
-dotile(void) {
+static void
+tile(void) {
        unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
        Client *c;
 
@@ -102,7 +52,7 @@ dotile(void) {
                        if(c->isbanned)
                                XMoveWindow(dpy, c->win, c->x, c->y);
                        c->isbanned = False;
-                       if(c->isfloat)
+                       if(c->versatile)
                                continue;
                        c->ismax = False;
                        nx = wax;
@@ -136,18 +86,62 @@ dotile(void) {
        restack();
 }
 
+LAYOUTS
+
+/* extern */
+
+void
+compileregs(void) {
+       unsigned int i;
+       regex_t *reg;
+
+       if(regs)
+               return;
+       nrules = sizeof rule / sizeof rule[0];
+       regs = emallocz(nrules * sizeof(Regs));
+       for(i = 0; i < nrules; i++) {
+               if(rule[i].prop) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rule[i].prop, REG_EXTENDED))
+                               free(reg);
+                       else
+                               regs[i].propregex = reg;
+               }
+               if(rule[i].tags) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rule[i].tags, REG_EXTENDED))
+                               free(reg);
+                       else
+                               regs[i].tagregex = reg;
+               }
+       }
+}
+
 void
 incnmaster(Arg *arg) {
-       if((arrange == dofloat) || (nmaster + arg->i < 1)
+       if((lt->arrange != tile) || (nmaster + arg->i < 1)
        || (wah / (nmaster + arg->i) <= 2 * BORDERPX))
                return;
        nmaster += arg->i;
        if(sel)
-               arrange();
+               lt->arrange();
        else
                drawstatus();
 }
 
+void
+initlayouts(void) {
+       unsigned int i, w;
+
+       lt = &layout[0];
+       nlayouts = sizeof layout / sizeof layout[0];
+       for(blw = i = 0; i < nlayouts; i++) {
+               w = textw(layout[i].symbol);
+               if(w > blw)
+                       blw = w;
+       }
+}
+
 Bool
 isvisible(Client *c) {
        unsigned int i;
@@ -160,7 +154,7 @@ isvisible(Client *c) {
 
 void
 resizemaster(Arg *arg) {
-       if(arrange != dotile)
+       if(lt->arrange != tile)
                return;
        if(arg->i == 0)
                master = MASTER;
@@ -170,7 +164,7 @@ resizemaster(Arg *arg) {
                        return;
                master += arg->i;
        }
-       arrange();
+       lt->arrange();
 }
 
 void
@@ -181,10 +175,10 @@ restack(void) {
        drawstatus();
        if(!sel)
                return;
-       if(sel->isfloat || arrange == dofloat)
+       if(sel->versatile || lt->arrange == versatile)
                XRaiseWindow(dpy, sel->win);
-       if(arrange != dofloat) {
-               if(!sel->isfloat)
+       if(lt->arrange != versatile) {
+               if(!sel->versatile)
                        XLowerWindow(dpy, sel->win);
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
@@ -212,11 +206,11 @@ settags(Client *c, Client *trans) {
                snprintf(prop, sizeof prop, "%s:%s:%s",
                                ch.res_class ? ch.res_class : "",
                                ch.res_name ? ch.res_name : "", c->name);
-               for(i = 0; i < len; i++)
-                       if(regexps[i].propregex && !regexec(regexps[i].propregex, prop, 1, &tmp, 0)) {
-                               c->isfloat = rule[i].isfloat;
-                               for(j = 0; regexps[i].tagregex && j < ntags; j++) {
-                                       if(!regexec(regexps[i].tagregex, tags[j], 1, &tmp, 0)) {
+               for(i = 0; i < nrules; i++)
+                       if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
+                               c->versatile = rule[i].versatile;
+                               for(j = 0; regs[i].tagregex && j < ntags; j++) {
+                                       if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
                                                matched = True;
                                                c->tags[j] = True;
                                        }
@@ -242,15 +236,7 @@ tag(Arg *arg) {
                sel->tags[i] = (arg->i == -1) ? True : False;
        if(arg->i >= 0 && arg->i < ntags)
                sel->tags[arg->i] = True;
-       arrange();
-}
-
-void
-togglefloat(Arg *arg) {
-       if(!sel || arrange == dofloat)
-               return;
-       sel->isfloat = !sel->isfloat;
-       arrange();
+       lt->arrange();
 }
 
 void
@@ -263,19 +249,33 @@ toggletag(Arg *arg) {
        for(i = 0; i < ntags && !sel->tags[i]; i++);
        if(i == ntags)
                sel->tags[arg->i] = True;
-       arrange();
+       lt->arrange();
 }
 
 void
-togglemode(Arg *arg) {
-       arrange = (arrange == dofloat) ? dotile : dofloat;
+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)
-               arrange();
+               lt->arrange();
        else
                drawstatus();
 }
 
 void
+toggleversatile(Arg *arg) {
+       if(!sel || lt->arrange == versatile)
+               return;
+       sel->versatile = !sel->versatile;
+       lt->arrange();
+}
+
+void
 toggleview(Arg *arg) {
        unsigned int i;
 
@@ -283,7 +283,30 @@ toggleview(Arg *arg) {
        for(i = 0; i < ntags && !seltag[i]; i++);
        if(i == ntags)
                seltag[arg->i] = True; /* cannot toggle last view */
-       arrange();
+       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
@@ -294,5 +317,5 @@ view(Arg *arg) {
                seltag[i] = (arg->i == -1) ? True : False;
        if(arg->i >= 0 && arg->i < ntags)
                seltag[arg->i] = True;
-       arrange();
+       lt->arrange();
 }