X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/b5159dfd2f552696b049b95e0d368a2c33a1002a..7225c99903c1a7ada44d575251e3aca64625a172:/view.c

diff --git a/view.c b/view.c
index 22b1794..a3b2029 100644
--- a/view.c
+++ b/view.c
@@ -4,81 +4,203 @@
  */
 #include "dwm.h"
 
+/* 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;
+}
+
+static Client *
+nexttiled(Client *c) {
+	for(c = getnext(c); c && c->isfloat; c = getnext(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)
+{
+	XEvent ev;
+	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;
+	}
+	resize(c, True, TopLeft);
+	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
+StackPos stackpos = STACKPOS;
 
 void
-dofloat(Arg *arg)
-{
+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;
+}
+
+void
+dofloat(Arg *arg) {
 	Client *c;
 
 	for(c = clients; c; c = c->next) {
-		c->ismax = False;
 		if(isvisible(c)) {
 			resize(c, True, TopLeft);
 		}
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if(!sel || !isvisible(sel)) {
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
+	}
 	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)
-{
-	int h, i, n, w;
+dotile(Arg *arg) {
+	int i, n, stackw, stackh, tw, th;
 	Client *c;
 
-	w = sw - mw;
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
 
+	if(stackpos == StackBottom) {
+		stackw = sw;
+		stackh = sh - bh - master;
+	}
+	else {
+		stackw = sw - master;
+		stackh = sh - bh;
+	}
+
+	tw = stackw;
 	if(n > 1)
-		h = (sh - bh) / (n - 1);
+		th = stackh / (n - 1);
 	else
-		h = sh - bh;
+		th = stackh;
 
 	for(i = 0, c = clients; c; c = c->next) {
-		c->ismax = False;
 		if(isvisible(c)) {
 			if(c->isfloat) {
 				resize(c, True, TopLeft);
 				continue;
 			}
-			if(n == 1) {
+			c->ismax = False;
+			if(n == 1) { /* only 1 window */
 				c->x = sx;
 				c->y = sy + bh;
-				c->w = sw - 2;
-				c->h = sh - 2 - bh;
+				c->w = sw - 2 * BORDERPX;
+				c->h = sh - 2 * BORDERPX - bh;
 			}
-			else if(i == 0) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = mw - 2;
-				c->h = sh - 2 - bh;
+			else if(i == 0) { /* master window */
+				switch(stackpos) {
+				case StackLeft:
+					c->x = sx + stackw;
+					c->y = sy + bh;
+					c->w = master - 2 * BORDERPX;
+					c->h = sh - bh - 2 * BORDERPX;
+					break;
+				case StackBottom:
+					c->x = sx;
+					c->y = sy + bh;
+					c->w = sw - 2 * BORDERPX;
+					c->h = master - 2 * BORDERPX;
+					break;
+				case StackRight:
+					c->x = sx;
+					c->y = sy + bh;
+					c->w = master - 2 * BORDERPX;
+					c->h = sh - bh - 2 * BORDERPX;
+					break;
+				}
 			}
-			else if(h > bh) {
-				c->x = sx + mw;
-				c->y = sy + (i - 1) * h + bh;
-				c->w = w - 2;
-				if(i + 1 == n)
-					c->h = sh - c->y - 2;
-				else
-					c->h = h - 2;
+			else if(th > bh) {
+				/* tile window */
+				c->w = tw - 2 * BORDERPX;
+				c->h = th - 2 * BORDERPX;
+				switch(stackpos) {
+				case StackLeft:
+					c->x = sx;
+					c->y = sy + (i - 1) * th + bh;
+					if(i + 1 == n)
+						c->h = sh - c->y - 2 * BORDERPX;
+					break;
+				case StackBottom:
+					c->x = sx;
+					c->y = sy + master + (i - 1) * th + bh;
+					if(i + 1 == n)
+						c->h = sh - c->y - 2 * BORDERPX;
+					break;
+				case StackRight:
+					c->x = sx + master;
+					c->y = sy + (i - 1) * th + bh;
+					if(i + 1 == n)
+						c->h = sh - c->y - 2 * BORDERPX;
+					break;
+				}
 			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
-				c->y = sy + bh;
-				c->w = w - 2;
-				c->h = sh - 2 - bh;
+			else { /* fallback if th < bh */
+				c->w = stackw - 2 * BORDERPX;
+				c->h = stackh - 2 * BORDERPX;
+				switch(stackpos) {
+				case StackLeft:
+					c->x = sx;
+					c->y = sy + bh;
+					break;
+				case StackBottom:
+					c->x = sx;
+					c->y = sy + master;
+					break;
+				case StackRight:
+					c->x = sx + master;
+					c->y = sy + bh;
+					break;
+				}
 			}
 			resize(c, False, TopLeft);
 			i++;
@@ -86,18 +208,15 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		sel = getnext(clients);
-	if(sel)
-		focus(sel);
-	else
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	if(!sel || !isvisible(sel)) {
+		for(c = stack; c && !isvisible(c); c = c->snext);
+		focus(c);
+	}
 	restack();
 }
 
 void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
 	Client *c;
    
 	if(!sel)
@@ -112,8 +231,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
 	Client *c;
 
 	if(!sel)
@@ -130,8 +248,7 @@ focusprev(Arg *arg)
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -141,60 +258,61 @@ isvisible(Client *c)
 }
 
 void
