X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=317d4b74587551294bc92d14e70941c3a932d099;hb=af0542e5036b997c69ac2758286ebcb43d7ac74a;hp=bafbc34fcaf51270748f3ff8e51cd96afe41e277;hpb=c7dc4771c947ecc0e65d4ef7d2854479565e4ed3;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index bafbc34..317d4b7 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -2769,6 +2769,13 @@ bar_setup(struct swm_region *r)
 	    XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL
 	    | XCB_CW_EVENT_MASK, wa);
 
+	/* Stack bar window above region window to start. */
+	wa[0] = r->id;
+	wa[1] = XCB_STACK_MODE_ABOVE;
+
+	xcb_configure_window(conn, r->bar->id, XCB_CONFIG_WINDOW_SIBLING |
+	    XCB_CONFIG_WINDOW_STACK_MODE, wa);
+
 	r->bar->buffer = xcb_generate_id(conn);
 	xcb_create_pixmap(conn, screen->root_depth, r->bar->buffer, r->bar->id,
 	    WIDTH(r->bar), HEIGHT(r->bar));
@@ -3483,7 +3490,7 @@ unfocus_win(struct ws_win *win)
 void
 focus_win(struct ws_win *win)
 {
-	struct ws_win			*cfw = NULL, *parent = NULL, *w;
+	struct ws_win			*cfw = NULL, *parent = NULL, *w, *tmpw;
 	struct workspace		*ws;
 	xcb_get_input_focus_reply_t	*gifr;
 
@@ -3566,20 +3573,25 @@ focus_win(struct ws_win *win)
 				map_window(parent);
 
 				/* Map siblings next. */
-				TAILQ_FOREACH(w, &ws->winlist, entry)
+				TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry,
+				    tmpw)
 					if (w != win && !ICONIC(w) &&
-					    win->transient == parent->id)
+					    w->transient == parent->id) {
+						raise_window(w);
 						map_window(w);
+					}
 			}
 
 			/* Map focused window. */
 			raise_window(win);
 			map_window(win);
 
-			/* Finally, map children of focus window. */
-			TAILQ_FOREACH(w, &ws->winlist, entry)
-				if (w->transient == win->id && !ICONIC(w))
+			/* Stack any children of focus window. */
+			TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw)
+				if (w->transient == win->id && !ICONIC(w)) {
+					raise_window(w);
 					map_window(w);
+				}
 		} else if (tile_gap < 0 && !ABOVE(win)) {
 			/*
 			 * Windows overlap in the layout.
@@ -4231,17 +4243,21 @@ focus(struct swm_region *r, union arg *args)
 	if (!(r && r->ws))
 		goto out;
 
-	DNPRINTF(SWM_D_FOCUS, "focus: id: %d\n", args->id);
-
 	cur_focus = r->ws->focus;
 	ws = r->ws;
 	wl = &ws->winlist;
 
+	DNPRINTF(SWM_D_FOCUS, "focus: id: %d, cur_focus: %#x\n", args->id,
+	    WINID(cur_focus));
+
 	/* Make sure an uniconified window has focus, if one exists. */
 	if (cur_focus == NULL) {
 		cur_focus = TAILQ_FIRST(wl);
 		while (cur_focus != NULL && ICONIC(cur_focus))
 			cur_focus = TAILQ_NEXT(cur_focus, entry);
+
+		DNPRINTF(SWM_D_FOCUS, "focus: new cur_focus: %#x\n",
+		    WINID(cur_focus));
 	}
 
 	switch (args->id) {
@@ -4256,8 +4272,10 @@ focus(struct swm_region *r, union arg *args)
 				winfocus = TAILQ_LAST(wl, ws_win_list);
 			if (winfocus == cur_focus)
 				break;
-		} while (winfocus != NULL &&
-		    (ICONIC(winfocus) || winfocus->id == cur_focus->transient));
+		} while (winfocus && (ICONIC(winfocus) ||
+		    winfocus->id == cur_focus->transient ||
+		    (cur_focus->transient != XCB_WINDOW_NONE &&
+		    winfocus->transient == cur_focus->transient)));
 		break;
 	case SWM_ARG_ID_FOCUSNEXT:
 		if (cur_focus == NULL)
@@ -4270,8 +4288,10 @@ focus(struct swm_region *r, union arg *args)
 				winfocus = TAILQ_FIRST(wl);
 			if (winfocus == cur_focus)
 				break;
-		} while (winfocus != NULL &&
-		    (ICONIC(winfocus) || winfocus->id == cur_focus->transient));
+		} while (winfocus && (ICONIC(winfocus) ||
+		    winfocus->id == cur_focus->transient ||
+		    (cur_focus->transient != XCB_WINDOW_NONE &&
+		    winfocus->transient == cur_focus->transient)));
 		break;
 	case SWM_ARG_ID_FOCUSMAIN:
 		if (cur_focus == NULL)
@@ -4897,7 +4917,7 @@ void
 max_stack(struct workspace *ws, struct swm_geometry *g)
 {
 	struct swm_geometry	gg = *g;
-	struct ws_win		*w, *win = NULL, *parent = NULL;
+	struct ws_win		*w, *win = NULL, *parent = NULL, *tmpw;
 	int			winno;
 
 	DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
@@ -4960,18 +4980,20 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
 		}
 	}
 
-	if (TRANS(win)) {
-		parent = find_window(win->transient);
+	/* If transient, stack parent and its children. */
+	if (TRANS(win) && (parent = find_window(win->transient))) {
 		raise_window(parent);
 
-		TAILQ_FOREACH(w, &ws->stack, stack_entry)
+		TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw)
 			if (w->transient == parent->id)
 				raise_window(w);
 	}
 
+	/* Make sure focus window is on top. */
 	raise_window(win);
 
-	TAILQ_FOREACH(w, &ws->stack, stack_entry)
+	/* Stack any children of focus window. */
+	TAILQ_FOREACH_SAFE(w, &ws->stack, stack_entry, tmpw)
 		if (w->transient == win->id)
 			raise_window(w);
 
@@ -8289,32 +8311,26 @@ setlayout(const char *selector, const char *value, int flags)
 			ws[ws_id].cur_layout->l_config(&ws[ws_id],
 			    mg >= 0 ?  SWM_ARG_ID_MASTERGROW :
 			    SWM_ARG_ID_MASTERSHRINK);
-			stack();
 		}
 		/* master add */
 		for (x = 0; x < abs(ma); x++) {
 			ws[ws_id].cur_layout->l_config(&ws[ws_id],
 			    ma >= 0 ?  SWM_ARG_ID_MASTERADD :
 			    SWM_ARG_ID_MASTERDEL);
-			stack();
 		}
 		/* stack inc */
 		for (x = 0; x < abs(si); x++) {
 			ws[ws_id].cur_layout->l_config(&ws[ws_id],
 			    si >= 0 ?  SWM_ARG_ID_STACKINC :
 			    SWM_ARG_ID_STACKDEC);
-			stack();
 		}
 		/* Apply flip */
 		if (f) {
 			ws[ws_id].cur_layout->l_config(&ws[ws_id],
 			    SWM_ARG_ID_FLIPLAYOUT);
-			stack();
 		}
 	}
 
-	focus_flush();
-
 	return (0);
 }