X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=cdb0f5242e5438ae29a6d1fa24e2ffe723a68274;hb=b43989207a949cbc17182b451aa527afe542c98f;hp=fce3c6e97e6e70996bcf3c6d8a58d825cfe63520;hpb=0aaa9a21f334a5c75b7efce2712384f57bd370cd;p=dwm.git

diff --git a/tag.c b/tag.c
index fce3c6e..cdb0f52 100644
--- a/tag.c
+++ b/tag.c
@@ -3,70 +3,68 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-
+#include <regex.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
+#include <sys/types.h>
 #include <X11/Xutil.h>
 
-/* static */
 
-/* CUSTOMIZE */ 
-static Rule rule[] = {
-	/* class			instance	tags						isfloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
-};
+typedef struct {
+	const char *clpattern;
+	const char *tpattern;
+	Bool isfloat;
+} Rule;
 
-/* extern */
+typedef struct {
+	regex_t *clregex;
+	regex_t *tregex;
+} RReg;
 
-/* CUSTOMIZE */
-char *tags[TLast] = {
-	[Tscratch] = "scratch",
-	[Tdev] = "dev",
-	[Twww] = "www",
-	[Twork] = "work",
-};
-void (*arrange)(Arg *) = dotile;
+/* static */
 
-void
-appendtag(Arg *arg)
-{
-	if(!sel)
-		return;
+TAGS
+RULES
 
-	sel->tags[arg->i] = tags[arg->i];
-	arrange(NULL);
-}
+static RReg *rreg = NULL;
+static unsigned int len = 0;
+
+void (*arrange)(Arg *) = DEFMODE;
+
+/* extern */
 
 void
 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(isvisible(c)) {
+			resize(c, True, TopLeft);
+		}
 		else
 			ban(c);
 	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients, tsel))) {
-			higher(sel);
-			focus(sel);
-		}
-	}
-	drawall();
+	if(!sel || !isvisible(sel))
+		sel = getnext(clients);
+	if(sel)
+		focus(sel);
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	restack();
 }
 
 void
 dotile(Arg *arg)
 {
+	int h, i, n, w;
 	Client *c;
-	int n, i, w, h;
 
 	w = sw - mw;
-	arrange = dotile;
 	for(n = 0, c = clients; c; c = c->next)
-		if(c->tags[tsel] && !c->isfloat)
+		if(isvisible(c) && !c->isfloat)
 			n++;
 
 	if(n > 1)
@@ -75,123 +73,256 @@ dotile(Arg *arg)
 		h = sh - bh;
 
 	for(i = 0, c = clients; c; c = c->next) {
-		if(c->tags[tsel]) {
+		c->ismax = False;
+		if(isvisible(c)) {
 			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;
+				if(i + 1 == n)
+					c->h = sh - c->y - 2;
+				else
+					c->h = h - 2;
 			}
-			resize(c, False);
+			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, TopLeft);
 			i++;
 		}
 		else
 			ban(c);
 	}
-	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients, tsel))) {
-			higher(sel);
-			focus(sel);
-		}
-	}
-	drawall();
+	if(!sel || !isvisible(sel))
+		sel = getnext(clients);
+	if(sel)
+		focus(sel);
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	restack();
 }
 
 Client *
-getnext(Client *c, unsigned int t)
+getnext(Client *c)
 {
-	for(; c && !c->tags[t]; c = c->next);
+	for(; c && !isvisible(c); c = c->next);
+	return c;
+}
+
+Client *
+getprev(Client *c)
+{
+	for(; c && !isvisible(c); c = c->prev);
 	return c;
 }
 
 void
-heretag(Arg *arg)
+initrregs()
 {
-	int i;
-	Client *c;
+	unsigned int i;
+	regex_t *reg;
 
-	if(arg->i == tsel)
+	if(rreg)
 		return;
+	len = sizeof(rule) / sizeof(rule[0]);
+	rreg = emallocz(len * sizeof(RReg));
 
-	if(!(c = getnext(clients, arg->i)))
-		return;
+	for(i = 0; i < len; i++) {
+		if(rule[i].clpattern) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].clpattern, 0))
+				free(reg);
+			else
+				rreg[i].clregex = reg;
+		}
+		if(rule[i].tpattern) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].tpattern, 0))
+				free(reg);
+			else
+				rreg[i].tregex = reg;
+		}
+	}
+}
 
