X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/c53d9d516a871661414ff8110cd3c17c3dc525ec..c789941bba6039026447f0472d15f49062d65308:/tag.c

diff --git a/tag.c b/tag.c
index 609ce9c..2db70b8 100644
--- a/tag.c
+++ b/tag.c
@@ -1,96 +1,91 @@
-/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* © 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+ * © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
+ * See LICENSE file for license details. */
 #include "dwm.h"
 #include <regex.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
-#include <sys/types.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;
 
 /* extern */
 
-Client *
-getnext(Client *c) {
-	for(; c && !isvisible(c); c = c->next);
-	return c;
-}
-
-Client *
-getprev(Client *c) {
-	for(; c && !isvisible(c); c = c->prev);
-	return c;
-}
-
 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 rule / sizeof rule[0];
+	regs = emallocz(nrules * sizeof(Regs));
+	for(i = 0; i < nrules; i++) {
+		if(rule[i].prop) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].clpattern, REG_EXTENDED))
+			if(regcomp(reg, rule[i].prop, REG_EXTENDED))
 				free(reg);
 			else
-				rreg[i].clregex = reg;
+				regs[i].propregex = reg;
 		}
-		if(rule[i].tpattern) {
+		if(rule[i].tags) {
 			reg = emallocz(sizeof(regex_t));
-			if(regcomp(reg, rule[i].tpattern, REG_EXTENDED))
+			if(regcomp(reg, rule[i].tags, REG_EXTENDED))
 				free(reg);
 			else
-				rreg[i].tregex = reg;
+				regs[i].tagregex = reg;
 		}
 	}
 }
 
+Bool
+isvisible(Client *c) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltag[i])
+			return True;
+	return False;
+}
+
 void
 settags(Client *c, Client *trans) {
 	char prop[512];
 	unsigned int i, j;
 	regmatch_t tmp;
 	Bool matched = trans != NULL;
-	XClassHint ch;
+	XClassHint ch = { 0 };
 
-	if(matched) {
+	if(matched)
 		for(i = 0; i < ntags; i++)
 			c->tags[i] = trans->tags[i];
-	}
-	else if(XGetClassHint(dpy, c->win, &ch)) {
+	else {
+		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 < 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)) {
+		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;
 					}
@@ -107,26 +102,53 @@ settags(Client *c, Client *trans) {
 }
 
 void
-tag(Arg *arg) {
-	unsigned int i;
+tag(const char *arg) {
+	int i;
 
 	if(!sel)
 		return;
 	for(i = 0; i < ntags; i++)
-		sel->tags[i] = (arg->i == -1) ? True : False;
-	sel->tags[arg->i] = True;
-	arrange();
+		sel->tags[i] = arg == NULL;
+	i = arg ? atoi(arg) : 0;
+	if(i >= 0 && i < ntags)
+		sel->tags[i] = True;
+	lt->arrange();
 }
 
 void
-toggletag(Arg *arg) {
-	unsigned int i;
+toggletag(const char *arg) {
+	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;
-	arrange();
+	i = arg ? atoi(arg) : 0;
+	sel->tags[i] = !sel->tags[i];
+	for(j = 0; j < ntags && !sel->tags[j]; j++);
+	if(j == ntags)
+		sel->tags[i] = True;
+	lt->arrange();
+}
+
+void
+toggleview(const char *arg) {
+	int i, j;
+
+	i = arg ? atoi(arg) : 0;
+	seltag[i] = !seltag[i];
+	for(j = 0; j < ntags && !seltag[j]; j++);
+	if(j == ntags)
+		seltag[i] = True; /* cannot toggle last view */
+	lt->arrange();
+}
+
+void
+view(const char *arg) {
+	int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = arg == NULL;
+	i = arg ? atoi(arg) : 0;
+	if(i >= 0 && i < ntags)
+		seltag[i] = True;
+	lt->arrange();
 }