X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=b250a20d66cb1b06b8a5b354eb4f6bbadaac2f11;hb=c03f2b39723401419d2a25d62f1b681128052259;hp=75c7a6cc7ddbe78b597bf9c71ceac86a3e2df770;hpb=43af7f1229fa4a5fbbc749733a08a5fb4ebfec24;p=spectrwm.git

diff --git a/spectrwm.c b/spectrwm.c
index 75c7a6c..b250a20 100644
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -128,6 +128,7 @@ static const char	*buildstr = SPECTRWM_VERSION;
 #define XCB_ICCCM_SIZE_HINT_P_MIN_SIZE		XCB_SIZE_HINT_P_MIN_SIZE
 #define XCB_ICCCM_SIZE_HINT_P_MAX_SIZE		XCB_SIZE_HINT_P_MAX_SIZE
 #define XCB_ICCCM_SIZE_HINT_P_RESIZE_INC	XCB_SIZE_HINT_P_RESIZE_INC
+#define XCB_ICCCM_WM_HINT_INPUT			XCB_WM_HINT_INPUT
 #define XCB_ICCCM_WM_HINT_X_URGENCY		XCB_WM_HINT_X_URGENCY
 #define XCB_ICCCM_WM_STATE_ICONIC		XCB_WM_STATE_ICONIC
 #define XCB_ICCCM_WM_STATE_WITHDRAWN		XCB_WM_STATE_WITHDRAWN
@@ -490,6 +491,7 @@ struct workspace {
 	struct layout		*cur_layout;	/* current layout handlers */
 	struct ws_win		*focus;		/* may be NULL */
 	struct ws_win		*focus_prev;	/* may be NULL */
+	struct ws_win		*focus_pending;	/* may be NULL */
 	struct swm_region	*r;		/* may be NULL */
 	struct swm_region	*old_r;		/* may be NULL */
 	struct ws_win_list	winlist;	/* list of windows in ws */
@@ -2847,6 +2849,8 @@ switchws(struct swm_region *r, union arg *args)
 	if (new_ws == old_ws)
 		return;
 
+	unfocus_win(old_ws->focus);
+
 	other_r = new_ws->r;
 	if (other_r == NULL) {
 		/* the other workspace is hidden, hide this one */
@@ -2862,8 +2866,6 @@ switchws(struct swm_region *r, union arg *args)
 	this_r->ws = new_ws;
 	new_ws->r = this_r;
 
-	unmap_window(old_ws->focus);
-
 	stack();
 
 	/* unmap old windows */
@@ -2871,16 +2873,16 @@ switchws(struct swm_region *r, union arg *args)
 		TAILQ_FOREACH(win, &old_ws->winlist, entry)
 			unmap_window(win);
 
-	new_ws->focus = get_region_focus(new_ws->r);
-
-	/* unmap old windows */
-	if (unmap_old)
-		TAILQ_FOREACH(win, &old_ws->winlist, entry)
-			unmap_window(win);
+	new_ws->focus_pending = get_region_focus(new_ws->r);
 
-	/* make sure bar gets updated if ws is empty */
-	if (!new_ws->focus)
+	if (new_ws->focus_pending) {
+		/* if workspaces were swapped, then don't wait to set focus */
+		if (old_ws->r)
+			focus_win(new_ws->focus);
+	} else {
+		/* make sure bar gets updated if ws is empty */
 		bar_update();
+	}
 
 	focus_flush();
 
@@ -3521,7 +3523,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 	int			w_inc = 1, h_inc, w_base = 1, h_base;
 	int			hrh, extra = 0, h_slice, last_h = 0;
 	int			split, colno, winno, mwin, msize, mscale;
-	int			remain, missing, v_slice, reconfigure;
+	int			remain, missing, v_slice, reconfigure = 0;
 	int			bordered = 1;
 
 	DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d, rot: %s, "
@@ -6562,7 +6564,7 @@ conf_load(char *filename, int keymapping)
 			    filename, lineno, wordlen, cp);
 			goto out;
 		}