-	for(i = 0; i < TLast; i++)
-		c->tags[i] = NULL;
-	c->tags[tsel] = tags[tsel];
-	pop(c);
-	focus(c);
+Bool
+isvisible(Client *c)
+{
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltag[i])
+			return True;
+	return False;
 }
 
 void
-replacetag(Arg *arg)
+restack()
 {
-	int i;
-	if(!sel)
+	static unsigned int nwins = 0;
+	static Window *wins = NULL;
+	unsigned int f, fi, m, mi, n;
+	Client *c;
+	XEvent ev;
+
+	for(f = 0, m = 0, c = clients; c; c = c->next)
+		if(isvisible(c)) {
+			if(c->isfloat || arrange == dofloat)
+				f++;
+			else
+				m++;
+		}
+	if(!(n = 2 * (f + m))) {
+		drawstatus();
 		return;
+	}
+	if(nwins < n) {
+		nwins = n;
+		wins = erealloc(wins, nwins * sizeof(Window));
+	}
 
-	for(i = 0; i < TLast; i++)
-		sel->tags[i] = NULL;
-	appendtag(arg);
+	fi = 0;
+	mi = 2 * f;
+	if(sel->isfloat || arrange == dofloat) {
+		wins[fi++] = sel->title;
+		wins[fi++] = sel->win;
+	}
+	else {
+		wins[mi++] = sel->title;
+		wins[mi++] = sel->win;
+	}
+	for(c = clients; c; c = c->next)
+		if(isvisible(c) && c != sel) {
+			if(c->isfloat || arrange == dofloat) {
+				wins[fi++] = c->title;
+				wins[fi++] = c->win;
+			}
+			else {
+				wins[mi++] = c->title;
+				wins[mi++] = c->win;
+			}
+		}
+	XRestackWindows(dpy, wins, n);
+	drawall();
+	XSync(dpy, False);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
 settags(Client *c)
 {
-	XClassHint ch;
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+	char classinst[256];
 	unsigned int i, j;
+	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];
-					c->isfloat = rule[i].isfloat;
-					matched = True;
-					break;
+		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(rreg[i].clregex && !regexec(rreg[i].clregex, classinst, 1, &tmp, 0)) {
+				c->isfloat = rule[i].isfloat;
+				for(j = 0; rreg[i].tregex && j < ntags; j++) {
+					if(!regexec(rreg[i].tregex, tags[j], 1, &tmp, 0)) {
+						matched = True;
+						c->tags[j] = True;
+					}
 				}
-		}
+			}
 		if(ch.res_class)
 			XFree(ch.res_class);
 		if(ch.res_name)
 			XFree(ch.res_name);
 	}
-
 	if(!matched)
-		c->tags[tsel] = tags[tsel];
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = seltag[i];
+}
+
+void
+tag(Arg *arg)
+{
+	unsigned int i;
+
+	if(!sel)
+		return;
+
+	for(i = 0; i < ntags; i++)
+		sel->tags[i] = False;
+	sel->tags[arg->i] = True;
+	settitle(sel);
+	if(!isvisible(sel))
+		arrange(NULL);
+}
+
+void
+togglemode(Arg *arg)
+{
+	arrange = arrange == dofloat ? dotile : dofloat;
+	if(sel)
+		arrange(NULL);
+	else
+		drawstatus();
+}
+
+void
+toggletag(Arg *arg)
+{
+	unsigned int i;
+
+	if(!sel)
+		return;
+
+	sel->tags[arg->i] = !sel->tags[arg->i];
+	for(i = 0; i < ntags && !sel->tags[i]; i++);
+	if(i == ntags)
+		sel->tags[arg->i] = True;
+	settitle(sel);
+	if(!isvisible(sel))
+		arrange(NULL);
+}
+
+
+void
+toggleview(Arg *arg)
+{
+	unsigned int i;
+
+	seltag[arg->i] = !seltag[arg->i];
+	for(i = 0; i < ntags && !seltag[i]; i++);
+	if(i == ntags)
+		seltag[arg->i] = True; /* cannot toggle last view */
+	arrange(NULL);
 }
 
 void
 view(Arg *arg)
 {
-	tsel = arg->i;
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = False;
+	seltag[arg->i] = True;
 	arrange(NULL);
-	drawall();
 }