X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=scrotwm.c;h=91a5ed8c5c7965b01134e82b54fed2d990259dc0;hb=ed1dbfa144d7a31153d5adf97ee3cb1dc3b28d1b;hp=6f26b63f97821895cc5b95ed0bfe38f69b838923;hpb=6ca5cd2ca75a7a4fcc9c55dc23b106bdd657e476;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 6f26b63..91a5ed8 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -91,7 +91,6 @@
 #endif
 
 /* #define SWM_DEBUG */
-/* #define SWM_DEBUG */
 #ifdef SWM_DEBUG
 #define DPRINTF(x...)		do { if (swm_debug) fprintf(stderr, x); } while(0)
 #define DNPRINTF(n,x...)	do { if (swm_debug & n) fprintf(stderr, x); } while(0)
@@ -147,6 +146,7 @@ char			*bar_argv[] = { NULL, NULL };
 int			bar_pipe[2];
 char			bar_ext[SWM_BAR_MAX];
 sig_atomic_t		bar_alarm = 0;
+int			bar_delay = 30;
 int			bar_enabled = 1;
 int			bar_extra = 1;
 int			bar_extra_running = 0;
@@ -412,6 +412,8 @@ conf_load(char *filename)
 				asprintf(&bar_fonts[0], "%s", val);
 			else if (!strncmp(var, "bar_action", strlen("bar_action")))
 				asprintf(&bar_argv[0], "%s", val);
+			else if (!strncmp(var, "bar_delay", strlen("bar_delay")))
+				bar_delay = atoi(val);
 			else
 				goto bad;
 			break;
@@ -534,8 +536,7 @@ bar_update(void)
 		}
 	}
 	XSync(display, False);
-
-	alarm(60);
+	alarm(bar_delay);
 }
 
 void
@@ -1366,6 +1367,8 @@ send_to_ws(struct swm_region *r, union arg *args)
 	int			wsid = args->id;
 	struct ws_win		*win = cur_focus;
 	struct workspace	*ws, *nws;
+	Atom			ws_idx_atom = 0;
+	unsigned char		ws_idx_str[1];
 
 	DNPRINTF(SWM_D_MOVE, "send_to_ws: win: %lu\n", win->id);
 
@@ -1386,6 +1389,12 @@ send_to_ws(struct swm_region *r, union arg *args)
 	TAILQ_INSERT_TAIL(&nws->winlist, win, entry);
 	win->ws = nws;
 
+	/* Try to update the window's workspace property */
+	ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+	ws_idx_str[0] = (unsigned char)nws->idx;
+	XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8,
+	    PropModeReplace, ws_idx_str, 1);
+
 	if (count_win(nws, 1) == 1)
 		nws->focus = win;
 	ws->restack = 1;
@@ -1613,23 +1622,40 @@ set_win_state(struct ws_win *win, long state)
 }
 
 struct ws_win *
-manage_window(Window id, struct workspace *ws)
+manage_window(Window id)
 {
 	Window			trans;
+	struct workspace	*ws;
 	struct ws_win		*win;
 	XClassHint		ch;
+	int			format;
+	unsigned long		nitems, bytes;
+	Atom			ws_idx_atom = 0, type;
+	unsigned char		ws_idx_str[1], *prop = NULL;
+	struct swm_region	*r;
 
-	TAILQ_FOREACH(win, &ws->winlist, entry) {
-		if (win->id == id)
+	if ((win = find_window(id)) != NULL)
 			return (win);	/* already being managed */
-	}
 
 	if ((win = calloc(1, sizeof(struct ws_win))) == NULL)
 		errx(1, "calloc: failed to allocate memory for new window");
 
+	ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+	if (ws_idx_atom)
+		XGetWindowProperty(display, id, ws_idx_atom, 0, 1, False, XA_STRING,
+		    &type, &format, &nitems, &bytes, &prop);
+
+	XGetWindowAttributes(display, id, &win->wa);
+	r = root_to_region(win->wa.root);
+	/* If the window was managed before, put it in the same workspace */
+	if (prop)
+		ws = &r->s->ws[prop[0]];
+	else
+		ws = r->ws;
+
 	win->id = id;
 	win->ws = ws;
-	win->s = ws->r->s;	/* this never changes */
+	win->s = r->s;	/* this never changes */
 	TAILQ_INSERT_TAIL(&ws->winlist, win, entry);
 
 	/* make new win focused */
@@ -1641,14 +1667,22 @@ manage_window(Window id, struct workspace *ws)
 		DNPRINTF(SWM_D_MISC, "manage_window: win %u transient %u\n",
 		    (unsigned)win->id, win->transient);
 	}
