X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=629f69969ed9d1d6a76bc70499e3eee723d36599;hb=7e463aa1bd6f8a52e1c55d6ae6c3c439a702ea64;hp=130c7afcbf54ffe9ef4c0375b0e4aa9f90cbd24f;hpb=2ac03f635fcaf119653eecb41feb6c0a8ccc8f79;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index 130c7af..629f699 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -5,10 +5,10 @@ * Copyright (c) 2009 Pierre-Yves Ritschard * Copyright (c) 2010 Tuukka Kataja * Copyright (c) 2011 Jason L. Wright - * Copyright (c) 2011-2012 Reginald Kennedy + * Copyright (c) 2011-2013 Reginald Kennedy * Copyright (c) 2011-2012 Lawrence Teo * Copyright (c) 2011-2012 Tiago Cunha - * Copyright (c) 2012 David Hill + * Copyright (c) 2012-2013 David Hill * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -243,9 +243,20 @@ u_int32_t swm_debug = 0 #define SH_INC_W(w) (w)->sh.width_inc #define SH_INC_H(w) (w)->sh.height_inc #define SWM_MAX_FONT_STEPS (3) -#define WINID(w) ((w) ? (w)->id : 0) +#define WINID(w) ((w) ? (w)->id : XCB_WINDOW_NONE) +#define WS_FOCUSED(ws) ((ws)->r && (ws)->r->s->r_focus == (ws)->r) #define YESNO(x) ((x) ? "yes" : "no") +/* Constrain Window flags */ +#define SWM_CW_RESIZABLE (0x01) +#define SWM_CW_SOFTBOUNDARY (0x02) +#define SWM_CW_HARDBOUNDARY (0x04) +#define SWM_CW_RIGHT (0x10) +#define SWM_CW_LEFT (0x20) +#define SWM_CW_BOTTOM (0x40) +#define SWM_CW_TOP (0x80) +#define SWM_CW_ALLSIDES (0xf0) + #define SWM_FOCUS_DEFAULT (0) #define SWM_FOCUS_FOLLOW (1) #define SWM_FOCUS_MANUAL (2) @@ -269,10 +280,7 @@ xcb_atom_t a_state; xcb_atom_t a_prot; xcb_atom_t a_delete; xcb_atom_t a_takefocus; -xcb_atom_t a_wmname; -xcb_atom_t a_netwmname; xcb_atom_t a_utf8_string; -xcb_atom_t a_string; xcb_atom_t a_swm_iconic; xcb_atom_t a_swm_ws; volatile sig_atomic_t running = 1; @@ -288,6 +296,7 @@ Display *display; xcb_connection_t *conn; xcb_key_symbols_t *syms; +int boundary_width = 50; int cycle_empty = 0; int cycle_visible = 0; int term_width = 0; @@ -386,6 +395,8 @@ int bar_font_legacy = 1; char *bar_fonts; XftColor bar_font_color; struct passwd *pwd; +char *startup_exception; +unsigned int nr_exceptions = 0; /* layout manager data */ struct swm_geometry { @@ -575,6 +586,8 @@ union arg { #define SWM_ARG_ID_CYCLERG_DOWN (43) #define SWM_ARG_ID_CYCLEWS_UP_ALL (44) #define SWM_ARG_ID_CYCLEWS_DOWN_ALL (45) +#define SWM_ARG_ID_CYCLEWS_MOVE_UP (46) +#define SWM_ARG_ID_CYCLEWS_MOVE_DOWN (47) #define SWM_ARG_ID_STACKINC (50) #define SWM_ARG_ID_STACKDEC (51) #define SWM_ARG_ID_SS_ALL (60) @@ -608,6 +621,8 @@ struct quirk { #define SWM_Q_XTERM_FONTADJ (1<<3) /* adjust xterm fonts when resizing */ #define SWM_Q_FULLSCREEN (1<<4) /* remove border */ #define SWM_Q_FOCUSPREV (1<<5) /* focus on caller */ +#define SWM_Q_NOFOCUSONMAP (1<<6) /* Don't focus on window when mapped. */ +#define SWM_Q_FOCUSONMAP_SINGLE (1<<7) /* Only focus if single win of type. */ }; TAILQ_HEAD(quirk_list, quirk); struct quirk_list quirks = TAILQ_HEAD_INITIALIZER(quirks); @@ -705,12 +720,15 @@ struct cursors { {"top_right_corner", XC_top_right_corner, XCB_CURSOR_NONE}, }; +#define SWM_SPAWN_OPTIONAL 0x1 + /* spawn */ struct spawn_prog { TAILQ_ENTRY(spawn_prog) entry; char *name; int argc; char **argv; + int flags; }; TAILQ_HEAD(spawn_list, spawn_prog); struct spawn_list spawns = TAILQ_HEAD_INITIALIZER(spawns); @@ -824,8 +842,10 @@ enum keyfuncid { KF_WS_22, KF_WS_NEXT, KF_WS_NEXT_ALL, + KF_WS_NEXT_MOVE, KF_WS_PREV, KF_WS_PREV_ALL, + KF_WS_PREV_MOVE, KF_WS_PRIOR, KF_DUMPWINS, /* MUST BE LAST */ KF_INVALID @@ -855,8 +875,7 @@ void bar_print(struct swm_region *, const char *); void bar_print_legacy(struct swm_region *, const char *); 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); +char *bar_replace_seq(char *, char *, struct swm_region *, size_t *, size_t); void bar_setup(struct swm_region *); void bar_title_name(char *, size_t, struct swm_region *); void bar_toggle(struct swm_region *, union arg *); @@ -873,7 +892,7 @@ 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); +void constrain_window(struct ws_win *, struct swm_geometry *, int *); int count_win(struct workspace *, int); void cursors_cleanup(void); void cursors_load(void); @@ -926,6 +945,8 @@ struct ws_win *get_pointer_win(xcb_window_t); struct ws_win *get_region_focus(struct swm_region *); int get_region_index(struct swm_region *); xcb_screen_t *get_screen(int); +xcb_window_t get_sibling(struct ws_win *, int); +int get_screen_count(void); #ifdef SWM_DEBUG char *get_stack_mode_name(uint8_t); #endif @@ -950,16 +971,16 @@ void kill_refs(struct ws_win *); #ifdef SWM_DEBUG void leavenotify(xcb_leave_notify_event_t *); #endif -void load_float_geom(struct ws_win *, struct swm_region *); +void load_float_geom(struct ws_win *); struct ws_win *manage_window(xcb_window_t, uint16_t); -void map_window(struct ws_win *); +void map_window(struct ws_win *, xcb_window_t); void mapnotify(xcb_map_notify_event_t *); void mappingnotify(xcb_mapping_notify_event_t *); void maprequest(xcb_map_request_event_t *); void motionnotify(xcb_motion_notify_event_t *); void move(struct ws_win *, union arg *); void move_step(struct swm_region *, union arg *); -uint32_t name_to_pixel(const char *); +uint32_t name_to_pixel(int, 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 *); @@ -977,6 +998,9 @@ 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 region_containment(struct ws_win *, struct swm_region *, int); +struct swm_region *region_under(struct swm_screen *, int, int); +void regionize(struct ws_win *, int, int); void resize(struct ws_win *, union arg *); void resize_step(struct swm_region *, union arg *); void restart(struct swm_region *, union arg *); @@ -984,10 +1008,10 @@ 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_name_workspace(const char *, size_t); void search_resp_search_window(const char *); void search_resp_search_workspace(const char *); -void search_resp_uniconify(const char *, unsigned long); +void search_resp_uniconify(const char *, size_t); void search_win(struct swm_region *, union arg *); void search_win_cleanup(void); void search_workspace(struct swm_region *, union arg *); @@ -1007,7 +1031,7 @@ 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 setspawn(const char *, const char *, int); void setup_ewmh(void); void setup_globals(void); void setup_keys(void); @@ -1024,15 +1048,16 @@ 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_insert(const char *, const char *, int); +struct spawn_prog *spawn_find(const char *); void spawn_remove(struct spawn_prog *); -void spawn_replace(struct spawn_prog *, const char *, const char *); +void spawn_replace(struct spawn_prog *, const char *, const char *, int); 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 store_float_geom(struct ws_win *); +char *strdupsafe(const char *); void swapwin(struct swm_region *, union arg *); void switchws(struct swm_region *, union arg *); void teardown_ewmh(void); @@ -1045,14 +1070,18 @@ void unmap_window(struct ws_win *); void updatenumlockmask(void); void update_modkey(unsigned int); void update_window(struct ws_win *); +void validate_spawns(void); 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 *); +void win_to_ws(struct ws_win *, int, int); pid_t window_get_pid(xcb_window_t); void wkill(struct swm_region *, union arg *); void workaround(void); void xft_init(struct swm_region *); +void _add_startup_exception(const char *, va_list); +void add_startup_exception(const char *, ...); RB_PROTOTYPE(key_tree, key, entry, key_cmp); RB_GENERATE(key_tree, key, entry, key_cmp); @@ -1178,6 +1207,19 @@ get_screen(int screen) } int +get_screen_count(void) +{ + const xcb_setup_t *r; + + if ((r = xcb_get_setup(conn)) == NULL) { + DNPRINTF(SWM_D_MISC, "get_screen_count: xcb_get_setup\n"); + check_conn(); + } + + return xcb_setup_roots_length(r); +} + +int get_region_index(struct swm_region *r) { struct swm_region *rr; @@ -1271,7 +1313,7 @@ setup_ewmh(void) for (i = 0; i < LENGTH(ewmh); i++) ewmh[i].atom = get_atom_from_string(ewmh[i].name); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { /* Support check window will be created by workaround(). */ @@ -1295,7 +1337,7 @@ teardown_ewmh(void) sup_check = get_atom_from_string("_NET_SUPPORTING_WM_CHECK"); sup_list = get_atom_from_string("_NET_SUPPORTED"); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { /* Get the support check window and destroy it */ @@ -1374,12 +1416,12 @@ ewmh_set_win_fullscreen(struct ws_win *win, int fs) if (fs) { if (!win->g_floatvalid) - store_float_geom(win, win->ws->r); + store_float_geom(win); win->g = win->ws->r->g; win->bordered = 0; } else { - load_float_geom(win, win->ws->r); + load_float_geom(win); } return (1); @@ -1644,7 +1686,7 @@ find_pid(pid_t pid) } uint32_t -name_to_pixel(const char *colorname) +name_to_pixel(int sidx, const char *colorname) { uint32_t result = 0; char cname[32] = "#"; @@ -1654,7 +1696,7 @@ name_to_pixel(const char *colorname) xcb_alloc_named_color_reply_t *nr; uint16_t rr, gg, bb; - screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; + screen = get_screen(sidx); cmap = screen->default_colormap; /* color is in format rgb://rr/gg/bb */ @@ -1696,15 +1738,15 @@ setscreencolor(char *val, int i, int c) { int num_screens; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); if (i > 0 && i <= num_screens) { - screens[i - 1].c[c].pixel = name_to_pixel(val); + screens[i - 1].c[c].pixel = name_to_pixel(i - 1, val); free(screens[i - 1].c[c].name); if ((screens[i - 1].c[c].name = strdup(val)) == NULL) err(1, "strdup"); } else if (i == -1) { for (i = 0; i < num_screens; i++) { - screens[i].c[c].pixel = name_to_pixel(val); + screens[i].c[c].pixel = name_to_pixel(0, val); free(screens[i].c[c].name); if ((screens[i].c[c].name = strdup(val)) == NULL) err(1, "strdup"); @@ -1747,7 +1789,7 @@ custom_region(char *val) int sidx, num_screens; xcb_screen_t *screen; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); if (sscanf(val, "screen[%d]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5) errx(1, "invalid custom region, " "should be 'screen[]:x++"); @@ -1962,12 +2004,12 @@ bar_window_name(char *s, size_t sz, struct swm_region *r) free(title); } -int urgent[SWM_WS_MAX]; void bar_urgent(char *s, size_t sz) { struct ws_win *win; int i, j, num_screens; + int urgent[SWM_WS_MAX]; char b[8]; xcb_get_property_cookie_t c; xcb_icccm_wm_hints_t hints; @@ -1975,7 +2017,7 @@ bar_urgent(char *s, size_t sz) for (i = 0; i < workspace_limit; i++) urgent[i] = 0; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) { @@ -2225,7 +2267,7 @@ bar_draw(void) /* expand the format by first passing it through strftime(3) */ bar_fmt_expand(fmtexp, sizeof fmtexp); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { TAILQ_FOREACH(r, &screens[i].rl, entry) { if (r->bar == NULL) @@ -2238,8 +2280,15 @@ bar_draw(void) continue; } - bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew); - bar_replace(fmtnew, fmtrep, r, sizeof fmtrep); + if (startup_exception) + snprintf(fmtrep, sizeof fmtrep, "total " + "exceptions: %d, first exception: %s", + nr_exceptions, + startup_exception); + else { + bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew); + bar_replace(fmtnew, fmtrep, r, sizeof fmtrep); + } if (bar_font_legacy) bar_print_legacy(r, fmtrep); else @@ -2322,7 +2371,7 @@ bar_toggle(struct swm_region *r, union arg *args) } /* update bars as necessary */ - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) TAILQ_FOREACH(tmpr, &screens[i].rl, entry) if (tmpr->bar) { @@ -2528,7 +2577,8 @@ bar_setup(struct swm_region *r) r->bar->id = xcb_generate_id(conn); wa[0] = r->s->c[SWM_S_COLOR_BAR].pixel; wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER_UNFOCUS].pixel; - wa[2] = XCB_EVENT_MASK_EXPOSURE; + wa[2] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_POINTER_MOTION | + XCB_EVENT_MASK_POINTER_MOTION_HINT; xcb_create_window(conn, XCB_COPY_FROM_PARENT, r->bar->id, r->s->root, X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar), @@ -2762,18 +2812,27 @@ quit(struct swm_region *r, union arg *args) } void -map_window(struct ws_win *win) +map_window(struct ws_win *win, xcb_window_t sibling) { - uint32_t val = XCB_STACK_MODE_ABOVE; + uint16_t mode = XCB_CONFIG_WINDOW_STACK_MODE; + uint32_t val[2]; + int i = 0; + + /* If sibling is specified, stack right above it. */ + if (sibling != XCB_WINDOW_NONE) { + mode |= XCB_CONFIG_WINDOW_SIBLING; + val[i++] = sibling; + } + + val[i] = XCB_STACK_MODE_ABOVE; if (win == NULL) return; - DNPRINTF(SWM_D_EVENT, "map_window: win 0x%x, mapped: %s\n", win->id, - YESNO(win->mapped)); + DNPRINTF(SWM_D_EVENT, "map_window: win 0x%x, mapped: %s, " + "sibling: 0x%x\n", win->id, YESNO(win->mapped), sibling); - xcb_configure_window(conn, win->id, - XCB_CONFIG_WINDOW_STACK_MODE, &val); + xcb_configure_window(conn, win->id, mode, val); if (win->mapped) return; @@ -2806,7 +2865,7 @@ unmap_all(void) struct ws_win *win; int i, j, num_screens; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) @@ -2901,7 +2960,7 @@ root_to_region(xcb_window_t root, int check) DNPRINTF(SWM_D_MISC, "root_to_region: window: 0x%x\n", root); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) if (screens[i].root == root) break; @@ -2944,6 +3003,8 @@ root_to_region(xcb_window_t root, int check) if (r == NULL && check & SWM_CK_FALLBACK) r = TAILQ_FIRST(&screens[i].rl); + DNPRINTF(SWM_D_MISC, "root_to_region: idx: %d\n", get_region_index(r)); + return (r); } @@ -2953,7 +3014,7 @@ find_unmanaged_window(xcb_window_t id) struct ws_win *win; int i, j, num_screens; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].unmanagedlist, @@ -2970,7 +3031,7 @@ find_window(xcb_window_t id) int i, j, num_screens; xcb_query_tree_reply_t *r; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) @@ -3065,7 +3126,7 @@ kill_refs(struct ws_win *win) if (win == NULL) return; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) for (x = 0; x < workspace_limit; x++) { @@ -3088,7 +3149,7 @@ validate_win(struct ws_win *testwin) if (testwin == NULL) return (0); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) for (x = 0; x < workspace_limit; x++) { @@ -3108,7 +3169,7 @@ validate_ws(struct workspace *testws) int i, x, num_screens; /* validate all ws */ - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) for (x = 0; x < workspace_limit; x++) { @@ -3119,6 +3180,42 @@ validate_ws(struct workspace *testws) return (1); } +xcb_window_t +get_sibling(struct ws_win *win, int mode) +{ + struct ws_win *w = win; + + switch (mode) { + case SWM_STACK_TOP: + TAILQ_FOREACH_REVERSE(w, &w->ws->winlist, ws_win_list, entry) + if (w != win && !w->floating && !w->iconic) + break; + break; + case SWM_STACK_ABOVE: + do { + w = TAILQ_NEXT(w, entry); + } while (w != NULL && (w == win || w->floating || w->iconic)); + break; + case SWM_STACK_BELOW: + do { + w = TAILQ_PREV(w, ws_win_list, entry); + } while (w != NULL && (w == win || w->floating || w->iconic)); + break; + case SWM_STACK_BOTTOM: + TAILQ_FOREACH(w, &w->ws->winlist, entry) + if (w != win && !w->floating && !w->iconic) + break; + break; + default: + w = NULL; + } + + if (w == NULL) + return (win->ws->r->id); + else + return (w->id); +} + void unfocus_win(struct ws_win *win) { @@ -3150,6 +3247,8 @@ unfocus_win(struct ws_win *win) } if (win->ws->focus == win) { + if (tile_gap < 0 && !win->floating) + map_window(win, get_sibling(win, SWM_STACK_BELOW)); win->ws->focus = NULL; win->ws->focus_prev = win; } @@ -3251,22 +3350,30 @@ focus_win(struct ws_win *win) ws->always_raise) { /* If a parent exists, map it first. */ if (parent) { - map_window(parent); + map_window(parent, XCB_WINDOW_NONE); /* Map siblings next. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w != win && !w->iconic && w->transient == parent->id) - map_window(w); + map_window(w, XCB_WINDOW_NONE); } /* Map focused window. */ - map_window(win); + map_window(win, XCB_WINDOW_NONE); /* Finally, map children of focus window. */ TAILQ_FOREACH(w, &ws->winlist, entry) if (w->transient == win->id && !w->iconic) - map_window(w); + map_window(w, XCB_WINDOW_NONE); + } else if (tile_gap < 0 && !win->floating) { + /* + * Windows overlap in the layout. + * Raise focused win above all tiled wins. + */ + if (tile_gap < 0 && !win->floating) + map_window(win, + get_sibling(win, SWM_STACK_TOP)); } set_region(ws->r); @@ -3339,11 +3446,6 @@ set_region(struct swm_region *r) if (r == NULL) return; - /* Skip if only one region on this screen. */ - rf = TAILQ_FIRST(&r->s->rl); - if (TAILQ_NEXT(rf, entry) == NULL) - goto out; - rf = r->s->r_focus; /* Unfocus old region bar. */ if (rf) { @@ -3359,7 +3461,6 @@ set_region(struct swm_region *r) xcb_change_window_attributes(conn, r->bar->id, XCB_CW_BORDER_PIXEL, &r->s->c[SWM_S_COLOR_BAR_BORDER].pixel); -out: r->s->r_focus = r; } @@ -3383,7 +3484,7 @@ focus_region(struct swm_region *r) if (old_r) unfocus_win(old_r->ws->focus); - xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->s->root, + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->id, XCB_CURRENT_TIME); /* Clear bar since empty. */ @@ -3394,10 +3495,11 @@ focus_region(struct swm_region *r) void switchws(struct swm_region *r, union arg *args) { - int wsid = args->id, unmap_old = 0; struct swm_region *this_r, *other_r; struct ws_win *win; struct workspace *new_ws, *old_ws; + xcb_window_t none = XCB_WINDOW_NONE; + int wsid = args->id, unmap_old = 0; if (!(r && r->s)) return; @@ -3417,7 +3519,14 @@ switchws(struct swm_region *r, union arg *args) if (new_ws == old_ws) return; - unfocus_win(old_ws->focus); + if ((win = old_ws->focus) != NULL) { + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL, + &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].pixel); + + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root, + ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, + &none); + } other_r = new_ws->r; if (other_r == NULL) { @@ -3434,9 +3543,13 @@ 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) + /* Set focus_pending before stacking, if needed. */ + if (focus_mode != SWM_FOCUS_FOLLOW && (!new_ws->focus_pending || + validate_win(new_ws->focus_pending))) { new_ws->focus_pending = get_region_focus(new_ws->r); + new_ws->focus = new_ws->focus_prev; + new_ws->focus_prev = NULL; + } stack(); @@ -3449,17 +3562,16 @@ switchws(struct swm_region *r, union arg *args) 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); + new_ws->focus_pending = NULL; } } - /* Clear bar if new ws is empty. */ - if (new_ws->focus_pending == NULL) + /* Clear bar and set focus on region input win if new ws is empty. */ + if (new_ws->focus_pending == NULL && new_ws->focus == NULL) { + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->id, + XCB_CURRENT_TIME); bar_draw(); + } focus_flush(); @@ -3472,30 +3584,32 @@ cyclews(struct swm_region *r, union arg *args) union arg a; struct swm_screen *s = r->s; int cycle_all = 0; + int move = 0; DNPRINTF(SWM_D_WS, "cyclews: id: %d, screen[%d]:%dx%d+%d+%d, ws: %d\n", args->id, r->s->idx, WIDTH(r), HEIGHT(r), X(r), Y(r), r->ws->idx); a.id = r->ws->idx; + do { switch (args->id) { + case SWM_ARG_ID_CYCLEWS_MOVE_UP: + move = 1; + /* FALLTHROUGH */ case SWM_ARG_ID_CYCLEWS_UP_ALL: cycle_all = 1; /* FALLTHROUGH */ case SWM_ARG_ID_CYCLEWS_UP: - if (a.id < workspace_limit - 1) - a.id++; - else - a.id = 0; + a.id = (a.id < workspace_limit - 1) ? a.id + 1 : 0; break; + case SWM_ARG_ID_CYCLEWS_MOVE_DOWN: + move = 1; + /* FALLTHROUGH */ case SWM_ARG_ID_CYCLEWS_DOWN_ALL: cycle_all = 1; /* FALLTHROUGH */ case SWM_ARG_ID_CYCLEWS_DOWN: - if (a.id > 0) - a.id--; - else - a.id = workspace_limit - 1; + a.id = (a.id > 0) ? a.id - 1 : workspace_limit - 1; break; default: return; @@ -3507,6 +3621,9 @@ cyclews(struct swm_region *r, union arg *args) if (!cycle_visible && s->ws[a.id].r != NULL) continue; + if (move) + send_to_ws(r, &a); + switchws(r, &a); } while (a.id != r->ws->idx); } @@ -3534,7 +3651,7 @@ focusrg(struct swm_region *r, union arg *args) int ridx = args->id, i, num_screens; struct swm_region *rr = NULL; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); /* do nothing if we don't have more than one screen */ if (!(num_screens > 1 || outputs > 1)) return; @@ -3558,7 +3675,7 @@ cyclerg(struct swm_region *r, union arg *args) struct swm_region *rr = NULL; int i, num_screens; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); /* do nothing if we don't have more than one screen */ if (!(num_screens > 1 || outputs > 1)) return; @@ -3961,7 +4078,7 @@ stack(void) { DNPRINTF(SWM_D_STACK, "stack: begin\n"); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { #ifdef SWM_DEBUG j = 0; @@ -3994,15 +4111,15 @@ stack(void) { } void -store_float_geom(struct ws_win *win, struct swm_region *r) +store_float_geom(struct ws_win *win) { - if (win == NULL || r == NULL) + if (win == NULL || win->ws->r == NULL) return; /* retain window geom and region geom */ win->g_float = win->g; - win->g_float.x -= X(r); - win->g_float.y -= Y(r); + win->g_float.x -= X(win->ws->r); + win->g_float.y -= Y(win->ws->r); win->g_floatvalid = 1; DNPRINTF(SWM_D_MISC, "store_float_geom: window: 0x%x, g: (%d,%d)" " %d x %d, g_float: (%d,%d) %d x %d\n", win->id, X(win), Y(win), @@ -4011,15 +4128,15 @@ store_float_geom(struct ws_win *win, struct swm_region *r) } void -load_float_geom(struct ws_win *win, struct swm_region *r) +load_float_geom(struct ws_win *win) { - if (win == NULL || r == NULL) + if (win == NULL || win->ws->r == NULL) return; if (win->g_floatvalid) { win->g = win->g_float; - X(win) += X(r); - Y(win) += Y(r); + X(win) += X(win->ws->r); + Y(win) += Y(win->ws->r); DNPRINTF(SWM_D_MISC, "load_float_geom: window: 0x%x, g: (%d,%d)" "%d x %d\n", win->id, X(win), Y(win), WIDTH(win), HEIGHT(win)); @@ -4044,7 +4161,7 @@ stack_floater(struct ws_win *win, struct swm_region *r) if (win->floatmaxed || (r != r->ws->old_r && !(win->ewmh_flags & EWMH_F_FULLSCREEN))) { /* update geometry for the new region */ - load_float_geom(win, r); + load_float_geom(win); } win->floatmaxed = 0; @@ -4054,7 +4171,7 @@ stack_floater(struct ws_win *win, struct swm_region *r) */ if (win->ewmh_flags & EWMH_F_FULLSCREEN) { if (!win->g_floatvalid) - store_float_geom(win, win->ws->r); + store_float_geom(win); win->g = r->g; } @@ -4091,11 +4208,11 @@ stack_floater(struct ws_win *win, struct swm_region *r) X(win) = X(r) + (WIDTH(r) - WIDTH(win)) / 2 - BORDER(win); Y(win) = Y(r) + (HEIGHT(r) - HEIGHT(win)) / 2 - BORDER(win); - store_float_geom(win, r); + store_float_geom(win); } - /* keep window within region bounds */ - constrain_window(win, r, 0); + /* Ensure at least 1 pixel of the window is in the region. */ + region_containment(win, r, SWM_CW_ALLSIDES); update_window(win); } @@ -4223,20 +4340,24 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) colno = (winno - mwin) / stacks; if (s <= (winno - mwin) % stacks) colno++; - split = split + colno; - hrh = (r_g.h / colno); + split += colno; + hrh = r_g.h / colno; extra = r_g.h - (colno * hrh); - if (flip) - win_g.x = r_g.x; - else + + if (!flip) win_g.x += win_g.w + 2 * border_width + tile_gap; + win_g.w = (r_g.w - msize - (stacks * (2 * border_width + tile_gap))) / stacks; if (s == 1) win_g.w += (r_g.w - msize - (stacks * (2 * border_width + tile_gap))) % stacks; + + if (flip) + win_g.x -= win_g.w + 2 * border_width + + tile_gap; s--; j = 0; } @@ -4311,13 +4432,17 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) update_window(win); } - map_window(win); + map_window(win, get_sibling(win, SWM_STACK_BELOW)); last_h = win_g.h; i++; j++; } + /* Map/raise focused tiled window to top if windows could overlap. */ + if (tile_gap < 0 && ws->focus != NULL && !ws->focus->floating) + map_window(ws->focus, get_sibling(ws->focus, SWM_STACK_TOP)); + notiles: /* now, stack all the floaters and transients */ TAILQ_FOREACH(win, &ws->winlist, entry) { @@ -4331,13 +4456,13 @@ notiles: } stack_floater(win, ws->r); - map_window(win); + map_window(win, XCB_WINDOW_NONE); } /* 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); + map_window(fs_win, XCB_WINDOW_NONE); } } @@ -4448,7 +4573,7 @@ max_stack(struct workspace *ws, struct swm_geometry *g) { struct swm_geometry gg = *g; struct ws_win *w, *win = NULL, *parent = NULL; - int winno, num_screens; + int winno; DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx); @@ -4464,6 +4589,8 @@ max_stack(struct workspace *ws, struct swm_geometry *g) win = ws->focus_pending; else if (ws->focus) win = ws->focus; + else if (ws->focus_prev) + win = ws->focus_prev; else win = TAILQ_FIRST(&ws->winlist); @@ -4473,17 +4600,19 @@ max_stack(struct workspace *ws, struct swm_geometry *g) 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(w, &ws->winlist, entry) { if (w->transient || w->iconic) continue; + if (!w->mapped && w != win) + map_window(w, XCB_WINDOW_NONE); + if (w->floating && !w->floatmaxed) { /* * retain geometry for retrieval on exit from * max_stack mode */ - store_float_geom(w, ws->r); + store_float_geom(w); w->floatmaxed = 1; } @@ -4501,34 +4630,29 @@ max_stack(struct workspace *ws, struct swm_geometry *g) update_window(w); } - - /* Unmap unwanted windows if not multi-screen. */ - if (num_screens <= 1 && outputs <= 1 && w != win && - w != parent && w->transient != win->id) - unmap_window(w); } - /* If a parent exists, map it first. */ + /* If a parent exists, map/raise it first. */ if (parent) { - map_window(parent); + map_window(parent, XCB_WINDOW_NONE); /* 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_window(w, XCB_WINDOW_NONE); } } - /* Map focused window. */ - map_window(win); + /* Map/raise focused window. */ + map_window(win, XCB_WINDOW_NONE); - /* Finally, map children of focus window. */ + /* Finally, map/raise 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); + map_window(w, XCB_WINDOW_NONE); } } @@ -4539,7 +4663,7 @@ send_to_rg(struct swm_region *r, union arg *args) struct swm_region *rr = NULL; union arg a; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); /* do nothing if we don't have more than one screen */ if (!(num_screens > 1 || outputs > 1)) return; @@ -4558,31 +4682,74 @@ send_to_rg(struct swm_region *r, union arg *args) send_to_ws(r, &a); } +struct swm_region * +region_under(struct swm_screen *s, int x, int y) +{ + struct swm_region *r = NULL; + + TAILQ_FOREACH(r, &s->rl, entry) { + DNPRINTF(SWM_D_MISC, "region_under: ws: %d, region g: (%d,%d) " + "%d x %d, coords: (%d,%d)\n", r->ws->idx, X(r), Y(r), + WIDTH(r), HEIGHT(r), x, y); + if (X(r) <= x && x < MAX_X(r)) + if (Y(r) <= y && y < MAX_Y(r)) + return (r); + } + + return (NULL); +} + void send_to_ws(struct swm_region *r, union arg *args) { int wsid = args->id; - struct ws_win *win = NULL, *parent; - struct workspace *ws, *nws, *pws; - char ws_idx_str[SWM_PROPLEN]; - - if (wsid >= workspace_limit) - return; + struct ws_win *win = NULL; if (r && r->ws && r->ws->focus) win = r->ws->focus; else return; - if (win->ws->idx == wsid) + DNPRINTF(SWM_D_MOVE, "send_to_ws: win 0x%x, ws %d\n", win->id, wsid); + + win_to_ws(win, wsid, 1); + + /* Restack and set new focus. */ + stack(); + + if (focus_mode != SWM_FOCUS_FOLLOW) { + if (r->ws->focus_pending) { + focus_win(r->ws->focus_pending); + r->ws->focus_pending = NULL; + } else { + xcb_set_input_focus(conn, + XCB_INPUT_FOCUS_PARENT, r->id, + XCB_CURRENT_TIME); + } + } + + focus_flush(); +} + +void +win_to_ws(struct ws_win *win, int wsid, int unfocus) +{ + struct ws_win *parent; + struct workspace *ws, *nws, *pws; + char ws_idx_str[SWM_PROPLEN]; + + if (wsid >= workspace_limit) return; - DNPRINTF(SWM_D_MOVE, "send_to_ws: win 0x%x, ws %d -> %d\n", win->id, - win->ws->idx, wsid); + if (win->ws->idx == wsid) + return; ws = win->ws; nws = &win->s->ws[wsid]; + DNPRINTF(SWM_D_MOVE, "win_to_ws: win 0x%x, ws %d -> %d\n", win->id, + ws->idx, wsid); + /* Update the window's workspace property: _SWM_WS */ if (snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < SWM_PROPLEN) { if (focus_mode != SWM_FOCUS_FOLLOW) @@ -4601,11 +4768,10 @@ send_to_ws(struct swm_region *r, union arg *args) unfocus_win(parent); - if (focus_mode != SWM_FOCUS_FOLLOW) + if (focus_mode != SWM_FOCUS_FOLLOW) { pws->focus = pws->focus_pending; - - if (focus_mode != SWM_FOCUS_FOLLOW) pws->focus_pending = NULL; + } } /* Don't unmap parent if new ws is visible */ @@ -4617,7 +4783,7 @@ send_to_ws(struct swm_region *r, union arg *args) TAILQ_INSERT_TAIL(&nws->winlist, parent, entry); parent->ws = nws; - DNPRINTF(SWM_D_PROP, "send_to_ws: set " + DNPRINTF(SWM_D_PROP, "win_to_ws: set " "property: _SWM_WS: %s\n", ws_idx_str); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, parent->id, a_swm_ws, XCB_ATOM_STRING, 8, @@ -4625,7 +4791,8 @@ send_to_ws(struct swm_region *r, union arg *args) } } - unfocus_win(win); + if (unfocus) + unfocus_win(win); /* Don't unmap if new ws is visible */ if (nws->r == NULL) @@ -4640,24 +4807,14 @@ send_to_ws(struct swm_region *r, union arg *args) unfocus_win(nws->focus); nws->focus = win; - DNPRINTF(SWM_D_PROP, "send_to_ws: set property: _SWM_WS: %s\n", + DNPRINTF(SWM_D_PROP, "win_to_ws: set property: _SWM_WS: %s\n", ws_idx_str); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, a_swm_ws, XCB_ATOM_STRING, 8, strlen(ws_idx_str), ws_idx_str); - - /* Restack and set new focus. */ - stack(); - - if (focus_mode != SWM_FOCUS_FOLLOW) { - focus_win(ws->focus_pending); - ws->focus_pending = NULL; - } - - focus_flush(); } - DNPRINTF(SWM_D_MOVE, "send_to_ws: done.\n"); + DNPRINTF(SWM_D_MOVE, "win_to_ws: done.\n"); } void @@ -4712,7 +4869,7 @@ get_win_name(xcb_window_t win) xcb_get_property_reply_t *r; /* First try _NET_WM_NAME for UTF-8. */ - c = xcb_get_property(conn, 0, win, a_netwmname, + c = xcb_get_property(conn, 0, win, ewmh[_NET_WM_NAME].atom, XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX); r = xcb_get_property_reply(conn, c, NULL); @@ -4721,7 +4878,7 @@ get_win_name(xcb_window_t win) free(r); /* Use WM_NAME instead; no UTF-8. */ c = xcb_get_property(conn, 0, win, XCB_ATOM_WM_NAME, - XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX); + XCB_GET_PROPERTY_TYPE_ANY, 0, UINT_MAX); r = xcb_get_property_reply(conn, c, NULL); if (!r) @@ -4733,7 +4890,7 @@ get_win_name(xcb_window_t win) } if (r->length > 0) name = strndup(xcb_get_property_value(r), - xcb_get_property_value_length(r)); + xcb_get_property_value_length(r)); free(r); } @@ -4963,7 +5120,7 @@ search_win(struct swm_region *r, union arg *args) } void -search_resp_uniconify(const char *resp, unsigned long len) +search_resp_uniconify(const char *resp, size_t len) { char *name; struct ws_win *win; @@ -4993,7 +5150,7 @@ search_resp_uniconify(const char *resp, unsigned long len) } void -search_resp_name_workspace(const char *resp, unsigned long len) +search_resp_name_workspace(const char *resp, size_t len) { struct workspace *ws; @@ -5089,7 +5246,7 @@ search_do_resp(void) { ssize_t rbytes; char *resp; - unsigned long len; + size_t len; DNPRINTF(SWM_D_MISC, "search_do_resp:\n"); @@ -5161,16 +5318,12 @@ wkill(struct swm_region *r, union arg *args) int floating_toggle_win(struct ws_win *win) { - struct swm_region *r; - if (win == NULL) return (0); if (!win->ws->r) return (0); - r = win->ws->r; - /* reject floating toggles in max stack mode */ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK]) return (0); @@ -5178,11 +5331,11 @@ floating_toggle_win(struct ws_win *win) if (win->floating) { if (!win->floatmaxed) { /* retain position for refloat */ - store_float_geom(win, r); + store_float_geom(win); } win->floating = 0; } else { - load_float_geom(win, r); + load_float_geom(win); win->floating = 1; } @@ -5217,37 +5370,85 @@ floating_toggle(struct swm_region *r, union arg *args) } void -constrain_window(struct ws_win *win, struct swm_region *r, int resizable) +region_containment(struct ws_win *win, struct swm_region *r, int opts) { - if (MAX_X(win) + BORDER(win) > MAX_X(r)) { - if (resizable) - WIDTH(win) = MAX_X(r) - X(win) - BORDER(win); + struct swm_geometry g = r->g; + int rt, lt, tp, bm, bw; + + bw = (opts & SWM_CW_SOFTBOUNDARY) ? boundary_width : 0; + + /* + * Perpendicular distance of each side of the window to the respective + * side of the region boundary. Positive values indicate the side of + * the window has passed beyond the region boundary. + */ + rt = opts & SWM_CW_RIGHT ? MAX_X(win) + BORDER(win) - MAX_X(r) : bw; + lt = opts & SWM_CW_LEFT ? X(r) - X(win) + BORDER(win) : bw; + bm = opts & SWM_CW_BOTTOM ? MAX_Y(win) + BORDER(win) - MAX_Y(r) : bw; + tp = opts & SWM_CW_TOP ? Y(r) - Y(win) + BORDER(win) : bw; + + DNPRINTF(SWM_D_MISC, "region_containment: win 0x%x, rt: %d, lt: %d, " + "bm: %d, tp: %d, SOFTBOUNDARY: %s, HARDBOUNDARY: %s\n", win->id, rt, + lt, bm, tp, YESNO(opts & SWM_CW_SOFTBOUNDARY), + YESNO(opts & SWM_CW_HARDBOUNDARY)); + + /* + * Disable containment if any of the flagged sides went beyond the + * containment boundary, or if containment is disabled. + */ + if (!(opts & SWM_CW_HARDBOUNDARY || opts & SWM_CW_SOFTBOUNDARY) || + (bw != 0 && ((rt > bw) || (lt > bw) || (bm > bw) || (tp > bw)))) { + /* Make sure window has at least 1 pixel in the region */ + g.x += 1 - WIDTH(win); + g.y += 1 - HEIGHT(win); + g.w += 2 * WIDTH(win) - 2; + g.h += 2 * HEIGHT(win) - 2; + } + + constrain_window(win, &g, &opts); +} + +/* Move or resize a window so that flagged side(s) fit into the supplied box. */ +void +constrain_window(struct ws_win *win, struct swm_geometry *b, int *opts) +{ + DNPRINTF(SWM_D_MISC, "constrain_window: window: 0x%x, (x,y) w x h: " + "(%d,%d) %d x %d, box: (x,y) w x h: (%d,%d) %d x %d, rt: %s, " + "lt: %s, bt: %s, tp: %s, allow resize: %s\n", win->id, X(win), + Y(win), WIDTH(win), HEIGHT(win), b->x, b->y, b->w, b->h, + YESNO(*opts & SWM_CW_RIGHT), YESNO(*opts & SWM_CW_LEFT), + YESNO(*opts & SWM_CW_BOTTOM), YESNO(*opts & SWM_CW_TOP), + YESNO(*opts & SWM_CW_RESIZABLE)); + + if ((*opts & SWM_CW_RIGHT) && MAX_X(win) + BORDER(win) > b->x + b->w) { + if (*opts & SWM_CW_RESIZABLE) + WIDTH(win) = b->x + b->w - X(win) - BORDER(win); else - X(win) = MAX_X(r)- WIDTH(win) - BORDER(win); + X(win) = b->x + b->w - WIDTH(win) - BORDER(win); } - if (X(win) + BORDER(win) < X(r)) { - if (resizable) - WIDTH(win) -= X(r) - X(win) - BORDER(win); + if ((*opts & SWM_CW_LEFT) && X(win) + BORDER(win) < b->x) { + if (*opts & SWM_CW_RESIZABLE) + WIDTH(win) -= b->x - X(win) - BORDER(win); - X(win) = X(r) - BORDER(win); + X(win) = b->x - BORDER(win); } - if (MAX_Y(win) + BORDER(win) > MAX_Y(r)) { - if (resizable) - HEIGHT(win) = MAX_Y(r) - Y(win) - BORDER(win); + if ((*opts & SWM_CW_BOTTOM) && MAX_Y(win) + BORDER(win) > b->y + b->h) { + if (*opts & SWM_CW_RESIZABLE) + HEIGHT(win) = b->y + b->h - Y(win) - BORDER(win); else - Y(win) = MAX_Y(r) - HEIGHT(win) - BORDER(win); + Y(win) = b->y + b->h - HEIGHT(win) - BORDER(win); } - if (Y(win) + BORDER(win) < Y(r)) { - if (resizable) - HEIGHT(win) -= Y(r) - Y(win) - BORDER(win); + if ((*opts & SWM_CW_TOP) && Y(win) + BORDER(win) < b->y) { + if (*opts & SWM_CW_RESIZABLE) + HEIGHT(win) -= b->y - Y(win) - BORDER(win); - Y(win) = Y(r) - BORDER(win); + Y(win) = b->y - BORDER(win); } - if (resizable) { + if (*opts & SWM_CW_RESIZABLE) { if (WIDTH(win) < 1) WIDTH(win) = 1; if (HEIGHT(win) < 1) @@ -5289,7 +5490,7 @@ resize(struct ws_win *win, union arg *args) int top = 0, left = 0, resizing; int dx, dy; xcb_cursor_t cursor; - xcb_query_pointer_reply_t *xpr; + xcb_query_pointer_reply_t *xpr = NULL; xcb_generic_event_t *evt; xcb_motion_notify_event_t *mne; @@ -5319,6 +5520,12 @@ resize(struct ws_win *win, union arg *args) focus_flush(); + /* It's possible for win to have been freed during focus_flush(). */ + if (validate_win(win)) { + DNPRINTF(SWM_D_EVENT, "resize: invalid win.\n"); + goto out; + } + switch (args->id) { case SWM_ARG_ID_WIDTHSHRINK: WIDTH(win) -= SWM_RESIZE_STEPS; @@ -5340,12 +5547,17 @@ resize(struct ws_win *win, union arg *args) break; } if (resize_stp) { - constrain_window(win, r, 1); + region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE | + SWM_CW_HARDBOUNDARY); update_window(win); - store_float_geom(win,r); + store_float_geom(win); return; } + region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE | + SWM_CW_SOFTBOUNDARY); + update_window(win); + /* get cursor offset from window root */ xpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id), NULL); @@ -5375,7 +5587,7 @@ resize(struct ws_win *win, union arg *args) xcb_flush(conn); resizing = 1; - while ((evt = xcb_wait_for_event(conn)) && resizing) { + while (resizing && (evt = xcb_wait_for_event(conn))) { switch (XCB_EVENT_RESPONSE_TYPE(evt)) { case XCB_BUTTON_RELEASE: DNPRINTF(SWM_D_EVENT, "resize: BUTTON_RELEASE\n"); @@ -5427,27 +5639,37 @@ resize(struct ws_win *win, union arg *args) WIDTH(win) = g.w + dx; } - constrain_window(win, r, 1); - /* not free, don't sync more than 120 times / second */ if ((mne->time - timestamp) > (1000 / 120) ) { timestamp = mne->time; + regionize(win, mne->root_x, mne->root_y); + region_containment(win, r, SWM_CW_ALLSIDES | + SWM_CW_RESIZABLE | SWM_CW_HARDBOUNDARY | + SWM_CW_SOFTBOUNDARY); update_window(win); xcb_flush(conn); } break; default: event_handle(evt); + + /* It's possible for win to have been freed above. */ + if (validate_win(win)) { + DNPRINTF(SWM_D_EVENT, "resize: invalid win.\n"); + goto out; + } break; } free(evt); } if (timestamp) { + region_containment(win, r, SWM_CW_ALLSIDES | SWM_CW_RESIZABLE | + SWM_CW_HARDBOUNDARY | SWM_CW_SOFTBOUNDARY); update_window(win); xcb_flush(conn); } - store_float_geom(win,r); - + store_float_geom(win); +out: xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); free(xpr); DNPRINTF(SWM_D_EVENT, "resize: done.\n"); @@ -5467,6 +5689,23 @@ resize_step(struct swm_region *r, union arg *args) focus_flush(); } +/* Try to set window region based on supplied coordinates or window center. */ +void +regionize(struct ws_win *win, int x, int y) +{ + struct swm_region *r = NULL; + + r = region_under(win->s, x, y); + if (r == NULL) + r = region_under(win->s, X(win) + WIDTH(win) / 2, + Y(win) + HEIGHT(win) / 2); + + if (r && r != win->ws->r) { + win_to_ws(win, r->ws->idx, 0); + set_region(r); + } +} + #define SWM_MOVE_STEPS (50) void @@ -5474,14 +5713,12 @@ move(struct ws_win *win, union arg *args) { xcb_timestamp_t timestamp = 0; int move_stp = 0, moving; - struct swm_region *r = NULL; - xcb_query_pointer_reply_t *qpr; + xcb_query_pointer_reply_t *qpr = NULL; xcb_generic_event_t *evt; xcb_motion_notify_event_t *mne; if (win == NULL) return; - r = win->ws->r; if (win->ewmh_flags & EWMH_F_FULLSCREEN) return; @@ -5493,19 +5730,28 @@ move(struct ws_win *win, union arg *args) if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !win->transient) return; - win->manual = 1; + if (!win->manual) { + win->manual = 1; + ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom, + _NET_WM_STATE_ADD); + } + + /* When a stacked win is moved, float it and restack. */ if (!win->floating && !win->transient) { - store_float_geom(win, r); + store_float_geom(win); ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom, _NET_WM_STATE_ADD); + stack(); } - ewmh_update_win_state(win, ewmh[_SWM_WM_STATE_MANUAL].atom, - _NET_WM_STATE_ADD); - - stack(); focus_flush(); + /* It's possible for win to have been freed during focus_flush(). */ + if (validate_win(win)) { + DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + goto out; + } + move_stp = 0; switch (args->id) { case SWM_ARG_ID_MOVELEFT: @@ -5528,9 +5774,10 @@ move(struct ws_win *win, union arg *args) break; } if (move_stp) { - constrain_window(win, r, 0); + regionize(win, -1, -1); + region_containment(win, win->ws->r, SWM_CW_ALLSIDES); update_window(win); - store_float_geom(win, r); + store_float_geom(win); return; } @@ -5546,9 +5793,13 @@ move(struct ws_win *win, union arg *args) return; } + regionize(win, qpr->root_x, qpr->root_y); + region_containment(win, win->ws->r, SWM_CW_ALLSIDES | + SWM_CW_SOFTBOUNDARY); + update_window(win); xcb_flush(conn); moving = 1; - while ((evt = xcb_wait_for_event(conn)) && moving) { + while (moving && (evt = xcb_wait_for_event(conn))) { switch (XCB_EVENT_RESPONSE_TYPE(evt)) { case XCB_BUTTON_RELEASE: DNPRINTF(SWM_D_EVENT, "move: BUTTON_RELEASE\n"); @@ -5556,29 +5807,40 @@ move(struct ws_win *win, union arg *args) break; case XCB_MOTION_NOTIFY: mne = (xcb_motion_notify_event_t *)evt; + DNPRINTF(SWM_D_EVENT, "motion: root: 0x%x\n", mne->root); X(win) = mne->root_x - qpr->win_x - border_width; Y(win) = mne->root_y - qpr->win_y - border_width; - constrain_window(win, r, 0); - /* not free, don't sync more than 120 times / second */ if ((mne->time - timestamp) > (1000 / 120) ) { timestamp = mne->time; + regionize(win, mne->root_x, mne->root_y); + region_containment(win, win->ws->r, + SWM_CW_ALLSIDES | SWM_CW_SOFTBOUNDARY); update_window(win); xcb_flush(conn); } break; default: event_handle(evt); + + /* It's possible for win to have been freed above. */ + if (validate_win(win)) { + DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + goto out; + } break; } free(evt); } if (timestamp) { + region_containment(win, win->ws->r, SWM_CW_ALLSIDES | + SWM_CW_SOFTBOUNDARY); update_window(win); xcb_flush(conn); } - store_float_geom(win, r); + store_float_geom(win); +out: free(qpr); xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); DNPRINTF(SWM_D_EVENT, "move: done.\n"); @@ -5715,8 +5977,10 @@ struct keyfunc { { "ws_22", switchws, {.id = 21} }, { "ws_next", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP} }, { "ws_next_all", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP_ALL} }, + { "ws_next_move", cyclews, {.id = SWM_ARG_ID_CYCLEWS_MOVE_UP} }, { "ws_prev", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} }, { "ws_prev_all", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN_ALL} }, + { "ws_prev_move", cyclews, {.id = SWM_ARG_ID_CYCLEWS_MOVE_DOWN} }, { "ws_prior", priorws, {0} }, { "dumpwins", dumpwins, {0} }, /* MUST BE LAST */ { "invalid key func", NULL, {0} }, @@ -5780,7 +6044,7 @@ spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name, char ***ret_args) { struct spawn_prog *prog = NULL; - int i; + int i, c; char *ap, **real_args; /* suppress unused warning since var is needed */ @@ -5803,62 +6067,68 @@ spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name, err(1, "spawn_custom: calloc real_args"); /* expand spawn_args into real_args */ - for (i = 0; i < prog->argc; i++) { + for (i = c = 0; i < prog->argc; i++) { ap = prog->argv[i]; DNPRINTF(SWM_D_SPAWN, "spawn_custom: raw arg: %s\n", ap); if (!strcasecmp(ap, "$bar_border")) { - if ((real_args[i] = + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_BAR_BORDER].name)) == NULL) err(1, "spawn_custom border color"); } else if (!strcasecmp(ap, "$bar_color")) { - if ((real_args[i] = + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_BAR].name)) == NULL) err(1, "spawn_custom bar color"); } else if (!strcasecmp(ap, "$bar_font")) { - if ((real_args[i] = strdup(bar_fonts)) + if ((real_args[c] = strdup(bar_fonts)) == NULL) err(1, "spawn_custom bar fonts"); } else if (!strcasecmp(ap, "$bar_font_color")) { - if ((real_args[i] = + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_BAR_FONT].name)) == NULL) err(1, "spawn_custom color font"); } else if (!strcasecmp(ap, "$color_focus")) { - if ((real_args[i] = + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_FOCUS].name)) == NULL) err(1, "spawn_custom color focus"); } else if (!strcasecmp(ap, "$color_unfocus")) { - if ((real_args[i] = + if ((real_args[c] = strdup(r->s->c[SWM_S_COLOR_UNFOCUS].name)) == NULL) err(1, "spawn_custom color unfocus"); } else if (!strcasecmp(ap, "$region_index")) { - if (asprintf(&real_args[i], "%d", + if (asprintf(&real_args[c], "%d", get_region_index(r) + 1) < 1) err(1, "spawn_custom region index"); } else if (!strcasecmp(ap, "$workspace_index")) { - if (asprintf(&real_args[i], "%d", r->ws->idx + 1) < 1) + if (asprintf(&real_args[c], "%d", r->ws->idx + 1) < 1) + err(1, "spawn_custom workspace index"); + } else if (!strcasecmp(ap, "$dmenu_bottom")) { + if (!bar_at_bottom) + continue; + if ((real_args[c] = strdup("-b")) == NULL) err(1, "spawn_custom workspace index"); } else { /* no match --> copy as is */ - if ((real_args[i] = strdup(ap)) == NULL) + if ((real_args[c] = strdup(ap)) == NULL) err(1, "spawn_custom strdup(ap)"); } DNPRINTF(SWM_D_SPAWN, "spawn_custom: cooked arg: %s\n", - real_args[i]); + real_args[c]); + ++c; } #ifdef SWM_DEBUG DNPRINTF(SWM_D_SPAWN, "spawn_custom: result: "); - for (i = 0; i < prog->argc; i++) - DNPRINTF(SWM_D_SPAWN, "\"%s\" ", real_args[i]); - DNPRINTF(SWM_D_SPAWN, "\n"); + for (i = 0; i < c; ++i) + DPRINTF("\"%s\" ", real_args[i]); + DPRINTF("\n"); #endif *ret_args = real_args; - return (prog->argc); + return (c); } void @@ -5923,7 +6193,7 @@ spawn_select(struct swm_region *r, union arg *args, const char *spawn_name, } void -spawn_insert(const char *name, const char *args) +spawn_insert(const char *name, const char *args, int flags) { char *arg, *cp, *ptr; struct spawn_prog *sp; @@ -5952,6 +6222,8 @@ spawn_insert(const char *name, const char *args) } free(cp); + sp->flags = flags; + TAILQ_INSERT_TAIL(&spawns, sp, entry); DNPRINTF(SWM_D_SPAWN, "spawn_insert: leave\n"); } @@ -5973,19 +6245,20 @@ spawn_remove(struct spawn_prog *sp) DNPRINTF(SWM_D_SPAWN, "spawn_remove: leave\n"); } -void -spawn_replace(struct spawn_prog *sp, const char *name, const char *args) +struct spawn_prog* +spawn_find(const char *name) { - DNPRINTF(SWM_D_SPAWN, "spawn_replace: %s [%s]\n", sp->name, name); + struct spawn_prog *sp; - spawn_remove(sp); - spawn_insert(name, args); + TAILQ_FOREACH(sp, &spawns, entry) + if (!strcasecmp(sp->name, name)) + return sp; - DNPRINTF(SWM_D_SPAWN, "spawn_replace: leave\n"); + return NULL; } void -setspawn(const char *name, const char *args) +setspawn(const char *name, const char *args, int flags) { struct spawn_prog *sp; @@ -5994,38 +6267,28 @@ setspawn(const char *name, const char *args) if (name == NULL) return; - TAILQ_FOREACH(sp, &spawns, entry) { - if (!strcmp(sp->name, name)) { - if (*args == '\0') - spawn_remove(sp); - else - spawn_replace(sp, name, args); - DNPRINTF(SWM_D_SPAWN, "setspawn: leave\n"); - return; - } - } - if (*args == '\0') { + /* Remove any old spawn under the same name. */ + if ((sp = spawn_find(name)) != NULL) + spawn_remove(sp); + + if (*args != '\0') + spawn_insert(name, args, flags); + else warnx("error: setspawn: cannot find program: %s", name); - return; - } - spawn_insert(name, args); DNPRINTF(SWM_D_SPAWN, "setspawn: leave\n"); } int setconfspawn(char *selector, char *value, int flags) { - char *args; - - /* suppress unused warning since var is needed */ - (void)flags; + char *args; args = expand_tilde(value); DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args); - setspawn(selector, args); + setspawn(selector, args, flags); free(args); DNPRINTF(SWM_D_SPAWN, "setconfspawn: done.\n"); @@ -6033,34 +6296,76 @@ setconfspawn(char *selector, char *value, int flags) } void +validate_spawns(void) +{ + struct spawn_prog *sp; + char which[PATH_MAX]; + size_t i; + + struct key *kp; + + RB_FOREACH(kp, key_tree, &keys) { + if (kp->funcid != KF_SPAWN_CUSTOM) + continue; + + /* find program */ + sp = spawn_find(kp->spawn_name); + if (sp == NULL || sp->flags & SWM_SPAWN_OPTIONAL) + continue; + + /* verify we have the goods */ + snprintf(which, sizeof which, "which %s", sp->argv[0]); + DNPRINTF(SWM_D_CONF, "validate_spawns: which %s\n", + sp->argv[0]); + for (i = strlen("which "); i < strlen(which); i++) + if (which[i] == ' ') { + which[i] = '\0'; + break; + } + if (system(which) != 0) + add_startup_exception("could not find %s", + &which[strlen("which ")]); + } +} + +void setup_spawn(void) { + setconfspawn("lock", "xlock", 0); + setconfspawn("term", "xterm", 0); setconfspawn("spawn_term", "xterm", 0); - setconfspawn("screenshot_all", "screenshot.sh full", 0); - setconfspawn("screenshot_wind", "screenshot.sh window", 0); - setconfspawn("lock", "xlock", 0); - setconfspawn("initscr", "initscreen.sh", 0); + setconfspawn("menu", "dmenu_run" + " $dmenu_bottom" " -fn $bar_font" " -nb $bar_color" " -nf $bar_font_color" " -sb $bar_border" " -sf $bar_color", 0); + setconfspawn("search", "dmenu" + " $dmenu_bottom" " -i" " -fn $bar_font" " -nb $bar_color" " -nf $bar_font_color" " -sb $bar_border" " -sf $bar_color", 0); + setconfspawn("name_workspace", "dmenu" + " $dmenu_bottom" " -p Workspace" " -fn $bar_font" " -nb $bar_color" " -nf $bar_font_color" " -sb $bar_border" " -sf $bar_color", 0); + + /* These are not verified for existence, even with a binding set. */ + setconfspawn("screenshot_all", "screenshot.sh full", SWM_SPAWN_OPTIONAL); + setconfspawn("screenshot_wind", "screenshot.sh window", SWM_SPAWN_OPTIONAL); + setconfspawn("initscr", "initscreen.sh", SWM_SPAWN_OPTIONAL); } /* key bindings */ @@ -6234,8 +6539,8 @@ setconfbinding(char *selector, char *value, int flags) for (kfid = 0; kfid < KF_INVALID; (kfid)++) { if (strncasecmp(selector, keyfuncs[kfid].name, SWM_FUNCNAME_LEN) == 0) { - DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n", - selector); + DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match " + "keyfunc\n", selector); if (parsekeys(value, mod_key, &mod, &ks) == 0) { setkeybinding(mod, ks, kfid, NULL); return (0); @@ -6244,17 +6549,15 @@ setconfbinding(char *selector, char *value, int flags) } } /* search by custom spawn name */ - TAILQ_FOREACH(sp, &spawns, entry) { - if (strcasecmp(selector, sp->name) == 0) { - DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n", - selector); - if (parsekeys(value, mod_key, &mod, &ks) == 0) { - setkeybinding(mod, ks, KF_SPAWN_CUSTOM, - sp->name); - return (0); - } else - return (1); - } + if ((sp = spawn_find(selector)) != NULL) { + DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match " + "spawn\n", selector); + if (parsekeys(value, mod_key, &mod, &ks) == 0) { + setkeybinding(mod, ks, KF_SPAWN_CUSTOM, + sp->name); + return (0); + } else + return (1); } DNPRINTF(SWM_D_KEY, "setconfbinding: no match\n"); return (1); @@ -6378,6 +6681,8 @@ setup_keys(void) setkeybinding(MODKEY, XK_Left, KF_WS_PREV, NULL); setkeybinding(MODKEY, XK_Up, KF_WS_NEXT_ALL, NULL); setkeybinding(MODKEY, XK_Down, KF_WS_PREV_ALL, NULL); + setkeybinding(MODKEY_SHIFT, XK_Up, KF_WS_NEXT_MOVE,NULL); + setkeybinding(MODKEY_SHIFT, XK_Down, KF_WS_PREV_MOVE,NULL); setkeybinding(MODKEY, XK_a, KF_WS_PRIOR, NULL); #ifdef SWM_DEBUG setkeybinding(MODKEY_SHIFT, XK_d, KF_DUMPWINS, NULL); @@ -6399,24 +6704,25 @@ clear_keys(void) int setkeymapping(char *selector, char *value, int flags) { - char keymapping_file[PATH_MAX]; + char *keymapping_file; /* suppress unused warnings since vars are needed */ (void)selector; (void)flags; DNPRINTF(SWM_D_KEY, "setkeymapping: enter\n"); - if (value[0] == '~') - snprintf(keymapping_file, sizeof keymapping_file, "%s/%s", - pwd->pw_dir, &value[1]); - else - strlcpy(keymapping_file, value, sizeof keymapping_file); + + keymapping_file = expand_tilde(value); + clear_keys(); /* load new key bindings; if it fails, revert to default bindings */ if (conf_load(keymapping_file, SWM_CONF_KEYMAPPING)) { clear_keys(); setup_keys(); } + + free(keymapping_file); + DNPRINTF(SWM_D_KEY, "setkeymapping: leave\n"); return (0); } @@ -6467,13 +6773,23 @@ grabkeys(void) modifiers[2] = XCB_MOD_MASK_LOCK; modifiers[3] = numlockmask | XCB_MOD_MASK_LOCK; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (k = 0; k < num_screens; k++) { if (TAILQ_EMPTY(&screens[k].rl)) continue; xcb_ungrab_key(conn, XCB_GRAB_ANY, screens[k].root, XCB_MOD_MASK_ANY); RB_FOREACH(kp, key_tree, &keys) { + /* Skip unused ws binds. */ + if ((int)kp->funcid > KF_WS_1 + workspace_limit - 1 && + kp->funcid <= KF_WS_22) + continue; + + /* Skip unused mvws binds. */ + if ((int)kp->funcid > KF_MVWS_1 + workspace_limit - 1 && + kp->funcid <= KF_MVWS_22) + continue; + if ((code = xcb_key_symbols_get_keycode(syms, kp->keysym))) { for (j = 0; j < LENGTH(modifiers); j++) @@ -6520,6 +6836,8 @@ const char *quirkname[] = { "XTERM_FONTADJ", "FULLSCREEN", "FOCUSPREV", + "NOFOCUSONMAP", + "FOCUSONMAP_SINGLE", }; /* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */ @@ -6689,6 +7007,7 @@ enum { SWM_S_BAR_FORMAT, SWM_S_BAR_JUSTIFY, SWM_S_BORDER_WIDTH, + SWM_S_BOUNDARY_WIDTH, SWM_S_CLOCK_ENABLED, SWM_S_CLOCK_FORMAT, SWM_S_CYCLE_EMPTY, @@ -6751,7 +7070,7 @@ setconfvalue(char *selector, char *value, int flags) errx(1, "setconfvalue: bar_enabled_ws: invalid " "workspace %d.", ws_id + 1); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { ws = (struct workspace *)&screens[i].ws; ws[ws_id].bar_enabled = atoi(value); @@ -6798,6 +7117,11 @@ setconfvalue(char *selector, char *value, int flags) if (border_width < 0) border_width = 0; break; + case SWM_S_BOUNDARY_WIDTH: + boundary_width = atoi(value); + if (boundary_width < 0) + boundary_width = 0; + break; case SWM_S_CLOCK_ENABLED: clock_enabled = atoi(value); break; @@ -6893,8 +7217,6 @@ setconfvalue(char *selector, char *value, int flags) break; case SWM_S_TILE_GAP: tile_gap = atoi(value); - if (tile_gap < 0) - tile_gap = 0; break; case SWM_S_TITLE_CLASS_ENABLED: title_class_enabled = atoi(value); @@ -7082,7 +7404,7 @@ setlayout(char *selector, char *value, int flags) "::::" "'"); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { ws = (struct workspace *)&screens[i].ws; ws[ws_id].cur_layout = &layouts[st]; @@ -7148,6 +7470,7 @@ struct config_option configopt[] = { { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY }, { "bind", setconfbinding, 0 }, { "border_width", setconfvalue, SWM_S_BORDER_WIDTH }, + { "boundary_width", setconfvalue, SWM_S_BOUNDARY_WIDTH }, { "clock_enabled", setconfvalue, SWM_S_CLOCK_ENABLED }, { "clock_format", setconfvalue, SWM_S_CLOCK_FORMAT }, { "color_focus", setconfcolor, SWM_S_COLOR_FOCUS }, @@ -7182,11 +7505,36 @@ struct config_option configopt[] = { { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT }, }; +void +_add_startup_exception(const char *fmt, va_list ap) +{ + if (vasprintf(&startup_exception, fmt, ap) == -1) + warn("%s: asprintf", __func__); +} + +void +add_startup_exception(const char *fmt, ...) +{ + va_list ap; + + nr_exceptions++; + + if (startup_exception) + return; + + /* force bar to be enabled due to exception */ + bar_enabled = 1; + + va_start(ap, fmt); + _add_startup_exception(fmt, ap); + va_end(ap); +} + int conf_load(const char *filename, int keymapping) { FILE *config; - char *line, *cp, *optsub, *optval; + char *line = NULL, *cp, *optsub, *optval = NULL; size_t linelen, lineno = 0; int wordlen, i, optidx; struct config_option *opt = NULL; @@ -7197,14 +7545,20 @@ conf_load(const char *filename, int keymapping) warnx("conf_load: no filename"); return (1); } + + DNPRINTF(SWM_D_CONF, "conf_load: open %s\n", filename); + if ((config = fopen(filename, "r")) == NULL) { warn("conf_load: fopen: %s", filename); return (1); } while (!feof(config)) { - if ((line = fparseln(config, &linelen, &lineno, NULL, 0)) - == NULL) { + if (line) + free(line); + + if ((line = fparseln(config, &linelen, &lineno, NULL, + FPARSELN_UNESCCOMM | FPARSELN_UNESCCONT)) == NULL) { if (ferror(config)) err(1, "%s", filename); else @@ -7214,15 +7568,14 @@ conf_load(const char *filename, int keymapping) cp += strspn(cp, " \t\n"); /* eat whitespace */ if (cp[0] == '\0') { /* empty line */ - free(line); continue; } /* get config option */ wordlen = strcspn(cp, "=[ \t\n"); if (wordlen == 0) { - warnx("%s: line %zd: no option found", + add_startup_exception("%s: line %zd: no option found", filename, lineno); - goto out; + continue; } optidx = -1; for (i = 0; i < LENGTH(configopt); i++) { @@ -7234,17 +7587,20 @@ conf_load(const char *filename, int keymapping) } } if (optidx == -1) { - warnx("%s: line %zd: unknown option %.*s", - filename, lineno, wordlen, cp); - goto out; + add_startup_exception("%s: line %zd: unknown option " + "%.*s", filename, lineno, wordlen, cp); + continue; } if (keymapping && opt && strcmp(opt->optname, "bind")) { - warnx("%s: line %zd: invalid option %.*s", - filename, lineno, wordlen, cp); - goto out; + add_startup_exception("%s: line %zd: invalid option " + "%.*s", filename, lineno, wordlen, cp); + continue; } cp += wordlen; cp += strspn(cp, " \t\n"); /* eat whitespace */ + + /* from here on out we call goto invalid to continue */ + /* get [selector] if any */ optsub = NULL; if (*cp == '[') { @@ -7252,17 +7608,17 @@ conf_load(const char *filename, int keymapping) wordlen = strcspn(cp, "]"); if (*cp != ']') { if (wordlen == 0) { - warnx("%s: line %zd: syntax error", - filename, lineno); - goto out; + add_startup_exception("%s: line %zd: " + "syntax error", filename, lineno); + goto invalid; } if (asprintf(&optsub, "%.*s", wordlen, cp) == -1) { - warnx("%s: line %zd: unable to allocate" - "memory for selector", filename, - lineno); - goto out; + add_startup_exception("%s: line %zd: " + "unable to allocatememory for " + "selector", filename, lineno); + goto invalid; } } cp += wordlen; @@ -7271,27 +7627,36 @@ conf_load(const char *filename, int keymapping) cp += strspn(cp, "= \t\n"); /* eat trailing */ /* get RHS value */ optval = strdup(cp); + if (strlen(optval) == 0) { + add_startup_exception("%s: line %zd: must supply value " + "to %s", filename, lineno, + configopt[optidx].optname); + goto invalid; + } /* call function to deal with it all */ if (configopt[optidx].func(optsub, optval, - configopt[optidx].funcflags) != 0) - errx(1, "%s: line %zd: invalid data for %s", - filename, lineno, configopt[optidx].optname); - free(optval); - free(optsub); - free(line); + configopt[optidx].funcflags) != 0) { + add_startup_exception("%s: line %zd: invalid data for " + "%s", filename, lineno, configopt[optidx].optname); + goto invalid; + } +invalid: + if (optval) { + free(optval); + optval = NULL; + } + if (optsub) { + free(optsub); + optsub = NULL; + } } + if (line) + free(line); fclose(config); DNPRINTF(SWM_D_CONF, "conf_load: end\n"); return (0); - -out: - free(line); - fclose(config); - DNPRINTF(SWM_D_CONF, "conf_load: end with error.\n"); - - return (1); } void @@ -7480,8 +7845,6 @@ manage_window(xcb_window_t id, uint16_t mapped) win->ewmh_flags = 0; win->s = r->s; /* this never changes */ - store_float_geom(win, r); - /* Get WM_SIZE_HINTS. */ xcb_icccm_get_wm_normal_hints_reply(conn, xcb_icccm_get_wm_normal_hints(conn, win->id), @@ -7543,6 +7906,9 @@ manage_window(xcb_window_t id, uint16_t mapped) ws_idx_str); } + /* WS must already be set for this to work. */ + store_float_geom(win); + /* Handle EWMH */ ewmh_autoquirk(win); @@ -7586,7 +7952,8 @@ manage_window(xcb_window_t id, uint16_t mapped) /* Make sure window is positioned inside its region, if its active. */ if (win->ws->r) { - constrain_window(win, win->ws->r, 0); + region_containment(win, r, SWM_CW_ALLSIDES | + SWM_CW_HARDBOUNDARY); update_window(win); } @@ -7688,7 +8055,7 @@ expose(xcb_expose_event_t *e) DNPRINTF(SWM_D_EVENT, "expose: window: 0x%x\n", e->window); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) if (e->window == WINID(r->bar)) @@ -8051,10 +8418,13 @@ destroynotify(xcb_destroy_notify_event_t *e) unmanage_window(win); stack(); - if (focus_mode != SWM_FOCUS_FOLLOW) { + if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) { if (win->ws->focus_pending) { focus_win(win->ws->focus_pending); win->ws->focus_pending = NULL; + } else if (win == win->ws->focus) { + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + win->ws->r->id, XCB_CURRENT_TIME); } } @@ -8155,7 +8525,7 @@ enternotify(xcb_enter_notify_event_t *e) /* If no windows on pointer region, then focus root. */ r = root_to_region(e->root, SWM_CK_POINTER); if (r == NULL) { - DNPRINTF(SWM_D_EVENT, "enterntoify: " + DNPRINTF(SWM_D_EVENT, "enternotify: " "NULL region; ignoring.\n"); return; } @@ -8170,7 +8540,7 @@ enternotify(xcb_enter_notify_event_t *e) focus_win(get_focus_magic(win)); } - focus_flush(); + xcb_flush(conn); } #ifdef SWM_DEBUG @@ -8201,7 +8571,7 @@ mapnotify(xcb_map_notify_event_t *e) win->mapped = 1; set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL); - if (focus_mode != SWM_FOCUS_FOLLOW) { + if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(win->ws)) { if (win->ws->focus_pending == win) { focus_win(win); win->ws->focus_pending = NULL; @@ -8224,7 +8594,7 @@ mappingnotify(xcb_mapping_notify_event_t *e) void maprequest(xcb_map_request_event_t *e) { - struct ws_win *win; + struct ws_win *win, *w = NULL; xcb_get_window_attributes_reply_t *war; DNPRINTF(SWM_D_EVENT, "maprequest: win 0x%x\n", @@ -8248,8 +8618,29 @@ maprequest(xcb_map_request_event_t *e) (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); + if (focus_mode != SWM_FOCUS_FOLLOW && + !(win->quirks & SWM_Q_NOFOCUSONMAP)) { + if (win->quirks & SWM_Q_FOCUSONMAP_SINGLE) { + /* See if other wins of same type are already mapped. */ + TAILQ_FOREACH(w, &win->ws->winlist, entry) { + if (w == win || !w->mapped) + continue; + + if (w->ch.class_name && + win->ch.class_name && + !strcmp(w->ch.class_name, + win->ch.class_name) && + w->ch.instance_name && + win->ch.instance_name && + !strcmp(w->ch.instance_name, + win->ch.instance_name)) + break; + } + } + + if (w == NULL) + 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) @@ -8279,7 +8670,10 @@ motionnotify(xcb_motion_notify_event_t *e) last_event_time = e->time; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + if (focus_mode == SWM_FOCUS_MANUAL) + return; + + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) if (screens[i].root == e->root) break; @@ -8330,6 +8724,7 @@ void propertynotify(xcb_property_notify_event_t *e) { struct ws_win *win; + struct workspace *ws; #ifdef SWM_DEBUG char *name; @@ -8343,28 +8738,40 @@ propertynotify(xcb_property_notify_event_t *e) if (win == NULL) return; + ws = win->ws; + last_event_time = e->time; if (e->atom == a_swm_iconic) { if (e->state == XCB_PROPERTY_NEW_VALUE) { if (focus_mode != SWM_FOCUS_FOLLOW) - win->ws->focus_pending = get_focus_prev(win); + ws->focus_pending = get_focus_prev(win); unfocus_win(win); unmap_window(win); - if (win->ws->r) { + if (ws->r) { stack(); - if (focus_mode != SWM_FOCUS_FOLLOW) { - focus_win(win->ws->focus_pending); - win->ws->focus_pending = NULL; + + if (focus_mode != SWM_FOCUS_FOLLOW && + WS_FOCUSED(ws)) { + if (ws->focus_pending) { + focus_win(ws->focus_pending); + ws->focus_pending = NULL; + } else { + xcb_set_input_focus(conn, + XCB_INPUT_FOCUS_PARENT, + ws->r->id, + XCB_CURRENT_TIME); + } } + focus_flush(); } } else if (e->state == XCB_PROPERTY_DELETE) { /* The window is no longer iconic, restack ws. */ if (focus_mode != SWM_FOCUS_FOLLOW) - win->ws->focus_pending = get_focus_magic(win); + ws->focus_pending = get_focus_magic(win); stack(); @@ -8374,11 +8781,11 @@ propertynotify(xcb_property_notify_event_t *e) } else if (e->atom == a_state) { /* State just changed, make sure it gets focused if mapped. */ if (e->state == XCB_PROPERTY_NEW_VALUE) { - if (focus_mode != SWM_FOCUS_FOLLOW) { + if (focus_mode != SWM_FOCUS_FOLLOW && WS_FOCUSED(ws)) { if (win->mapped && - win->ws->focus_pending == win) { - focus_win(win->ws->focus_pending); - win->ws->focus_pending = NULL; + ws->focus_pending == win) { + focus_win(ws->focus_pending); + ws->focus_pending = NULL; } } } @@ -8430,13 +8837,15 @@ unmapnotify(xcb_unmap_notify_event_t *e) if (ws->r) stack(); - if (focus_mode == SWM_FOCUS_FOLLOW) { - if (ws->r) + if (WS_FOCUSED(ws)) { + if (focus_mode == SWM_FOCUS_FOLLOW) { focus_win(get_pointer_win(ws->r->s->root)); - } else { - if (ws->focus_pending) { + } else if (ws->focus_pending) { focus_win(ws->focus_pending); ws->focus_pending = NULL; + } else if (ws->focus == NULL) { + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + ws->r->id, XCB_CURRENT_TIME); } } } @@ -8484,7 +8893,10 @@ clientmessage(xcb_client_message_event_t *e) if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW\n"); - focus_win(win); + if (WS_FOCUSED(win->ws)) + focus_win(win); + else + win->ws->focus_pending = win; } if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_CLOSE_WINDOW\n"); @@ -8571,7 +8983,7 @@ enable_wm(void) xcb_generic_error_t *error; /* this causes an error if some other window manager is running */ - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { if ((sc = get_screen(i)) == NULL) errx(1, "ERROR: can't get screen %d.", i); @@ -8689,6 +9101,7 @@ scan_xrandr(int i) int ncrtc = 0; #endif /* SWM_XRR_HAS_CRTC */ struct swm_region *r; + struct ws_win *win; int num_screens; xcb_randr_get_screen_resources_current_cookie_t src; xcb_randr_get_screen_resources_current_reply_t *srr; @@ -8702,7 +9115,7 @@ scan_xrandr(int i) if ((screen = get_screen(i)) == NULL) errx(1, "ERROR: can't get screen %d.", i); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); if (i >= num_screens) errx(1, "scan_xrandr: invalid screen"); @@ -8762,6 +9175,16 @@ scan_xrandr(int i) screen->height_in_pixels); out: + /* Cleanup unused previously visible workspaces. */ + TAILQ_FOREACH(r, &screens[i].orl, entry) { + TAILQ_FOREACH(win, &r->ws->winlist, entry) + unmap_window(win); + + /* The screen shouldn't focus on an unused region. */ + if (screens[i].r_focus == r) + screens[i].r_focus = NULL; + } + DNPRINTF(SWM_D_MISC, "scan_xrandr: done.\n"); } @@ -8773,7 +9196,7 @@ screenchange(xcb_randr_screen_change_notify_event_t *e) DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%x\n", e->root); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); /* silly event doesn't include the screen index */ for (i = 0; i < num_screens; i++) if (screens[i].root == e->root) @@ -8788,10 +9211,22 @@ screenchange(xcb_randr_screen_change_notify_event_t *e) print_win_geom(e->root); #endif /* add bars to all regions */ - for (i = 0; i < num_screens; i++) + for (i = 0; i < num_screens; i++) { TAILQ_FOREACH(r, &screens[i].rl, entry) bar_setup(r); + } + stack(); + + /* Make sure a region has focus on each screen. */ + for (i = 0; i < num_screens; i++) { + if (screens[i].r_focus == NULL) { + r = TAILQ_FIRST(&screens[i].rl); + if (r != NULL) + focus_region(r); + } + } + bar_draw(); focus_flush(); } @@ -8812,7 +9247,7 @@ grab_windows(void) xcb_get_property_cookie_t pc; DNPRINTF(SWM_D_INIT, "grab_windows: begin\n"); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { qtc = xcb_query_tree(conn, screens[i].root); qtr = xcb_query_tree_reply(conn, qtc, NULL); @@ -8910,7 +9345,7 @@ setup_screens(void) xcb_randr_query_version_cookie_t c; xcb_randr_query_version_reply_t *r; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); if ((screens = calloc(num_screens, sizeof(struct swm_screen))) == NULL) err(1, "setup_screens: calloc: failed to allocate memory for " @@ -9011,10 +9446,7 @@ setup_globals(void) a_prot = get_atom_from_string("WM_PROTOCOLS"); a_delete = get_atom_from_string("WM_DELETE_WINDOW"); a_takefocus = get_atom_from_string("WM_TAKE_FOCUS"); - a_wmname = get_atom_from_string("WM_NAME"); - a_netwmname = get_atom_from_string("_NET_WM_NAME"); a_utf8_string = get_atom_from_string("UTF8_STRING"); - a_string = get_atom_from_string("STRING"); a_swm_iconic = get_atom_from_string("_SWM_ICONIC"); a_swm_ws = get_atom_from_string("_SWM_WS"); } @@ -9029,7 +9461,7 @@ workaround(void) /* work around sun jdk bugs, code from wmname */ netwmcheck = get_atom_from_string("_NET_SUPPORTING_WM_CHECK"); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { root = screens[i].root; @@ -9043,7 +9475,8 @@ workaround(void) xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win, netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win, - a_netwmname, a_utf8_string, 8, strlen("LG3D"), "LG3D"); + ewmh[_NET_WM_NAME].atom, a_utf8_string, 8, strlen("LG3D"), + "LG3D"); } } @@ -9064,7 +9497,7 @@ shutdown_cleanup(void) teardown_ewmh(); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; ++i) { if (screens[i].bar_gc != 0) xcb_free_gc(conn, screens[i].bar_gc); @@ -9271,6 +9704,8 @@ noconfig: if (cfile) conf_load(cfile, SWM_CONF_DEFAULT); + validate_spawns(); + setup_ewmh(); /* set some values to work around bad programs */ workaround(); @@ -9281,7 +9716,7 @@ noconfig: setenv("SWM_STARTED", "YES", 1); /* setup all bars */ - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) bar_setup(r); @@ -9343,11 +9778,11 @@ noconfig: if (stdin_ready) { stdin_ready = 0; - if (bar_extra_update()) { - bar_draw(); - xcb_flush(conn); - } + bar_extra_update(); } + + bar_draw(); + xcb_flush(conn); } done: shutdown_cleanup();