X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=cf983b8c1759c4bce65ccfe9cf78395b60409eff;hb=e40448fd6340620354d82d801d975eaa53dbd924;hp=c069dccca2bf90d68fc994cc871d6ce1fdf629dc;hpb=355beb53f085f51f49159bc9822922c11fbddd26;p=dwm.git

diff --git a/tag.c b/tag.c
index c069dcc..cf983b8 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 isversatile;
+	Bool isfloating;
 } Rule;
 
 typedef struct {
@@ -25,6 +25,30 @@ RULES
 
 static Regs *regs = NULL;
 static unsigned int nrules = 0;
+static char prop[512];
+
+static void
+persistconfig(Client *c) {
+	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);
+}
+
+static unsigned int
+idxoftag(const char *tag) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(tags[i] == tag)
+			return i;
+	return 0;
+}
 
 /* extern */
 
@@ -67,23 +91,40 @@ 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];
+	}
 	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->isversatile = rule[i].isversatile;
+				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;
@@ -99,52 +140,71 @@ settags(Client *c, Client *trans) {
 	if(!matched)
 		for(i = 0; i < ntags; i++)
 			c->tags[i] = seltag[i];
+	persistconfig(c);
 }
 
 void
-tag(Arg *arg) {
+tag(const char *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;
-	lt->arrange();
+		sel->tags[i] = arg == NULL;
+	i = idxoftag(arg);
+	if(i >= 0 && i < ntags)
+		sel->tags[i] = True;
+	persistconfig(sel);
+	arrange();
 }
 
 void
-toggletag(Arg *arg) {
-	unsigned int i;
+togglefloating(const char *arg) {
+	if(!sel || isfloating())
+		return;
+	sel->isfloating = !sel->isfloating;
+	if(sel->isfloating) {
+		resize(sel, sel->x, sel->y, sel->w, sel->h, True);
+		persistconfig(sel);
+	}
+	arrange();
+}
+
+void
+toggletag(const char *arg) {
+	unsigned int i, j;
 
 	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;
-	lt->arrange();
+	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;
+	persistconfig(sel);
+	arrange();
 }
 
 void
-toggleview(Arg *arg) {
-	unsigned int i;
+toggleview(const char *arg) {
+	unsigned int i, j;
 
-	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 */
-	lt->arrange();
+	i = idxoftag(arg);
+	seltag[i] = !seltag[i];
+	for(j = 0; j < ntags && !seltag[j]; j++);
+	if(j == ntags)
+		seltag[i] = True; /* cannot toggle last view */
+	arrange();
 }
 
 void
-view(Arg *arg) {
+view(const char *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
-		seltag[i] = (arg->i == -1) ? True : False;
-	if(arg->i >= 0 && arg->i < ntags)
-		seltag[arg->i] = True;
-	lt->arrange();
+		seltag[i] = arg == NULL;
+	i = idxoftag(arg);
+	if(i >= 0 && i < ntags)
+		seltag[i] = True;
+	arrange();
 }