removed TLast tag enum, now tags is simple defined as char *[] array, the rest is...

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 48f1f2a..b20e71e 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -3,29 +3,26 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
+#include <regex.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <X11/Xutil.h>
 
-/********** CUSTOMIZE **********/
-
-char *tags[TLast] = {
-       [Tscratch] = "scratch",
-       [Tdev] = "dev",
-       [Twww] = "www",
-       [Twork] = "work",
-};
+/* static */
 
-static Rule rule[] = {
-       /* class                        instance        tags                                            isfloat */
-       { "Firefox-bin",        "Gecko",        { [Twww] = "www" },                     False },
-};
+typedef struct {
+       const char *pattern;
+       const unsigned int *tags;
+       Bool isfloat;
+} Rule;
 
-/********** CUSTOMIZE **********/
+TAGS
+RULES
 
-/* extern functions */
+void (*arrange)(Arg *) = DEFMODE;
 
-void (*arrange)(Arg *) = dotile;
+/* extern */
 
 void
 appendtag(Arg *arg)
@@ -33,7 +30,7 @@ appendtag(Arg *arg)
        if(!sel)
                return;
 
-       sel->tags[arg->i] = tags[arg->i];
+       sel->tags[arg->i] = True;
        arrange(NULL);
 }
 
@@ -42,10 +39,11 @@ dofloat(Arg *arg)
 {
        Client *c;
 
-       arrange = dofloat;
        for(c = clients; c; c = c->next) {
-               if(c->tags[tsel])
-                       resize(c, True);
+               c->ismax = False;
+               if(c->tags[tsel]) {
+                       resize(c, True, TopLeft);
+               }
                else
                        ban(c);
        }
@@ -54,6 +52,8 @@ dofloat(Arg *arg)
                        higher(sel);
                        focus(sel);
                }
+               else
+                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        }
        drawall();
 }
@@ -61,11 +61,10 @@ dofloat(Arg *arg)
 void
 dotile(Arg *arg)
 {
-       Client *c;
        int n, i, w, h;
+       Client *c;
 
        w = sw - mw;
-       arrange = dotile;
        for(n = 0, c = clients; c; c = c->next)
                if(c->tags[tsel] && !c->isfloat)
                        n++;
@@ -76,31 +75,38 @@ dotile(Arg *arg)
                h = sh - bh;
 
        for(i = 0, c = clients; c; c = c->next) {
+               c->ismax = False;
                if(c->tags[tsel]) {
                        if(c->isfloat) {
                                higher(c);
-                               resize(c, True);
+                               resize(c, True, TopLeft);
                                continue;
                        }
                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
-                               c->w = sw - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               c->w = sw - 2;
+                               c->h = sh - 2 - 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;
+                               c->w = mw - 2;
+                               c->h = sh - 2 - bh;
                        }
-                       else {
+                       else if(h > bh) {
                                c->x = sx + mw;
                                c->y = sy + (i - 1) * h + bh;
-                               c->w = w - 2 * c->border;
-                               c->h = h - 2 * c->border;
+                               c->w = w - 2;
+                               c->h = h - 2;
+                       }
+                       else { /* fallback if h < bh */
+                               c->x = sx + mw;
+                               c->y = sy + bh;
+                               c->w = w - 2;
+                               c->h = sh - 2 - bh;
                        }
-                       resize(c, False);
+                       resize(c, False, TopLeft);
                        i++;
                }
                else
@@ -111,6 +117,8 @@ dotile(Arg *arg)
                        higher(sel);
                        focus(sel);
                }
+               else
+                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        }
        drawall();
 }
@@ -122,52 +130,68 @@ getnext(Client *c)
        return c;
 }
 
+Client *
+getprev(Client *c)
+{
+       for(; c && !c->tags[tsel]; c = c->prev);
+       return c;
+}
+
 void
 replacetag(Arg *arg)
 {
        int i;
+
        if(!sel)
                return;
 
-       for(i = 0; i < TLast; i++)
-               sel->tags[i] = NULL;
+       for(i = 0; i < ntags; i++)
+               sel->tags[i] = False;
        appendtag(arg);
 }
 
 void
 settags(Client *c)
 {
-       XClassHint ch;
-       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
-       unsigned int i, j;
+       char classinst[256];
+       static unsigned int len = sizeof(rule) / sizeof(rule[0]);
+       unsigned int i, j, n;
+       regex_t regex;
+       regmatch_t tmp;
        Bool matched = False;
-
-       if(!len) {
-               c->tags[tsel] = tags[tsel];
-               return;
-       }
+       XClassHint ch;
 
        if(XGetClassHint(dpy, c->win, &ch)) {
-               if(ch.res_class && ch.res_name) {
-                       for(i = 0; i < len; i++)
-                               if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
-                                       && !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
-                               {
-                                       for(j = 0; j < TLast; j++)
-                                               c->tags[j] = rule[i].tags[j];
+               snprintf(classinst, sizeof(classinst), "%s:%s",
+                               ch.res_class ? ch.res_class : "",
+                               ch.res_name ? ch.res_name : "");
+               for(i = 0; !matched && i < len; i++) {
+                       if(!regcomp(&regex, rule[i].pattern, 0)) {
+                               if(!regexec(&regex, classinst, 1, &tmp, 0)) {
+                                       n = rule[i].tags ?
+                                               sizeof(rule[i].tags) / sizeof(rule[i].tags[0]) : 0;
+                                       matched = n != 0;
+                                       for(j = 0; j < n; j++)
+                                               c->tags[rule[i].tags[j]] = True;
                                        c->isfloat = rule[i].isfloat;
-                                       matched = True;
-                                       break;
                                }
+                               regfree(&regex);
+                       }
                }
                if(ch.res_class)
                        XFree(ch.res_class);
                if(ch.res_name)
                        XFree(ch.res_name);
        }
-
        if(!matched)
-               c->tags[tsel] = tags[tsel];
+               c->tags[tsel] = True;
+}
+
+void
+togglemode(Arg *arg)
+{
+       arrange = arrange == dofloat ? dotile : dofloat;
+       arrange(NULL);
 }
 
 void
@@ -177,3 +201,17 @@ view(Arg *arg)
        arrange(NULL);
        drawall();
 }
+
+void
+viewnext(Arg *arg)
+{
+       arg->i = (tsel < ntags-1) ? tsel+1 : 0;
+       view(arg);
+}
+
+void
+viewprev(Arg *arg)
+{
+       arg->i = (tsel > 0) ? tsel-1 : ntags-1;
+       view(arg);
+}