setlayout should perform strcmp's if arg != NULL, because Layout is local to screen.o

[dwm.git] / screen.c

diff --git a/screen.c b/screen.c
index 8086bd0..8d04911 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -1,25 +1,22 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */

 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

-#include <sys/types.h>

 #include <X11/Xutil.h>
 
 #include <X11/Xutil.h>
 

-unsigned int master = MASTER;
-unsigned int nmaster = NMASTER;
-unsigned int blw = 0;
-Layout *lt = NULL;
-

 /* static */
 
 /* static */
 

+typedef struct {
+       const char *symbol;
+       void (*arrange)(void);
+} Layout;
+

 typedef struct {
        const char *prop;
        const char *tags;
 typedef struct {
        const char *prop;
        const char *tags;

-       Bool swimming;
+       Bool isfloating;

 } Rule;
 
 typedef struct {
 } Rule;
 
 typedef struct {


@@ -30,65 +27,81 @@ typedef struct {
 TAGS
 RULES
 
 TAGS
 RULES
 

-static Regs *regs = NULL;

 static unsigned int nrules = 0;
 static unsigned int nlayouts = 0;
 static unsigned int nrules = 0;
 static unsigned int nlayouts = 0;

+static unsigned int ltidx = 0; /* default */
+static Regs *regs = NULL;
+
+static unsigned int
+idxoftag(const char *tag) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               if(tags[i] == tag)
+                       return i;
+       return 0;
+}

 
 static void
 
 static void

-tile(void) {
-       unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
+floating(void) { /* default floating layout */

        Client *c;
 
        Client *c;
 

-       for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
-               n++;
-       /* window geoms */
-       mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
-       mw = (n > nmaster) ? (waw * master) / 1000 : waw;
-       th = (n > nmaster) ? wah / (n - nmaster) : 0;
-       tw = waw - mw;
-
-       for(i = 0, c = clients; c; c = c->next)
-               if(isvisible(c)) {
-                       if(c->isbanned)
-                               XMoveWindow(dpy, c->win, c->x, c->y);
-                       c->isbanned = False;
-                       if(c->swimming)
-                               continue;
-                       c->ismax = False;
-                       nx = wax;
-                       ny = way;
-                       if(i < nmaster) {
-                               ny += i * mh;
-                               nw = mw - 2 * BORDERPX;
-                               nh = mh - 2 * BORDERPX;
-                       }
-                       else {  /* tile window */
-                               nx += mw;
-                               nw = tw - 2 * BORDERPX;
-                               if(th > 2 * BORDERPX) {
-                                       ny += (i - nmaster) * th;
-                                       nh = th - 2 * BORDERPX;
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       resize(c, c->x, c->y, c->w, c->h, True);
+}
+
+LAYOUTS
+
+/* extern */
+
+unsigned int blw = 0;
+
+void
+applyrules(Client *c) {
+       static char buf[512];
+       unsigned int i, j;
+       regmatch_t tmp;
+       Bool matched = False;
+       XClassHint ch = { 0 };
+
+       /* rule matching */
+       XGetClassHint(dpy, c->win, &ch);
+       snprintf(buf, sizeof buf, "%s:%s:%s",
+                       ch.res_class ? ch.res_class : "",
+                       ch.res_name ? ch.res_name : "", c->name);
+       for(i = 0; i < nrules; i++)
+               if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
+                       c->isfloating = rules[i].isfloating;
+                       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;

                                }
                                }

-                               else /* fallback if th <= 2 * BORDERPX */
-                                       nh = wah - 2 * BORDERPX;

                        }
                        }

-                       resize(c, nx, ny, nw, nh, False);
-                       i++;
-               }
-               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();
+       if(ch.res_class)
+               XFree(ch.res_class);
+       if(ch.res_name)
+               XFree(ch.res_name);
+       if(!matched)
+               for(i = 0; i < ntags; i++)
+                       c->tags[i] = seltags[i];

 }
 
 }
 

