X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=tag.c;h=a0ddb0daa56be45288662121d0640c6897dbe5fb;hb=a923298d3577dca0e69fd70edbef56c7822258e3;hp=4b6d513c06c6544c397dd5923cb69bd4deb4dcb3;hpb=dfa5ea63600d8c68bbe05fbc80191bd3198510b2;p=dwm.git

diff --git a/tag.c b/tag.c
index 4b6d513..a0ddb0d 100644
--- a/tag.c
+++ b/tag.c
@@ -1,173 +1,86 @@
-/*
- * (C)opyright MMVI 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 <sys/types.h>
+#include <X11/Xatom.h>
 #include <X11/Xutil.h>
 
+/* static */
 
 typedef struct {
-	const char *clpattern;
-	const char *tpattern;
-	Bool isfloat;
+	const char *prop;
+	const char *tags;
+	Bool isfloating;
 } Rule;
 
 typedef struct {
-	regex_t *clregex;
-	regex_t *tregex;
-} RReg;
-
-/* static */
+	regex_t *propregex;
+	regex_t *tagregex;
+} Regs;
 
 TAGS
 RULES
 
-static RReg *rreg = NULL;
-static unsigned int len = 0;
-
-void (*arrange)(Arg *) = DEFMODE;
+static Regs *regs = NULL;
+static unsigned int nrules = 0;
+static char prop[512];
 
-/* extern */
-
-void
-dofloat(Arg *arg)
-{
-	Client *c;
+static void
+persistconfig(Client *c) {
+	unsigned int i;
 
-	for(c = clients; c; c = c->next) {
-		c->ismax = False;
-		if(isvisible(c)) {
-			resize(c, True, TopLeft);
-		}
-		else
-			ban(c);
-	}
-	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel) {
-		focus(sel);
-		restack();
-	}
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	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);
 }
 
-void
-dotile(Arg *arg)
-{
-	int h, i, n, w;
-	Client *c;
-
-	w = sw - mw;
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
-
-	if(n > 1)
-		h = (sh - bh) / (n - 1);
-	else
-		h = sh - bh;
-
-	for(i = 0, c = clients; c; c = c->next) {
-		c->ismax = False;
-		if(isvisible(c)) {
-			if(c->isfloat) {
-				resize(c, True, TopLeft);
-				continue;
-			}
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = sw - 2;
-				c->h = sh - 2 - bh;
-			}
-			else if(i == 0) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = mw - 2;
-				c->h = sh - 2 - bh;
-			}
-			else if(h > bh) {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2;
-				if(i + 1 == n)
-					c->h = sh - c->y - 2;
-				else
-					c->h = h - 2;
-			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
-				c->y = sy + bh;
-				c->w = w - 2;
-				c->h = sh - 2 - bh;
-			}
-			resize(c, False, TopLeft);
-			i++;
-		}
-		else
-			ban(c);
-	}
-	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-	restack();
-}
+static unsigned int
+idxoftag(const char *tag) {
+	unsigned int i;
 
-Client *
-getnext(Client *c)
-{
-	for(; c && !isvisible(c); c = c->next);
-	return c;
+	for(i = 0; i < ntags; i++)
+		if(tags[i] == tag)
+			return i;
+	return 0;
 }
 
-Client *
-getprev(Client *c)
-{
-	for(; c && !isvisible(c); c = c->prev);
-	return c;
-}
+/* extern */
 
 void
-initrregs()
-{
+compileregs(void) {
 	unsigned int i;
 	regex_t *reg;
 
-	if(rreg)
+	if(regs)
 		return;
-	len = sizeof(rule) / sizeof(rule[0]);
-	rreg = emallocz(len * sizeof(RReg));
-
-	for(i = 0; i < len; i++) {
-		if(rule[i].clpattern) {
+	nrules = sizeof rules / sizeof rules[0];
+	regs = emallocz(nrules * sizeof(Regs));
+	for(i = 0; i < nrules; i++) {
+		if(rules[i].prop) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].clpattern, 0))
+			if(regcomp(reg, rules[i].prop, REG_EXTENDED))
 				free(reg);
 			else
-				rreg[i].clregex = reg;
+				regs[i].propregex = reg;
 		}
-		if(rule[i].tpattern) {
+		if(rules[i].tags) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].tpattern, 0))
+			if(regcomp(reg, rules[i].tags, REG_EXTENDED))
 				free(reg);
 			else
-				rreg[i].tregex = reg;
+				regs[i].tagregex = reg;
 		}
 	}
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -177,75 +90,43 @@ isvisible(Client *c)
 }
 
 void
-restack()
-{
-	static unsigned int nwins = 0;
-	static Window *wins = NULL;
-	unsigned int f, fi, m, mi, n;
-	Client *c;
-	XEvent ev;
-
-	for(f = 0, m = 0, c = clients; c; c = c->next)
-		if(isvisible(c)) {
-			if(c->isfloat || arrange == dofloat)
-				f++;
-			else
-				m++;
-		}
-	if(!(n = 2 * (f + m))) {
-		drawstatus();
-		return;
-	}
-	if(nwins < n) {
-		nwins = n;
-		wins = erealloc(wins, nwins * sizeof(Window));
-	}
+settags(Client *c, Client *trans) {
+	unsigned int i, j;
+	regmatch_t tmp;
+	Bool matched = trans != NULL;
+	XClassHint ch = { 0 };
+	XTextProperty name;
 
-	fi = 0;
-	mi = 2 * f;
-	if(sel->isfloat || arrange == dofloat) {
-		wins[fi++] = sel->title;
-		wins[fi++] = sel->win;
+	if(matched) {
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = trans->tags[i];
 	}
 	else {
-		wins[mi++] = sel->title;
-		wins[mi++] = sel->win;
-	}
-	for(c = clients; c; c = c->next)
-		if(isvisible(c) && c != sel) {
-			if(c->isfloat || arrange == dofloat) {
-				wins[fi++] = c->title;
-				wins[fi++] = c->win;
-			}
-			else {
-				wins[mi++] = c->title;
-				wins[mi++] = c->win;
-			}
+		/* 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';
 		}
-	XRestackWindows(dpy, wins, n);
-	drawall();
-	XSync(dpy, False);
-	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-settags(Client *c)
-{
-	char classinst[256];
-	unsigned int i, j;
-	regmatch_t tmp;
-	Bool matched = False;
-	XClassHint ch;
-
-	if(XGetClassHint(dpy, c->win, &ch)) {
-		snprintf(classinst, sizeof(classinst), "%s:%s",
+	}
+	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 : "");
-		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)) {
+				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;
 					}
@@ -259,68 +140,71 @@ settags(Client *c)
 	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] = False;
-	sel->tags[arg->i] = True;
-	settitle(sel);
-	if(!isvisible(sel))
-		arrange(NULL);
+		sel->tags[i] = arg == NULL;
+	i = idxoftag(arg);
+	if(i >= 0 && i < ntags)
+		sel->tags[i] = True;
+	persistconfig(sel);
+	arrange();
 }
 
 void
-togglemode(Arg *arg)
-{
-	arrange = arrange == dofloat ? dotile : dofloat;
-	arrange(NULL);
+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(Arg *arg)
-{
-	unsigned int i;
+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;
-	settitle(sel);
-	if(!isvisible(sel))
-		arrange(NULL);
+	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 */
-	arrange(NULL);
+	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] = False;
-	seltag[arg->i] = True;
-	arrange(NULL);
+		seltag[i] = arg == NULL;
+	i = idxoftag(arg);
+	if(i >= 0 && i < ntags)
+		seltag[i] = True;
+	arrange();
 }