X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=448ed2a880ab99a75155d744b3708d73160b1625;hb=f80688f1c79ae813965c7c9cac35931a07c4cc90;hp=82cf18aab65768022297fc70a81a4fdb7bee3582;hpb=bcaf6a7a0f492c3fafc4baabd2dc06f5191417ee;p=dwm.git

diff --git a/tag.c b/tag.c
index 82cf18a..448ed2a 100644
--- 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>
@@ -14,27 +13,16 @@
 
 typedef struct {
 	const char *pattern;
-	char *tags[TLast];
+	Bool tags[TLast];
 	Bool isfloat;
 } Rule;
 
-/* CUSTOMIZE */ 
-static Rule rule[] = {
-	/* class			instance	tags		isfloat */
-	{ "Firefox.*",	{ [Twww] = "www" },			False },
-	{ "Gimp.*",		{ 0 },						True},
-};
+TAGS
+RULES
 
-/* extern */
+void (*arrange)(Arg *) = DEFMODE;
 
-/* CUSTOMIZE */
-char *tags[TLast] = {
-	[Tscratch] = "scratch",
-	[Tdev] = "dev",
-	[Twww] = "www",
-	[Twork] = "work",
-};
-void (*arrange)(Arg *) = dotile;
+/* extern */
 
 void
 appendtag(Arg *arg)
@@ -42,7 +30,7 @@ appendtag(Arg *arg)
 	if(!sel)
 		return;
 
-	sel->tags[arg->i] = tags[arg->i];
+	sel->tags[arg->i] = True;
 	arrange(NULL);
 }
 
@@ -51,9 +39,8 @@ dofloat(Arg *arg)
 {
 	Client *c;
 
-	arrange = dofloat;
 	for(c = clients; c; c = c->next) {
-		setgeom(c);
+		c->ismax = False;
 		if(c->tags[tsel]) {
 			resize(c, True, TopLeft);
 		}
@@ -61,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();
 }
@@ -72,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++;
@@ -87,7 +75,7 @@ dotile(Arg *arg)
 		h = sh - bh;
 
 	for(i = 0, c = clients; c; c = c->next) {
-		setgeom(c);
+		c->ismax = False;
 		if(c->tags[tsel]) {
 			if(c->isfloat) {
 				higher(c);
@@ -95,28 +83,28 @@ dotile(Arg *arg)
 				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->x = sx;
+				c->y = sy + 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->x = sx;
+				c->y = sy + 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->x = sx + mw;
+				c->y = sy + (i - 1) * h + bh;
+				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->x = sx + mw;
+				c->y = sy + bh;
+				c->w = w - 2;
+				c->h = sh - 2 - bh;
 			}
 			resize(c, False, TopLeft);
 			i++;
@@ -125,49 +113,40 @@ 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;
 }
 
-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
 replacetag(Arg *arg)
 {
 	int i;
+
 	if(!sel)
 		return;
 
 	for(i = 0; i < TLast; i++)
-		sel->tags[i] = NULL;
+		sel->tags[i] = False;
 	appendtag(arg);
 }
 
@@ -175,18 +154,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 : "",
@@ -197,7 +171,7 @@ settags(Client *c)
 					for(j = 0; j < TLast; j++) {
 						if(rule[i].tags[j])
 							matched = True;
-						c->tags[j] = rule[i].tags[j];
+						c->tags[j] = True;
 					}
 					c->isfloat = rule[i].isfloat;
 				}
@@ -210,7 +184,14 @@ settags(Client *c)
 			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
@@ -220,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);
+}