X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=685308ae3b49b2cac95b6d4dc8e6f5bc695a6067;hb=96d7fe16eaf6b656800f08da3156bacd75ca3b08;hp=cb1a2c4e4a1013b8499641ba67b2d4823c1f178b;hpb=10d13f01ff764ba0e875adf5d2b83c49aa08d148;p=dwm.git

diff --git a/tag.c b/tag.c
index cb1a2c4..685308a 100644
--- a/tag.c
+++ b/tag.c
@@ -3,8 +3,6 @@
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 /* static */
@@ -27,41 +25,69 @@ static Regs *regs = NULL;
 static unsigned int nrules = 0;
 static char prop[512];
 
-static void
-persistconfig(Client *c) {
+static unsigned int
+idxoftag(const char *tag) {
 	unsigned int i;
 
-	for(i = 0; i < ntags && i < sizeof prop - 1; i++)
-		prop[i] = c->tags[i] ? '1' : '0';
-	if(i < sizeof prop - 1)
-		prop[i++] = c->isfloating ? '1' : '0';
-	prop[i] = '\0';
-	XChangeProperty(dpy, c->win, dwmconfig, XA_STRING, 8,
-			PropModeReplace, (unsigned char *)prop, i);
+	for(i = 0; i < ntags; i++)
+		if(tags[i] == tag)
+			return i;
+	return 0;
 }
 
 /* extern */
 
 void
+applyrules(Client *c) {
+	unsigned int i, j;
+	regmatch_t tmp;
+	Bool matched = False;
+	XClassHint ch = { 0 };
+
+	/* rule matching */
+	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 < nrules; i++)
+		if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
+			c->isfloating = rules[i].isfloating;
+			for(j = 0; regs[i].tagregex && j < ntags; j++) {
+				if(!regexec(regs[i].tagregex, 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)
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = seltags[i];
+}
+
+void
 compileregs(void) {
 	unsigned int i;
 	regex_t *reg;
 
 	if(regs)
 		return;
-	nrules = sizeof rule / sizeof rule[0];
+	nrules = sizeof rules / sizeof rules[0];
 	regs = emallocz(nrules * sizeof(Regs));
 	for(i = 0; i < nrules; i++) {
-		if(rule[i].prop) {
+		if(rules[i].prop) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].prop, REG_EXTENDED))
+			if(regcomp(reg, rules[i].prop, REG_EXTENDED))
 				free(reg);
 			else
 				regs[i].propregex = reg;
 		}
-		if(rule[i].tags) {
+		if(rules[i].tags) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].tags, REG_EXTENDED))
+			if(regcomp(reg, rules[i].tags, REG_EXTENDED))
 				free(reg);
 			else
 				regs[i].tagregex = reg;
@@ -74,78 +100,23 @@ isvisible(Client *c) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
-		if(c->tags[i] && seltag[i])
+		if(c->tags[i] && seltags[i])
 			return True;
 	return False;
 }
 
 void
-settags(Client *c, Client *trans) {
-	unsigned int i, j;
-	regmatch_t tmp;
-	Bool matched = trans != NULL;
-	XClassHint ch = { 0 };
-	XTextProperty name;
-
-	if(matched) {
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = trans->tags[i];
-	}
-	else {
-		/* check if window has set a property */
-		name.nitems = 0;
-		XGetTextProperty(dpy, c->win, &name, dwmconfig);
-		if(name.nitems && name.encoding == XA_STRING) {
-			strncpy(prop, (char *)name.value, sizeof prop - 1);
-			prop[sizeof prop - 1] = '\0';
-			XFree(name.value);
-			for(i = 0; i < ntags && i < sizeof prop - 1 && prop[i] != '\0'; i++)
-				if((c->tags[i] = prop[i] == '1'))
-					matched = True;
-			if(i < sizeof prop - 1 && prop[i] != '\0')
-				c->isfloating = prop[i] == '1';
-		}
-	}
-	if(!matched) {
-		/* rule matching */
-		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 < nrules; i++)
-			if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
-				c->isfloating = rule[i].isfloating;
-				for(j = 0; regs[i].tagregex && j < ntags; j++) {
-					if(!regexec(regs[i].tagregex, 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)
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = seltag[i];
-	persistconfig(c);
-}
-
-void
 tag(const char *arg) {
-	int i;
+	unsigned int i;
 
 	if(!sel)
 		return;
 	for(i = 0; i < ntags; i++)
 		sel->tags[i] = arg == NULL;
-	i = arg ? atoi(arg) : 0;
+	i = idxoftag(arg);
 	if(i >= 0 && i < ntags)
 		sel->tags[i] = True;
-	if(sel)
-		persistconfig(sel);
+	saveprops(sel);
 	arrange();
 }
 
@@ -154,47 +125,50 @@ togglefloating(const char *arg) {
 	if(!sel || isfloating())
 		return;
 	sel->isfloating = !sel->isfloating;
-	if(sel->isfloating)
+	if(sel->isfloating) {
 		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+		saveprops(sel);
+	}
 	arrange();
 }
 
 void
 toggletag(const char *arg) {
-	int i, j;
+	unsigned int i, j;
 
 	if(!sel)
 		return;
-	i = arg ? atoi(arg) : 0;
+	i = idxoftag(arg);
 	sel->tags[i] = !sel->tags[i];
 	for(j = 0; j < ntags && !sel->tags[j]; j++);
 	if(j == ntags)
 		sel->tags[i] = True;
-	if(sel)
-		persistconfig(sel);
+	saveprops(sel);
 	arrange();
 }
 
 void
 toggleview(const char *arg) {
-	int i, j;
+	unsigned int i, j;
 
-	i = arg ? atoi(arg) : 0;
-	seltag[i] = !seltag[i];
-	for(j = 0; j < ntags && !seltag[j]; j++);
+	i = idxoftag(arg);
+	seltags[i] = !seltags[i];
+	for(j = 0; j < ntags && !seltags[j]; j++);
 	if(j == ntags)
-		seltag[i] = True; /* cannot toggle last view */
+		seltags[i] = True; /* cannot toggle last view */
+	savedwmprops();
 	arrange();
 }
 
 void
 view(const char *arg) {
-	int i;
+	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
-		seltag[i] = arg == NULL;
-	i = arg ? atoi(arg) : 0;
+		seltags[i] = arg == NULL;
+	i = idxoftag(arg);
 	if(i >= 0 && i < ntags)
-		seltag[i] = True;
+		seltags[i] = True;
+	savedwmprops();
 	arrange();
 }