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 5da3c31..b20e71e 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
  * See LICENSE file for license details.
  */
 #include "dwm.h"

-

 #include <regex.h>
 #include <stdio.h>
 #include <string.h>
 #include <regex.h>
 #include <stdio.h>
 #include <string.h>


@@ -14,27 +13,14 @@
 
 typedef struct {
        const char *pattern;
 
 typedef struct {
        const char *pattern;

-       char *tags[TLast];
+       const unsigned int *tags;

        Bool isfloat;
 } Rule;
 
        Bool isfloat;
 } Rule;
 

-/* CUSTOMIZE */ 
-static Rule rule[] = {
-       /* class:instance       tags                            isfloat */
-       { "Firefox.*",          { [Twww] = "www" },             False },
-       { "Gimp.*",             { 0 },                          True},
-};
-
-char *tags[TLast] = {
-       [Tscratch] = "scratch",
-       [Tdev] = "dev",
-       [Twww] = "www",
-       [Twork] = "work",
-};
+TAGS
+RULES

 
 

-void (*arrange)(Arg *) = dotile;
-
-/* END CUSTOMIZE */
+void (*arrange)(Arg *) = DEFMODE;

 
 /* extern */
 
 
 /* extern */
 


@@ -44,7 +30,7 @@ appendtag(Arg *arg)
        if(!sel)
                return;
 
        if(!sel)
                return;
 

-       sel->tags[arg->i] = tags[arg->i];
+       sel->tags[arg->i] = True;

        arrange(NULL);
 }
 
        arrange(NULL);
 }
 


@@ -62,10 +48,12 @@ dofloat(Arg *arg)
                        ban(c);
        }
        if(sel && !sel->tags[tsel]) {
                        ban(c);
        }
        if(sel && !sel->tags[tsel]) {

-               if((sel = getnext(clients, tsel))) {
+               if((sel = getnext(clients))) {

                        higher(sel);
                        focus(sel);
                }
                        higher(sel);
                        focus(sel);
                }

+               else
+                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

        }
        drawall();
 }
        }
        drawall();
 }


@@ -97,26 +85,26 @@ dotile(Arg *arg)
                        if(n == 1) {
                                c->x = sx;
                                c->y = sy + bh;
                        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;
                        }
                        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 if(h > bh) {
                                c->x = sx + mw;
                                c->y = sy + (i - 1) * h + bh;
                        }
                        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;
                        }
                        else { /* fallback if h < bh */
                                c->x = sx + mw;
                                c->y = sy + bh;

-                               c->w = w - 2 * c->border;
-                               c->h = sh - 2 * c->border - bh;
+                               c->w = w - 2;
+                               c->h = sh - 2 - bh;

                        }
                        resize(c, False, TopLeft);
                        i++;
                        }
                        resize(c, False, TopLeft);
                        i++;


@@ -125,38 +113,28 @@ dotile(Arg *arg)
                        ban(c);
        }
        if(!sel || (sel && !sel->tags[tsel])) {
                        ban(c);
        }
        if(!sel || (sel && !sel->tags[tsel])) {

-               if((sel = getnext(clients, tsel))) {
+               if((sel = getnext(clients))) {

                        higher(sel);
                        focus(sel);
                }
                        higher(sel);
                        focus(sel);
                }

+               else
+                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);

        }
        drawall();
 }
 
 Client *
        }
        drawall();
 }
 
 Client *

-getnext(Client *c, unsigned int t)
+getnext(Client *c)

 {
 {

-       for(; c && !c->tags[t]; c = c->next);
+       for(; c && !c->tags[tsel]; c = c->next);

        return c;
 }
 
        return c;
 }
 

-void
-heretag(Arg *arg)
+Client *
+getprev(Client *c)

 {
 {

-       int i;
-       Client *c;
-
-       if(arg->i == tsel)
-               return;
-
-       if(!(c = getnext(clients, arg->i)))
-               return;
-
-       for(i = 0; i < TLast; i++)
-               c->tags[i] = NULL;
-       c->tags[tsel] = tags[tsel];
-       pop(c);
-       focus(c);
+       for(; c && !c->tags[tsel]; c = c->prev);
+       return c;

 }
 
 void
 }
 
 void


@@ -167,8 +145,8 @@ replacetag(Arg *arg)
        if(!sel)
                return;
 
        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);
 }
 
        appendtag(arg);
 }
 


@@ -176,18 +154,13 @@ void
 settags(Client *c)
 {
        char classinst[256];
 settags(Client *c)
 {
        char classinst[256];

-       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
-       unsigned int i, j;
+       static unsigned int len = sizeof(rule) / sizeof(rule[0]);
+       unsigned int i, j, n;

        regex_t regex;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
 
        regex_t regex;
        regmatch_t tmp;
        Bool matched = False;
        XClassHint ch;
 

-       if(!len) {
-               c->tags[tsel] = tags[tsel];
-               return;
-       }
-

        if(XGetClassHint(dpy, c->win, &ch)) {
                snprintf(classinst, sizeof(classinst), "%s:%s",
                                ch.res_class ? ch.res_class : "",
        if(XGetClassHint(dpy, c->win, &ch)) {
                snprintf(classinst, sizeof(classinst), "%s:%s",
                                ch.res_class ? ch.res_class : "",


@@ -195,11 +168,11 @@ settags(Client *c)
                for(i = 0; !matched && i < len; i++) {
                        if(!regcomp(&regex, rule[i].pattern, 0)) {
                                if(!regexec(&regex, classinst, 1, &tmp, 0)) {
                for(i = 0; !matched && i < len; i++) {
                        if(!regcomp(&regex, rule[i].pattern, 0)) {
                                if(!regexec(&regex, classinst, 1, &tmp, 0)) {

-                                       for(j = 0; j < TLast; j++) {
-                                               if(rule[i].tags[j])
-                                                       matched = True;
-                                               c->tags[j] = rule[i].tags[j];
-                                       }
+                                       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;
                                }
                                regfree(&regex);
                                        c->isfloat = rule[i].isfloat;
                                }
                                regfree(&regex);


@@ -211,7 +184,7 @@ settags(Client *c)
                        XFree(ch.res_name);
        }
        if(!matched)
                        XFree(ch.res_name);
        }
        if(!matched)

-               c->tags[tsel] = tags[tsel];
+               c->tags[tsel] = True;

 }
 
 void
 }
 
 void


@@ -228,3 +201,17 @@ view(Arg *arg)
        arrange(NULL);
        drawall();
 }
        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);
+}