X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scrotwm.c;h=64a8b657dc389b7cba7095724c0812f18e9a2d87;hb=4a52579466f80ce9cd0a81b9c351ce1470953a74;hp=9078c6b3d101f62bd60761c49015c2c839ffe021;hpb=5bc67cb7a856ad03f080e5e281984133ddbe932a;p=spectrwm.git

diff --git a/scrotwm.c b/scrotwm.c
index 9078c6b..64a8b65 100644
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -198,7 +198,7 @@ GC			bar_gc;
 XGCValues		bar_gcv;
 int			bar_fidx = 0;
 XFontStruct		*bar_fs;
-char			*bar_fonts[] = { NULL, NULL, NULL };	/* XXX Make fully dynamic */
+char			*bar_fonts[] = { NULL, NULL, NULL, NULL };/* XXX Make fully dynamic */
 char			*spawn_term[] = { NULL, NULL };		/* XXX Make fully dynamic */
 
 #define SWM_MENU_FN	(2)
@@ -1162,6 +1162,7 @@ unfocus_all(void)
 		for (j = 0; j < SWM_WS_MAX; j++)
 			TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry)
 				unfocus_win(win);
+	XSync(display, False);
 }
 
 void
@@ -1182,6 +1183,7 @@ focus_win(struct ws_win *win)
 		grabbuttons(win, 1);
 		XSetInputFocus(display, win->id,
 		    RevertToPointerRoot, CurrentTime);
+		XSync(display, False);
 	}
 }
 
@@ -1201,22 +1203,19 @@ switchws(struct swm_region *r, union arg *args)
 	    "%d -> %d\n", r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r),
 	    old_ws->idx, wsid);
 
-	/* get focus window */
-	if (new_ws->focus)
-		winfocus = new_ws->focus;
-	else if (new_ws->focus_prev)
-		winfocus = new_ws->focus_prev;
+	if (new_ws == old_ws)
+		return;
 
+	/* get focus window */
 	if (new_ws->focus)
 		winfocus = new_ws->focus;
 	else if (new_ws->focus_prev)
 		winfocus = new_ws->focus_prev;
-
-	if (new_ws == old_ws)
-		return;
+	else
+		winfocus = TAILQ_FIRST(&new_ws->winlist);
 
 	other_r = new_ws->r;
-	if (!other_r) {
+	if (other_r == NULL) {
 		/* if the other workspace is hidden, switch windows */
 		/* map new window first to prevent ugly blinking */
 		old_ws->r = NULL;
@@ -3189,7 +3188,7 @@ manage_window(Window id)
 {
 	Window			trans;
 	struct workspace	*ws;
-	struct ws_win		*win;
+	struct ws_win		*win, *ww;
 	int			format, i, ws_idx, n;
 	unsigned long		nitems, bytes;
 	Atom			ws_idx_atom = 0, type;
@@ -3242,8 +3241,17 @@ manage_window(Window id)
 			    errstr, prop);
 		}
 		ws = &r->s->ws[ws_idx];
-	} else
+	} else {
 		ws = r->ws;
+		/* this should launch transients in the same ws as parent */
+		/* XXX doesn't work for intel xrandr */
+		if (id && trans) {
+			if ((ww = find_window(trans)) != NULL) {
+				ws = ww->ws;
+				r = ws->r;
+			}
+		}
+	}
 
 	/* set up the window layout */
 	win->id = id;
@@ -3316,9 +3324,6 @@ manage_window(Window id)
 	if (win->floating && (ws->idx == r->ws->idx))
 		XMapRaised(display, win->id);
 
-	/* make new win focused */
-	focus_win(win);
-
 	return (win);
 }
 
@@ -3333,20 +3338,6 @@ unmanage_window(struct ws_win *win)
 	DNPRINTF(SWM_D_MISC, "unmanage_window:  %lu\n", win->id);
 
 	ws = win->ws;
-
-	/* find a window to focus */
-	if (ws->focus == win)
-		ws->focus = TAILQ_PREV(win, ws_win_list, entry);
-	if (ws->focus == NULL)
-		ws->focus = TAILQ_FIRST(&ws->winlist);
-	if (ws->focus == NULL || ws->focus == win) {
-		ws->focus = NULL;
-		unfocus_win(win);
-	} else
-		focus_win(ws->focus);
-	if (ws->focus_prev == win)
-		ws->focus_prev = NULL;
-
 	TAILQ_REMOVE(&win->ws->winlist, win, entry);
 	set_win_state(win, WithdrawnState);
 	if (win->ch.res_class)
@@ -3438,14 +3429,32 @@ configurenotify(XEvent *e)
 void
 destroynotify(XEvent *e)
 {
-	struct ws_win		*win;
+	struct ws_win		*win, *winfocus = NULL;
+	struct workspace	*ws;
+	struct ws_win_list	*wl;
+
 	XDestroyWindowEvent	*ev = &e->xdestroywindow;
 
 	DNPRINTF(SWM_D_EVENT, "destroynotify: window %lu\n", ev->window);
 
 	if ((win = find_window(ev->window)) != NULL) {
+		/* find a window to focus */
+		ws = win->ws;
+		wl = &ws->winlist;
+		if (ws->focus == win) {
+			if (TAILQ_FIRST(wl) == win)
+				winfocus = TAILQ_NEXT(win, entry);
+			else {
+				winfocus = TAILQ_PREV(ws->focus, ws_win_list, entry);
+				if (winfocus == NULL)
+					winfocus = TAILQ_LAST(wl, ws_win_list);
+			}
+		}
+
 		unmanage_window(win);
 		stack();
+		if (winfocus)
+			focus_win(winfocus);
 	}
 }
 
@@ -3462,6 +3471,12 @@ enternotify(XEvent *e)
 		ignore_enter--;
 		return;
 	}
+	/*
+	 * happens when a window is created or destroyed and the border
+	 * crosses the mouse pointer
+	 */
+	if (QLength(display))
+		return;
 
 	if ((win = find_window(ev->window)) != NULL)
 		focus_win(win);
@@ -3494,6 +3509,9 @@ mappingnotify(XEvent *e)
 void
 maprequest(XEvent *e)
 {
+	struct ws_win		*win;
+	struct swm_region	*r;
+
 	XMapRequestEvent	*ev = &e->xmaprequest;
 	XWindowAttributes	wa;
 
@@ -3504,9 +3522,16 @@ maprequest(XEvent *e)
 		return;
 	if (wa.override_redirect)
 		return;
+
 	manage_window(e->xmaprequest.window);
 
 	stack();
+
+	/* make new win focused */
+	win = find_window(ev->window);
+	r = root_to_region(win->wa.root);
+	if (win->ws == r->ws) /* XXX this probably breaks multi screen */
+		focus_win(win);
 }
 
 void
@@ -3883,6 +3908,9 @@ setup_globals(void)
 	if ((bar_fonts[1] = strdup("-*-times-medium-r-*-*-*-*-*-*-*-*-*-*"))
 	    == NULL)
 		err(1, "setup_globals: strdup");
+	if ((bar_fonts[2] = strdup("-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*"))
+	    == NULL)
+		err(1, "setup_globals: strdup");
 	if ((spawn_term[0] = strdup("xterm")) == NULL)
 		err(1, "setup_globals: strdup");
 }