-restack()
-{
-	static unsigned int nwins = 0;
-	static Window *wins = NULL;
-	unsigned int f, fi, m, mi, n;
+resizecol(Arg *arg) {
+	unsigned int n;
 	Client *c;
-	XEvent ev;
 
-	for(f = 0, m = 0, c = clients; c; c = c->next)
-		if(isvisible(c)) {
-			if(c->isfloat || arrange == dofloat)
-				f++;
-			else
-				m++;
-		}
-	if(!(n = 2 * (f + m))) {
-		drawstatus();
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
 		return;
+
+	if(sel == getnext(clients)) {
+		if(master + arg->i > sw - MINW || master + arg->i < MINW)
+			return;
+		master += arg->i;
 	}
-	if(nwins < n) {
-		nwins = n;
-		wins = erealloc(wins, nwins * sizeof(Window));
+	else {
+		if(master - arg->i > sw - MINW || master - arg->i < MINW)
+			return;
+		master -= arg->i;
 	}
+	arrange(NULL);
+}
 
-	fi = 0;
-	mi = 2 * f;
+void
+restack(void) {
+	Client *c;
+	XEvent ev;
+
+	if(!sel) {
+		drawstatus();
+		return;
+	}
 	if(sel->isfloat || arrange == dofloat) {
-		wins[fi++] = sel->title;
-		wins[fi++] = sel->win;
+		XRaiseWindow(dpy, sel->win);
+		XRaiseWindow(dpy, sel->twin);
 	}
-	else {
-		wins[mi++] = sel->title;
-		wins[mi++] = sel->win;
-	}
-	for(c = clients; c; c = c->next)
-		if(isvisible(c) && c != sel) {
-			if(c->isfloat || arrange == dofloat) {
-				wins[fi++] = c->title;
-				wins[fi++] = c->win;
-			}
-			else {
-				wins[mi++] = c->title;
-				wins[mi++] = c->win;
-			}
+	if(arrange != dofloat) {
+		if(!sel->isfloat) {
+			XLowerWindow(dpy, sel->twin);
+			XLowerWindow(dpy, sel->win);
 		}
-	XRestackWindows(dpy, wins, n);
+		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+			if(c == sel)
+				continue;
+			XLowerWindow(dpy, c->twin);
+			XLowerWindow(dpy, c->win);
+		}
+	}
 	drawall();
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 void
-togglemode(Arg *arg)
-{
+togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
 	if(sel)
 		arrange(NULL);
@@ -203,51 +321,84 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+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 */
+	reorder();
 	arrange(NULL);
 }
 
 void
-view(Arg *arg)
-{
+togglestackpos(Arg *arg) {
+	if(arrange == dofloat)
+		return;
+	if(stackpos == StackBottom)
+		stackpos = STACKPOS;
+	else
+		stackpos = StackBottom;
+	updatemaster();
+	arrange(NULL);
+}
+
+void
+updatemaster(void) {
+	master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
+}
+
+void
+view(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
 		seltag[i] = False;
 	seltag[arg->i] = True;
+	reorder();
 	arrange(NULL);
 }
 
 void
-zoom(Arg *arg)
-{
+viewall(Arg *arg) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		seltag[i] = True;
+	reorder();
+	arrange(NULL);
+}
+
+
+
+void
+zoom(Arg *arg) {
+	unsigned int n;
 	Client *c;
 
-	if(!sel || (arrange != dotile) || sel->isfloat || sel->ismax)
+	if(!sel)
 		return;
 
-	if(sel == getnext(clients))  {
-		if((c = getnext(sel->next)))
-			sel = c;
-		else
-			return;
+	if(sel->isfloat || (arrange == dofloat)) {
+		togglemax(sel);
+		return;
 	}
 
-	/* pop */
-	sel->prev->next = sel->next;
-	if(sel->next)
-		sel->next->prev = sel->prev;
-	sel->prev = NULL;
-	clients->prev = sel;
-	sel->next = clients;
-	clients = sel;
-	focus(sel);
+	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)))
+			return;
+	detach(c);
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
+	focus(c);
 	arrange(NULL);
 }