]> code.delx.au - spectrwm/blobdiff - spectrwm.c
add remaining missing prototypes
[spectrwm] / spectrwm.c
index e45a28d209701489b111407ad98e5fa305a88e08..3da4be032ce0ddd1a85171bae64334ee645d6eb8 100644 (file)
@@ -90,6 +90,7 @@
 #include <util.h>
 #include <X11/cursorfont.h>
 #include <X11/extensions/Xrandr.h>
+#include <X11/Xcursor/Xcursor.h>
 #include <X11/Xft/Xft.h>
 #include <X11/Xlib-xcb.h>
 #include <xcb/xcb_atom.h>
@@ -672,43 +673,250 @@ struct ewmh_hint {
     {"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE},
 };
 
+/* Cursors */
+enum {
+       XC_FLEUR,
+       XC_LEFT_PTR,
+       XC_BOTTOM_LEFT_CORNER,
+       XC_BOTTOM_RIGHT_CORNER,
+       XC_SIZING,
+       XC_TOP_LEFT_CORNER,
+       XC_TOP_RIGHT_CORNER,
+       XC_MAX
+};
+
+struct cursors {
+       char            *name; /* Name used by Xcursor .*/
+       uint8_t         cf_char; /* cursorfont index. */
+       xcb_cursor_t    cid;
+} cursors[XC_MAX] =    {
+       {"fleur", XC_fleur, XCB_CURSOR_NONE},
+       {"left_ptr", XC_left_ptr, XCB_CURSOR_NONE},
+       {"bottom_left_corner", XC_bottom_left_corner, XCB_CURSOR_NONE},
+       {"bottom_right_corner", XC_bottom_right_corner, XCB_CURSOR_NONE},
+       {"sizing", XC_sizing, XCB_CURSOR_NONE},
+       {"top_left_corner", XC_top_left_corner, XCB_CURSOR_NONE},
+       {"top_right_corner", XC_top_right_corner, XCB_CURSOR_NONE},
+};
+
+/* spawn */
+struct spawn_prog {
+       TAILQ_ENTRY(spawn_prog) entry;
+       char                    *name;
+       int                     argc;
+       char                    **argv;
+};
+TAILQ_HEAD(spawn_list, spawn_prog);
+struct spawn_list              spawns = TAILQ_HEAD_INITIALIZER(spawns);
+
+/* user/key callable function IDs */
+enum keyfuncid {
+       KF_BAR_TOGGLE,
+       KF_BUTTON2,
+       KF_CYCLE_LAYOUT,
+       KF_FLIP_LAYOUT,
+       KF_FLOAT_TOGGLE,
+       KF_FOCUS_MAIN,
+       KF_FOCUS_NEXT,
+       KF_FOCUS_PREV,
+       KF_HEIGHT_GROW,
+       KF_HEIGHT_SHRINK,
+       KF_ICONIFY,
+       KF_MASTER_SHRINK,
+       KF_MASTER_GROW,
+       KF_MASTER_ADD,
+       KF_MASTER_DEL,
+       KF_MOVE_DOWN,
+       KF_MOVE_LEFT,
+       KF_MOVE_RIGHT,
+       KF_MOVE_UP,
+       KF_MVWS_1,
+       KF_MVWS_2,
+       KF_MVWS_3,
+       KF_MVWS_4,
+       KF_MVWS_5,
+       KF_MVWS_6,
+       KF_MVWS_7,
+       KF_MVWS_8,
+       KF_MVWS_9,
+       KF_MVWS_10,
+       KF_MVWS_11,
+       KF_MVWS_12,
+       KF_MVWS_13,
+       KF_MVWS_14,
+       KF_MVWS_15,
+       KF_MVWS_16,
+       KF_MVWS_17,
+       KF_MVWS_18,
+       KF_MVWS_19,
+       KF_MVWS_20,
+       KF_MVWS_21,
+       KF_MVWS_22,
+       KF_NAME_WORKSPACE,
+       KF_QUIT,
+       KF_RAISE_TOGGLE,
+       KF_RESTART,
+       KF_SCREEN_NEXT,
+       KF_SCREEN_PREV,
+       KF_SEARCH_WIN,
+       KF_SEARCH_WORKSPACE,
+       KF_SPAWN_CUSTOM,
+       KF_STACK_INC,
+       KF_STACK_DEC,
+       KF_STACK_RESET,
+       KF_SWAP_MAIN,
+       KF_SWAP_NEXT,
+       KF_SWAP_PREV,
+       KF_UNICONIFY,
+       KF_VERSION,
+       KF_WIDTH_GROW,
+       KF_WIDTH_SHRINK,
+       KF_WIND_DEL,
+       KF_WIND_KILL,
+       KF_WS_1,
+       KF_WS_2,
+       KF_WS_3,
+       KF_WS_4,
+       KF_WS_5,
+       KF_WS_6,
+       KF_WS_7,
+       KF_WS_8,
+       KF_WS_9,
+       KF_WS_10,
+       KF_WS_11,
+       KF_WS_12,
+       KF_WS_13,
+       KF_WS_14,
+       KF_WS_15,
+       KF_WS_16,
+       KF_WS_17,
+       KF_WS_18,
+       KF_WS_19,
+       KF_WS_20,
+       KF_WS_21,
+       KF_WS_22,
+       KF_WS_NEXT,
+       KF_WS_NEXT_ALL,
+       KF_WS_PREV,
+       KF_WS_PREV_ALL,
+       KF_WS_PRIOR,
+       KF_DUMPWINS, /* MUST BE LAST */
+       KF_INVALID
+};
+
+struct key {
+        RB_ENTRY(key)           entry;
+        unsigned int            mod;
+        KeySym                  keysym;
+        enum keyfuncid          funcid;
+        char                    *spawn_name;
+};
+RB_HEAD(key_tree, key);
+
 /* function prototypes */
+void    adjust_font(struct ws_win *);
+void    bar_class_name(char *, size_t, struct swm_region *);
+void    bar_class_title_name(char *, size_t, struct swm_region *);
+void    bar_cleanup(struct swm_region *);
+void    bar_extra_stop(void);
+void    bar_fmt(const char *, char *, struct swm_region *, size_t);
+void    bar_fmt_expand(char *, size_t);
+void    bar_fmt_print(void);
+void    bar_print(struct swm_region *, const char *);
+void    bar_print_legacy(struct swm_region *, const char *);
+void    bar_refresh(void);
+void    bar_replace(char *, char *, struct swm_region *, size_t);
+void    bar_replace_pad(char *, int *, size_t);
+char *  bar_replace_seq(char *, char *, struct swm_region *, size_t *,
+            size_t);
+void    bar_setup(struct swm_region *);
+void    bar_signal(int);
+void    bar_title_name(char *, size_t, struct swm_region *);
+void    bar_toggle(struct swm_region *, union arg *);
+void    bar_update(void);
+void    bar_urgent(char *, size_t);
+void    bar_window_float(char *, size_t, struct swm_region *);
+void    bar_window_name(char *, size_t, struct swm_region *);
+void    bar_workspace_name(char *, size_t, struct swm_region *);
 void    buttonpress(xcb_button_press_event_t *);
 void    check_conn(void);
+void    clear_keys(void);
 void    clientmessage(xcb_client_message_event_t *);
-int     conf_load(char *, int);
+void    client_msg(struct ws_win *, xcb_atom_t, xcb_timestamp_t);
+int     conf_load(const char *, int);
 void    configurenotify(xcb_configure_notify_event_t *);
 void    configurerequest(xcb_configure_request_event_t *);
+void    config_win(struct ws_win *, xcb_configure_request_event_t *);
 void    constrain_window(struct ws_win *, struct swm_region *, int);
+int     count_win(struct workspace *, int);
+void    cursors_cleanup(void);
+void    cursors_load(void);
+void    custom_region(char *);
+void    cyclescr(struct swm_region *, union arg *);
+void    cyclews(struct swm_region *, union arg *);
+void    cycle_layout(struct swm_region *, union arg *);
 void    destroynotify(xcb_destroy_notify_event_t *);
+void    dumpwins(struct swm_region *, union arg *);
+int     enable_wm(void);
 void    enternotify(xcb_enter_notify_event_t *);
 void    event_drain(uint8_t);
 void    event_error(xcb_generic_error_t *);
 void    event_handle(xcb_generic_event_t *);
-char   *expand_tilde(char *);
+void    ewmh_autoquirk(struct ws_win *);
+void    ewmh_get_win_state(struct ws_win *);
+int     ewmh_set_win_fullscreen(struct ws_win *, int);
+void    ewmh_update_actions(struct ws_win *);
+void    ewmh_update_win_state(struct ws_win *, xcb_atom_t, long);
+char   *expand_tilde(const char *);
 void    expose(xcb_expose_event_t *);
+void    fake_keypress(struct ws_win *, xcb_keysym_t, uint16_t);
+struct pid_e   *find_pid(pid_t);
+struct ws_win  *find_unmanaged_window(xcb_window_t); 
 struct ws_win  *find_window(xcb_window_t);
+void    floating_toggle(struct swm_region *, union arg *);
 int     floating_toggle_win(struct ws_win *);
 void    focus(struct swm_region *, union arg *);
-void    focus_flush(void);
-struct ws_win  *get_focus_magic(struct ws_win *);
-struct ws_win  *get_focus_prev(struct ws_win *);
-void    focus_win(struct ws_win *);
 #ifdef SWM_DEBUG
 void    focusin(xcb_focus_in_event_t *);
+void    focusout(xcb_focus_out_event_t *);
 #endif
+void    focus_flush(void);
+void    focus_win(struct ws_win *);
+void    fontset_init(void);
+void    free_window(struct ws_win *);
 xcb_atom_t get_atom_from_string(const char *);
 #ifdef SWM_DEBUG
 char   *get_atom_name(xcb_atom_t);
+#endif
+struct ws_win   *get_focus_magic(struct ws_win *);
+struct ws_win   *get_focus_prev(struct ws_win *);
+#ifdef SWM_DEBUG
 char   *get_notify_detail_label(uint8_t);
 char   *get_notify_mode_label(uint8_t);
 #endif
+struct ws_win  *get_pointer_win(xcb_window_t);
 struct ws_win  *get_region_focus(struct swm_region *);
 xcb_screen_t   *get_screen(int);
+#ifdef SWM_DEBUG
+char   *get_stack_mode_name(uint8_t);
+#endif
+int32_t         get_swm_iconic(struct ws_win *);
 char   *get_win_name(xcb_window_t);
+int     get_ws_idx(xcb_window_t);
 uint32_t getstate(xcb_window_t);
 void    grabbuttons(struct ws_win *);
+void    grabkeys(void);
+void    grab_windows(void);
+void    iconify(struct swm_region *, union arg *);
+int     isxlfd(char *);
 void    keypress(xcb_key_press_event_t *);
+int     key_cmp(struct key *, struct key *);
+void    key_insert(unsigned int, KeySym, enum keyfuncid, const char *);
+struct key     *key_lookup(unsigned int, KeySym);
+void    key_remove(struct key *);
+void    key_replace(struct key *, unsigned int, KeySym, enum keyfuncid,
+            const char *);
+void    kill_refs(struct ws_win *);
 #ifdef SWM_DEBUG
 void    leavenotify(xcb_leave_notify_event_t *);
 #endif
@@ -718,21 +926,146 @@ void      map_window(struct ws_win *);
 void    mapnotify(xcb_map_notify_event_t *);
 void    mappingnotify(xcb_mapping_notify_event_t *);
 void    maprequest(xcb_map_request_event_t *);
+void    move(struct ws_win *, union arg *);
+void    move_step(struct swm_region *, union arg *);
+uint32_t name_to_pixel(const char *);
+void    name_workspace(struct swm_region *, union arg *);
 void    new_region(struct swm_screen *, int, int, int, int);
+int     parsekeys(char *, unsigned int, unsigned int *, KeySym *);
+int     parsequirks(char *, unsigned long *);
 int     parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *);
