X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=34aae58d5bd3222f42f29c7845adb5e58ccd337b;hb=64871a7045077bb2ec4cbcd62a74cabbe6b45096;hp=ccbb454228759e802302080e4d65d787f5c1f6b6;hpb=de6695792a7e24c925b18c74f913f82b0a0e9148;p=dwm.git

diff --git a/view.c b/view.c
index ccbb454..34aae58 100644
--- a/view.c
+++ b/view.c
@@ -2,12 +2,38 @@
  * 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>
+
+void (*arrange)(void) = DEFMODE;
+unsigned int master = MASTER;
+unsigned int nmaster = NMASTER;
 
 /* static */
 
+typedef struct {
+	const char *prop;
+	const char *tags;
+	Bool isfloat;
+} Rule;
+
+typedef struct {
+	regex_t *propregex;
+	regex_t *tagregex;
+} Regexps;
+
+TAGS
+RULES
+
+static Regexps *regexps = NULL;
+static unsigned int len = 0;
+
 static Client *
-nexttiled(Client *c) {
+nextmanaged(Client *c) {
 	for(; c && (c->isfloat || !isvisible(c)); c = c->next);
 	return c;
 }
@@ -15,10 +41,9 @@ nexttiled(Client *c) {
 static void
 togglemax(Client *c) {
 	XEvent ev;
-		
+
 	if(c->isfixed)
 		return;
-
 	if((c->ismax = !c->ismax)) {
 		c->rx = c->x;
 		c->ry = c->y;
@@ -33,17 +58,31 @@ togglemax(Client *c) {
 
 /* extern */
 
-void (*arrange)(void) = DEFMODE;
-
 void
-detach(Client *c) {
-	if(c->prev)
-		c->prev->next = c->next;
-	if(c->next)
-		c->next->prev = c->prev;
-	if(c == clients)
-		clients = c->next;
-	c->next = c->prev = NULL;
+compileregexps(void) {
+	unsigned int i;
+	regex_t *reg;
+
+	if(regexps)
+		return;
+	len = sizeof rule / sizeof rule[0];
+	regexps = emallocz(len * sizeof(Regexps));
+	for(i = 0; i < len; i++) {
+		if(rule[i].prop) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].prop, REG_EXTENDED))
+				free(reg);
+			else
+				regexps[i].propregex = reg;
+		}
+		if(rule[i].tags) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].tags, REG_EXTENDED))
+				free(reg);
+			else
+				regexps[i].tagregex = reg;
+		}
+	}
 }
 
 void
@@ -68,13 +107,12 @@ dofloat(void) {
 	}
 	restack();
 }
-
 void
 dotile(void) {
 	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
 	Client *c;
 
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+	for(n = 0, c = nextmanaged(clients); c; c = nextmanaged(c->next))
 		n++;
 	/* window geoms */
 	mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1);
@@ -122,38 +160,6 @@ dotile(void) {
 }
 
 void
-focusnext(Arg *arg) {
-	Client *c;
-   
-	if(!sel)
-		return;
-	for(c = sel->next; c && !isvisible(c); c = c->next);
-	if(!c)
-		for(c = clients; c && !isvisible(c); c = c->next);
-	if(c) {
-		focus(c);
-		restack();
-	}
-}
-
-void
-focusprev(Arg *arg) {
-	Client *c;
-
-	if(!sel)
-		return;
-	for(c = sel->prev; c && !isvisible(c); c = c->prev);
-	if(!c) {
-		for(c = clients; c && c->next; c = c->next);
-		for(; c && !isvisible(c); c = c->prev);
-	}
-	if(c) {
-		focus(c);
-		restack();
-	}
-}
-
-void
 incnmaster(Arg *arg) {
 	if((arrange == dofloat) || (nmaster + arg->i < 1)
 	|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
@@ -177,6 +183,8 @@ isvisible(Client *c) {
 
 void
 resizemaster(Arg *arg) {
+	if(arrange != dotile)
+		return;
 	if(arg->i == 0)
 		master = MASTER;
 	else {
@@ -201,7 +209,7 @@ restack(void) {
 	if(arrange != dofloat) {
 		if(!sel->isfloat)
 			XLowerWindow(dpy, sel->win);
-		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+		for(c = nextmanaged(clients); c; c = nextmanaged(c->next)) {
 			if(c == sel)
 				continue;
 			XLowerWindow(dpy, c->win);
@@ -212,6 +220,55 @@ restack(void) {
 }
 
 void
+settags(Client *c, Client *trans) {
+	char prop[512];
+	unsigned int i, j;
+	regmatch_t tmp;
+	Bool matched = trans != NULL;
+	XClassHint ch = { 0 };
+
+	if(matched)
+		for(i = 0; i < ntags; i++)
+			c->tags[i] = trans->tags[i];
+	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(regexps[i].propregex && !regexec(regexps[i].propregex, prop, 1, &tmp, 0)) {
+				c->isfloat = rule[i].isfloat;
+				for(j = 0; regexps[i].tagregex && j < ntags; j++) {
+					if(!regexec(regexps[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] = seltag[i];
+}
+
+void
+tag(Arg *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;
+	arrange();
+}
+
+void
 togglefloat(Arg *arg) {
 	if(!sel || arrange == dofloat)
 		return;
@@ -220,6 +277,19 @@ togglefloat(Arg *arg) {
 }
 
 void
+toggletag(Arg *arg) {
+	unsigned int i;
+
+	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();
+}
+
+void
 togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
 	if(sel)
@@ -261,17 +331,14 @@ zoom(Arg *arg) {
 		togglemax(sel);
 		return;
 	}
-	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+	for(n = 0, c = nextmanaged(clients); c; c = nextmanaged(c->next))
 		n++;
 
-	if((c = sel) == nexttiled(clients))
-		if(!(c = nexttiled(c->next)))
+	if((c = sel) == nextmanaged(clients))
+		if(!(c = nextmanaged(c->next)))
 			return;
 	detach(c);
-	if(clients)
-		clients->prev = c;
-	c->next = clients;
-	clients = c;
+	attach(c);
 	focus(c);
 	arrange();
 }