X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/6b25d06d7d159bf89d740847fedc876ab0137b6b..50be6c8b67c500ee4aa07919609fa80785fd389d:/tag.c

diff --git a/tag.c b/tag.c
index eda1543..1dd542b 100644
--- a/tag.c
+++ b/tag.c
@@ -1,139 +1,174 @@
-/*
- * (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;
+static Regs *regs = NULL;
+static unsigned int nrules = 0;
+static char prop[512];
 
-/* extern */
+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
+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
-initrregs(void) {
+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;
 		}
 	}
 }
 
-void
-settags(Client *c, Client *trans) {
-	char prop[512];
-	unsigned int i, j;
-	regmatch_t tmp;
-	Bool matched = trans != NULL;
-	XClassHint ch;
+Bool
+isvisible(Client *c) {
+	unsigned int i;
 
-	if(matched) {
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = trans->tags[i];
-	}
-	else if(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; !matched && i < len; i++)
-			if(rreg[i].clregex && !regexec(rreg[i].clregex, prop, 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;
-					}
-				}
-			}
-		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];
-	for(c->weight = 0; c->weight < ntags && !c->tags[c->weight]; c->weight++);
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltags[i])
+			return True;
+	return False;
 }
 
 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;
-	sel->weight = arg->i;
-	arrange(NULL);
+		sel->tags[i] = arg == NULL;
+	i = idxoftag(arg);
+	if(i >= 0 && i < ntags)
+		sel->tags[i] = True;
+	saveconfig(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);
+		saveconfig(sel);
+	}
+	arrange();
+}
+
+void
+toggletag(const char *arg) {
+	unsigned int i, j;
 
 	if(!sel)
 		return;
+	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;
+	saveconfig(sel);
+	arrange();
+}
+
+void
+toggleview(const char *arg) {
+	unsigned int i, j;
 
-	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;
-	sel->weight = (i == ntags) ? arg->i : i;
-	arrange(NULL);
+	i = idxoftag(arg);
+	seltags[i] = !seltags[i];
+	for(j = 0; j < ntags && !seltags[j]; j++);
+	if(j == ntags)
+		seltags[i] = True; /* cannot toggle last view */
+	arrange();
+}
+
+void
+view(const char *arg) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltags[i] = arg == NULL;
+	i = idxoftag(arg);
+	if(i >= 0 && i < ntags)
+		seltags[i] = True;
+	arrange();
 }