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

diff --git a/view.c b/view.c
index 6ca82d1..34aae58 100644
--- a/view.c
+++ b/view.c
@@ -1,93 +1,105 @@
-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam 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>
+
+void (*arrange)(void) = DEFMODE;
+unsigned int master = MASTER;
+unsigned int nmaster = NMASTER;
 
 /* static */
 
-static Client *
-minclient(void) {
-	Client *c, *min;
-
-	if((clients && clients->isfloat) || arrange == dofloat)
-		return clients; /* don't touch floating order */
-	for(min = c = clients; c; c = c->next)
-		if(c->weight < min->weight)
-			min = c;
-	return min;
-}
+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) {
-	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+nextmanaged(Client *c) {
+	for(; c && (c->isfloat || !isvisible(c)); c = c->next);
 	return c;
 }
 
 static void
-reorder(void) {
-	Client *c, *newclients, *tail;
-
-	newclients = tail = NULL;
-	while((c = minclient())) {
-		detach(c);
-		if(tail) {
-			c->prev = tail;
-			tail->next = c;
-			tail = c;
-		}
-		else
-			tail = newclients = c;
-	}
-	clients = newclients;
-}
-
-static void
-togglemax(Client *c)
-{
+togglemax(Client *c) {
 	XEvent ev;
+
+	if(c->isfixed)
+		return;
 	if((c->ismax = !c->ismax)) {
-		c->rx = c->x; c->x = sx;
-		c->ry = c->y; c->y = bh;
-		c->rw = c->w; c->w = sw - 2 * BORDERPX;
-		c->rh = c->h; c->h = sh - bh - 2 * BORDERPX;
-	}
-	else {
-		c->x = c->rx;
-		c->y = c->ry;
-		c->w = c->rw;
-		c->h = c->rh;
+		c->rx = c->x;
+		c->ry = c->y;
+		c->rw = c->w;
+		c->rh = c->h;
+		resize(c, wax, way, waw - 2 * BORDERPX, wah - 2 * BORDERPX, True);
 	}
-	resize(c, True, TopLeft);
+	else
+		resize(c, c->rx, c->ry, c->rw, c->rh, True);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 /* extern */
 
-void (*arrange)(Arg *) = DEFMODE;
-StackPos stackpos = STACKPOS;
-
 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
-dofloat(Arg *arg) {
+dofloat(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
-			resize(c, True, TopLeft);
+			if(c->isbanned)
+				XMoveWindow(dpy, c->win, c->x, c->y);
+			c->isbanned = False;
+			resize(c, c->x, c->y, c->w, c->h, True);
+		}
+		else {
+			c->isbanned = True;
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 		}
-		else
-			ban(c);
 	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -95,98 +107,51 @@ dofloat(Arg *arg) {
 	}
 	restack();
 }
-
-/* This algorithm is based on a (M)aster area and a (S)tacking area.
- * It supports following arrangements:
- * 	SSMMM	MMMMM	MMMSS
- * 	SSMMM	SSSSS	MMMSS
- */
 void
-dotile(Arg *arg) {
-	unsigned int i, n, md, stackw, stackh, tw, th;
+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);
+	mw = (n > nmaster) ? (waw * master) / 1000 : waw;
+	th = (n > nmaster) ? wah / (n - nmaster) : 0;
+	tw = waw - mw;
 
-	if(stackpos == StackBottom) {
-		md = ((sh - bh) * master) / 100;
-		stackw = sw;
-		stackh = sh - bh - md;
-	}
-	else {
-		md = (sw * master) / 100;
-		stackw = sw - md;
-		stackh = sh - bh;
-	}
-
-	tw = stackw;
-	if(n > 1)
-		th = stackh / (n - 1);
-	else
-		th = stackh;
-
-	for(i = 0, c = clients; c; c = c->next) {
+	for(i = 0, c = clients; c; c = c->next)
 		if(isvisible(c)) {
-			if(c->isfloat) {
-				resize(c, True, TopLeft);
+			if(c->isbanned)
+				XMoveWindow(dpy, c->win, c->x, c->y);
+			c->isbanned = False;
+			if(c->isfloat)
 				continue;
-			}
 			c->ismax = False;
-			c->x = sx;
-			c->y = sy + bh;
-			if(n == 1) { /* only 1 window */
-				c->w = sw - 2 * BORDERPX;
-				c->h = sh - 2 * BORDERPX - bh;
-			}
-			else if(i == 0) { /* master window */
-				if(stackpos == StackLeft)
-					c->x += stackw;
-				switch(stackpos) {
-				case StackLeft:
-				case StackRight:
-					c->w = md - 2 * BORDERPX;
-					c->h = sh - bh - 2 * BORDERPX;
-					break;
-				case StackBottom:
-					c->w = sw - 2 * BORDERPX;
-					c->h = md - 2 * BORDERPX;
-					break;
-				}
+			nx = wax;
+			ny = way;
+			if(i < nmaster) {
+				ny += i * mh;
+				nw = mw - 2 * BORDERPX;
+				nh = mh - 2 * BORDERPX;
 			}
 			else {  /* tile window */
-				if(stackpos == StackRight)
-					c->x += md;
-				if(th > bh) {
-					switch(stackpos) {
-					case StackLeft:
-					case StackRight:
-						c->y = sy + (i - 1) * th + bh;
-						if(i + 1 == n)
-							c->h = sh - c->y - 2 * BORDERPX;
-						break;
-					case StackBottom:
-						c->y = sy + md + (i - 1) * th + bh;
-						if(i + 1 == n)
-							c->h = sh - c->y - 2 * BORDERPX;
-						break;
-					}
-					c->w = tw - 2 * BORDERPX;
-					c->h = th - 2 * BORDERPX;
-				}
-				else { /* fallback if th < bh */
-					if(stackpos == StackBottom)
-						c->y += md;
-					c->w = stackw - 2 * BORDERPX;
-					c->h = stackh - 2 * BORDERPX;
+				nx += mw;
+				nw = tw - 2 * BORDERPX;
+				if(th > 2 * BORDERPX) {
+					ny += (i - nmaster) * th;
+					nh = th - 2 * BORDERPX;
 				}
+				else /* fallback if th <= 2 * BORDERPX */
+					nh = wah - 2 * BORDERPX;
 			}
-			resize(c, False, TopLeft);
+			resize(c, nx, ny, nw, nh, False);
 			i++;
 		}
-		else
-			ban(c);
-	}
+		else {
+			c->isbanned = True;
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+		}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
 		focus(c);
@@ -195,35 +160,15 @@ dotile(Arg *arg) {
 }
 
 void
-focusnext(Arg *arg) {
-	Client *c;
-   
-	if(!sel)
+incnmaster(Arg *arg) {
+	if((arrange == dofloat) || (nmaster + arg->i < 1)
+	|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
 		return;
-
-	if(!(c = getnext(sel->next)))
-		c = getnext(clients);
-	if(c) {
-		focus(c);
-		restack();
-	}
-}
-
-void
-focusprev(Arg *arg) {
-	Client *c;
-
-	if(!sel)
-		return;
-
-	if(!(c = getprev(sel->prev))) {
-		for(c = clients; c && c->next; c = c->next);
-		c = getprev(c);
-	}
-	if(c) {
-		focus(c);
-		restack();
-	}
+	nmaster += arg->i;
+	if(sel)
+		arrange();
+	else
+		drawstatus();
 }
 
 Bool
@@ -237,27 +182,18 @@ isvisible(Client *c) {
 }
 
 void
-resizecol(Arg *arg) {
-	unsigned int n;
-	Client *c;
-
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
-	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
+resizemaster(Arg *arg) {
+	if(arrange != dotile)
 		return;
-
-	if(sel == getnext(clients)) {
-		if(master + arg->i > 95 || master + arg->i < 5)
-			return;
-		master += arg->i;
-	}
+	if(arg->i == 0)
+		master = MASTER;
 	else {
-		if(master - arg->i > 95 || master - arg->i < 5)
+		if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
+		|| waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
 			return;
-		master -= arg->i;
+		master += arg->i;
 	}
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -265,36 +201,99 @@ restack(void) {
 	Client *c;
 	XEvent ev;
 
-	if(!sel) {
-		drawstatus();
+	drawstatus();
+	if(!sel)
 		return;
-	}
-	if(sel->isfloat || arrange == dofloat) {
+	if(sel->isfloat || arrange == dofloat)
 		XRaiseWindow(dpy, sel->win);
-		XRaiseWindow(dpy, sel->twin);
-	}
 	if(arrange != dofloat) {
-		if(!sel->isfloat) {
-			XLowerWindow(dpy, sel->twin);
+		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->twin);
 			XLowerWindow(dpy, c->win);
 		}
 	}
-	drawall();
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 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;
+	sel->isfloat = !sel->isfloat;
+	arrange();
+}
+
+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)
-		arrange(NULL);
+		arrange();
 	else
 		drawstatus();
 }
@@ -307,19 +306,7 @@ toggleview(Arg *arg) {
 	for(i = 0; i < ntags && !seltag[i]; i++);
 	if(i == ntags)
 		seltag[arg->i] = True; /* cannot toggle last view */
-	reorder();
-	arrange(NULL);
-}
-
-void
-togglestackpos(Arg *arg) {
-	if(arrange == dofloat)
-		return;
-	if(stackpos == StackBottom)
-		stackpos = STACKPOS;
-	else
-		stackpos = StackBottom;
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -327,24 +314,12 @@ view(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
-		seltag[i] = False;
-	seltag[arg->i] = True;
-	reorder();
-	arrange(NULL);
-}
-
-void
-viewall(Arg *arg) {
-	unsigned int i;
-
-	for(i = 0; i < ntags; i++)
-		seltag[i] = True;
-	reorder();
-	arrange(NULL);
+		seltag[i] = (arg->i == -1) ? True : False;
+	if(arg->i >= 0 && arg->i < ntags)
+		seltag[arg->i] = True;
+	arrange();
 }
 
-
-
 void
 zoom(Arg *arg) {
 	unsigned int n;
@@ -352,26 +327,18 @@ zoom(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	if(sel->isfloat || (arrange == dofloat)) {
 		togglemax(sel);
 		return;
 	}
+	for(n = 0, c = nextmanaged(clients); c; c = nextmanaged(c->next))
+		n++;
 
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
-	if(n < 2 || (arrange == dofloat))
-		return;
-
-	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(NULL);
+	arrange();
 }