X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=tag.c;h=5161ae21db876fc60a0d916a37802f9f85e3c789;hb=9e56e1ded6889335035c8ffbe2763d3d83978673;hp=b8539ac13234be1b7dd04587407b5562f7a7d64c;hpb=587100873a66e34251041678504a8c1e28410591;p=dwm.git

diff --git a/tag.c b/tag.c
index b8539ac..5161ae2 100644
--- a/tag.c
+++ b/tag.c
@@ -1,10 +1,10 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
 /* static */
@@ -12,7 +12,7 @@
 typedef struct {
 	const char *prop;
 	const char *tags;
-	Bool isuntiled;
+	Bool isfloating;
 } Rule;
 
 typedef struct {
@@ -25,6 +25,7 @@ RULES
 
 static Regs *regs = NULL;
 static unsigned int nrules = 0;
+static char prop[512];
 
 /* extern */
 
@@ -67,23 +68,39 @@ isvisible(Client *c) {
 
 void
 settags(Client *c, Client *trans) {
-	char prop[512];
 	unsigned int i, j;
 	regmatch_t tmp;
 	Bool matched = trans != NULL;
 	XClassHint ch = { 0 };
+	XTextProperty name;
 
-	if(matched)
+	if(matched) {
 		for(i = 0; i < ntags; i++)
 			c->tags[i] = trans->tags[i];
+		return;
+	}
 	else {
+		/* check if window has set a property */
+		name.nitems = 0;
+		XGetTextProperty(dpy, c->win, &name, dwmtags);
+		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] == '+'))
+					matched = True;
+		}
+		if(matched)
+			return;
+		/* 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->isuntiled = rule[i].isuntiled;
+				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;
@@ -112,7 +129,13 @@ tag(const char *arg) {
 	i = arg ? atoi(arg) : 0;
 	if(i >= 0 && i < ntags)
 		sel->tags[i] = True;
-	lt->arrange();
+	if(sel) {
+		for(i = 0; i < ntags && i < sizeof prop - 1; i++)
+			prop[i] = sel->tags[i] ? '+' : '-';
+		prop[i] = '\0';
+		XChangeProperty(dpy, sel->win, dwmtags, XA_STRING, 8, PropModeReplace, (unsigned char *)prop, i);
+	}
+	arrange();
 }
 
 void
@@ -126,7 +149,7 @@ toggletag(const char *arg) {
 	for(j = 0; j < ntags && !sel->tags[j]; j++);
 	if(j == ntags)
 		sel->tags[i] = True;
-	lt->arrange();
+	arrange();
 }
 
 void
@@ -138,7 +161,7 @@ toggleview(const char *arg) {
 	for(j = 0; j < ntags && !seltag[j]; j++);
 	if(j == ntags)
 		seltag[i] = True; /* cannot toggle last view */
-	lt->arrange();
+	arrange();
 }
 
 void
@@ -150,5 +173,5 @@ view(const char *arg) {
 	i = arg ? atoi(arg) : 0;
 	if(i >= 0 && i < ntags)
 		seltag[i] = True;
-	lt->arrange();
+	arrange();
 }