-LAYOUTS
+void
+arrange(void) {
+       Client *c;

 
 

-/* extern */
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       unban(c);
+               else
+                       ban(c);
+       layouts[ltidx].arrange();
+       focus(NULL);
+       restack();
+}

 
 void
 compileregs(void) {
 
 void
 compileregs(void) {


@@ -97,19 +110,19 @@ compileregs(void) {
 
        if(regs)
                return;
 
        if(regs)
                return;

-       nrules = sizeof rule / sizeof rule[0];
+       nrules = sizeof rules / sizeof rules[0];

        regs = emallocz(nrules * sizeof(Regs));
        for(i = 0; i < nrules; i++) {
        regs = emallocz(nrules * sizeof(Regs));
        for(i = 0; i < nrules; i++) {

-               if(rule[i].prop) {
+               if(rules[i].prop) {

                        reg = emallocz(sizeof(regex_t));
                        reg = emallocz(sizeof(regex_t));

-                       if(regcomp(reg, rule[i].prop, REG_EXTENDED))
+                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))

                                free(reg);
                        else
                                regs[i].propregex = reg;
                }
                                free(reg);
                        else
                                regs[i].propregex = reg;
                }

-               if(rule[i].tags) {
+               if(rules[i].tags) {

                        reg = emallocz(sizeof(regex_t));
                        reg = emallocz(sizeof(regex_t));

-                       if(regcomp(reg, rule[i].tags, REG_EXTENDED))
+                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))

                                free(reg);
                        else
                                regs[i].tagregex = reg;
                                free(reg);
                        else
                                regs[i].tagregex = reg;


@@ -118,72 +131,105 @@ compileregs(void) {
 }
 
 void
 }
 
 void

-incnmaster(Arg *arg) {
-       if((lt->arrange != tile) || (nmaster + arg->i < 1)
-       || (wah / (nmaster + arg->i) <= 2 * BORDERPX))
+focusnext(const char *arg) {
+       Client *c;
+
+       if(!sel)

                return;
                return;

-       nmaster += arg->i;
-       if(sel)
-               lt->arrange();
-       else
-               drawstatus();
+       for(c = sel->next; c && !isvisible(c); c = c->next);
+       if(!c)
+               for(c = clients; c && !isvisible(c); c = c->next);
+       if(c) {
+               focus(c);
+               restack();
+       }
+}
+
+void
+focusprev(const char *arg) {
+       Client *c;
+
+       if(!sel)
+               return;
+       for(c = sel->prev; c && !isvisible(c); c = c->prev);
+       if(!c) {
+               for(c = clients; c && c->next; c = c->next);
+               for(; c && !isvisible(c); c = c->prev);
+       }
+       if(c) {
+               focus(c);
+               restack();
+       }
+}
+
+const char *
+getsymbol(void)
+{
+       return layouts[ltidx].symbol;

 }
 
 void
 initlayouts(void) {
        unsigned int i, w;
 
 }
 
 void
 initlayouts(void) {
        unsigned int i, w;
 

-       lt = &layout[0];
-       nlayouts = sizeof layout / sizeof layout[0];
+       nlayouts = sizeof layouts / sizeof layouts[0];

        for(blw = i = 0; i < nlayouts; i++) {
        for(blw = i = 0; i < nlayouts; i++) {

-               w = textw(layout[i].symbol);
+               w = textw(layouts[i].symbol);

                if(w > blw)
                        blw = w;
        }
 }
 
                if(w > blw)
                        blw = w;
        }
 }
 

+Bool
+isfloating(void) {
+       return layouts[ltidx].arrange == floating;
+}
+
+Bool
+isarrange(void (*func)())
+{
+       return func == layouts[ltidx].arrange;
+}
+

 Bool
 isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)
 Bool
 isvisible(Client *c) {
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               if(c->tags[i] && seltag[i])
+               if(c->tags[i] && seltags[i])

                        return True;
        return False;
 }
 
                        return True;
        return False;
 }
 

-void
-resizemaster(Arg *arg) {
-       if(lt->arrange != tile)
-               return;
-       if(arg->i == 0)
-               master = MASTER;
-       else {
-               if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
-               || waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
-                       return;
-               master += arg->i;
-       }
-       lt->arrange();
+Client *
+nexttiled(Client *c) {
+       for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+       return c;

 }
 
 void
 restack(void) {
        Client *c;
        XEvent ev;
 }
 
 void
 restack(void) {
        Client *c;
        XEvent ev;

+       XWindowChanges wc;

 
        drawstatus();
        if(!sel)
                return;
 
        drawstatus();
        if(!sel)
                return;

-       if(sel->swimming || lt->arrange == swim)
+       if(sel->isfloating || isfloating())

                XRaiseWindow(dpy, sel->win);
                XRaiseWindow(dpy, sel->win);

-       if(lt->arrange != swim) {
-               if(!sel->swimming)
-                       XLowerWindow(dpy, sel->win);
+       if(!isfloating()) {
+               wc.stack_mode = Below;
+               wc.sibling = barwin;
+               if(!sel->isfloating) {
+                       XConfigureWindow(dpy, sel->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = sel->win;
+               }

                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                                continue;
                for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
                        if(c == sel)
                                continue;

-                       XLowerWindow(dpy, c->win);
+                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = c->win;

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


@@ -191,131 +237,140 @@ restack(void) {
 }
 
 void
 }
 
 void

-settags(Client *c, Client *trans) {
-       char prop[512];
-       unsigned int i, j;
-       regmatch_t tmp;
-       Bool matched = trans != NULL;
-       XClassHint ch = { 0 };
+setlayout(const char *arg) {
+       unsigned int i;

 
 

-       if(matched)
-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = trans->tags[i];
+       if(!arg) {
+               if(++ltidx == nlayouts)
+                       ltidx = 0;;
+       }

        else {
        else {

-               XGetClassHint(dpy, c->win, &ch);
-               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 < nrules; i++)
-                       if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
-                               c->swimming = rule[i].swimming;
-                               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;
-                                       }
-                               }
-                       }
-               if(ch.res_class)
-                       XFree(ch.res_class);
-               if(ch.res_name)
-                       XFree(ch.res_name);
+               for(i = 0; i < nlayouts; i++)
+                       if(!strcmp(arg, layouts[i].symbol))
+                               break;
+               if(i == nlayouts)
+                       return;
+               ltidx = i;

        }
        }

-       if(!matched)
-               for(i = 0; i < ntags; i++)
-                       c->tags[i] = seltag[i];
+       if(sel)
+               arrange();
+       else
+               drawstatus();

 }
 
 void
 }
 
 void

