From: James Bunton <jamesbunton@delx.net.au>
Date: Wed, 21 Sep 2016 14:07:49 +0000 (+1000)
Subject: Improvements for remanaging a previously unmanaged window
X-Git-Url: https://code.delx.au/spectrwm/commitdiff_plain/df0824f66a64252c87077b0a27df1d9567eb02de

Improvements for remanaging a previously unmanaged window

This fixes applications that reuse a window and then expect it to open a
different workspace.

For example Kupfer does this.
---

diff --git a/spectrwm.c b/spectrwm.c
index 6ba69d2..78e9b85 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -9885,11 +9885,6 @@ manage_window(xcb_window_t id, int spawn_pos, bool mapping)
 		DNPRINTF(SWM_D_MISC, "manage_window: win %#x found on "
 		    "unmanaged list.\n", id);
 		TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry);
-
-		if (TRANS(win))
-			set_child_transient(win, &trans);
-
-		goto remanage;
 	} else {
 		DNPRINTF(SWM_D_MISC, "manage_window: win %#x is new.\n", id);
 	}
@@ -9931,12 +9926,14 @@ manage_window(xcb_window_t id, int spawn_pos, bool mapping)
 		goto out;
 	}
 
-	/* Create and initialize ws_win object. */
-	if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
-		err(1, "manage_window: calloc: failed to allocate memory for "
-		    "new window");
+	if (!win) {
+		/* Create and initialize ws_win object. */
+		if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
+			err(1, "manage_window: calloc: failed to allocate "
+			    "memory for new window");
 
-	win->id = id;
+		win->id = id;
+	}
 
 	/* Ignore window border if there is one. */
 	WIDTH(win) = gr->width;
@@ -10067,7 +10064,6 @@ manage_window(xcb_window_t id, int spawn_pos, bool mapping)
 		update_window(win);
 	}
 
-remanage:
 	/* Figure out where to insert the window in the workspace list. */
 	if (trans && (ww = find_window(trans)))
 		TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry);