centralized/externalized configuration to config.h

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index f7ab6b9..f7513c1 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -18,24 +18,10 @@ typedef struct {
        Bool isfloat;
 } Rule;
 
-/* CUSTOMIZE */ 
-static Rule rule[] = {
-       /* class:instance       tags                            isfloat */
-       { "Firefox.*",          { [Tnet] = "net" },             False },
-       { "Gimp.*",             { 0 },                          True},
-};
+TAGS
+RULES
 
-char *tags[TLast] = {
-       [Tfnord] = "fnord",
-       [Tdev] = "dev",
-       [Tnet] = "net",
-       [Twork] = "work",
-       [Tmisc] = "misc",
-};
-
-void (*arrange)(Arg *) = dotile;
-
-/* END CUSTOMIZE */
+void (*arrange)(Arg *) = ARRANGE;
 
 /* extern */
 
@@ -63,10 +49,12 @@ dofloat(Arg *arg)
                        ban(c);
        }
        if(sel && !sel->tags[tsel]) {
-               if((sel = getnext(clients, tsel))) {
+               if((sel = getnext(clients))) {
                        higher(sel);
                        focus(sel);
                }
+               else
+                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        }
        drawall();
 }
@@ -126,18 +114,20 @@ dotile(Arg *arg)
                        ban(c);
        }
        if(!sel || (sel && !sel->tags[tsel])) {
-               if((sel = getnext(clients, tsel))) {
+               if((sel = getnext(clients))) {
                        higher(sel);
                        focus(sel);
                }
+               else
+                       XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
        }
        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;
 }
 
@@ -165,18 +155,13 @@ void
 settags(Client *c)
 {
        char classinst[256];
-       static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+       static unsigned int len = sizeof(rule) / sizeof(rule[0]);
        unsigned int i, j;
        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 : "",
@@ -217,3 +202,17 @@ view(Arg *arg)
        arrange(NULL);
        drawall();
 }
+
+void
+viewnext(Arg *arg)
+{
+       arg->i = (tsel < TLast-1) ? tsel+1 : 0;
+       view(arg);
+}
+
+void
+viewprev(Arg *arg)
+{
+       arg->i = (tsel > 0) ? tsel-1 : TLast-1;
+       view(arg);
+}