-swim(void) {
-       Client *c;
+tag(const char *arg) {
+       unsigned int i;

 
 

-       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();
+       if(!sel)
+               return;
+       for(i = 0; i < ntags; i++)
+               sel->tags[i] = arg == NULL;
+       i = idxoftag(arg);
+       if(i >= 0 && i < ntags)
+               sel->tags[i] = True;
+       arrange();

 }
 
 void
 }
 
 void

-tag(Arg *arg) {
-       unsigned int i;
+togglebar(const char *arg) {
+       if(bpos == BarOff)
+               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+       else
+               bpos = BarOff;
+       updatebarpos();
+       arrange();
+}

 
 

-       if(!sel)
+void
+togglefloating(const char *arg) {
+       if(!sel || isfloating())

                return;
                return;

-       for(i = 0; i < ntags; i++)
-               sel->tags[i] = (arg->i == -1) ? True : False;
-       if(arg->i >= 0 && arg->i < ntags)
-               sel->tags[arg->i] = True;
-       lt->arrange();
+       sel->isfloating = !sel->isfloating;
+       if(sel->isfloating)
+               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+       arrange();

 }
 
 void
 }
 
 void

-toggleswimming(Arg *arg) {
-       if(!sel || lt->arrange == swim)
+togglemax(const char *arg) {
+       XEvent ev;
+
+       if(!sel || (!isfloating() && !sel->isfloating) || sel->isfixed)

                return;
                return;

-       sel->swimming = !sel->swimming;
-       lt->arrange();
+       if((sel->ismax = !sel->ismax)) {
+               sel->rx = sel->x;
+               sel->ry = sel->y;
+               sel->rw = sel->w;
+               sel->rh = sel->h;
+               resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
+       }
+       else
+               resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
+       drawstatus();
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 void
 }
 
 void

-toggletag(Arg *arg) {
-       unsigned int i;
+toggletag(const char *arg) {
+       unsigned int i, j;

 
        if(!sel)
                return;
 
        if(!sel)
                return;

-       sel->tags[arg->i] = !sel->tags[arg->i];
-       for(i = 0; i < ntags && !sel->tags[i]; i++);
-       if(i == ntags)
-               sel->tags[arg->i] = True;
-       lt->arrange();
+       i = idxoftag(arg);
+       sel->tags[i] = !sel->tags[i];
+       for(j = 0; j < ntags && !sel->tags[j]; j++);
+       if(j == ntags)
+               sel->tags[i] = True;
+       arrange();

 }
 
 void
 }
 
 void

-togglelayout(Arg *arg) {
-       unsigned int i;
+toggleview(const char *arg) {
+       unsigned int i, j;

 
 

-       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();
+       i = idxoftag(arg);
+       seltags[i] = !seltags[i];
+       for(j = 0; j < ntags && !seltags[j]; j++);
+       if(j == ntags)
+               seltags[i] = True; /* cannot toggle last view */
+       arrange();

 }
 
 void
 }
 
 void

-toggleview(Arg *arg) {
-       unsigned int i;
+updatebarpos(void) {
+       XEvent ev;

 
 

-       seltag[arg->i] = !seltag[arg->i];
-       for(i = 0; i < ntags && !seltag[i]; i++);
-       if(i == ntags)
-               seltag[arg->i] = True; /* cannot toggle last view */
-       lt->arrange();
+       wax = sx;
+       way = sy;
+       wah = sh;
+       waw = sw;
+       switch(bpos) {
+       default:
+               wah -= bh;
+               way += bh;
+               XMoveWindow(dpy, barwin, sx, sy);
+               break;
+       case BarBot:
+               wah -= bh;
+               XMoveWindow(dpy, barwin, sx, sy + wah);
+               break;
+       case BarOff:
+               XMoveWindow(dpy, barwin, sx, sy - bh);
+               break;
+       }
+       XSync(dpy, False);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 void
 }
 
 void

-view(Arg *arg) {
+view(const char *arg) {

        unsigned int i;
 
        for(i = 0; i < ntags; i++)
        unsigned int i;
 
        for(i = 0; i < ntags; i++)

-               seltag[i] = (arg->i == -1) ? True : False;
-       if(arg->i >= 0 && arg->i < ntags)
-               seltag[arg->i] = True;
-       lt->arrange();
+               seltags[i] = arg == NULL;
+       i = idxoftag(arg);
+       if(i >= 0 && i < ntags)
+               seltags[i] = True;
+       arrange();

 }
 }