+void    pressbutton(struct swm_region *, union arg *);
+void    priorws(struct swm_region *, union arg *);
+#ifdef SWM_DEBUG
+void    print_win_geom(xcb_window_t);
+#endif
 void    propertynotify(xcb_property_notify_event_t *);
-void    spawn_select(struct swm_region *, union arg *, char *, int *);
+void    quirk_insert(const char *, const char *, unsigned long);
+void    quirk_remove(struct quirk *);
+void    quirk_replace(struct quirk *, const char *, const char *,
+            unsigned long);
+void    quit(struct swm_region *, union arg *);
+void    raise_toggle(struct swm_region *, union arg *);
+void    resize(struct ws_win *, union arg *);
+void    resize_step(struct swm_region *, union arg *);
+void    restart(struct swm_region *, union arg *);
+struct swm_region      *root_to_region(xcb_window_t, int);
 void    screenchange(xcb_randr_screen_change_notify_event_t *);
+void    scan_xrandr(int);
+void    search_do_resp(void);
+void    search_resp_name_workspace(const char *, unsigned long);
+void    search_resp_search_window(const char *);
+void    search_resp_search_workspace(const char *);
+void    search_resp_uniconify(const char *, unsigned long);
+void    search_win(struct swm_region *, union arg *);
+void    search_win_cleanup(void);
+void    search_workspace(struct swm_region *, union arg *);
+void    send_to_ws(struct swm_region *, union arg *);
+int     setautorun(char *, char *, int);
+int     setconfbinding(char *, char *, int);
+int     setconfcolor(char *, char *, int);
+int     setconfmodkey(char *, char *, int);
+int     setconfquirk(char *, char *, int);
+int     setconfregion(char *, char *, int);
+int     setconfspawn(char *, char *, int);
+int     setconfvalue(char *, char *, int);
+void    setkeybinding(unsigned int, KeySym, enum keyfuncid, const char *);
+int     setkeymapping(char *, char *, int);
+int     setlayout(char *, char *, int);
+void    setquirk(const char *, const char *, unsigned long);
+void    setscreencolor(char *, int, int);
+void    setspawn(const char *, const char *);
+void    setup_ewmh(void);
+void    setup_globals(void);
+void    setup_keys(void);
+void    setup_quirks(void);
+void    setup_screens(void);
+void    setup_spawn(void);
+void    set_child_transient(struct ws_win *, xcb_window_t *);
+void    set_swm_iconic(struct ws_win *, int);
+void    set_win_state(struct ws_win *, uint16_t);
 void    shutdown_cleanup(void);
+void    sighdlr(int);
+void    socket_setnonblock(int);
+void    sort_windows(struct ws_win_list *);
+void    spawn(int, union arg *, int);
+void    spawn_custom(struct swm_region *, union arg *, const char *);
+int     spawn_expand(struct swm_region *, union arg *, const char *, char ***);
+void    spawn_insert(const char *, const char *);
+void    spawn_remove(struct spawn_prog *);
+void    spawn_replace(struct spawn_prog *, const char *, const char *);
+void    spawn_select(struct swm_region *, union arg *, const char *, int *);
+void    stack_config(struct swm_region *, union arg *);
+void    stack_floater(struct ws_win *, struct swm_region *);
+void    stack_master(struct workspace *, struct swm_geometry *, int, int);
 void    store_float_geom(struct ws_win *, struct swm_region *);
+char *  strdupsafe(const char *);
+void    swapwin(struct swm_region *, union arg *);
+void    switchws(struct swm_region *, union arg *);
+void    teardown_ewmh(void);
+void    unfocus_win(struct ws_win *);
+void    uniconify(struct swm_region *, union arg *);
 void    unmanage_window(struct ws_win *);
 void    unmapnotify(xcb_unmap_notify_event_t *);
-void    unfocus_win(struct ws_win *);
+void    unmap_all(void);
+void    unmap_window(struct ws_win *);
+void    updatenumlockmask(void);
+void    update_modkey(unsigned int);
 void    update_window(struct ws_win *);
+int     validate_win(struct ws_win *);
+int     validate_ws(struct workspace *);
 /*void  visibilitynotify(xcb_visibility_notify_event_t *);*/
+void    version(struct swm_region *, union arg *);
+pid_t   window_get_pid(xcb_window_t);
+void    wkill(struct swm_region *, union arg *);
+void    workaround(void);
+void    xft_init(struct swm_region *);
+
+RB_PROTOTYPE(key_tree, key, entry, key_cmp);
+RB_GENERATE(key_tree, key, entry, key_cmp);
+struct key_tree                 keys;
+
+void
+cursors_load(void)
+{
+       xcb_font_t      cf = XCB_NONE;
+       int             i;
+
+       for (i = 0; i < LENGTH(cursors); ++i) {
+               /* try to load Xcursor first. */
+               cursors[i].cid = XcursorLibraryLoadCursor(display,
+                   cursors[i].name);
+
+               /* fallback to cursorfont. */
+               if (cursors[i].cid == XCB_CURSOR_NONE) {
+                       if (cf == XCB_NONE) {
+                               cf = xcb_generate_id(conn);
+                               xcb_open_font(conn, cf, strlen("cursor"),
+                                   "cursor");
+                       }
+
+                       cursors[i].cid = xcb_generate_id(conn);
+                       xcb_create_glyph_cursor(conn, cursors[i].cid, cf, cf,
+                           cursors[i].cf_char, cursors[i].cf_char + 1, 0, 0, 0,
+                           0xffff, 0xffff, 0xffff);
+
+               }
+       }
+
+       if (cf != XCB_NONE)
+               xcb_close_font(conn, cf);
+}
+
+void
+cursors_cleanup(void)
+{
+       int     i;
+       for (i = 0; i < LENGTH(cursors); ++i)
+               xcb_free_cursor(conn, cursors[i].cid);
+}
 
 char *
-expand_tilde(char *s)
+expand_tilde(const char *s)
 {
        struct passwd           *ppwd;
        int                     i, max;
@@ -762,6 +1095,8 @@ expand_tilde(char *s)
        s = &s[i];
 
        ppwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user);
+       free(user);
+
        if (ppwd == NULL)
                result = strdup(sc);
        else
@@ -1982,7 +2317,7 @@ isxlfd(char *s)
 }
 
 void
-fontset_init()
+fontset_init(void)
 {
        char                    *default_string;
        char                    **missing_charsets;
@@ -2449,6 +2784,28 @@ restart(struct swm_region *r, union arg *args)
        quit(NULL, NULL);
 }
 
