X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=80d483ae4392e8c921f826e2c7a724ff55fab02f;hb=d504005e9117d325456642501b9cc61649b6ffcd;hp=8f5ad64fc89c4d74e022190be166c626fea86710;hpb=25060031a5e9a505c53d8462c087d80013ffdc16;p=dwm.git

diff --git a/view.c b/view.c
index 8f5ad64..80d483a 100644
--- a/view.c
+++ b/view.c
@@ -3,25 +3,23 @@
  * See LICENSE file for license details.
  */
 #include "dwm.h"
-#include <stdio.h>
 
 /* static */
 
 static Client *
-minclient()
-{
+minclient() {
 	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
-reorder()
-{
+reorder() {
 	Client *c, *newclients, *tail;
 
 	newclients = tail = NULL;
@@ -38,13 +36,18 @@ reorder()
 	clients = newclients;
 }
 
+static Client *
+nexttiled(Client *c) {
+	for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+	return c;
+}
+
 /* extern */
 
 void (*arrange)(Arg *) = DEFMODE;
 
 void
-detach(Client *c)
-{
+detach(Client *c) {
 	if(c->prev)
 		c->prev->next = c->next;
 	if(c->next)
@@ -55,8 +58,7 @@ detach(Client *c)
 }
 
 void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
 	Client *c;
 
 	maximized = False;
@@ -68,14 +70,15 @@ 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();
 }
 
 void
-dotile(Arg *arg)
-{
+dotile(Arg *arg) {
 	int h, i, n, w;
 	Client *c;
 
@@ -130,14 +133,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)
@@ -152,8 +156,7 @@ focusnext(Arg *arg)
 }
 
 void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
 	Client *c;
 
 	if(!sel)
@@ -169,94 +172,65 @@ focusprev(Arg *arg)
 	}
 }
 
+Bool
+isvisible(Client *c) {
+	unsigned int i;
+
+	for(i = 0; i < ntags; i++)
+		if(c->tags[i] && seltag[i])
+			return True;
+	return False;
+}
+
 void
-growcol(Arg *arg)
-{
-	Client *c = getnext(clients);
+resizecol(Arg *arg) {
+	unsigned int n;
+	Client *c;
 
-	if(!sel || !c || !getnext(c->next) || (arrange != dotile))
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
+
 	if(sel == getnext(clients)) {
-		if(mw + arg->i > sw - 100)
+		if(mw + arg->i > sw - 100 || mw + arg->i < 100)
 			return;
 		mw += arg->i;
 	}
 	else {
-		if(mw - arg->i < 100)
+		if(mw - arg->i > sw - 100 || mw - arg->i < 100)
 			return;
 		mw -= arg->i;
 	}
 	arrange(NULL);
 }
 
-Bool
-isvisible(Client *c)
-{
-	unsigned int i;
-
-	for(i = 0; i < ntags; i++)
-		if(c->tags[i] && seltag[i])
-			return True;
-	return False;
-}
-
 void
-restack()
-{
-	static unsigned int nwins = 0;
-	static Window *wins = NULL;
-	unsigned int f, fi, m, mi, n;
+restack() {
 	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))) {
+	
+	if(!sel) {
 		drawstatus();
 		return;
 	}
-	if(nwins < n) {
-		nwins = n;
-		wins = erealloc(wins, nwins * sizeof(Window));
+	if(sel->isfloat || arrange == dofloat) {
+		XRaiseWindow(dpy, sel->win);
+		XRaiseWindow(dpy, sel->twin);
 	}
-
-	fi = 0;
-	mi = 2 * f;
-	if(sel) {
-		if(sel->isfloat || arrange == dofloat) {
-			wins[fi++] = sel->twin;
-			wins[fi++] = sel->win;
-		}
-		else {
-			wins[mi++] = sel->twin;
-			wins[mi++] = sel->win;
+	if(arrange != dofloat)
+		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
+			XLowerWindow(dpy, c->twin);
+			XLowerWindow(dpy, c->win);
 		}
-	}
-	for(c = clients; c; c = c->next)
-		if(isvisible(c) && c != sel) {
-			if(c->isfloat || arrange == dofloat) {
-				wins[fi++] = c->twin;
-				wins[fi++] = c->win;
-			}
-			else {
-				wins[mi++] = c->twin;
-				wins[mi++] = c->win;
-			}
-		}
-	XRestackWindows(dpy, wins, n);
 	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);
@@ -265,8 +239,7 @@ togglemode(Arg *arg)
 }
 
 void
-toggleview(Arg *arg)
-{
+toggleview(Arg *arg) {
 	unsigned int i;
 
 	seltag[arg->i] = !seltag[arg->i];
@@ -278,8 +251,7 @@ toggleview(Arg *arg)
 }
 
 void
-view(Arg *arg)
-{
+view(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -290,8 +262,7 @@ view(Arg *arg)
 }
 
 void
-viewall(Arg *arg)
-{
+viewall(Arg *arg) {
 	unsigned int i;
 
 	for(i = 0; i < ntags; i++)
@@ -301,19 +272,23 @@ viewall(Arg *arg)
 }
 
 void
-zoom(Arg *arg)
-{
-	Client *c = sel;
+zoom(Arg *arg) {
+	unsigned int n;
+	Client *c;
 
-	if(!c || (arrange != dotile) || c->isfloat || maximized)
+	for(n = 0, c = clients; c; c = c->next)
+		if(isvisible(c) && !c->isfloat)
+			n++;
+	if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized)
 		return;
 
-	if(c == getnext(clients))
-		if(!(c = getnext(c->next)))
+	if((c = sel) == nexttiled(clients))
+		if(!(c = nexttiled(c->next)))
 			return;
 	detach(c);
+	if(clients)
+		clients->prev = c;
 	c->next = clients;
-	clients->prev = c;
 	clients = c;
 	focus(c);
 	arrange(NULL);