X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=72d87d33454c027037a534f48cb4469cb2effec5;hb=3d73084b5ef25bca354b32e049b2904aa9519c09;hp=448ed2a880ab99a75155d744b3708d73160b1625;hpb=8cc7f3bace087dfb024a23115c211d82b35614ae;p=dwm.git

diff --git a/tag.c b/tag.c
index 448ed2a..72d87d3 100644
--- a/tag.c
+++ b/tag.c
@@ -5,21 +5,31 @@
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/types.h>
 #include <X11/Xutil.h>
 
-/* static */
 
 typedef struct {
-	const char *pattern;
-	Bool tags[TLast];
+	const char *clpattern;
+	const char *tpattern;
 	Bool isfloat;
 } Rule;
 
+typedef struct {
+	regex_t *clregex;
+	regex_t *tregex;
+} RReg;
+
+/* static */
+
 TAGS
 RULES
 
+static RReg *rreg = NULL;
+static unsigned int len = 0;
+
 void (*arrange)(Arg *) = DEFMODE;
 
 /* extern */
@@ -47,14 +57,12 @@ dofloat(Arg *arg)
 		else
 			ban(c);
 	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
-		}
-		else
-			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if((sel = getnext(clients))) {
+		higher(sel);
+		focus(sel);
 	}
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	drawall();
 }
 
@@ -112,14 +120,12 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
-		}
-		else
-			XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if((sel = getnext(clients))) {
+		higher(sel);
+		focus(sel);
 	}
+	else
+		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 	drawall();
 }
 
@@ -138,6 +144,35 @@ getprev(Client *c)
 }
 
 void
+initrregs()
+{
+	unsigned int i;
+	regex_t *reg;
+
+	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, 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;
+		}
+	}
+}
+
+void
 replacetag(Arg *arg)
 {
 	int i;
@@ -145,7 +180,7 @@ replacetag(Arg *arg)
 	if(!sel)
 		return;
 
-	for(i = 0; i < TLast; i++)
+	for(i = 0; i < ntags; i++)
 		sel->tags[i] = False;
 	appendtag(arg);
 }
@@ -154,9 +189,7 @@ void
 settags(Client *c)
 {
 	char classinst[256];
-	static unsigned int len = sizeof(rule) / sizeof(rule[0]);
 	unsigned int i, j;
-	regex_t regex;
 	regmatch_t tmp;
 	Bool matched = False;
 	XClassHint ch;
@@ -165,19 +198,16 @@ settags(Client *c)
 		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(!regcomp(&regex, rule[i].pattern, 0)) {
-				if(!regexec(&regex, classinst, 1, &tmp, 0)) {
-					for(j = 0; j < TLast; j++) {
-						if(rule[i].tags[j])
-							matched = True;
+		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;
 					}
-					c->isfloat = rule[i].isfloat;
 				}
-				regfree(&regex);
 			}
-		}
 		if(ch.res_class)
 			XFree(ch.res_class);
 		if(ch.res_name)
@@ -205,13 +235,13 @@ view(Arg *arg)
 void
 viewnext(Arg *arg)
 {
-	arg->i = (tsel < TLast-1) ? tsel+1 : 0;
+	arg->i = (tsel < ntags-1) ? tsel+1 : 0;
 	view(arg);
 }
 
 void
 viewprev(Arg *arg)
 {
-	arg->i = (tsel > 0) ? tsel-1 : TLast-1;
+	arg->i = (tsel > 0) ? tsel-1 : ntags-1;
 	view(arg);
 }