moved updatebarpos to screen

[dwm.git] / screen.c

diff --git a/screen.c b/screen.c
index d313955..022633b 100644 (file)
--- a/screen.c
+++ b/screen.c
@@ -1,100 +1,409 @@
-/*
- * (C)opyright MMVI 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 "dwm.h"

+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <X11/Xatom.h>
+#include <X11/Xutil.h>

 
 

-void (*arrange)(Arg *) = tiling;
+/* static */

 
 

-void
-view(Arg *arg)
-{
+typedef struct {
+       const char *symbol;
+       void (*arrange)(void);
+} Layout;
+
+typedef struct {
+       const char *prop;
+       const char *tags;
+       Bool isfloating;
+} Rule;
+
+typedef struct {
+       regex_t *propregex;
+       regex_t *tagregex;
+} Regs;
+
+TAGS
+RULES
+
+static char prop[512];
+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
+floating(void) { /* default floating layout */

        Client *c;
 
        Client *c;
 

-       tsel = arg->i;
-       arrange(NULL);
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       resize(c, c->x, c->y, c->w, c->h, True);
+}

 
 

-       for(c = clients; c; c = getnext(c->next))
-               drawtitle(c);
-       drawstatus();
+static void
+setdwmprops(void) {
+       unsigned int i;
+
+       for(i = 0; i < ntags && i < sizeof prop - 1; i++)
+               prop[i] = seltags[i] ? '1' : '0';
+       if(i < sizeof prop - 1)
+               prop[i++] = (char)ltidx;
+       prop[i] = '\0';
+       XChangeProperty(dpy, root, dwmprops, XA_STRING, 8,
+                       PropModeReplace, (unsigned char *)prop, i);
+}
+
+LAYOUTS
+
+/* extern */
+
+unsigned int blw = 0;
+
+void
+applyrules(Client *c) {
+       unsigned int i, j;
+       regmatch_t tmp;
+       Bool matched = False;
+       XClassHint ch = { 0 };
+
+       /* rule matching */
+       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->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;
+                               }
+                       }
+               }
+       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];

 }
 
 void
 }
 
 void

-floating(Arg *arg)
-{
+arrange(void) {

        Client *c;
 
        Client *c;
 

-       arrange = floating;
-       for(c = clients; c; c = c->next) {
-               if(c->tags[tsel])
-                       resize(c, True);
+       for(c = clients; c; c = c->next)
+               if(isvisible(c))
+                       unban(c);

                else
                        ban(c);
                else
                        ban(c);

-       }
-       if(sel && !sel->tags[tsel]) {
-               if((sel = getnext(clients))) {
-                       higher(sel);
-                       focus(sel);
+       layouts[ltidx].arrange();
+       focus(NULL);
+       restack();
+}
+
+void
+compileregs(void) {
+       unsigned int i;
+       regex_t *reg;
+
+       if(regs)
+               return;
+       nrules = sizeof rules / sizeof rules[0];
+       regs = emallocz(nrules * sizeof(Regs));
+       for(i = 0; i < nrules; i++) {
+               if(rules[i].prop) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rules[i].prop, REG_EXTENDED))
+                               free(reg);
+                       else
+                               regs[i].propregex = reg;
+               }
+               if(rules[i].tags) {
+                       reg = emallocz(sizeof(regex_t));
+                       if(regcomp(reg, rules[i].tags, REG_EXTENDED))
+                               free(reg);
+                       else
+                               regs[i].tagregex = reg;

                }
        }
                }
        }

-       drawstatus();

 }
 
 void
 }
 
 void

-tiling(Arg *arg)
-{
+focusnext(const char *arg) {

        Client *c;
        Client *c;

-       int n, i, w, h;

 
 

-       w = sw - mw;
-       arrange = tiling;
-       for(n = 0, c = clients; c; c = c->next)
-               if(c->tags[tsel] && !c->floating)
-                       n++;
+       if(!sel)
+               return;
+       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();
+       }
+}

 
 

