X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=screen.c;h=3f186e65575046bd7174fda3f84cf31d82d373fb;hb=cdbc84b9a87c427b3d0a202475b0f5aae315fb90;hp=d3139552ef2613c5b189576551598d5eeda451a3;hpb=c0705eeb65733e8c5091e47d5bdc701a0779a949;p=dwm.git

diff --git a/screen.c b/screen.c
index d313955..3f186e6 100644
--- a/screen.c
+++ b/screen.c
@@ -1,100 +1,320 @@
-/*
- * (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)(Arg *) = tiling;
+unsigned int master = MASTER;
+unsigned int nmaster = NMASTER;
+unsigned int blw = 0;
+Layout *lt = NULL;
 
-void
-view(Arg *arg)
-{
-	Client *c;
+/* static */
 
-	tsel = arg->i;
-	arrange(NULL);
+typedef struct {
+	const char *prop;
+	const char *tags;
+	Bool isfloat;
+} Rule;
 
-	for(c = clients; c; c = getnext(c->next))
-		drawtitle(c);
-	drawstatus();
+typedef struct {
+	regex_t *propregex;
+	regex_t *tagregex;
+} Regs;
+
+LAYOUTS
+TAGS
+RULES
+
+static Regs *regs = NULL;
+static unsigned int nrules = 0;
+static unsigned int nlayouts = 0;
+
+/* extern */
+
+void
+compileregs(void) {
+	unsigned int i;
+	regex_t *reg;
+
+	if(regs)
+		return;
+	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].prop, REG_EXTENDED))
+				free(reg);
+			else
+				regs[i].propregex = reg;
+		}
+		if(rule[i].tags) {
+			reg = emallocz(sizeof(regex_t));
+			if(regcomp(reg, rule[i].tags, REG_EXTENDED))
+				free(reg);
+			else
+				regs[i].tagregex = reg;
+		}
+	}
 }
 
 void
-floating(Arg *arg)
-{
+dofloat(void) {
 	Client *c;
 
-	arrange = floating;
 	for(c = clients; c; c = c->next) {
-		if(c->tags[tsel])
-			resize(c, True);
-		else
-			ban(c);
-	}
-	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
+		if(isvisible(c)) {
+			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);
 		}
 	}
-	drawstatus();
+	if(!sel || !isvisible(sel)) {
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
+	}
+	restack();
 }
 
 void
-tiling(Arg *arg)
-{
+dotile(void) {
+	unsigned int i, n, nx, ny, nw, nh, mw, mh, tw, th;
 	Client *c;
-	int n, i, w, h;
 
-	w = sw - mw;
-	arrange = tiling;
-	for(n = 0, c = clients; c; c = c->next)
-		if(c->tags[tsel] && !c->floating)
-			n++;
-
-	if(n > 1)
-		h = (sh - bh) / (n - 1);
-	else
-		h = sh - bh;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(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;
 
-	for(i = 0, c = clients; c; c = c->next) {
-		if(c->tags[tsel]) {
-			if(c->floating) {
-				higher(c);
-				resize(c, True);
+	for(i = 0, c = clients; c; c = c->next)
+		if(isvisible(c)) {
+			if(c->isbanned)
+				XMoveWindow(dpy, c->win, c->x, c->y);
+			c->isbanned = False;
+			if(c->isfloat)
 				continue;
+			c->ismax = False;
+			nx = wax;
+			ny = way;
+			if(i < nmaster) {
+				ny += i * mh;
+				nw = mw - 2 * BORDERPX;
+				nh = mh - 2 * BORDERPX;
 			}
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = sw - 2 * c->border;
-				c->h = sh - 2 * c->border - bh;
+			else {  /* tile window */
+				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;
 			}
-			else if(i == 0) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = mw - 2 * c->border;
-				c->h = sh - 2 * c->border - bh;
-			}
-			else {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2 * c->border;
-				c->h = h - 2 * c->border;
-			}
-			resize(c, False);
+			resize(c, nx, ny, nw, nh, False);
 			i++;
 		}
-		else
-			ban(c);
-	}
-	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients))) {
-			higher(sel);
-			focus(sel);
+		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);
+	}
+	restack();
+}
+
+void
+incnmaster(Arg *arg) {
+	if((lt->arrange == dofloat) || (nmaster + arg->i < 1)
+	|| (wah / (nmaster + arg->i) <= 2 * BORDERPX))
+		return;
+	nmaster += arg->i;
+	if(sel)
+		lt->arrange();
+	else
+		drawstatus();
+}
+
+void
+initlayouts(void) {
+	unsigned int i, w;
+
+	lt = &layout[0];
+	nlayouts = sizeof layout / sizeof layout[0];
+	for(blw = i = 0; i < nlayouts; i++) {
+		w = textw(layout[i].symbol);
+		if(w > blw)
+			blw = w;
+	}
+}
+
+Bool
+isvisible(Client *c) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltag[i])
+			return True;
+	return False;
+}
+
+void
+resizemaster(Arg *arg) {
+	if(lt->arrange != dotile)
+		return;
+	if(arg->i == 0)
+		master = MASTER;
+	else {
+		if(waw * (master + arg->i) / 1000 >= waw - 2 * BORDERPX
+		|| waw * (master + arg->i) / 1000 <= 2 * BORDERPX)
+			return;
+		master += arg->i;
 	}
+	lt->arrange();
+}
+
+void
+restack(void) {
+	Client *c;
+	XEvent ev;
+
 	drawstatus();
+	if(!sel)
+		return;
+	if(sel->isfloat || lt->arrange == dofloat)
+		XRaiseWindow(dpy, sel->win);
+	if(lt->arrange != dofloat) {
+		if(!sel->isfloat)
+			XLowerWindow(dpy, sel->win);
+		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+			if(c == sel)
+				continue;
+			XLowerWindow(dpy, c->win);
+		}
+	}
+	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 < nrules; i++)
+			if(regs[i].propregex && !regexec(regs[i].propregex, prop, 1, &tmp, 0)) {
+				c->isfloat = rule[i].isfloat;
+				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] = 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;
+	lt->arrange();
+}
+
+void
+togglefloat(Arg *arg) {
+	if(!sel || lt->arrange == dofloat)
+		return;
+	sel->isfloat = !sel->isfloat;
+	lt->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;
+	lt->arrange();
 }
 
+void
+togglelayout(Arg *arg) {
+	unsigned int i;
+
+	for(i = 0; i < nlayouts && lt != &layout[i]; i++);
+	if(i == nlayouts - 1)
+		lt = &layout[0];
+	else
+		lt = &layout[++i];
+	if(sel)
+		lt->arrange();
+	else
+		drawstatus();
+}
+
+void
+toggleview(Arg *arg) {
+	unsigned int i;
+
+	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 */
+	lt->arrange();
+}
+
+void
+view(Arg *arg) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = (arg->i == -1) ? True : False;
+	if(arg->i >= 0 && arg->i < ntags)
+		seltag[arg->i] = True;
+	lt->arrange();
+}