+struct ws_win *
+get_pointer_win(xcb_window_t root)
+{
+       struct ws_win                   *win = NULL;
+       xcb_query_pointer_reply_t       *r;
+
+       DNPRINTF(SWM_D_EVENT, "get_pointer_win: root: 0x%x.\n", root);
+
+       r = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, root), NULL);
+       if (r) {
+               win = find_window(r->child);
+               if (win) {
+                       DNPRINTF(SWM_D_EVENT, "get_pointer_win: 0x%x.\n",
+                           win->id);
+               } else {
+                       DNPRINTF(SWM_D_EVENT, "get_pointer_win: none.\n");
+               }
+       }
+
+       return win;
+}
+
 struct swm_region *
 root_to_region(xcb_window_t root, int check)
 {
@@ -2731,7 +3088,8 @@ unfocus_win(struct ws_win *win)
 void
 focus_win(struct ws_win *win)
 {
-       struct ws_win                   *cfw = NULL;
+       struct ws_win                   *cfw = NULL, *parent = NULL, *w;
+       struct workspace                *ws;
        xcb_get_input_focus_reply_t     *r;
 
        DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%x\n", WINID(win));
@@ -2742,7 +3100,9 @@ focus_win(struct ws_win *win)
        if (win->ws == NULL)
                goto out;
 
-       if (validate_ws(win->ws))
+       ws = win->ws;
+
+       if (validate_ws(ws))
                goto out;
 
        if (validate_win(win)) {
@@ -2758,13 +3118,24 @@ focus_win(struct ws_win *win)
                free(r);
        }
 
-       if (win->ws->focus != win) {
-               if (win->ws->focus && win->ws->focus != cfw)
-                       unfocus_win(win->ws->focus);
-               win->ws->focus = win;
+       if (ws->focus != win) {
+               if (ws->focus && ws->focus != cfw)
+                       unfocus_win(ws->focus);
+               ws->focus = win;
        }
 
-       if (cfw != win && win->ws->r != NULL) {
+       /* If this window directs focus to a child window, then clear. */
+       if (win->focus_child)
+               win->focus_child = NULL;
+
+       /* If transient, adjust parent's focus child for focus_magic. */
+       if (win->transient) {
+               parent = find_window(win->transient);
+               if (parent && parent->focus_child != win)
+                       parent->focus_child = win;
+       }
+
+       if (cfw != win && ws->r != NULL) {
                /* Set input focus if no input hint, or indicated by hint. */
                if (!(win->hints.flags & XCB_ICCCM_WM_HINT_INPUT) ||
                    (win->hints.flags & XCB_ICCCM_WM_HINT_INPUT &&
@@ -2776,19 +3147,38 @@ focus_win(struct ws_win *win)
                if (win->take_focus) {
                        /* java is special; always tell parent */
                        if (win->transient && win->java)
-                               client_msg(find_window(win->transient),
-                                   a_takefocus, last_event_time);
+                               client_msg(parent, a_takefocus,
+                                   last_event_time);
                        else
                                client_msg(win, a_takefocus, last_event_time);
                }
 
                xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL,
-                   &win->ws->r->s->c[SWM_S_COLOR_FOCUS].pixel);
+                   &ws->r->s->c[SWM_S_COLOR_FOCUS].pixel);
+
+               if (ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
+                   ws->always_raise) {
+                       /* If a parent exists, map it first. */
+                       if (parent) {
+                               map_window(parent);
+
+                               /* Map siblings next. */
+                               TAILQ_FOREACH(w, &ws->winlist, entry)
+                                       if (w != win && !w->iconic &&
+                                           w->transient == parent->id)
+                                               map_window(w);
+                       }
 
-               if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS ||
-                   win->ws->always_raise)
+                       /* Map focused window. */
                        map_window(win);
 
+                       /* Finally, map children of focus window. */
+                       TAILQ_FOREACH(w, &ws->winlist, entry)
+                               if (w->transient == win->id && !w->iconic)
+                                       map_window(w);
+
+               }
+
                xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root,
                    ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1,
                    &win->id);
@@ -2892,6 +3282,10 @@ switchws(struct swm_region *r, union arg *args)
        this_r->ws = new_ws;
        new_ws->r = this_r;
 
+       /* Set focus_pending before stacking. */
+       if (focus_mode != SWM_FOCUS_FOLLOW)
+               new_ws->focus_pending = get_region_focus(new_ws->r);
+
        stack();
 
        /* unmap old windows */
@@ -2899,19 +3293,15 @@ switchws(struct swm_region *r, union arg *args)
                TAILQ_FOREACH(win, &old_ws->winlist, entry)
                        unmap_window(win);
 
-       if (focus_mode != SWM_FOCUS_FOLLOW) {
-               new_ws->focus_pending = get_region_focus(new_ws->r);
-
-               /* if workspaces were swapped, then don't wait to set focus */
-               if (old_ws->r) {
-                       if (new_ws->focus_pending) {
-                               focus_win(new_ws->focus_pending);
-                       } else {
-                               /* Empty region, focus on root. */
-                               xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
-                                   new_ws->r->s[new_ws->r->s->idx].root,
-                                   XCB_CURRENT_TIME);
-                       }
+       /* if workspaces were swapped, then don't wait to set focus */
+       if (old_ws->r && focus_mode != SWM_FOCUS_FOLLOW) {
+               if (new_ws->focus_pending) {
+                       focus_win(new_ws->focus_pending);
+               } else {
+                       /* Empty region, focus on root. */
+                       xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT,
+                           new_ws->r->s[new_ws->r->s->idx].root,
+                           XCB_CURRENT_TIME);
                }
        }
 
@@ -3321,7 +3711,7 @@ focus(struct swm_region *r, union arg *args)
 
        focus_win(get_focus_magic(winfocus));
 
-       xcb_flush(conn);
+       focus_flush();
 }
 
 void
@@ -3741,6 +4131,7 @@ notiles:
                map_window(win);
        }
 
+       /* Make sure fs_win is stacked last so it's on top. */
        if (fs_win) {
                stack_floater(fs_win, ws->r);
                map_window(fs_win);
@@ -3853,7 +4244,7 @@ void
 max_stack(struct workspace *ws, struct swm_geometry *g)
 {
        struct swm_geometry     gg = *g;
-       struct ws_win           *win, *wintrans = NULL, *parent = NULL;
+       struct ws_win           *w, *win = NULL, *parent = NULL;
        int                     winno, num_screens;
 
        DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx);
@@ -3865,50 +4256,77 @@ max_stack(struct workspace *ws, struct swm_geometry *g)
        if (winno == 0 && count_win(ws, 1) == 0)
                return;
 
+       /* Figure out which top level window should be visible. */
+       if (ws->focus_pending)
+               win = ws->focus_pending;
+       else if (ws->focus)
+               win = ws->focus;
+       else
+               win = TAILQ_FIRST(&ws->winlist);
+
+       if (win->transient)
+               parent = find_window(win->transient);
+
+       DNPRINTF(SWM_D_STACK, "max_stack: win: 0x%x\n", win->id);
+
+       /* maximize all top level windows */
        num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
-       TAILQ_FOREACH(win, &ws->winlist, entry) {
-               if (win->transient) {
-                       wintrans = win;
-                       parent = find_window(win->transient);
+       TAILQ_FOREACH(w, &ws->winlist, entry) {
+               if (w->transient || w->iconic)
                        continue;
-               }
 
-               if (win->floating && !win->floatmaxed ) {
+               if (w->floating && !w->floatmaxed) {
                        /*
                         * retain geometry for retrieval on exit from
                         * max_stack mode
                         */
-                       store_float_geom(win, ws->r);
-                       win->floatmaxed = 1;
+                       store_float_geom(w, ws->r);
+                       w->floatmaxed = 1;
                }
 
                /* only reconfigure if necessary */
-               if (X(win) != gg.x || Y(win) != gg.y || WIDTH(win) != gg.w ||
-                   HEIGHT(win) != gg.h) {
-                       win->g = gg;
+               if (X(w) != gg.x || Y(w) != gg.y || WIDTH(w) != gg.w ||
+                   HEIGHT(w) != gg.h) {
+                       w->g = gg;
                        if (bar_enabled){
-                               win->bordered = 1;
+                               w->bordered = 1;
                        } else {
-                               win->bordered = 0;
-                               WIDTH(win) += 2 * border_width;
-                               HEIGHT(win) += 2 * border_width;
+                               w->bordered = 0;
+                               WIDTH(w) += 2 * border_width;
+                               HEIGHT(w) += 2 * border_width;
                        }
 
-                       update_window(win);
+                       update_window(w);
                }
-               /* unmap only if we don't have multi screen */
-               if (win != ws->focus)
-                       if (!(num_screens > 1 || outputs > 1))
-                               unmap_window(win);
+
+               /* Unmap unwanted windows if not multi-screen. */
+               if (!(num_screens > 1 || outputs > 1) && (w != win ||
+                   w != parent || w->transient != win->id))
+                       unmap_window(w);
        }
 
-       /* put the last transient on top */
-       if (wintrans) {
-               if (parent)
-                       map_window(parent);
-               stack_floater(wintrans, ws->r);
-               ws->focus = get_focus_magic(wintrans);
+       /* If a parent exists, map it first. */
+       if (parent) {
+               map_window(parent);
+
+               /* Map siblings next. */
+               TAILQ_FOREACH(w, &ws->winlist, entry)
+                       if (w != win && !w->iconic &&
+                           w->transient == parent->id) {
+                               stack_floater(w, ws->r);
+                               map_window(w);
+                       }
        }
+
+       /* Map focused window. */
+       map_window(win);
+
+       /* Finally, map children of focus window. */
+       TAILQ_FOREACH(w, &ws->winlist, entry)
+               if (w->transient == win->id && !w->iconic) {
+                       stack_floater(w, ws->r);
+                       map_window(w);
+               }
 }
 
 void
@@ -4087,7 +4505,7 @@ get_win_name(xcb_window_t win)
                    xcb_get_property_value_length(r));
 
        free(r);
-       return name;
+       return (name);
 }
 
 void
@@ -4312,7 +4730,7 @@ search_win(struct swm_region *r, union arg *args)
 }
 
 void
-search_resp_uniconify(char *resp, unsigned long len)
+search_resp_uniconify(const char *resp, unsigned long len)
 {
        char                    *name;
        struct ws_win           *win;
@@ -4334,7 +4752,6 @@ search_resp_uniconify(char *resp, unsigned long len)
                if (strncmp(s, resp, len) == 0) {
                        /* XXX this should be a callback to generalize */
                        set_swm_iconic(win, 0);
-                       xcb_flush(conn);
                        free(s);
                        break;
                }
@@ -4343,7 +4760,7 @@ search_resp_uniconify(char *resp, unsigned long len)
 }
 
 void
-search_resp_name_workspace(char *resp, unsigned long len)
+search_resp_name_workspace(const char *resp, unsigned long len)
 {
        struct workspace        *ws;
 
@@ -4369,7 +4786,7 @@ search_resp_name_workspace(char *resp, unsigned long len)
 }
 
 void
-search_resp_search_workspace(char *resp)
+search_resp_search_workspace(const char *resp)
 {
        char                    *p, *q;
        int                     ws_idx;
@@ -4400,7 +4817,7 @@ search_resp_search_workspace(char *resp)
 }
 
 void
-search_resp_search_window(char *resp)
+search_resp_search_window(const char *resp)
 {
        char                    *s;
        int                     idx;
@@ -4638,9 +5055,7 @@ resize(struct ws_win *win, union arg *args)
        struct swm_geometry     g;
        int                     top = 0, left = 0, resizing;
        int                     dx, dy;
-       unsigned int            shape; /* cursor style */
-       xcb_cursor_t            cursor;
-       xcb_font_t              cursor_font;
+       xcb_cursor_t                    cursor;
        xcb_query_pointer_reply_t       *xpr;
        xcb_generic_event_t             *evt;
        xcb_motion_notify_event_t       *mne;
@@ -4713,18 +5128,13 @@ resize(struct ws_win *win, union arg *args)
                top = 1;
 
        if (args->id == SWM_ARG_ID_CENTER)
-               shape = XC_sizing;
+               cursor = cursors[XC_SIZING].cid;
        else if (top)
-               shape = (left) ? XC_top_left_corner : XC_top_right_corner;
+               cursor = cursors[left ? XC_TOP_LEFT_CORNER :
+                   XC_TOP_RIGHT_CORNER].cid;
        else
-               shape = (left) ? XC_bottom_left_corner : XC_bottom_right_corner;
-
-       cursor_font = xcb_generate_id(conn);
-       xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
-
-       cursor = xcb_generate_id(conn);
-       xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
-           shape, shape + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
+               cursor = cursors[left ? XC_BOTTOM_LEFT_CORNER :
+                   XC_BOTTOM_RIGHT_CORNER].cid;
 
        xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
            XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, cursor,
@@ -4806,8 +5216,6 @@ resize(struct ws_win *win, union arg *args)
        store_float_geom(win,r);
 
        xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
-       xcb_free_cursor(conn, cursor);
-       xcb_close_font(conn, cursor_font);
        free(xpr);
        DNPRINTF(SWM_D_EVENT, "resize: done.\n");
 }
@@ -4823,6 +5231,7 @@ resize_step(struct swm_region *r, union arg *args)
                return;
 
        resize(win, args);
+       focus_flush();
 }
 
 #define SWM_MOVE_STEPS (50)
@@ -4833,8 +5242,6 @@ move(struct ws_win *win, union arg *args)
        xcb_timestamp_t         timestamp = 0;
        int                     move_step = 0, moving;
        struct swm_region       *r = NULL;
-       xcb_font_t                      cursor_font;
-       xcb_cursor_t                    cursor;
        xcb_query_pointer_reply_t       *qpr;
        xcb_generic_event_t             *evt;
        xcb_motion_notify_event_t       *mne;
@@ -4894,24 +5301,15 @@ move(struct ws_win *win, union arg *args)
                return;
        }
 