-	XGetWindowAttributes(display, id, &win->wa);
 	win->g.w = win->wa.width;
 	win->g.h = win->wa.height;
 	win->g.x = win->wa.x;
 	win->g.y = win->wa.y;
+
+	if (ws_idx_atom && prop == NULL) {
+		/* set the window's workspace property if it wasn't there */
+		ws_idx_str[0] = (unsigned char)ws->idx;
+		XChangeProperty(display, id, ws_idx_atom, XA_STRING, 1,
+		    PropModeReplace, ws_idx_str, 1);
+	}
+
 	/*
 	fprintf(stderr, "manage window: %d x %d y %d w %d h %d\n", win->id, win->g.x, win->g.y, win->g.w, win->g.h);
 	*/
+
 	/* XXX make this a table */
 	bzero(&ch, sizeof ch);
 	if (XGetClassHint(display, win->id, &ch)) {
@@ -1812,7 +1846,6 @@ maprequest(XEvent *e)
 {
 	XMapRequestEvent	*ev = &e->xmaprequest;
 	XWindowAttributes	wa;
-	struct swm_region	*r;
 
 	DNPRINTF(SWM_D_EVENT, "maprequest: window: %lu\n",
 	    e->xmaprequest.window);
@@ -1821,8 +1854,7 @@ maprequest(XEvent *e)
 		return;
 	if (wa.override_redirect)
 		return;
-	r = root_to_region(wa.root);
-	manage_window(e->xmaprequest.window, r->ws);
+	manage_window(e->xmaprequest.window);
 	stack();
 }
 
@@ -1961,11 +1993,16 @@ setup_screens(void)
 	int			ncrtc = 0, w = 0;
         int			i, j, k;
 	struct workspace	*ws;
+	int			ws_idx_atom;
+
 
 	if ((screens = calloc(ScreenCount(display),
 	     sizeof(struct swm_screen))) == NULL)
 		errx(1, "calloc: screens");
 
+	ws_idx_atom = XInternAtom(display, "_SWM_WS", False);
+	
+
 	/* map physical screens */
 	for (i = 0; i < ScreenCount(display); i++) {
 		DNPRINTF(SWM_D_WS, "setup_screens: init screen %d\n", i);
@@ -2024,7 +2061,7 @@ setup_screens(void)
 		else 
 			ncrtc = sr->ncrtc;
 
-		for (c = 0; c < ncrtc; c++) {
+		for (c = 0, ci = NULL; c < ncrtc; c++) {
 			ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]);
 			if (ci->noutput == 0)
 				continue;
@@ -2038,7 +2075,8 @@ setup_screens(void)
 				    ci->x, ci->y, ci->width, ci->height);
 			w++;
 		}
-		XRRFreeCrtcInfo(ci);
+		if (ci)
+			XRRFreeCrtcInfo(ci);
 		XRRFreeScreenResources(sr);
 #else
 		new_region(&screens[i], &screens[i].ws[w], 0, 0,
@@ -2060,7 +2098,7 @@ setup_screens(void)
 
 			if (wa.map_state == IsViewable ||
 			    getstate(wins[i]) == NormalState)
-				manage_window(wins[i], r->ws);
+				manage_window(wins[i]);
 		}
 		/* transient windows */
 		for (i = 0; i < no; i++) {
@@ -2070,7 +2108,7 @@ setup_screens(void)
 			if (XGetTransientForHint(display, wins[i], &d1) &&
 			    (wa.map_state == IsViewable || getstate(wins[i]) ==
 			    NormalState))
-				manage_window(wins[i], r->ws);
+				manage_window(wins[i]);
                 }
                 if (wins) {
                         XFree(wins);