# HG changeset patch
# User Anselm R. Garbe <arg@10kloc.org>
# Date 1157644420 -7200
# Node ID a2e587651c79ac651e165c17b845a5ba099e0b6a
# Parent  00584fe34361acb8bed7835a9c5a5621e573d0a1
using a global stack for focus recovery on arrange() - seems to work great

diff -r 00584fe34361 -r a2e587651c79 client.c
--- a/client.c	Thu Sep 07 09:26:01 2006 +0200
+++ b/client.c	Thu Sep 07 17:53:40 2006 +0200
@@ -11,6 +11,14 @@
 /* static functions */
 
 static void
+detachstack(Client *c)
+{
+	Client **tc;
+	for(tc=&stack; *tc && *tc != c; tc=&(*tc)->snext);
+	*tc = c->snext;
+}
+
+static void
 grabbuttons(Client *c, Bool focus)
 {
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
@@ -99,6 +107,9 @@
 		}
 	}
 	if(c) {
+		detachstack(c);
+		c->snext = stack;
+		stack = c;
 		grabbuttons(c, True);
 		drawtitle(c);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
@@ -198,7 +209,6 @@
 void
 manage(Window w, XWindowAttributes *wa)
 {
-	unsigned int i;
 	Client *c;
 	Window trans;
 	XSetWindowAttributes twa;
@@ -247,7 +257,8 @@
 	if(clients)
 		clients->prev = c;
 	c->next = clients;
-	clients = c;
+	c->snext = stack;
+	stack = clients = c;
 
 	settitle(c);
 	ban(c);
@@ -421,6 +432,7 @@
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	XDestroyWindow(dpy, c->twin);
 
+	detachstack(c);
 	free(c->tags);
 	free(c);
 
diff -r 00584fe34361 -r a2e587651c79 dwm.h
--- a/dwm.h	Thu Sep 07 09:26:01 2006 +0200
+++ b/dwm.h	Thu Sep 07 17:53:40 2006 +0200
@@ -61,6 +61,7 @@
 	Bool *tags;
 	Client *next;
 	Client *prev;
+	Client *snext;
 	Window win;
 	Window twin;
 };
@@ -73,7 +74,7 @@
 extern void (*arrange)(Arg *);
 extern Atom wmatom[WMLast], netatom[NetLast];
 extern Bool running, issel, maximized, *seltag;
-extern Client *clients, *sel;
+extern Client *clients, *sel, *stack;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Display *dpy;
diff -r 00584fe34361 -r a2e587651c79 main.c
--- a/main.c	Thu Sep 07 09:26:01 2006 +0200
+++ b/main.c	Thu Sep 07 17:53:40 2006 +0200
@@ -27,6 +27,7 @@
 Bool maximized = False;
 Client *clients = NULL;
 Client *sel = NULL;
+Client *stack = NULL;
 Cursor cursor[CurLast];
 Display *dpy;
 DC dc = {0};
diff -r 00584fe34361 -r a2e587651c79 view.c
--- a/view.c	Thu Sep 07 09:26:01 2006 +0200
+++ b/view.c	Thu Sep 07 17:53:40 2006 +0200
@@ -76,8 +76,10 @@
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		focus(getnext(clients));
+	if(!sel || !isvisible(sel)) {
+		for(sel = stack; sel && !isvisible(sel); sel = sel->snext);
+		focus(sel);
+	}
 	restack();
 }
 
@@ -138,8 +140,10 @@
 		else
 			ban(c);
 	}
-	if(!sel || !isvisible(sel))
-		focus(getnext(clients));
+	if(!sel || !isvisible(sel)) {
+		for(sel = stack; sel && !isvisible(sel); sel = sel->snext);
+		focus(sel);
+	}
 	restack();
 }
 
@@ -227,7 +231,7 @@
 		XRaiseWindow(dpy, sel->win);
 		XRaiseWindow(dpy, sel->twin);
 	}
-	if(arrange != dofloat) 
+	if(arrange != dofloat)
 		for(c = nexttiled(clients); c; c = nexttiled(c->next)) {
 			XLowerWindow(dpy, c->twin);
 			XLowerWindow(dpy, c->win);