-       cursor_font = xcb_generate_id(conn);
-       xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
-
-       cursor = xcb_generate_id(conn);
-       xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
-               XC_fleur, XC_fleur + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
-
        xcb_grab_pointer(conn, 0, win->id, MOUSEMASK,
            XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC,
-           XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME);
+           XCB_WINDOW_NONE, cursors[XC_FLEUR].cid, XCB_CURRENT_TIME);
 
        /* get cursor offset from window root */
        qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id),
                NULL);
        if (!qpr) {
                xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
-               xcb_free_cursor(conn, cursor);
-               xcb_close_font(conn, cursor_font);
                return;
        }
 
@@ -4949,8 +5347,6 @@ move(struct ws_win *win, union arg *args)
        }
        store_float_geom(win, r);
        free(qpr);
-       xcb_free_cursor(conn, cursor);
-       xcb_close_font(conn, cursor_font);
        xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
        DNPRINTF(SWM_D_EVENT, "move: done.\n");
 }
@@ -4969,103 +5365,9 @@ move_step(struct swm_region *r, union arg *args)
                return;
 
        move(win, args);
+       focus_flush();
 }
 
-/* user/key callable function IDs */
-enum keyfuncid {
-       KF_BAR_TOGGLE,
-       KF_BUTTON2,
-       KF_CYCLE_LAYOUT,
-       KF_FLIP_LAYOUT,
-       KF_FLOAT_TOGGLE,
-       KF_FOCUS_MAIN,
-       KF_FOCUS_NEXT,
-       KF_FOCUS_PREV,
-       KF_HEIGHT_GROW,
-       KF_HEIGHT_SHRINK,
-       KF_ICONIFY,
-       KF_MASTER_SHRINK,
-       KF_MASTER_GROW,
-       KF_MASTER_ADD,
-       KF_MASTER_DEL,
-       KF_MOVE_DOWN,
-       KF_MOVE_LEFT,
-       KF_MOVE_RIGHT,
-       KF_MOVE_UP,
-       KF_MVWS_1,
-       KF_MVWS_2,
-       KF_MVWS_3,
-       KF_MVWS_4,
-       KF_MVWS_5,
-       KF_MVWS_6,
-       KF_MVWS_7,
-       KF_MVWS_8,
-       KF_MVWS_9,
-       KF_MVWS_10,
-       KF_MVWS_11,
-       KF_MVWS_12,
-       KF_MVWS_13,
-       KF_MVWS_14,
-       KF_MVWS_15,
-       KF_MVWS_16,
-       KF_MVWS_17,
-       KF_MVWS_18,
-       KF_MVWS_19,
-       KF_MVWS_20,
-       KF_MVWS_21,
-       KF_MVWS_22,
-       KF_NAME_WORKSPACE,
-       KF_QUIT,
-       KF_RAISE_TOGGLE,
-       KF_RESTART,
-       KF_SCREEN_NEXT,
-       KF_SCREEN_PREV,
-       KF_SEARCH_WIN,
-       KF_SEARCH_WORKSPACE,
-       KF_SPAWN_CUSTOM,
-       KF_STACK_INC,
-       KF_STACK_DEC,
-       KF_STACK_RESET,
-       KF_SWAP_MAIN,
-       KF_SWAP_NEXT,
-       KF_SWAP_PREV,
-       KF_UNICONIFY,
-       KF_VERSION,
-       KF_WIDTH_GROW,
-       KF_WIDTH_SHRINK,
-       KF_WIND_DEL,
-       KF_WIND_KILL,
-       KF_WS_1,
-       KF_WS_2,
-       KF_WS_3,
-       KF_WS_4,
-       KF_WS_5,
-       KF_WS_6,
-       KF_WS_7,
-       KF_WS_8,
-       KF_WS_9,
-       KF_WS_10,
-       KF_WS_11,
-       KF_WS_12,
-       KF_WS_13,
-       KF_WS_14,
-       KF_WS_15,
-       KF_WS_16,
-       KF_WS_17,
-       KF_WS_18,
-       KF_WS_19,
-       KF_WS_20,
-       KF_WS_21,
-       KF_WS_22,
-       KF_WS_NEXT,
-       KF_WS_NEXT_ALL,
-       KF_WS_PREV,
-       KF_WS_PREV_ALL,
-       KF_WS_PRIOR,
-       KF_DUMPWINS, /* MUST BE LAST */
-       KF_INVALID
-};
-
 /* key definitions */
 struct keyfunc {
        char                    name[SWM_FUNCNAME_LEN];
@@ -5165,14 +5467,6 @@ struct keyfunc {
        { "dumpwins",           dumpwins,       {0} }, /* MUST BE LAST */
        { "invalid key func",   NULL,           {0} },
 };
-struct key {
-       RB_ENTRY(key)           entry;
-       unsigned int            mod;
-       KeySym                  keysym;
-       enum keyfuncid          funcid;
-       char                    *spawn_name;
-};
-RB_HEAD(key_tree, key);
 
 int
 key_cmp(struct key *kp1, struct key *kp2)
@@ -5190,9 +5484,6 @@ key_cmp(struct key *kp1, struct key *kp2)
        return (0);
 }
 
