X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=tag.c;h=ef9cb0889300657441809adf32b17c5ae08ef917;hp=8951dd82bc89ab5f040714f7473f02f7c03b7cfa;hb=cb4aa5bc35cf16a06bb2b4e880648e390fa2cc55;hpb=adaa28a6e600f636f5e86244ccef69e98419ba1a

diff --git a/tag.c b/tag.c
index 8951dd8..ef9cb08 100644
--- a/tag.c
+++ b/tag.c
@@ -1,179 +1,133 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVII Anselm R. Garbe <garbeam at gmail dot com>
  * 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>
 
-/********** CUSTOMIZE **********/
-
-char *tags[TLast] = {
-	[Tscratch] = "scratch",
-	[Tdev] = "dev",
-	[Twww] = "www",
-	[Twork] = "work",
-};
-
-static Rule rule[] = {
-	/* class			instance	tags						dofloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
-};
 
-/********** CUSTOMIZE **********/
+typedef struct {
+	const char *clpattern;
+	const char *tpattern;
+	Bool isfloat;
+} Rule;
 
-/* extern functions */
+typedef struct {
+	regex_t *clregex;
+	regex_t *tregex;
+} RReg;
 
-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
-dofloat(Arg *arg)
-{
-	Client *c;
-
-	arrange = dofloat;
-	for(c = clients; c; c = c->next) {
-		if(c->tags[tsel])
-			resize(c, True);
-		else
-			ban(c);
-	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
-		}
-	}
-	drawall();
-}
+/* extern */
 
-void
-dotile(Arg *arg)
-{
-	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->dofloat)
-			n++;
-
-	if(n > 1)
-		h = (sh - bh) / (n - 1);
-	else
-		h = sh - bh;
-
-	for(i = 0, c = clients; c; c = c->next) {
-		if(c->tags[tsel]) {
-			if(c->dofloat) {
-				higher(c);
-				resize(c, True);
-				continue;
-			}
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = sw - 2 * c->border;
-				c->h = sh - 2 * c->border - 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;
-			}
-			else {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2 * c->border;
-				c->h = h - 2 * c->border;
-			}
-			resize(c, False);
-			i++;
-		}
-		else
-			ban(c);
-	}
-	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
-		}
-	}
-	drawall();
+Client *
+getnext(Client *c) {
+	for(; c && !isvisible(c); c = c->next);
+	return c;
 }
 
 Client *
-getnext(Client *c)
-{
-	for(; c && !c->tags[tsel]; c = c->next);
+getprev(Client *c) {
+	for(; c && !isvisible(c); c = c->prev);
 	return c;
 }
 
 void
-replacetag(Arg *arg)
-{
-	int i;
-	if(!sel)
-		return;
+initrregs(void) {
+	unsigned int i;
+	regex_t *reg;
 
-	for(i = 0; i < TLast; i++)
-		sel->tags[i] = NULL;
-	appendtag(arg);
+	if(rreg)
+		return;
+	len = sizeof rule / sizeof rule[0];
+	rreg = emallocz(len * sizeof(RReg));
+	for(i = 0; i < len; i++) {
+		if(rule[i].clpattern) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].clpattern, REG_EXTENDED))
+				free(reg);
+			else
+				rreg[i].clregex = reg;
+		}
+		if(rule[i].tpattern) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].tpattern, REG_EXTENDED))
+				free(reg);
+			else
+				rreg[i].tregex = reg;
+		}
+	}
 }
 
 void
-settags(Client *c)
-{
-	XClassHint ch;
-	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
+settags(Client *c, Client *trans) {
+	char prop[512];
 	unsigned int i, j;
-	Bool matched = False;
+	regmatch_t tmp;
+	Bool matched = trans != NULL;
+	XClassHint ch;
 
-	if(!len) {
-		c->tags[tsel] = tags[tsel];
-		return;
+	if(matched) {
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = trans->tags[i];
 	}
-
-	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->dofloat = rule[i].dofloat;
-					matched = True;
-					break;
+	else if(XGetClassHint(dpy, c->win, &ch)) {
+		snprintf(prop, sizeof prop, "%s:%s:%s",
+				ch.res_class ? ch.res_class : "",
+				ch.res_name ? ch.res_name : "", c->name);
+		for(i = 0; i < len; i++)
+			if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 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
-view(Arg *arg)
-{
-	tsel = arg->i;
-	arrange(NULL);
-	drawall();
+tag(Arg *arg) {
+	unsigned int i;
+
+	if(!sel)
+		return;
+	for(i = 0; i < ntags; i++)
+		sel->tags[i] = (arg->i == -1) ? True : False;
+	if(arg->i >= 0 && arg->i < ntags)
+		sel->tags[arg->i] = True;
+	arrange();
+}
+
+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;
+	arrange();
 }