-		if (keymapping && strcmp(opt->optname, "bind")) {
+		if (keymapping && opt && strcmp(opt->optname, "bind")) {
 			warnx("%s: line %zd: invalid option %.*s",
 			    filename, lineno, wordlen, cp);
 			goto out;
@@ -6750,12 +6752,12 @@ manage_window(xcb_window_t id, uint16_t mapped)
 {
 	xcb_window_t		trans = XCB_WINDOW_NONE;
 	struct ws_win		*win, *ww;
-	int			ws_idx, border_me = 0;
+	int			ws_idx;
 	char			ws_idx_str[SWM_PROPLEN];
 	struct swm_region	*r;
 	struct pid_e		*p;
 	struct quirk		*qp;
-	uint32_t		event_mask, i;
+	uint32_t		i, wa[2];
 	xcb_icccm_get_wm_protocols_reply_t	wpr;
 
 	if ((win = find_window(id)) != NULL) {
@@ -6796,9 +6798,9 @@ manage_window(xcb_window_t id, uint16_t mapped)
 	/* Ignore window border if there is one. */
 	WIDTH(win) = win->wa->width;
 	HEIGHT(win) = win->wa->height;
-	X(win) = win->wa->x + win->wa->border_width;
-	Y(win) = win->wa->y + win->wa->border_width;
-	win->bordered = 0;
+	X(win) = win->wa->x + win->wa->border_width - border_width;
+	Y(win) = win->wa->y + win->wa->border_width - border_width;
+	win->bordered = 1;
 	win->mapped = mapped;
 	win->floatmaxed = 0;
 	win->ewmh_flags = 0;
@@ -6853,7 +6855,6 @@ manage_window(xcb_window_t id, uint16_t mapped)
 	} else if (trans && (ww = find_window(trans)) != NULL) {
 		/* Launch transients in the same ws as parent. */
 		win->ws = ww->ws;
-		border_me = 1;
 	} else {
 		win->ws = r->ws;
 	}
@@ -6883,7 +6884,6 @@ manage_window(xcb_window_t id, uint16_t mapped)
 			DNPRINTF(SWM_D_CLASS, "manage_window: java window "
 			    "detected.\n");
 			win->java = 1;
-			border_me = 1;
 		}
 
 		TAILQ_FOREACH(qp, &quirks, entry) {
@@ -6891,20 +6891,16 @@ manage_window(xcb_window_t id, uint16_t mapped)
 			    !strcmp(win->ch.instance_name, qp->name)) {
 				DNPRINTF(SWM_D_CLASS, "manage_window: on quirks"
 				    "list; mask: 0x%lx\n", qp->quirk);
-				if (qp->quirk & SWM_Q_FLOAT) {
+				if (qp->quirk & SWM_Q_FLOAT)
 					win->floating = 1;
-					border_me = 1;
-				}
 				win->quirks = qp->quirk;
 			}
 		}
 	}
 
 	/* Alter window position if quirky */
-	if (win->quirks & SWM_Q_ANYWHERE) {
+	if (win->quirks & SWM_Q_ANYWHERE)
 		win->manual = 1;
-		border_me = 1;
-	}
 
 	/* Reset font sizes (the bruteforce way; no default keybinding). */
 	if (win->quirks & SWM_Q_XTERM_FONTADJ) {
@@ -6914,28 +6910,23 @@ manage_window(xcb_window_t id, uint16_t mapped)
 			fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT);
 	}
 
-	if (border_me) {
-		win->bordered = 1;
-		X(win) -= border_width;
-		Y(win) -= border_width;
-	}
-
 	/* Make sure window is positioned inside its region, if its active. */
-	if (win->ws->r)
+	if (win->ws->r) {
 		constrain_window(win, win->ws->r, 0);
-
-	if (win->ws->r || border_me)
 		update_window(win);
+	}
+
 
-	/* Select which X events to monitor. */
-	event_mask = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE |
-	    XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY;
+	/* Select which X events to monitor and set border pixel color. */
+	wa[0] = win->s->c[SWM_S_COLOR_UNFOCUS].pixel;
+	wa[1] = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_PROPERTY_CHANGE |
+	    XCB_EVENT_MASK_STRUCTURE_NOTIFY;
 #ifdef SWM_DEBUG
-	event_mask |= XCB_EVENT_MASK_LEAVE_WINDOW;
+	wa[1] |= XCB_EVENT_MASK_LEAVE_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE;
 #endif
 