-RB_GENERATE(key_tree, key, entry, key_cmp);
-struct key_tree                        keys;
-
 /* mouse */
 enum { client_click, root_click };
 struct button {
@@ -5230,18 +5521,8 @@ update_modkey(unsigned int mod)
                        buttons[i].mask = mod;
 }
 
-/* spawn */
-struct spawn_prog {
-       TAILQ_ENTRY(spawn_prog) entry;
-       char                    *name;
-       int                     argc;
-       char                    **argv;
-};
-TAILQ_HEAD(spawn_list, spawn_prog);
-struct spawn_list              spawns = TAILQ_HEAD_INITIALIZER(spawns);
-
 int
-spawn_expand(struct swm_region *r, union arg *args, char *spawn_name,
+spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name,
     char ***ret_args)
 {
        struct spawn_prog       *prog = NULL;
@@ -5320,7 +5601,7 @@ spawn_expand(struct swm_region *r, union arg *args, char *spawn_name,
 }
 
 void
-spawn_custom(struct swm_region *r, union arg *args, char *spawn_name)
+spawn_custom(struct swm_region *r, union arg *args, const char *spawn_name)
 {
        union arg               a;
        char                    **real_args;
@@ -5338,7 +5619,8 @@ spawn_custom(struct swm_region *r, union arg *args, char *spawn_name)
 }
 
 void
-spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid)
+spawn_select(struct swm_region *r, union arg *args, const char *spawn_name,
+    int *pid)
 {
        union arg               a;
        char                    **real_args;
@@ -5380,7 +5662,7 @@ spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid)
 }
 
 void
-spawn_insert(char *name, char *args)
+spawn_insert(const char *name, const char *args)
 {
        char                    *arg, *cp, *ptr;
        struct spawn_prog       *sp;
@@ -5431,7 +5713,7 @@ spawn_remove(struct spawn_prog *sp)
 }
 
 void
-spawn_replace(struct spawn_prog *sp, char *name, char *args)
+spawn_replace(struct spawn_prog *sp, const char *name, const char *args)
 {
        DNPRINTF(SWM_D_SPAWN, "spawn_replace: %s [%s]\n", sp->name, name);
 
@@ -5442,7 +5724,7 @@ spawn_replace(struct spawn_prog *sp, char *name, char *args)
 }
 
 void
-setspawn(char *name, char *args)
+setspawn(const char *name, const char *args)
 {
        struct spawn_prog       *sp;
 
@@ -5574,7 +5856,7 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
 }
 
 char *
-strdupsafe(char *str)
+strdupsafe(const char *str)
 {
        if (str == NULL)
                return (NULL);
@@ -5583,7 +5865,8 @@ strdupsafe(char *str)
 }
 
 void
-key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid, char *spawn_name)
+key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid,
+    const char *spawn_name)
 {
        struct key              *kp;
 
@@ -5627,7 +5910,7 @@ key_remove(struct key *kp)
 
 void
 key_replace(struct key *kp, unsigned int mod, KeySym ks, enum keyfuncid kfid,
-    char *spawn_name)
+    const char *spawn_name)
 {
        DNPRINTF(SWM_D_KEY, "key_replace: %s [%s]\n", keyfuncs[kp->funcid].name,
            spawn_name);
@@ -5640,7 +5923,7 @@ key_replace(struct key *kp, unsigned int mod, KeySym ks, enum keyfuncid kfid,
 
 void
 setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid,
-    char *spawn_name)
+    const char *spawn_name)
 {
        struct key              *kp;
 
@@ -5937,11 +6220,6 @@ grabbuttons(struct ws_win *win)
                            XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC,
                            XCB_WINDOW_NONE, XCB_CURSOR_NONE,
                            buttons[i].button, buttons[i].mask);
-
-       /* click to focus */
-       xcb_grab_button(conn, 0, win->id, BUTTONMASK, XCB_GRAB_MODE_SYNC,
-           XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, XCB_CURSOR_NONE,
-           XCB_BUTTON_INDEX_1, XCB_BUTTON_MASK_ANY);
 }
 
 const char *quirkname[] = {
@@ -6047,6 +6325,7 @@ setquirk(const char *class, const char *name, unsigned long quirk)
        DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s [%lu]\n", class, name,
           quirk);
 
+       /* Remove/replace existing quirk. */
        TAILQ_FOREACH(qp, &quirks, entry) {
                if (!strcmp(qp->class, class) && !strcmp(qp->name, name)) {
                        if (!quirk)
@@ -6057,12 +6336,11 @@ setquirk(const char *class, const char *name, unsigned long quirk)
                        return;
                }
        }
-       if (!quirk) {
-               warnx("error: setquirk: cannot find class/name combination");
-               return;
-       }
 
-       quirk_insert(class, name, quirk);
+       /* Only insert if quirk is not NONE. */
+       if (quirk)
+               quirk_insert(class, name, quirk);
+
        DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n");
 }
 
