X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/0ef6e3103c60510ebde09b74fb0f3590a641e6cc..fcd98308ba65c8872b485ac7f1800841b0a29e5c:/view.c

diff --git a/view.c b/view.c
index 93a8c66..81dd4b3 100644
--- a/view.c
+++ b/view.c
@@ -1,25 +1,11 @@
-/*
- * (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"
-
-#define MINDIM			100
+#include <stdio.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));
@@ -27,32 +13,17 @@ nexttiled(Client *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;
+		c->rx = c->x; c->x = wax;
+		c->ry = c->y; c->y = way;
+		c->rw = c->w; c->w = waw - 2 * BORDERPX;
+		c->rh = c->h; c->h = wah - 2 * BORDERPX;
 	}
 	else {
 		c->x = c->rx;
@@ -60,14 +31,13 @@ togglemax(Client *c)
 		c->w = c->rw;
 		c->h = c->rh;
 	}
-	resize(c, True, TopLeft);
+	resize(c, True);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
 /* extern */
 
-void (*arrange)(Arg *) = DEFMODE;
-StackPos stackpos = STACKPOS;
+void (*arrange)(void) = DEFMODE;
 
 void
 detach(Client *c) {
@@ -81,15 +51,15 @@ detach(Client *c) {
 }
 
 void
-dofloat(Arg *arg) {
+dofloat(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next) {
 		if(isvisible(c)) {
-			resize(c, True, TopLeft);
+			resize(c, True);
 		}
 		else
-			ban(c);
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
 	}
 	if(!sel || !isvisible(sel)) {
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -98,100 +68,48 @@ 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) {
-	int i, n, stackw, stackh, tw, th;
+dotile(void) {
+	unsigned int i, n, mw, mh, tw, th;
 	Client *c;
 
 	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;
 
-	if(stackpos == StackBottom) {
-		stackw = sw;
-		stackh = sh - bh - master;
-	}
-	else {
-		stackw = sw - master;
-		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);
+				resize(c, True);
 				continue;
 			}
 			c->ismax = False;
-			if(n == 1) { /* only 1 window */
-				c->x = sx;
-				c->y = sy + bh;
-				c->w = sw - 2 * BORDERPX;
-				c->h = sh - 2 * BORDERPX - bh;
-			}
-			else if(i == 0) { /* master window */
-				c->x = sx;
-				if(stackpos == StackLeft)
-					c->x += stackw;
-				c->y = sy + bh;
-				switch(stackpos) {
-				case StackLeft:
-				case StackRight:
-					c->w = master - 2 * BORDERPX;
-					c->h = sh - bh - 2 * BORDERPX;
-					break;
-				case StackBottom:
-					c->w = sw - 2 * BORDERPX;
-					c->h = master - 2 * BORDERPX;
-					break;
-				}
+			c->x = wax;
+			c->y = way;
+			if(i < nmaster) {
+				c->y += i * mh;
+				c->w = mw - 2 * BORDERPX;
+				c->h = mh - 2 * BORDERPX;
 			}
-			else if(th > bh) { /* tile window */
-				c->x = sx;
-				if(stackpos == StackRight)
-					c->x += master;
+			else {  /* tile window */
+				c->x += mw;
 				c->w = tw - 2 * BORDERPX;
-				c->h = th - 2 * BORDERPX;
-				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 + master + (i - 1) * th + bh;
-					if(i + 1 == n)
-						c->h = sh - c->y - 2 * BORDERPX;
-					break;
+				if(th > bh) {
+					c->y += (i - nmaster) * th;
+					c->h = th - 2 * BORDERPX;
 				}
+				else /* fallback if th < bh */
+					c->h = wah - 2 * BORDERPX;
 			}
-			else { /* fallback if th < bh */
-				c->x = sx;
-				if(stackpos == StackRight)
-					c->x += master;
-				c->y = sy + bh;
-				if(stackpos == StackBottom)
-					c->y += master;
-				c->w = stackw - 2 * BORDERPX;
-				c->h = stackh - 2 * BORDERPX;
-			}
-			resize(c, False, TopLeft);
+			resize(c, False);
 			i++;
 		}
 		else
-			ban(c);
-	}
+			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);
@@ -205,7 +123,6 @@ focusnext(Arg *arg) {
    
 	if(!sel)
 		return;
-
 	if(!(c = getnext(sel->next)))
 		c = getnext(clients);
 	if(c) {
@@ -220,7 +137,6 @@ focusprev(Arg *arg) {
 
 	if(!sel)
 		return;
-
 	if(!(c = getprev(sel->prev))) {
 		for(c = clients; c && c->next; c = c->next);
 		c = getprev(c);
@@ -231,6 +147,17 @@ focusprev(Arg *arg) {
 	}
 }
 
+void
+incnmaster(Arg *arg) {
+	if((arrange == dofloat) || (nmaster + arg->i < 1) || (wah / (nmaster + arg->i) < bh))
+		return;
+	nmaster += arg->i;
+	if(sel)
+		arrange();
+	else
+		drawstatus();
+}
+
 Bool
 isvisible(Client *c) {
 	unsigned int i;
@@ -242,29 +169,15 @@ isvisible(Client *c) {
 }
 
 void
-resizecol(Arg *arg) {
-	int s;
-	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))
-		return;
-
-	s = stackpos == StackBottom ? sh - bh : sw;
-	if(sel == getnext(clients)) {
-		if(master + arg->i > s - MINDIM || master + arg->i < MINDIM)
-			return;
-		master += arg->i;
-	}
+resizemaster(Arg *arg) {
+	if(arg->i == 0)
+		master = MASTER;
 	else {
-		if(master - arg->i > s - MINDIM || master - arg->i < MINDIM)
+		if(master + arg->i > 950 || master + arg->i < 50)
 			return;
-		master -= arg->i;
+		master += arg->i;
 	}
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -272,36 +185,37 @@ 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)) {
 			if(c == sel)
 				continue;
-			XLowerWindow(dpy, c->twin);
 			XLowerWindow(dpy, c->win);
 		}
 	}
-	drawall();
 	XSync(dpy, False);
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
+void
+togglefloat(Arg *arg) {
+	if (!sel || arrange == dofloat)
+		return;
+	sel->isfloat = !sel->isfloat;
+	arrange();
+}
+
 void
 togglemode(Arg *arg) {
 	arrange = (arrange == dofloat) ? dotile : dofloat;
 	if(sel)
-		arrange(NULL);
+		arrange();
 	else
 		drawstatus();
 }
@@ -314,20 +228,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;
-	master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100;
-	arrange(NULL);
+	arrange();
 }
 
 void
@@ -335,24 +236,12 @@ view(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
-		seltag[i] = False;
-	seltag[arg->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
-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;
@@ -360,17 +249,12 @@ zoom(Arg *arg) {
 
 	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(n < 2 || (arrange == dofloat))
-		return;
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
+		n++;
 
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))
@@ -381,5 +265,5 @@ zoom(Arg *arg) {
 	c->next = clients;
 	clients = c;
 	focus(c);
-	arrange(NULL);
+	arrange();
 }