#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
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 */
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 */
this_r->ws = new_ws;
new_ws->r = this_r;
- unfocus_win(old_ws->focus);
-
stack();
/* unmap old windows */
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();
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, "
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;
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);
}
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();
}
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);
}
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)
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);
}
}
} 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) {
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();
}
}
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);