@@ -6378,7 +6656,7 @@ setautorun(char *selector, char *value, int flags)
 {
        int                     ws_id;
        char                    s[1024];
-       char                    *ap, *sp = s;
+       char                    *ap, *sp;
        union arg               a;
        int                     argc = 0;
        pid_t                   pid;
@@ -6398,6 +6676,8 @@ setautorun(char *selector, char *value, int flags)
        if (ws_id < 0 || ws_id >= workspace_limit)
                errx(1, "autorun: invalid workspace %d", ws_id + 1);
 
+       sp = expand_tilde((char *)&s);
+
        /*
         * This is a little intricate
         *
@@ -6415,6 +6695,7 @@ setautorun(char *selector, char *value, int flags)
                        err(1, "setautorun: realloc");
                a.argv[argc - 1] = ap;
        }
+       free(sp);
 
        if ((a.argv = realloc(a.argv, (argc + 1) * sizeof(char *))) == NULL)
                err(1, "setautorun: realloc");
@@ -6581,7 +6862,7 @@ struct config_option configopt[] = {
 };
 
 int
-conf_load(char *filename, int keymapping)
+conf_load(const char *filename, int keymapping)
 {
        FILE                    *config;
        char                    *line, *cp, *optsub, *optval;
@@ -7139,14 +7420,47 @@ keypress(xcb_key_press_event_t *e)
 void
 buttonpress(xcb_button_press_event_t *e)
 {
-       struct ws_win           *win;
+       struct ws_win           *win = NULL;
+       struct swm_region       *r, *old_r;
        int                     i;
        int                     handled = 0;
 
-       DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n",
-           e->event, e->detail);
+       DNPRINTF(SWM_D_EVENT, "buttonpress: win (x,y): 0x%x (%d,%d), "
+           "detail: %u, time: %u, root (x,y): 0x%x (%d,%d), child: 0x%x, "
+           "state: %u, same_screen: %s\n", e->event, e->event_x, e->event_y,
+           e->detail, e->time, e->root, e->root_x, e->root_y, e->child,
+           e->state, YESNO(e->same_screen));
+
+       if (e->event == e->root) {
+               if (e->child != 0) {
+                       win = find_window(e->child);
+                       /* Pass ButtonPress to window if it isn't managed. */
+                       if (win == NULL)
+                               goto out;
+               } else {
+                       /* Focus on empty region */
+                       /* If no windows on region if its empty. */
+                       r = root_to_region(e->root, SWM_CK_POINTER);
+                       if (r && TAILQ_EMPTY(&r->ws->winlist)) {
+                               old_r = root_to_region(e->root, SWM_CK_FOCUS);
+                               if (old_r && old_r != r)
+                                       unfocus_win(old_r->ws->focus);
+
+                               xcb_set_input_focus(conn,
+                                   XCB_INPUT_FOCUS_PARENT, e->root, e->time);
+
+                               /* Clear bar since empty. */
+                               bar_update();
+
+                               handled = 1;
+                               goto out;
+                       }
+               }
+       } else {
+               win = find_window(e->event);
+       }
 
-       if ((win = find_window(e->event)) == NULL)
+       if (win == NULL)
                return;
 
        last_event_time = e->time;
@@ -7161,11 +7475,15 @@ buttonpress(xcb_button_press_event_t *e)
                        handled = 1;
                }
 
+out:
        if (!handled) {
                DNPRINTF(SWM_D_EVENT, "buttonpress: passing to window.\n");
+               /* Replay event to event window */
                xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, e->time);
        } else {
                DNPRINTF(SWM_D_EVENT, "buttonpress: handled.\n");
+               /* Unfreeze grab events. */
+               xcb_allow_events(conn, XCB_ALLOW_SYNC_POINTER, e->time);
        }
 
        xcb_flush(conn);
@@ -7327,7 +7645,8 @@ configurerequest(xcb_configure_request_event_t *e)
 
                win->g_floatvalid = 1;
 
-               if (win->floating && r) {
+               if (win->floating && r && (win->transient ||
+                   win->ws->cur_layout != &layouts[SWM_MAX_STACK])) {
                        WIDTH(win) = win->g_float.w;
                        HEIGHT(win) = win->g_float.h;
 
@@ -7342,6 +7661,8 @@ configurerequest(xcb_configure_request_event_t *e)
                config_win(win, e);
                xcb_flush(conn);
        }
+
+       DNPRINTF(SWM_D_EVENT, "configurerequest: done.\n");
 }
 
 void
@@ -7554,6 +7875,7 @@ mapnotify(xcb_map_notify_event_t *e)
                if (win->ws->focus_pending == win) {
                        focus_win(win);
                        win->ws->focus_pending = NULL;
+                       focus_flush();
                }
        }
 
@@ -7595,14 +7917,14 @@ maprequest(xcb_map_request_event_t *e)
        win = manage_window(e->window,
            (war->map_state == XCB_MAP_STATE_VIEWABLE));
 
+       /* The new window should get focus; prepare. */
+       if (focus_mode != SWM_FOCUS_FOLLOW)
+               win->ws->focus_pending = get_focus_magic(win);
+
        /* All windows need to be mapped if they are in the current workspace.*/
        if (win->ws->r)
                stack();
 
-       /* The new window should get focus. */
-       if (focus_mode != SWM_FOCUS_FOLLOW)
-               win->ws->focus_pending = get_focus_magic(win);
-
        /* Ignore EnterNotify to handle the mapnotify without interference. */
        if (focus_mode == SWM_FOCUS_DEFAULT)
                event_drain(XCB_ENTER_NOTIFY);
@@ -7654,7 +7976,8 @@ propertynotify(xcb_property_notify_event_t *e)
 
        name = get_atom_name(e->atom);
        DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%x, atom: %s(%u), "
-           "time: %#x\n", e->window, name, e->atom, e->time);
+           "time: %#x, state: %u\n", e->window, name, e->atom, e->time,
+           e->state);
        free(name);
 #endif
        win = find_window(e->window);
@@ -7716,38 +8039,53 @@ unmapnotify(xcb_unmap_notify_event_t *e)
 
        DNPRINTF(SWM_D_EVENT, "unmapnotify: window: 0x%x\n", e->window);
 
-       /* determine if we need to help unmanage this window */
+       /* If we aren't managing the window, then ignore. */
        win = find_window(e->window);
        if (win == NULL)
                return;
 
        ws = win->ws;
 
-       if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL) {
-               win->mapped = 0;
+       if (getstate(e->window) != XCB_ICCCM_WM_STATE_ICONIC)
                set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
 
-               /* If we were focused, make sure we focus on something else. */
-               if (win == ws->focus)
-                       if (focus_mode != SWM_FOCUS_FOLLOW)
+       if (win->mapped) {
+               /* window unmapped itself */
+               /* do unmap/unfocus/restack and unmanage */
+               win->mapped = 0;
+
+               /* If win was focused, make sure to focus on something else. */
+               if (win == ws->focus) {
+                       if (focus_mode != SWM_FOCUS_FOLLOW) {
                                ws->focus_pending = get_focus_prev(win);
+                               DNPRINTF(SWM_D_EVENT, "unmapnotify: "
+                                   "focus_pending: 0x%x\n",
+                                   WINID(ws->focus_pending));
+                       }
+
+                       unfocus_win(win);
+               }
 
-               unfocus_win(win);
                unmanage_window(win);
-               stack();
 
-               DNPRINTF(SWM_D_EVENT, "unmapnotify: focus_pending: 0x%x\n",
-                   ws->focus_pending->id);
+               if (ws->r)
+                       stack();
 
-               if (focus_mode != SWM_FOCUS_FOLLOW) {
+               if (focus_mode == SWM_FOCUS_FOLLOW) {
+                       if (ws->r)
+                               focus_win(get_pointer_win(ws->r->s->root));
+               } else {
                        if (ws->focus_pending) {
                                focus_win(ws->focus_pending);
                                ws->focus_pending = NULL;
                        }
                }
-
-               focus_flush();
        }
+
+       if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL)
+               set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC);
+
+       focus_flush();
 }
 
 #if 0
@@ -7776,6 +8114,7 @@ clientmessage(xcb_client_message_event_t *e)
 
        if (win == NULL) {
                if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) {
+                       /* Manage the window with maprequest. */
                        DNPRINTF(SWM_D_EVENT, "clientmessage: request focus on "
                            "unmanaged window.\n");
                        mre.window = e->window;
@@ -7826,7 +8165,7 @@ clientmessage(xcb_client_message_event_t *e)
                stack();
        }
 
