X-Git-Url: https://code.delx.au/spectrwm/blobdiff_plain/6b0c4d149311ff3ce8a79e23e78e80f4a936bf0e..HEAD:/spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index 37b0d2e..285bac9 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -69,6 +69,7 @@
 #include <X11/Xcursor/Xcursor.h>
 #include <X11/Xft/Xft.h>
 #include <X11/Xlib-xcb.h>
+#include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
 #include <xcb/xcb_aux.h>
 #include <xcb/xcb_event.h>
@@ -3712,7 +3713,16 @@ spawn(int ws_idx, union arg *args, bool close_fd)
 
 	close(xcb_get_file_descriptor(conn));
 
-	setenv("LD_PRELOAD", SWM_LIB, 1);
+	if ((ret = getenv("LD_PRELOAD"))) {
+		if (asprintf(&ret, "%s:%s", SWM_LIB, ret) == -1) {
+			warn("spawn: asprintf LD_PRELOAD");
+			_exit(1);
+		}
+		setenv("LD_PRELOAD", ret, 1);
+		free(ret);
+	} else {
+		setenv("LD_PRELOAD", SWM_LIB, 1);
+	}
 
 	if (asprintf(&ret, "%d", ws_idx) == -1) {
 		warn("spawn: asprintf SWM_WS");
@@ -4135,6 +4145,10 @@ set_region(struct swm_region *r)
 
 	r->s->r_focus = r;
 
+	/* Update the focus window frame on the now unfocused region. */
+	if (rf && rf->ws->focus)
+		draw_frame(rf->ws->focus);
+
 	ewmh_update_current_desktop();
 }
 
@@ -11083,7 +11097,7 @@ reparentnotify(xcb_reparent_notify_event_t *e)
 		if (win->state == SWM_WIN_STATE_REPARENTING) {
 			win->state = SWM_WIN_STATE_REPARENTED;
 
-			if (win->ws->r)
+			if (win->ws->r && !ICONIC(win))
 				map_window(win);
 			else
 				unmap_window(win);
@@ -11509,7 +11523,6 @@ scan_randr(int idx)
 	int						ncrtc = 0;
 #endif /* SWM_XRR_HAS_CRTC */
 	struct swm_region				*r;
-	struct ws_win					*win;
 	int						num_screens;
 	xcb_randr_get_screen_resources_current_cookie_t	src;
 	xcb_randr_get_screen_resources_current_reply_t	*srr;
@@ -11584,13 +11597,8 @@ scan_randr(int idx)
 		    screen->height_in_pixels);
 
 out:
-	/* Cleanup unused previously visible workspaces. */
+	/* The screen shouldn't focus on unused regions. */
 	TAILQ_FOREACH(r, &screens[idx].orl, entry) {
-		TAILQ_FOREACH(win, &r->ws->winlist, entry)
-			unmap_window(win);
-		r->ws->state = SWM_WS_STATE_HIDDEN;
-
-		/* The screen shouldn't focus on an unused region. */
 		if (screens[idx].r_focus == r)
 			screens[idx].r_focus = NULL;
 	}
@@ -11602,7 +11610,9 @@ void
 screenchange(xcb_randr_screen_change_notify_event_t *e)
 {
 	struct swm_region		*r;
-	int				i, num_screens;
+	struct workspace		*ws;
+	struct ws_win			*win;
+	int				i, j, num_screens;
 
 	DNPRINTF(SWM_D_EVENT, "screenchange: root: %#x\n", e->root);
 
@@ -11635,6 +11645,16 @@ screenchange(xcb_randr_screen_change_notify_event_t *e)
 			focus_region(r);
 	}
 
+	/* Cleanup unused previously visible workspaces. */
+	for (j = 0; j < workspace_limit; j++) {
+		ws = &screens[i].ws[j];
+		if (ws->r == NULL && ws->state != SWM_WS_STATE_HIDDEN) {
+			TAILQ_FOREACH(win, &ws->winlist, entry)
+				unmap_window(win);
+			ws->state = SWM_WS_STATE_HIDDEN;
+		}
+	}
+
 	focus_flush();
 
 	/* Update workspace state and bar on all regions. */