-       if(n > 1)
-               h = (sh - bh) / (n - 1);
-       else
-               h = sh - bh;
+void
+focusprev(const char *arg) {
+       Client *c;

 
 

-       for(i = 0, c = clients; c; c = c->next) {
-               if(c->tags[tsel]) {
-                       if(c->floating) {
-                               higher(c);
-                               resize(c, True);
-                               continue;
-                       }
-                       if(n == 1) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = sw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
-                       }
-                       else if(i == 0) {
-                               c->x = sx;
-                               c->y = sy + bh;
-                               c->w = mw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
-                       }
-                       else {
-                               c->x = sx + mw;
-                               c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
-                       }
-                       resize(c, False);
-                       i++;
+       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;
+
+       nlayouts = sizeof layouts / sizeof layouts[0];
+       for(blw = i = 0; i < nlayouts; i++) {
+               w = textw(layouts[i].symbol);
+               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++)
+               if(c->tags[i] && seltags[i])
+                       return True;
+       return False;
+}
+
+void
+getdwmprops(void) {
+       unsigned int i;
+
+       if(gettextprop(root, dwmprops, prop, sizeof prop)) {
+               for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
+                       seltags[i] = prop[i] == '1';
+               if(i < sizeof prop - 1 && prop[i] != '\0') {
+                       if(prop[i] < nlayouts)
+                               ltidx = prop[i];

                }
                }

-               else
-                       ban(c);

        }
        }

-       if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients))) {
-                       higher(sel);
-                       focus(sel);
+}
+
+Client *
+nexttiled(Client *c) {
+       for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+       return c;
+}
+
+void
+restack(void) {
+       Client *c;
+       XEvent ev;
+       XWindowChanges wc;
+
+       drawstatus();
+       if(!sel)
+               return;
+       if(sel->isfloating || isfloating())
+               XRaiseWindow(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;
+                       XConfigureWindow(dpy, c->win, CWSibling | CWStackMode, &wc);
+                       wc.sibling = c->win;
+               }
+       }
+       XSync(dpy, False);
+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
+void
+setlayout(const char *arg) {
+       int i;
+
+       if(!arg) {
+               if(++ltidx == nlayouts)
+                       ltidx = 0;;
+       }
+       else {
+               i = atoi(arg);
+               if(i < 0 || i >= nlayouts)
+                       return;
+               ltidx = i;
+       }
+       if(sel)
+               arrange();
+       else
+               drawstatus();
+       setdwmprops();
+}
+
+void
+tag(const char *arg) {
+       unsigned int i;
+
+       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;
+       setprops(sel);
+       arrange();
+}
+
+void
+togglebar(const char *arg) {
+       if(bpos == BarOff)
+               bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
+       else
+               bpos = BarOff;
+       updatebarpos();
+       arrange();
+}
+
+void
+togglefloating(const char *arg) {
+       if(!sel || isfloating())
+               return;
+       sel->isfloating = !sel->isfloating;
+       if(sel->isfloating) {
+               resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+               setprops(sel);

        }
        }

+       arrange();
+}
+
+void
+togglemax(const char *arg) {
+       XEvent ev;
+
+       if(!sel || (!isfloating() && !sel->isfloating) || sel->isfixed)
+               return;
+       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();
        drawstatus();

+       while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));

 }
 
 }
 

+void
+toggletag(const char *arg) {
+       unsigned int i, j;
+
+       if(!sel)
+               return;
+       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;
+       setprops(sel);
+       arrange();
+}
+
+void
+toggleview(const char *arg) {
+       unsigned int i, j;
+
+       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 */
+       setdwmprops();
+       arrange();
+}
+
+void
+updatebarpos(void) {
+       XEvent ev;
+
+       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
+view(const char *arg) {
+       unsigned int i;
+
+       for(i = 0; i < ntags; i++)
+               seltags[i] = arg == NULL;
+       i = idxoftag(arg);
+       if(i >= 0 && i < ntags)
+               seltags[i] = True;
+       setdwmprops();
+       arrange();
+}