-       xcb_flush(conn);
+       focus_flush();
 }
 
 void
@@ -7887,6 +8226,11 @@ enable_wm(void)
                        free(error);
                        return 1;
                }
+
+               /* click to focus on empty region */
+               xcb_grab_button(conn, 1, sc->root, BUTTONMASK,
+                   XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE,
+                   XCB_CURSOR_NONE, XCB_BUTTON_INDEX_1, XCB_BUTTON_MASK_ANY);
        }
 
        return 0;
@@ -7983,6 +8327,8 @@ scan_xrandr(int i)
        xcb_randr_crtc_t                                *crtc;
        xcb_screen_t                                    *screen;
 
+       DNPRINTF(SWM_D_MISC, "scan_xrandr: screen: %d\n", i);
+
        if ((screen = get_screen(i)) == NULL)
                errx(1, "ERROR: can't get screen %d.", i);
 
@@ -8010,7 +8356,7 @@ scan_xrandr(int i)
                        new_region(&screens[i], 0, 0,
                            screen->width_in_pixels,
                            screen->height_in_pixels);
-                       return;
+                       goto out;
                } else
                        ncrtc = srr->num_crtcs;
 
@@ -8036,12 +8382,16 @@ scan_xrandr(int i)
                        free(cir);
                }
                free(srr);
-       } else
+       }
 #endif /* SWM_XRR_HAS_CRTC */
-       {
+
+       /* If detection failed, create a single region that spans the screen. */
+       if (TAILQ_EMPTY(&screens[i].rl))
                new_region(&screens[i], 0, 0, screen->width_in_pixels,
                    screen->height_in_pixels);
-       }
+
+out:
+       DNPRINTF(SWM_D_MISC, "scan_xrandr: done.\n");
 }
 
 void
@@ -8076,7 +8426,7 @@ screenchange(xcb_randr_screen_change_notify_event_t *e)
 void
 grab_windows(void)
 {
-       xcb_window_t            *wins   = NULL;
+       xcb_window_t            *wins = NULL, trans;
        int                     no;
        int                     i, j, num_screens;
        uint16_t                state, manage, mapped;
@@ -8098,49 +8448,63 @@ grab_windows(void)
                no = xcb_query_tree_children_length(qtr);
                /* attach windows to a region */
                /* normal windows */
+               DNPRINTF(SWM_D_INIT, "grab_windows: grab top level windows.\n");
                for (j = 0; j < no; j++) {
                        c = xcb_get_window_attributes(conn, wins[j]);
                        r = xcb_get_window_attributes_reply(conn, c, NULL);
-                       if (!r)
+                       if (!r) {
+                               DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+                                   "doesn't exist.\n", wins[j]);
                                continue;
+                       }
                        if (r->override_redirect) {
+                               DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+                                   "override_redirect set.\n", wins[j]);
                                free(r);
                                continue;
                        }
 
                        pc = xcb_icccm_get_wm_transient_for(conn, wins[j]);
                        if (xcb_icccm_get_wm_transient_for_reply(conn, pc,
-                           &wins[j], NULL)) {
+                           &trans, NULL)) {
+                               DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+                                   "is transient for %#x.\n", wins[j], trans);
                                free(r);
                                continue;
                        }
 
                        state = getstate(wins[j]);
-                       manage = state == XCB_ICCCM_WM_STATE_ICONIC;
+                       manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
                        mapped = r->map_state != XCB_MAP_STATE_UNMAPPED;
                        if (mapped || manage)
                                manage_window(wins[j], mapped);
                        free(r);
                }
                /* transient windows */
+               DNPRINTF(SWM_D_INIT, "grab_windows: grab transient windows.\n");
                for (j = 0; j < no; j++) {
                        c = xcb_get_window_attributes(conn, wins[j]);
                        r = xcb_get_window_attributes_reply(conn, c, NULL);
-                       if (!r)
+                       if (!r) {
+                               DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+                                   "doesn't exist.\n", wins[j]);
                                continue;
+                       }
                        if (r->override_redirect) {
+                               DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; "
+                                   "override_redirect set.\n", wins[j]);
                                free(r);
                                continue;
                        }
-                       free(r);
 
                        state = getstate(wins[j]);
-                       manage = state == XCB_ICCCM_WM_STATE_ICONIC;
+                       manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN;
                        mapped = r->map_state != XCB_MAP_STATE_UNMAPPED;
                        pc = xcb_icccm_get_wm_transient_for(conn, wins[j]);
                        if (xcb_icccm_get_wm_transient_for_reply(conn, pc,
-                           &wins[j], NULL) && manage)
+                           &trans, NULL) && manage)
                                manage_window(wins[j], mapped);
+                       free(r);
                }
                free(qtr);
        }
@@ -8155,8 +8519,6 @@ setup_screens(void)
        uint32_t                gcv[1], wa[1];
        const xcb_query_extension_reply_t *qep;
        xcb_screen_t                            *screen;
-       xcb_cursor_t                            cursor;
-       xcb_font_t                              cursor_font;
        xcb_randr_query_version_cookie_t        c;
        xcb_randr_query_version_reply_t         *r;
 
@@ -8181,13 +8543,7 @@ setup_screens(void)
                }
        }
 
-       cursor_font = xcb_generate_id(conn);
-       xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor");
-
-       cursor = xcb_generate_id(conn);
-       xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font,
-           XC_left_ptr, XC_left_ptr + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff);
-       wa[0] = cursor;
+       wa[0] = cursors[XC_LEFT_PTR].cid;
 
        /* map physical screens */
        for (i = 0; i < num_screens; i++) {
@@ -8244,8 +8600,6 @@ setup_screens(void)
                        xcb_randr_select_input(conn, screens[i].root,
                            XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE);
        }
-       xcb_free_cursor(conn, cursor);
-       xcb_close_font(conn, cursor_font);
 }
 
 void
@@ -8314,6 +8668,8 @@ shutdown_cleanup(void)
        bar_extra = 1;
        unmap_all();
 
+       cursors_cleanup();
+
        teardown_ewmh();
 
        num_screens = xcb_setup_roots_length(xcb_get_setup(conn));
@@ -8470,6 +8826,9 @@ main(int argc, char *argv[])
        if (enable_wm() != 0)
                errx(1, "another window manager is currently running");
 
+       /* Load Xcursors and/or cursorfont glyph cursors. */
+       cursors_load();
+
        xcb_aux_sync(conn);
 
        setup_globals();
@@ -8550,19 +8909,14 @@ noconfig:
                        free(evt);
                }
 
-               /* if we are being restarted go focus on first window */
-               if (winfocus) {
+               /* If just (re)started, set default focus if needed. */
+               if (winfocus && focus_mode != SWM_FOCUS_FOLLOW) {
                        rr = winfocus->ws->r;
                        if (rr == NULL) {
                                /* not a visible window */
                                winfocus = NULL;
                                continue;
                        }
-                       /* move pointer to first screen if multi screen */
-                       if (num_screens > 1 || outputs > 1)
-                               xcb_warp_pointer(conn, XCB_WINDOW_NONE,
-                                   rr->s[0].root, 0, 0, 0, 0, X(rr),
-                                   Y(rr) + (bar_enabled ? bar_height : 0));
 
                        focus_win(get_region_focus(rr));
                        focus_flush();