X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=61144dfc8ce62eecdda0cb5529e4976cac5402b3;hb=6fc8a6304163fb63551e54acc62e6e9b7e96c820;hp=eddf2dadc0baf79da8afe0ff46a244efc3fbebe5;hpb=a33150eb4b041b243d0493cd4b53bfbcace3299e;p=dwm.git

diff --git a/view.c b/view.c
index eddf2da..61144df 100644
--- a/view.c
+++ b/view.c
@@ -3,34 +3,29 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-#include <stdio.h>
 
 /* static */
 
 static Client *
-minclient()
-{
+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 void
-pop(Client *c)
-{
-	detach(c);
-	if(clients)
-		clients->prev = c;
-	c->next = clients;
-	clients = c;
+static Client *
+nexttiled(Client *c) {
+	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+	return c;
 }
 
 static void
-reorder()
-{
+reorder(void) {
 	Client *c, *newclients, *tail;
 
 	newclients = tail = NULL;
@@ -47,20 +42,33 @@ reorder()
 	clients = newclients;
 }
 
-static Client *
-nexttiled(Client *c)
+static void
+togglemax(Client *c)
 {
-	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
-	return 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
-detach(Client *c)
-{
+detach(Client *c) {
 	if(c->prev)
 		c->prev->next = c->next;
 	if(c->next)
@@ -71,12 +79,9 @@ detach(Client *c)
 }
 
 void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
 	Client *c;
 
-	maximized = False;
-
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
 			resize(c, True, TopLeft);
@@ -84,28 +89,41 @@ dofloat(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		focus(getnext(clients));
+	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;
+	unsigned int md = ((stackpos == StackBottom ? sh - bh : sw) * master) / 100;
 	Client *c;
 
-	maximized = False;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
 
-	w = sw - mw;
-	for(n = 0, c = clients; c; c = c->next)
-		if(isvisible(c) && !c->isfloat)
-			n++;
+	if(stackpos == StackBottom) {
+		stackw = sw;
+		stackh = sh - bh - md;
+	}
+	else {
+		stackw = sw - md;
+		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) {
 		if(isvisible(c)) {
@@ -113,32 +131,54 @@ dotile(Arg *arg)
 				resize(c, True, TopLeft);
 				continue;
 			}
-			if(n == 1) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = sw - 2;
-				c->h = sh - 2 - bh;
-			}
-			else if(i == 0) {
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = mw - 2;
-				c->h = sh - 2 - bh;
+			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(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(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;
+				}
 			}
-			else { /* fallback if h < bh */
-				c->x = sx + mw;
-				c->y = sy + bh;
-				c->w = w - 2;
-				c->h = sh - 2 - bh;
+			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;
+				}
 			}
 			resize(c, False, TopLeft);
 			i++;
@@ -146,14 +186,15 @@ dotile(Arg *arg)
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		focus(getnext(clients));
+	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)
@@ -168,8 +209,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
 	Client *c;
 
 	if(!sel)
@@ -186,8 +226,7 @@ focusprev(Arg *arg)
 }
 
 Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -197,58 +236,61 @@ isvisible(Client *c)
 }
 
 void
-resizecol(Arg *arg)
-{
+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 != dotile) || maximized)
+	if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
 		return;
 
 	if(sel == getnext(clients)) {
-		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
+		if(master + arg->i > 95 || master + arg->i < 5)
 			return;
-		mw += arg->i;
+		master += arg->i;
 	}
 	else {
-		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
+		if(master - arg->i > 95 || master - arg->i < 5)
 			return;
-		mw -= arg->i;
+		master -= arg->i;
 	}
 	arrange(NULL);
 }
 
 void
-restack()
-{
+restack(void) {
 	Client *c;
 	XEvent ev;
-	
+
 	if(!sel) {
 		drawstatus();
 		return;
 	}
 	if(sel->isfloat || arrange == dofloat) {
-		pop(sel);
 		XRaiseWindow(dpy, sel->win);
 		XRaiseWindow(dpy, sel->twin);
 	}
-	if(arrange != dofloat) 
+	if(arrange != dofloat) {
+		if(!sel->isfloat) {
+			XLowerWindow(dpy, sel->twin);
+			XLowerWindow(dpy, sel->win);
+		}
 		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);
@@ -257,8 +299,7 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
 	unsigned int i;
 
 	seltag[arg->i] = !seltag[arg->i];
@@ -270,8 +311,18 @@ toggleview(Arg *arg)
 }
 
 void
-view(Arg *arg)
-{
+togglestackpos(Arg *arg) {
+	if(arrange == dofloat)
+		return;
+	if(stackpos == StackBottom)
+		stackpos = STACKPOS;
+	else
+		stackpos = StackBottom;
+	arrange(NULL);
+}
+
+void
+view(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -282,8 +333,7 @@ view(Arg *arg)
 }
 
 void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -292,22 +342,35 @@ viewall(Arg *arg)
 	arrange(NULL);
 }
 
+
+
 void
-zoom(Arg *arg)
-{
+zoom(Arg *arg) {
 	unsigned int n;
 	Client *c;
 
+	if(!sel)
+		return;
+
+	if(sel->isfloat || (arrange == dofloat)) {
+		togglemax(sel);
+		return;
+	}
+
 	for(n = 0, c = clients; c; c = c->next)
 		if(isvisible(c) && !c->isfloat)
 			n++;
-	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
+	if(n < 2 || (arrange == dofloat))
 		return;
 
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))
 			return;
-	pop(c);
+	detach(c);
+	if(clients)
+		clients->prev = c;
+	c->next = clients;
+	clients = c;
 	focus(c);
 	arrange(NULL);
 }