-	xcb_change_window_attributes(conn, win->id, XCB_CW_EVENT_MASK,
-	    &event_mask);
+	xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL |
+	    XCB_CW_EVENT_MASK, wa);
 
 out:
 	/* Figure out where to stack the window in the workspace. */
@@ -7012,8 +7003,6 @@ unmanage_window(struct ws_win *win)
 			parent->focus_child = NULL;
 	}
 
-	focus_win(get_focus_prev(win));
-
 	TAILQ_REMOVE(&win->ws->winlist, win, entry);
 	TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry);
 }
@@ -7317,14 +7306,20 @@ destroynotify(xcb_destroy_notify_event_t *e)
 		return;
 	}
 
-	/* make sure we focus on something */
-	win->floating = 0;
+	/* If we were focused, make sure we focus on something else. */
+	if (win == win->ws->focus)
+		win->ws->focus_pending = get_focus_prev(win);
 
 	unmanage_window(win);
-	free_window(win);
-
 	stack();
 
+	if (win->ws->focus_pending) {
+		focus_win(win->ws->focus_pending);
+		win->ws->focus_pending = NULL;
+	}
+
+	free_window(win);
+
 	focus_flush();
 }
 
@@ -7455,9 +7450,10 @@ mapnotify(xcb_map_notify_event_t *e)
 	win->mapped = 1;
 	set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL);
 
-	/* Focus on window if it is selected. */
-	if (win->ws->focus == win)
+	if (win->ws->focus_pending == win) {
 		focus_win(win);
+		win->ws->focus_pending = NULL;
+	}
 
 	xcb_flush(conn);
 }
@@ -7502,7 +7498,7 @@ maprequest(xcb_map_request_event_t *e)
 		stack();
 
 	/* The new window should get focus. */
-	win->ws->focus = get_focus_magic(win);
+	win->ws->focus_pending = get_focus_magic(win);
 
 	/* Ignore EnterNotify to handle the mapnotify without interference. */
 	if (focus_mode == SWM_FOCUS_DEFAULT)
@@ -7567,17 +7563,13 @@ propertynotify(xcb_property_notify_event_t *e)
 	if (e->atom == a_swm_iconic) {
 		if (e->state == XCB_PROPERTY_DELETE) {
 			/* The window is no longer iconic, restack ws. */
+			win->ws->focus_pending = get_focus_magic(win);
 			stack();
 
-			/* The window should get focus. */
-			win->ws->focus = get_focus_magic(win);
-
 			/* Flush EnterNotify for mapnotify, if needed. */
 			focus_flush();
 			return;
 		} else if (e->state == XCB_PROPERTY_NEW_VALUE) {
-			win->ws->focus = NULL;
-
 			unfocus_win(win);
 			unmap_window(win);
 
@@ -7588,9 +7580,11 @@ propertynotify(xcb_property_notify_event_t *e)
 			}
 		}
 	} else if (e->atom == a_state && e->state == XCB_PROPERTY_NEW_VALUE) {
-		/* Focus on window if it is selected. */
-		if (win->ws->focus == win)
+		/* State just changed, make sure it gets focused if mapped. */
+		if (win->mapped && win->ws->focus_pending == win) {
+			win->ws->focus_pending = NULL;
 			focus_win(win);
+		}
 	}
 
 	switch (e->atom) {
@@ -7618,8 +7612,18 @@ unmapnotify(xcb_unmap_notify_event_t *e)
 		return;
 
 	if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL) {
+		/* If we were focused, make sure we focus on something else. */
+		if (win == win->ws->focus)
+			win->ws->focus_pending = get_focus_prev(win);
+
 		unmanage_window(win);
 		stack();
+
+		if (win->ws->focus_pending) {
+			focus_win(win->ws->focus_pending);
+			win->ws->focus_pending = NULL;
+		}
+
 		focus_flush();
 	}
 }
@@ -8096,6 +8100,8 @@ setup_screens(void)
 			ws->idx = j;
 			ws->name = NULL;
 			ws->focus = NULL;
+			ws->focus_prev = NULL;
+			ws->focus_pending = NULL;
 			ws->r = NULL;
 			ws->old_r = NULL;
 			TAILQ_INIT(&ws->winlist);