From 88120580348462e7182086ed128f6b3190a79e7c Mon Sep 17 00:00:00 2001
From: Marco Peereboom <marco@conformal.com>
Date: Thu, 1 Oct 2009 15:17:17 +0000
Subject: [PATCH 1/1] fix max_stack for real

---
 scrotwm.c |   32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/scrotwm.c b/scrotwm.c
index a925fa0..bc11395 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -1436,9 +1436,16 @@ cycle_layout(struct swm_region *r, union arg *args)
 	if (ws->cur_layout->l_stack == NULL)
 		ws->cur_layout = &layouts[0];
 
+	/*
+	 * do the ignore enter dance but undo or sometimes an unwanted
+	 * enter gets discarded
+	 */
 	ignore_enter = 1;
+
 	stack();
 	focus_win(winfocus);
+
+	ignore_enter = 0;
 }
 
 void
@@ -1494,6 +1501,9 @@ stack_floater(struct ws_win *win, struct swm_region *r)
 	unsigned int		mask;
 	XWindowChanges		wc;
 
+	if (win == NULL)
+		return;
+
 	bzero(&wc, sizeof wc);
 	mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight;
 	if ((win->quirks & SWM_Q_FULLSCREEN) && (win->g.w == WIDTH(r)) &&
@@ -1822,12 +1832,10 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 {
 	XWindowChanges		wc;
 	struct swm_geometry	gg = *g;
-	struct ws_win		*win;
+	struct ws_win		*win, *wintrans = NULL;
 	unsigned int		mask;
 	int			winno;
 
-	/* XXX this function needs to be rewritten it sucks crap */
-
 	DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
 
 	winno = count_win(ws, 0);
@@ -1835,12 +1843,8 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 		return;
 
 	TAILQ_FOREACH(win, &ws->winlist, entry) {
-		if (win->transient != 0 || win->floating != 0) {
-			if (win == ws->focus) {
-				stack_floater(win, ws->r);
-				XMapRaised(display, win->id);
-				focus_win(win); /* override */
-			}
+		if (win->transient != 0) {
+			wintrans = win;
 		} else {
 			bzero(&wc, sizeof wc);
 			wc.border_width = 1;
@@ -1850,8 +1854,17 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 			win->g.h = wc.height = gg.h;
 			mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth;
 			XConfigureWindow(display, win->id, mask, &wc);
+			if (win != ws->focus)
+				XUnmapWindow(display, win->id);
 		}
 	}
+
+	/* put the last transient on top */
+	if (wintrans) {
+		stack_floater(wintrans, ws->r);
+		XMapRaised(display, wintrans->id);
+		focus_win(wintrans); /* override */
+	}
 }
 
 void
@@ -3545,6 +3558,7 @@ maprequest(XEvent *e)
 	/* make new win focused */
 	win = find_window(ev->window);
 	r = root_to_region(win->wa.root);
+
 	if (win->ws == r->ws)
 		focus_win(win);
 }
-- 
1.7.10.4