added Acroread.* and MPlayer.* to config.arg.h rules

[dwm.git] / tag.c

diff --git a/tag.c b/tag.c
index 67e2498..f4ddfd9 100644 (file)
--- a/tag.c
+++ b/tag.c
@@ -3,7 +3,6 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
 #include <regex.h>
 #include <stdio.h>
 #include <string.h>
@@ -18,24 +17,10 @@ typedef struct {
        Bool isfloat;
 } Rule;
 
-/* CUSTOMIZE */ 
-static Rule rule[] = {
-       /* class:instance       tags                            isfloat */
-       { "Firefox.*",          { [Tnet] = "net" },             False },
-       { "Gimp.*",             { 0 },                          True},
-};
-
-char *tags[TLast] = {
-       [Tfnord] = "fnord",
-       [Tdev] = "dev",
-       [Tnet] = "net",
-       [Twork] = "work",
-       [Tmisc] = "misc",
-};
+TAGS
+RULES
 
-void (*arrange)(Arg *) = dotile;
-
-/* END CUSTOMIZE */
+void (*arrange)(Arg *) = DEFMODE;
 
 /* extern */
 
@@ -63,10 +48,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();
 }
@@ -98,26 +85,26 @@ dotile(Arg *arg)
                        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 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->border;
-                               c->h = sh - 2 * c->border - bh;
+                               c->w = w - 2;
+                               c->h = sh - 2 - bh;
                        }
                        resize(c, False, TopLeft);
                        i++;
@@ -126,18 +113,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;
 }
 
@@ -212,3 +201,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);
+}