X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=d9b3c0585955cfaf4f259a56f0343d396a0393a6;hb=850d04544241b5b6f22e854473c245d956603d0f;hp=059c2ac5182ab271ca5d3a6f71feca0b7fed9b5c;hpb=fedd800f2a1e4dddc024d4559e2cec299e8c541c;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index 059c2ac..d9b3c05 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 @@ -81,6 +81,7 @@ #include #include #include +#include #include #include #include @@ -141,6 +142,7 @@ static const char *buildstr = SPECTRWM_VERSION; #define xcb_icccm_get_wm_class_reply_t xcb_get_wm_class_reply_t #define xcb_icccm_get_wm_class_reply_wipe xcb_get_wm_class_reply_wipe #define xcb_icccm_get_wm_hints xcb_get_wm_hints +#define xcb_icccm_wm_hints_get_urgency xcb_wm_hints_get_urgency #define xcb_icccm_get_wm_hints_reply xcb_get_wm_hints_reply #define xcb_icccm_get_wm_name xcb_get_wm_name #define xcb_icccm_get_wm_name_reply xcb_get_wm_name_reply @@ -243,9 +245,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 +282,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 +298,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; @@ -362,10 +373,11 @@ int bar_justify = SWM_BAR_JUSTIFY_LEFT; char *bar_format = NULL; int stack_enabled = 1; int clock_enabled = 1; +int iconic_enabled = 0; int urgent_enabled = 0; char *clock_format = NULL; -int title_name_enabled = 0; -int title_class_enabled = 0; +int window_class_enabled = 0; +int window_instance_enabled = 0; int window_name_enabled = 0; int focus_mode = SWM_FOCUS_DEFAULT; int focus_close = SWM_STACK_BELOW; @@ -442,7 +454,6 @@ struct ws_win { unsigned long quirks; struct workspace *ws; /* always valid */ struct swm_screen *s; /* always valid, never changes */ - xcb_get_geometry_reply_t *wa; xcb_size_hints_t sh; xcb_icccm_get_wm_class_reply_t ch; xcb_icccm_wm_hints_t hints; @@ -560,6 +571,7 @@ union arg { #define SWM_ARG_ID_FOCUSNEXT (0) #define SWM_ARG_ID_FOCUSPREV (1) #define SWM_ARG_ID_FOCUSMAIN (2) +#define SWM_ARG_ID_FOCUSURGENT (3) #define SWM_ARG_ID_SWAPNEXT (10) #define SWM_ARG_ID_SWAPPREV (11) #define SWM_ARG_ID_SWAPMAIN (12) @@ -577,6 +589,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) @@ -601,8 +615,12 @@ union arg { /* quirks */ struct quirk { TAILQ_ENTRY(quirk) entry; - char *class; - char *name; + char *class; /* WM_CLASS:class */ + char *instance; /* WM_CLASS:instance */ + char *name; /* WM_NAME */ + regex_t regex_class; + regex_t regex_instance; + regex_t regex_name; unsigned long quirk; #define SWM_Q_FLOAT (1<<0) /* float this window */ #define SWM_Q_TRANSSZ (1<<1) /* transiend window size too small */ @@ -733,6 +751,7 @@ enum keyfuncid { KF_FOCUS_MAIN, KF_FOCUS_NEXT, KF_FOCUS_PREV, + KF_FOCUS_URGENT, KF_HEIGHT_GROW, KF_HEIGHT_SHRINK, KF_ICONIFY, @@ -831,8 +850,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 @@ -849,8 +870,6 @@ 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_setup(void); void bar_extra_stop(void); @@ -864,10 +883,12 @@ 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_title_name(char *, size_t, struct swm_region *); void bar_toggle(struct swm_region *, union arg *); void bar_urgent(char *, size_t); +void bar_window_class(char *, size_t, struct swm_region *); +void bar_window_class_instance(char *, size_t, struct swm_region *); void bar_window_float(char *, size_t, struct swm_region *); +void bar_window_instance(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 *); @@ -879,11 +900,11 @@ 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); -void custom_region(char *); +void custom_region(const char *); void cyclerg(struct swm_region *, union arg *); void cyclews(struct swm_region *, union arg *); void cycle_layout(struct swm_region *, union arg *); @@ -932,11 +953,14 @@ 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 int32_t get_swm_iconic(struct ws_win *); char *get_win_name(xcb_window_t); +void get_wm_protocols(struct ws_win *); int get_ws_idx(xcb_window_t); uint32_t getstate(xcb_window_t); void grabbuttons(struct ws_win *); @@ -956,20 +980,20 @@ 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 *); -int parsequirks(char *, unsigned long *); +int parsekeys(const char *, unsigned int, unsigned int *, KeySym *); +int parsequirks(const 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 *); @@ -977,12 +1001,16 @@ void priorws(struct swm_region *, union arg *); void print_win_geom(xcb_window_t); #endif void propertynotify(xcb_property_notify_event_t *); -void quirk_insert(const char *, const char *, unsigned long); +void quirk_free(struct quirk *); +void quirk_insert(const char *, const char *, const char *,unsigned long); void quirk_remove(struct quirk *); -void quirk_replace(struct quirk *, const char *, const char *, +void quirk_replace(struct quirk *, const char *, 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 *); @@ -990,29 +1018,29 @@ 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 *); void send_to_rg(struct swm_region *, union arg *); void send_to_ws(struct swm_region *, union arg *); void set_region(struct swm_region *); -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); +int setautorun(const char *, const char *, int); +int setconfbinding(const char *, const char *, int); +int setconfcolor(const char *, const char *, int); +int setconfmodkey(const char *, const char *, int); +int setconfquirk(const char *, const char *, int); +int setconfregion(const char *, const char *, int); +int setconfspawn(const char *, const char *, int); +int setconfvalue(const char *, const 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); +int setkeymapping(const char *, const char *, int); +int setlayout(const char *, const char *, int); +void setquirk(const char *, const char *, const char *,unsigned long); +void setscreencolor(const char *, int, int); void setspawn(const char *, const char *, int); void setup_ewmh(void); void setup_globals(void); @@ -1031,17 +1059,19 @@ 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 *, int); +struct spawn_prog *spawn_find(const char *); void spawn_remove(struct spawn_prog *); 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 *); +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); +void unescape_selector(char *); void unfocus_win(struct ws_win *); void uniconify(struct swm_region *, union arg *); void unmanage_window(struct ws_win *); @@ -1054,8 +1084,8 @@ 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); @@ -1187,6 +1217,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; @@ -1236,6 +1279,24 @@ get_atom_from_string(const char *str) } void +get_wm_protocols(struct ws_win *win) { + int i; + xcb_icccm_get_wm_protocols_reply_t wpr; + + if (xcb_icccm_get_wm_protocols_reply(conn, + xcb_icccm_get_wm_protocols(conn, win->id, a_prot), + &wpr, NULL)) { + for (i = 0; i < (int)wpr.atoms_len; i++) { + if (wpr.atoms[i] == a_takefocus) + win->take_focus = 1; + if (wpr.atoms[i] == a_delete) + win->can_delete = 1; + } + xcb_icccm_get_wm_protocols_reply_wipe(&wpr); + } +} + +void set_swm_iconic(struct ws_win *win, int newv) { int32_t v = newv; @@ -1258,7 +1319,7 @@ get_swm_iconic(struct ws_win *win) pr = xcb_get_property_reply(conn, xcb_get_property(conn, 0, win->id, a_swm_iconic, XCB_ATOM_INTEGER, 0, 1), NULL); - if (!pr) + if (pr == NULL) goto out; if (pr->type != XCB_ATOM_INTEGER || pr->format != 32) goto out; @@ -1280,7 +1341,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(). */ @@ -1304,14 +1365,14 @@ 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 */ pc = xcb_get_property(conn, 0, screens[i].root, sup_check, XCB_ATOM_WINDOW, 0, 1); pr = xcb_get_property_reply(conn, pc, NULL); - if (!pr) + if (pr == NULL) continue; if (pr->format == sup_check) { id = *((xcb_window_t *)xcb_get_property_value(pr)); @@ -1335,7 +1396,7 @@ ewmh_autoquirk(struct ws_win *win) c = xcb_get_property(conn, 0, win->id, ewmh[_NET_WM_WINDOW_TYPE].atom, XCB_ATOM_ATOM, 0, UINT32_MAX); r = xcb_get_property_reply(conn, c, NULL); - if (!r) + if (r == NULL) return; n = xcb_get_property_value_length(r); @@ -1372,7 +1433,7 @@ ewmh_autoquirk(struct ws_win *win) int ewmh_set_win_fullscreen(struct ws_win *win, int fs) { - if (!win->ws->r) + if (win->ws->r == NULL) return (0); if (!win->floating) @@ -1383,12 +1444,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); @@ -1515,7 +1576,7 @@ ewmh_get_win_state(struct ws_win *win) c = xcb_get_property(conn, 0, win->id, ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 0, UINT32_MAX); r = xcb_get_property_reply(conn, c, NULL); - if (!r) + if (r == NULL) return; states = xcb_get_property_value(r); @@ -1653,7 +1714,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] = "#"; @@ -1663,7 +1724,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 */ @@ -1684,7 +1745,7 @@ name_to_pixel(const char *colorname) nr = xcb_alloc_named_color_reply(conn, xcb_alloc_named_color(conn, cmap, strlen(colorname), colorname), NULL); - if (!nr) { + if (nr == NULL) { strlcat(cname, colorname + 2, sizeof cname - 1); nr = xcb_alloc_named_color_reply(conn, xcb_alloc_named_color(conn, cmap, strlen(cname), @@ -1701,19 +1762,19 @@ name_to_pixel(const char *colorname) } void -setscreencolor(char *val, int i, int c) +setscreencolor(const 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"); @@ -1750,13 +1811,13 @@ plain_stacker(struct workspace *ws) } void -custom_region(char *val) +custom_region(const char *val) { unsigned int x, y, w, h; 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++"); @@ -1920,7 +1981,7 @@ bar_extra_stop(void) } void -bar_class_name(char *s, size_t sz, struct swm_region *r) +bar_window_class(char *s, size_t sz, struct swm_region *r) { if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; @@ -1929,7 +1990,7 @@ bar_class_name(char *s, size_t sz, struct swm_region *r) } void -bar_title_name(char *s, size_t sz, struct swm_region *r) +bar_window_instance(char *s, size_t sz, struct swm_region *r) { if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; @@ -1938,14 +1999,14 @@ bar_title_name(char *s, size_t sz, struct swm_region *r) } void -bar_class_title_name(char *s, size_t sz, struct swm_region *r) +bar_window_class_instance(char *s, size_t sz, struct swm_region *r) { if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; - bar_class_name(s, sz, r); + bar_window_class(s, sz, r); strlcat(s, ":", sz); - bar_title_name(s, sz, r); + bar_window_instance(s, sz, r); } void @@ -1964,19 +2025,18 @@ bar_window_name(char *s, size_t sz, struct swm_region *r) if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; - if ((title = get_win_name(r->ws->focus->id)) == NULL) - return; + title = get_win_name(r->ws->focus->id); strlcat(s, title, sz); 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; @@ -1984,7 +2044,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) { @@ -2018,6 +2078,8 @@ bar_workspace_name(char *s, size_t sz, struct swm_region *r) void bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz) { + struct ws_win *w; + /* if format provided, just copy the buffers */ if (bar_format != NULL) { strlcpy(fmtnew, fmtexp, sz); @@ -2035,6 +2097,15 @@ bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz) /* only show the workspace name if there's actually one */ if (r != NULL && r->ws != NULL && r->ws->name != NULL) strlcat(fmtnew, "<+D>", sz); + + /* If enabled, only show the iconic count if there are iconic wins. */ + if (iconic_enabled && r != NULL && r->ws != NULL) + TAILQ_FOREACH(w, &r->ws->winlist, entry) + if (w->iconic) { + strlcat(fmtnew, "{+M}", sz); + break; + } + strlcat(fmtnew, "+3<", sz); if (clock_enabled) { @@ -2046,16 +2117,16 @@ bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz) if (urgent_enabled) strlcat(fmtnew, "* +U*+4<", sz); - if (title_class_enabled) { + if (window_class_enabled) { strlcat(fmtnew, "+C", sz); - if (!title_name_enabled) + if (!window_instance_enabled) strlcat(fmtnew, "+4<", sz); } /* checks needed by the colon and floating strlcat(3) calls below */ if (r != NULL && r->ws != NULL && r->ws->focus != NULL) { - if (title_name_enabled) { - if (title_class_enabled) + if (window_instance_enabled) { + if (window_class_enabled) strlcat(fmtnew, ":", sz); strlcat(fmtnew, "+T+4<", sz); } @@ -2084,9 +2155,10 @@ char * bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep, size_t sz) { + struct ws_win *w; char *ptr; char tmp[SWM_BAR_MAX]; - int limit, size; + int limit, size, count; size_t len; /* reset strlcat(3) buffer */ @@ -2113,7 +2185,7 @@ bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep, snprintf(tmp, sizeof tmp, "%s", bar_ext); break; case 'C': - bar_class_name(tmp, sizeof tmp, r); + bar_window_class(tmp, sizeof tmp, r); break; case 'D': bar_workspace_name(tmp, sizeof tmp, r); @@ -2124,17 +2196,25 @@ bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep, case 'I': snprintf(tmp, sizeof tmp, "%d", r->ws->idx + 1); break; + case 'M': + count = 0; + TAILQ_FOREACH(w, &r->ws->winlist, entry) + if (w->iconic) + ++count; + + snprintf(tmp, sizeof tmp, "%d", count); + break; case 'N': snprintf(tmp, sizeof tmp, "%d", r->s->idx + 1); break; case 'P': - bar_class_title_name(tmp, sizeof tmp, r); + bar_window_class_instance(tmp, sizeof tmp, r); break; case 'S': snprintf(tmp, sizeof tmp, "%s", r->ws->stacker); break; case 'T': - bar_title_name(tmp, sizeof tmp, r); + bar_window_instance(tmp, sizeof tmp, r); break; case 'U': bar_urgent(tmp, sizeof tmp); @@ -2234,7 +2314,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) @@ -2338,7 +2418,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) { @@ -2485,7 +2565,7 @@ xft_init(struct swm_region *r) font); } - if (!bar_font) { + if (bar_font == NULL) { warnx("unable to load font %s", font); continue; } else { @@ -2606,7 +2686,6 @@ getstate(xcb_window_t w) c = xcb_get_property(conn, 0, w, a_state, a_state, 0L, 2L); r = xcb_get_property_reply(conn, c, NULL); - if (r) { if (r->type == a_state && r->format == 32 && r->length == 2) result = *((uint32_t *)xcb_get_property_value(r)); @@ -2779,18 +2858,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; @@ -2823,7 +2911,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) @@ -2918,7 +3006,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; @@ -2943,7 +3031,6 @@ root_to_region(xcb_window_t root, int check) /* No region with an active focus; try to use pointer. */ qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, screens[i].root), NULL); - if (qpr) { DNPRINTF(SWM_D_MISC, "root_to_region: pointer: " "(%d,%d)\n", qpr->root_x, qpr->root_y); @@ -2961,6 +3048,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); } @@ -2970,7 +3059,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, @@ -2987,7 +3076,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) @@ -2995,7 +3084,7 @@ find_window(xcb_window_t id) return (win); r = xcb_query_tree_reply(conn, xcb_query_tree(conn, id), NULL); - if (!r) + if (r == NULL) return (NULL); /* if we were looking for the parent return that window instead */ @@ -3082,7 +3171,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++) { @@ -3105,7 +3194,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++) { @@ -3125,7 +3214,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++) { @@ -3136,6 +3225,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) { @@ -3167,6 +3292,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; } @@ -3250,6 +3377,9 @@ focus_win(struct ws_win *win) win->hints.input)) xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, win->id, last_event_time); + else + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + ws->r->id, XCB_CURRENT_TIME); /* Tell app it can adjust focus to a specific window. */ if (win->take_focus) { @@ -3268,22 +3398,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); @@ -3394,7 +3532,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. */ @@ -3405,10 +3543,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; @@ -3428,7 +3567,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) { @@ -3445,9 +3591,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(); @@ -3460,17 +3610,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(); @@ -3483,30 +3632,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; @@ -3518,6 +3669,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); } @@ -3545,7 +3699,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; @@ -3553,7 +3707,7 @@ focusrg(struct swm_region *r, union arg *args) DNPRINTF(SWM_D_FOCUS, "focusrg: id: %d\n", ridx); rr = TAILQ_FIRST(&r->s->rl); - for (i = 0; i < ridx; ++i) + for (i = 0; i < ridx && rr != NULL; ++i) rr = TAILQ_NEXT(rr, entry); if (rr == NULL) @@ -3569,7 +3723,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; @@ -3839,86 +3993,107 @@ focus(struct swm_region *r, union arg *args) struct ws_win *head, *cur_focus = NULL, *winfocus = NULL; struct ws_win_list *wl = NULL; struct workspace *ws = NULL; - int all_iconics; + union arg a; + int i; + xcb_icccm_wm_hints_t hints; if (!(r && r->ws)) - return; + goto out; DNPRINTF(SWM_D_FOCUS, "focus: id: %d\n", args->id); - if ((cur_focus = r->ws->focus) == NULL) - return; + cur_focus = r->ws->focus; ws = r->ws; wl = &ws->winlist; - if (TAILQ_EMPTY(wl)) - return; - /* make sure there is at least one uniconified window */ - all_iconics = 1; - TAILQ_FOREACH(winfocus, wl, entry) - if (!winfocus->iconic) { - all_iconics = 0; - break; - } - if (all_iconics) - return; + + /* Make sure an uniconified window has focus, if one exists. */ + if (cur_focus == NULL) { + cur_focus = TAILQ_FIRST(wl); + while (cur_focus != NULL && cur_focus->iconic) + cur_focus = TAILQ_NEXT(cur_focus, entry); + } switch (args->id) { case SWM_ARG_ID_FOCUSPREV: - head = TAILQ_PREV(cur_focus, ws_win_list, entry); - if (head == NULL) - head = TAILQ_LAST(wl, ws_win_list); - winfocus = head; - if (WINID(winfocus) == cur_focus->transient) { - head = TAILQ_PREV(winfocus, ws_win_list, entry); - if (head == NULL) - head = TAILQ_LAST(wl, ws_win_list); - winfocus = head; - } + if (cur_focus == NULL) + goto out; - /* skip iconics */ - if (winfocus && winfocus->iconic) { - while (winfocus != cur_focus) { - if (winfocus == NULL) - winfocus = TAILQ_LAST(wl, ws_win_list); - if (!winfocus->iconic) - break; - winfocus = TAILQ_PREV(winfocus, ws_win_list, - entry); - } - } + winfocus = cur_focus; + do { + winfocus = TAILQ_PREV(winfocus, ws_win_list, entry); + if (winfocus == NULL) + winfocus = TAILQ_LAST(wl, ws_win_list); + if (winfocus == cur_focus) + break; + } while (winfocus != NULL && + (winfocus->iconic || winfocus->id == cur_focus->transient)); break; - case SWM_ARG_ID_FOCUSNEXT: - head = TAILQ_NEXT(cur_focus, entry); - if (head == NULL) - head = TAILQ_FIRST(wl); - winfocus = head; - - /* skip iconics */ - if (winfocus && winfocus->iconic) { - while (winfocus != cur_focus) { - if (winfocus == NULL) - winfocus = TAILQ_FIRST(wl); - if (!winfocus->iconic) - break; - winfocus = TAILQ_NEXT(winfocus, entry); - } - } - break; + if (cur_focus == NULL) + goto out; + winfocus = cur_focus; + do { + winfocus = TAILQ_NEXT(winfocus, entry); + if (winfocus == NULL) + winfocus = TAILQ_FIRST(wl); + if (winfocus == cur_focus) + break; + } while (winfocus != NULL && + (winfocus->iconic || winfocus->id == cur_focus->transient)); + break; case SWM_ARG_ID_FOCUSMAIN: + if (cur_focus == NULL) + goto out; + winfocus = TAILQ_FIRST(wl); if (winfocus == cur_focus) winfocus = cur_focus->ws->focus_prev; break; + case SWM_ARG_ID_FOCUSURGENT: + /* Search forward for the next urgent window. */ + winfocus = NULL; + head = cur_focus; + + for (i = 0; i <= workspace_limit; ++i) { + if (head == NULL) + head = TAILQ_FIRST(&r->s->ws[(ws->idx + i) % + workspace_limit].winlist); + while (head != NULL && + (head = TAILQ_NEXT(head, entry)) != NULL) { + if (head == cur_focus) { + winfocus = cur_focus; + break; + } + if (xcb_icccm_get_wm_hints_reply(conn, + xcb_icccm_get_wm_hints(conn, head->id), + &hints, NULL) != 0 && + xcb_icccm_wm_hints_get_urgency(&hints)) { + winfocus = head; + break; + } + } + + if (winfocus != NULL) + break; + } + + /* Switch ws if new focus is on a different ws. */ + if (winfocus != NULL && winfocus->ws != ws) { + a.id = winfocus->ws->idx; + switchws(r, &a); + } + break; default: - return; + goto out; } focus_win(get_focus_magic(winfocus)); - focus_flush(); + +out: + DNPRINTF(SWM_D_FOCUS, "focus: done\n"); } void @@ -3972,7 +4147,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; @@ -4005,15 +4180,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), @@ -4022,15 +4197,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)); @@ -4055,7 +4230,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; @@ -4065,7 +4240,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; } @@ -4102,11 +4277,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); } @@ -4234,20 +4409,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; } @@ -4322,13 +4501,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) { @@ -4342,13 +4525,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); } } @@ -4475,6 +4658,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); @@ -4489,14 +4674,14 @@ max_stack(struct workspace *ws, struct swm_geometry *g) continue; if (!w->mapped && w != win) - map_window(w); + 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; } @@ -4518,25 +4703,25 @@ max_stack(struct workspace *ws, struct swm_geometry *g) /* 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/raise focused window. */ - map_window(win); + map_window(win, XCB_WINDOW_NONE); /* 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); } } @@ -4547,7 +4732,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; @@ -4555,7 +4740,7 @@ send_to_rg(struct swm_region *r, union arg *args) DNPRINTF(SWM_D_FOCUS, "send_to_rg: id: %d\n", ridx); rr = TAILQ_FIRST(&r->s->rl); - for (i = 0; i < ridx; ++i) + for (i = 0; i < ridx && rr != NULL; ++i) rr = TAILQ_NEXT(rr, entry); if (rr == NULL) @@ -4566,31 +4751,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) @@ -4609,11 +4837,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 */ @@ -4625,7 +4852,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, @@ -4633,7 +4860,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) @@ -4648,24 +4876,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 @@ -4720,32 +4938,28 @@ 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); - - if (r) { - if (r->type == XCB_NONE) { - 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); - r = xcb_get_property_reply(conn, c, NULL); - - if (!r) - return (NULL); - if (r->type == XCB_NONE) { - free(r); - return (NULL); - } - } - if (r->length > 0) - name = strndup(xcb_get_property_value(r), - xcb_get_property_value_length(r)); - + if (r && r->type == XCB_NONE) { 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); + r = xcb_get_property_reply(conn, c, NULL); } + if (r && r->type != XCB_NONE && r->length > 0) + name = strndup(xcb_get_property_value(r), + xcb_get_property_value_length(r)); + else + name = strdup(""); + + if (name == NULL) + err(1, "get_win_name: failed to allocate memory."); + + free(r); + return (name); } @@ -4788,8 +5002,6 @@ uniconify(struct swm_region *r, union arg *args) continue; name = get_win_name(win->id); - if (name == NULL) - continue; fprintf(lfile, "%s.%u\n", name, win->id); free(name); } @@ -4971,7 +5183,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; @@ -4983,8 +5195,6 @@ search_resp_uniconify(const char *resp, unsigned long len) if (!win->iconic) continue; name = get_win_name(win->id); - if (name == NULL) - continue; if (asprintf(&s, "%s.%u", name, win->id) == -1) { free(name); continue; @@ -5001,7 +5211,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; @@ -5037,7 +5247,7 @@ search_resp_search_workspace(const char *resp) DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: resp: %s\n", resp); q = strdup(resp); - if (!q) { + if (q == NULL) { DNPRINTF(SWM_D_MISC, "search_resp_search_workspace: strdup: %s", strerror(errno)); return; @@ -5068,7 +5278,7 @@ search_resp_search_window(const char *resp) DNPRINTF(SWM_D_MISC, "search_resp_search_window: resp: %s\n", resp); s = strdup(resp); - if (!s) { + if (s == NULL) { DNPRINTF(SWM_D_MISC, "search_resp_search_window: strdup: %s", strerror(errno)); return; @@ -5097,7 +5307,7 @@ search_do_resp(void) { ssize_t rbytes; char *resp; - unsigned long len; + size_t len; DNPRINTF(SWM_D_MISC, "search_do_resp:\n"); @@ -5152,7 +5362,8 @@ done: void wkill(struct swm_region *r, union arg *args) { - DNPRINTF(SWM_D_MISC, "wkill: id: %d\n", args->id); + DNPRINTF(SWM_D_MISC, "wkill: win %#x, id: %d\n", WINID(r->ws->focus), + args->id); if (r->ws->focus == NULL) return; @@ -5169,16 +5380,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) + if (win->ws->r == NULL) return (0); - r = win->ws->r; - /* reject floating toggles in max stack mode */ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK]) return (0); @@ -5186,11 +5393,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; } @@ -5225,37 +5432,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) @@ -5297,7 +5552,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; @@ -5329,7 +5584,7 @@ resize(struct ws_win *win, union arg *args) /* It's possible for win to have been freed during focus_flush(). */ if (validate_win(win)) { - DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + DNPRINTF(SWM_D_EVENT, "resize: invalid win.\n"); goto out; } @@ -5354,16 +5609,21 @@ 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); - if (!xpr) + if (xpr == NULL) return; g = win->g; @@ -5441,11 +5701,13 @@ 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); } @@ -5455,7 +5717,7 @@ resize(struct ws_win *win, union arg *args) /* It's possible for win to have been freed above. */ if (validate_win(win)) { - DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + DNPRINTF(SWM_D_EVENT, "resize: invalid win.\n"); goto out; } break; @@ -5463,10 +5725,12 @@ resize(struct ws_win *win, union arg *args) 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); @@ -5487,6 +5751,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 @@ -5494,14 +5775,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; @@ -5513,16 +5792,19 @@ 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(); @@ -5554,9 +5836,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; } @@ -5567,11 +5850,15 @@ move(struct ws_win *win, union arg *args) /* get cursor offset from window root */ qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id), NULL); - if (!qpr) { + if (qpr == NULL) { xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); 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 (moving && (evt = xcb_wait_for_event(conn))) { @@ -5582,14 +5869,16 @@ 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); } @@ -5607,10 +5896,12 @@ move(struct ws_win *win, union arg *args) 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); @@ -5650,6 +5941,7 @@ struct keyfunc { { "focus_main", focus, {.id = SWM_ARG_ID_FOCUSMAIN} }, { "focus_next", focus, {.id = SWM_ARG_ID_FOCUSNEXT} }, { "focus_prev", focus, {.id = SWM_ARG_ID_FOCUSPREV} }, + { "focus_urgent", focus, {.id = SWM_ARG_ID_FOCUSURGENT} }, { "height_grow", resize_step, {.id = SWM_ARG_ID_HEIGHTGROW} }, { "height_shrink", resize_step, {.id = SWM_ARG_ID_HEIGHTSHRINK} }, { "iconify", iconify, {0} }, @@ -5748,8 +6040,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} }, @@ -5813,7 +6107,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 */ @@ -5823,7 +6117,7 @@ spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name, /* find program */ TAILQ_FOREACH(prog, &spawns, entry) { - if (!strcasecmp(spawn_name, prog->name)) + if (strcasecmp(spawn_name, prog->name) == 0) break; } if (prog == NULL) { @@ -5836,62 +6130,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 (strcasecmp(ap, "$bar_border") == 0) { + 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] = + } else if (strcasecmp(ap, "$bar_color") == 0) { + 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)) + } else if (strcasecmp(ap, "$bar_font") == 0) { + 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] = + } else if (strcasecmp(ap, "$bar_font_color") == 0) { + 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] = + } else if (strcasecmp(ap, "$color_focus") == 0) { + 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] = + } else if (strcasecmp(ap, "$color_unfocus") == 0) { + 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", + } else if (strcasecmp(ap, "$region_index") == 0) { + 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) + } else if (strcasecmp(ap, "$workspace_index") == 0) { + if (asprintf(&real_args[c], "%d", r->ws->idx + 1) < 1) + err(1, "spawn_custom workspace index"); + } else if (strcasecmp(ap, "$dmenu_bottom") == 0) { + 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 @@ -6008,6 +6308,18 @@ spawn_remove(struct spawn_prog *sp) DNPRINTF(SWM_D_SPAWN, "spawn_remove: leave\n"); } +struct spawn_prog* +spawn_find(const char *name) +{ + struct spawn_prog *sp; + + TAILQ_FOREACH(sp, &spawns, entry) + if (strcasecmp(sp->name, name) == 0) + return sp; + + return NULL; +} + void setspawn(const char *name, const char *args, int flags) { @@ -6019,11 +6331,8 @@ setspawn(const char *name, const char *args, int flags) return; /* Remove any old spawn under the same name. */ - TAILQ_FOREACH(sp, &spawns, entry) - if (!strcmp(sp->name, name)) { - spawn_remove(sp); - break; - } + if ((sp = spawn_find(name)) != NULL) + spawn_remove(sp); if (*args != '\0') spawn_insert(name, args, flags); @@ -6034,7 +6343,7 @@ setspawn(const char *name, const char *args, int flags) } int -setconfspawn(char *selector, char *value, int flags) +setconfspawn(const char *selector, const char *value, int flags) { char *args; @@ -6063,11 +6372,7 @@ validate_spawns(void) continue; /* find program */ - TAILQ_FOREACH(sp, &spawns, entry) { - if (!strcasecmp(kp->spawn_name, sp->name)) - break; - } - + sp = spawn_find(kp->spawn_name); if (sp == NULL || sp->flags & SWM_SPAWN_OPTIONAL) continue; @@ -6095,6 +6400,7 @@ setup_spawn(void) setconfspawn("spawn_term", "xterm", 0); setconfspawn("menu", "dmenu_run" + " $dmenu_bottom" " -fn $bar_font" " -nb $bar_color" " -nf $bar_font_color" @@ -6102,6 +6408,7 @@ setup_spawn(void) " -sf $bar_color", 0); setconfspawn("search", "dmenu" + " $dmenu_bottom" " -i" " -fn $bar_font" " -nb $bar_color" @@ -6110,6 +6417,7 @@ setup_spawn(void) " -sf $bar_color", 0); setconfspawn("name_workspace", "dmenu" + " $dmenu_bottom" " -p Workspace" " -fn $bar_font" " -nb $bar_color" @@ -6127,10 +6435,11 @@ setup_spawn(void) #define SWM_MODNAME_SIZE 32 #define SWM_KEY_WS "\n+ \t" int -parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) +parsekeys(const char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) { - char *cp, *name; + char *str, *cp, *name; KeySym uks; + DNPRINTF(SWM_D_KEY, "parsekeys: enter [%s]\n", keystr); if (mod == NULL || ks == NULL) { DNPRINTF(SWM_D_KEY, "parsekeys: no mod or key vars\n"); @@ -6140,7 +6449,10 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) DNPRINTF(SWM_D_KEY, "parsekeys: no keystr\n"); return (1); } - cp = keystr; + + if ((cp = str = strdup(keystr)) == NULL) + err(1, "parsekeys: strdup"); + *ks = XCB_NO_SYMBOL; *mod = 0; while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) { @@ -6149,13 +6461,13 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) cp += (long)strspn(cp, SWM_KEY_WS); if (strncasecmp(name, "MOD", SWM_MODNAME_SIZE) == 0) *mod |= currmod; - else if (!strncasecmp(name, "Mod1", SWM_MODNAME_SIZE)) + else if (strncasecmp(name, "Mod1", SWM_MODNAME_SIZE) == 0) *mod |= XCB_MOD_MASK_1; - else if (!strncasecmp(name, "Mod2", SWM_MODNAME_SIZE)) + else if (strncasecmp(name, "Mod2", SWM_MODNAME_SIZE) == 0) *mod += XCB_MOD_MASK_2; - else if (!strncmp(name, "Mod3", SWM_MODNAME_SIZE)) + else if (strncmp(name, "Mod3", SWM_MODNAME_SIZE) == 0) *mod |= XCB_MOD_MASK_3; - else if (!strncmp(name, "Mod4", SWM_MODNAME_SIZE)) + else if (strncmp(name, "Mod4", SWM_MODNAME_SIZE) == 0) *mod |= XCB_MOD_MASK_4; else if (strncasecmp(name, "SHIFT", SWM_MODNAME_SIZE) == 0) *mod |= XCB_MOD_MASK_SHIFT; @@ -6168,10 +6480,13 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) DNPRINTF(SWM_D_KEY, "parsekeys: invalid key %s\n", name); + free(str); return (1); } } } + + free(str); DNPRINTF(SWM_D_KEY, "parsekeys: leave ok\n"); return (0); } @@ -6270,7 +6585,7 @@ setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid, } int -setconfbinding(char *selector, char *value, int flags) +setconfbinding(const char *selector, const char *value, int flags) { enum keyfuncid kfid; unsigned int mod; @@ -6304,17 +6619,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 " - "spawn\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); @@ -6335,6 +6648,7 @@ setup_keys(void) setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL); setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL); setkeybinding(MODKEY_SHIFT, XK_Tab, KF_FOCUS_PREV, NULL); + setkeybinding(MODKEY, XK_u, KF_FOCUS_URGENT,NULL); setkeybinding(MODKEY_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL); setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL); setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL); @@ -6438,6 +6752,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); @@ -6457,7 +6773,7 @@ clear_keys(void) } int -setkeymapping(char *selector, char *value, int flags) +setkeymapping(const char *selector, const char *value, int flags) { char *keymapping_file; @@ -6528,13 +6844,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++) @@ -6588,25 +6914,30 @@ const char *quirkname[] = { /* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */ #define SWM_Q_WS "\n|+ \t" int -parsequirks(char *qstr, unsigned long *quirk) +parsequirks(const char *qstr, unsigned long *quirk) { - char *cp, *name; + char *str, *cp, *name; int i; - if (quirk == NULL) + if (quirk == NULL || qstr == NULL) return (1); - cp = qstr; + if ((str = strdup(qstr)) == NULL) + err(1, "parsequirks: strdup"); + + cp = str; *quirk = 0; while ((name = strsep(&cp, SWM_Q_WS)) != NULL) { if (cp) cp += (long)strspn(cp, SWM_Q_WS); for (i = 0; i < LENGTH(quirkname); i++) { - if (!strncasecmp(name, quirkname[i], SWM_QUIRK_LEN)) { + if (strncasecmp(name, quirkname[i], + SWM_QUIRK_LEN) == 0) { DNPRINTF(SWM_D_QUIRK, "parsequirks: %s\n", name); if (i == 0) { *quirk = 0; + free(str); return (0); } *quirk |= 1 << (i-1); @@ -6616,30 +6947,73 @@ parsequirks(char *qstr, unsigned long *quirk) if (i >= LENGTH(quirkname)) { DNPRINTF(SWM_D_QUIRK, "parsequirks: invalid quirk [%s]\n", name); + free(str); return (1); } } + + free(str); return (0); } void -quirk_insert(const char *class, const char *name, unsigned long quirk) +quirk_insert(const char *class, const char *instance, const char *name, + unsigned long quirk) { struct quirk *qp; + int failed = 0; + char *str; - DNPRINTF(SWM_D_QUIRK, "quirk_insert: %s:%s [%lu]\n", class, name, - quirk); + DNPRINTF(SWM_D_QUIRK, "quirk_insert: class: %s, instance: %s, name: %s," + " value: %lu\n", class, instance, name, quirk); if ((qp = malloc(sizeof *qp)) == NULL) err(1, "quirk_insert: malloc"); + if ((qp->class = strdup(class)) == NULL) err(1, "quirk_insert: strdup"); + if ((qp->instance = strdup(instance)) == NULL) + err(1, "quirk_insert: strdup"); if ((qp->name = strdup(name)) == NULL) err(1, "quirk_insert: strdup"); - qp->quirk = quirk; - TAILQ_INSERT_TAIL(&quirks, qp, entry); - + if (asprintf(&str, "^%s$", class) == -1) + err(1, "quirk_insert: asprintf"); + if (regcomp(&qp->regex_class, str, REG_EXTENDED | REG_NOSUB)) { + add_startup_exception("regex failed to compile quirk 'class' " + "field: %s", class); + failed = 1; + } + DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str); + free(str); + + if (asprintf(&str, "^%s$", instance) == -1) + err(1, "quirk_insert: asprintf"); + if (regcomp(&qp->regex_instance, str, REG_EXTENDED | REG_NOSUB)) { + add_startup_exception("regex failed to compile quirk 'instance'" + " field: %s", instance); + failed = 1; + } + DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str); + free(str); + + if (asprintf(&str, "^%s$", name) == -1) + err(1, "quirk_insert: asprintf"); + if (regcomp(&qp->regex_name, str, REG_EXTENDED | REG_NOSUB)) { + add_startup_exception("regex failed to compile quirk 'name' " + "field: %s", name); + failed = 1; + } + DNPRINTF(SWM_D_QUIRK, "quirk_insert: compiled: %s\n", str); + free(str); + + if (failed) { + DNPRINTF(SWM_D_QUIRK, "quirk_insert: regex error; skipping.\n"); + quirk_free(qp); + } else { + qp->quirk = quirk; + TAILQ_INSERT_TAIL(&quirks, qp, entry); + } DNPRINTF(SWM_D_QUIRK, "quirk_insert: leave\n"); } @@ -6650,41 +7024,54 @@ quirk_remove(struct quirk *qp) qp->name, qp->quirk); TAILQ_REMOVE(&quirks, qp, entry); + quirk_free(qp); + + DNPRINTF(SWM_D_QUIRK, "quirk_remove: leave\n"); +} + +void +quirk_free(struct quirk *qp) +{ + regfree(&qp->regex_class); + regfree(&qp->regex_instance); + regfree(&qp->regex_name); free(qp->class); + free(qp->instance); free(qp->name); free(qp); - - DNPRINTF(SWM_D_QUIRK, "quirk_remove: leave\n"); } void -quirk_replace(struct quirk *qp, const char *class, const char *name, - unsigned long quirk) +quirk_replace(struct quirk *qp, const char *class, const char *instance, + const char *name, unsigned long quirk) { - DNPRINTF(SWM_D_QUIRK, "quirk_replace: %s:%s [%lu]\n", qp->class, - qp->name, qp->quirk); + DNPRINTF(SWM_D_QUIRK, "quirk_replace: %s:%s:%s [%lu]\n", qp->class, + qp->instance, qp->name, qp->quirk); quirk_remove(qp); - quirk_insert(class, name, quirk); + quirk_insert(class, instance, name, quirk); DNPRINTF(SWM_D_QUIRK, "quirk_replace: leave\n"); } void -setquirk(const char *class, const char *name, unsigned long quirk) +setquirk(const char *class, const char *instance, const char *name, + unsigned long quirk) { struct quirk *qp; - DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s [%lu]\n", class, name, - quirk); + DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s:%s [%lu]\n", class, + instance, name, quirk); /* Remove/replace existing quirk. */ TAILQ_FOREACH(qp, &quirks, entry) { - if (!strcmp(qp->class, class) && !strcmp(qp->name, name)) { - if (!quirk) + if (strcmp(qp->class, class) == 0 && + strcmp(qp->instance, instance) == 0 && + strcmp(qp->name, name) == 0) { + if (quirk == 0) quirk_remove(qp); else - quirk_replace(qp, class, name, quirk); + quirk_replace(qp, class, instance, name, quirk); DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n"); return; } @@ -6692,16 +7079,33 @@ setquirk(const char *class, const char *name, unsigned long quirk) /* Only insert if quirk is not NONE. */ if (quirk) - quirk_insert(class, name, quirk); + quirk_insert(class, instance, name, quirk); DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n"); } +/* Eat '\' in str used to escape square brackets and colon. */ +void +unescape_selector(char *str) +{ + char *cp; + + for (cp = str; *str != '\0'; ++str, ++cp) { + if (*str == '\\' && (*(str + 1) == ':' || *(str + 1) == ']' || + *(str + 1) == '[')) + ++str; + + *cp = *str; + } + *cp = '\0'; +} + int -setconfquirk(char *selector, char *value, int flags) +setconfquirk(const char *selector, const char *value, int flags) { - char *cp, *class, *name; - int retval; + char *str, *cp, *class; + char *instance = NULL, *name = NULL; + int retval, count = 0; unsigned long qrks; /* suppress unused warning since var is needed */ @@ -6709,32 +7113,65 @@ setconfquirk(char *selector, char *value, int flags) if (selector == NULL) return (0); - if ((cp = strchr(selector, ':')) == NULL) - return (0); - *cp = '\0'; - class = selector; - name = cp + 1; + + if ((str = strdup(selector)) == NULL) + err(1, "setconfquirk: strdup"); + + /* Find non-escaped colon. */ + class = cp = str; + if (*cp == ':') { + *cp = '\0'; + ++count; + } + + for (++cp; *cp != '\0'; ++cp) { + if (*cp == ':' && *(cp - 1) != '\\') { + *cp = '\0'; + ++count; + } + } + + unescape_selector(class); + if (count) { + instance = class + strlen(class) + 1; + unescape_selector(instance); + } else { + instance = ".*"; + } + + if (count > 1) { + name = instance + strlen(instance) + 1; + unescape_selector(name); + } else { + name = ".*"; + } + + DNPRINTF(SWM_D_CONF, "setconfquirk: class: %s, instance: %s, " + "name: %s\n", class, instance, name); + if ((retval = parsequirks(value, &qrks)) == 0) - setquirk(class, name, qrks); + setquirk(class, instance, name, qrks); + + free(str); return (retval); } void setup_quirks(void) { - setquirk("MPlayer", "xv", SWM_Q_FLOAT | SWM_Q_FULLSCREEN | SWM_Q_FOCUSPREV); - setquirk("OpenOffice.org 3.2", "VCLSalFrame", SWM_Q_FLOAT); - setquirk("Firefox-bin", "firefox-bin", SWM_Q_TRANSSZ); - setquirk("Firefox", "Dialog", SWM_Q_FLOAT); - setquirk("Gimp", "gimp", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("XTerm", "xterm", SWM_Q_XTERM_FONTADJ); - setquirk("xine", "Xine Window", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("Xitk", "Xitk Combo", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("xine", "xine Panel", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("Xitk", "Xine Window", SWM_Q_FLOAT | SWM_Q_ANYWHERE); - setquirk("xine", "xine Video Fullscreen Window", SWM_Q_FULLSCREEN | SWM_Q_FLOAT); - setquirk("pcb", "pcb", SWM_Q_FLOAT); - setquirk("SDL_App", "SDL_App", SWM_Q_FLOAT | SWM_Q_FULLSCREEN); + setquirk("MPlayer", "xv", ".*", SWM_Q_FLOAT | SWM_Q_FULLSCREEN | SWM_Q_FOCUSPREV); + setquirk("OpenOffice.org 3.2", "VCLSalFrame", ".*", SWM_Q_FLOAT); + setquirk("Firefox-bin", "firefox-bin", ".*", SWM_Q_TRANSSZ); + setquirk("Firefox", "Dialog", ".*", SWM_Q_FLOAT); + setquirk("Gimp", "gimp", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("XTerm", "xterm", ".*", SWM_Q_XTERM_FONTADJ); + setquirk("xine", "Xine Window", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("Xitk", "Xitk Combo", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("xine", "xine Panel", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("Xitk", "Xine Window", ".*", SWM_Q_FLOAT | SWM_Q_ANYWHERE); + setquirk("xine", "xine Video Fullscreen Window", ".*", SWM_Q_FULLSCREEN | SWM_Q_FLOAT); + setquirk("pcb", "pcb", ".*", SWM_Q_FLOAT); + setquirk("SDL_App", "SDL_App", ".*", SWM_Q_FLOAT | SWM_Q_FULLSCREEN); } /* conf file stuff */ @@ -6752,6 +7189,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, @@ -6762,6 +7200,7 @@ enum { SWM_S_FOCUS_CLOSE_WRAP, SWM_S_FOCUS_DEFAULT, SWM_S_FOCUS_MODE, + SWM_S_ICONIC_ENABLED, SWM_S_REGION_PADDING, SWM_S_SPAWN_ORDER, SWM_S_SPAWN_TERM, @@ -6770,20 +7209,20 @@ enum { SWM_S_STACK_ENABLED, SWM_S_TERM_WIDTH, SWM_S_TILE_GAP, - SWM_S_TITLE_CLASS_ENABLED, - SWM_S_TITLE_NAME_ENABLED, SWM_S_URGENT_ENABLED, SWM_S_VERBOSE_LAYOUT, + SWM_S_WINDOW_CLASS_ENABLED, + SWM_S_WINDOW_INSTANCE_ENABLED, SWM_S_WINDOW_NAME_ENABLED, SWM_S_WORKSPACE_LIMIT }; int -setconfvalue(char *selector, char *value, int flags) +setconfvalue(const char *selector, const char *value, int flags) { struct workspace *ws; int i, ws_id, num_screens; - char *b; + char *b, *str; /* suppress unused warning since var is needed */ (void)selector; @@ -6814,7 +7253,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); @@ -6831,8 +7270,11 @@ setconfvalue(char *selector, char *value, int flags) if (!bar_font_legacy) break; + if ((str = strdup(value)) == NULL) + err(1, "setconfvalue: strdup"); + /* If there are any non-XLFD entries, switch to Xft mode. */ - while ((b = strsep(&value, ",")) != NULL) { + while ((b = strsep(&str, ",")) != NULL) { if (*b == '\0') continue; if (!isxlfd(b)) { @@ -6840,6 +7282,8 @@ setconfvalue(char *selector, char *value, int flags) break; } } + + free(str); break; case SWM_S_BAR_FORMAT: free(bar_format); @@ -6847,11 +7291,11 @@ setconfvalue(char *selector, char *value, int flags) err(1, "setconfvalue: bar_format"); break; case SWM_S_BAR_JUSTIFY: - if (!strcmp(value, "left")) + if (strcmp(value, "left") == 0) bar_justify = SWM_BAR_JUSTIFY_LEFT; - else if (!strcmp(value, "center")) + else if (strcmp(value, "center") == 0) bar_justify = SWM_BAR_JUSTIFY_CENTER; - else if (!strcmp(value, "right")) + else if (strcmp(value, "right") == 0) bar_justify = SWM_BAR_JUSTIFY_RIGHT; else errx(1, "invalid bar_justify"); @@ -6861,6 +7305,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; @@ -6886,13 +7335,13 @@ setconfvalue(char *selector, char *value, int flags) disable_border = atoi(value); break; case SWM_S_FOCUS_CLOSE: - if (!strcmp(value, "first")) + if (strcmp(value, "first") == 0) focus_close = SWM_STACK_BOTTOM; - else if (!strcmp(value, "last")) + else if (strcmp(value, "last") == 0) focus_close = SWM_STACK_TOP; - else if (!strcmp(value, "next")) + else if (strcmp(value, "next") == 0) focus_close = SWM_STACK_ABOVE; - else if (!strcmp(value, "previous")) + else if (strcmp(value, "previous") == 0) focus_close = SWM_STACK_BELOW; else errx(1, "focus_close"); @@ -6901,37 +7350,40 @@ setconfvalue(char *selector, char *value, int flags) focus_close_wrap = atoi(value); break; case SWM_S_FOCUS_DEFAULT: - if (!strcmp(value, "last")) + if (strcmp(value, "last") == 0) focus_default = SWM_STACK_TOP; - else if (!strcmp(value, "first")) + else if (strcmp(value, "first") == 0) focus_default = SWM_STACK_BOTTOM; else errx(1, "focus_default"); break; case SWM_S_FOCUS_MODE: - if (!strcmp(value, "default")) + if (strcmp(value, "default") == 0) focus_mode = SWM_FOCUS_DEFAULT; - else if (!strcmp(value, "follow") || - !strcmp(value, "follow_cursor")) + else if (strcmp(value, "follow") == 0 || + strcmp(value, "follow_cursor") == 0) focus_mode = SWM_FOCUS_FOLLOW; - else if (!strcmp(value, "manual")) + else if (strcmp(value, "manual") == 0) focus_mode = SWM_FOCUS_MANUAL; else errx(1, "focus_mode"); break; + case SWM_S_ICONIC_ENABLED: + iconic_enabled = atoi(value); + break; case SWM_S_REGION_PADDING: region_padding = atoi(value); if (region_padding < 0) region_padding = 0; break; case SWM_S_SPAWN_ORDER: - if (!strcmp(value, "first")) + if (strcmp(value, "first") == 0) spawn_position = SWM_STACK_BOTTOM; - else if (!strcmp(value, "last")) + else if (strcmp(value, "last") == 0) spawn_position = SWM_STACK_TOP; - else if (!strcmp(value, "next")) + else if (strcmp(value, "next") == 0) spawn_position = SWM_STACK_ABOVE; - else if (!strcmp(value, "previous")) + else if (strcmp(value, "previous") == 0) spawn_position = SWM_STACK_BELOW; else errx(1, "spawn_position"); @@ -6956,14 +7408,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); - break; - case SWM_S_TITLE_NAME_ENABLED: - title_name_enabled = atoi(value); break; case SWM_S_URGENT_ENABLED: urgent_enabled = atoi(value); @@ -6977,6 +7421,12 @@ setconfvalue(char *selector, char *value, int flags) layouts[i].l_string = plain_stacker; } break; + case SWM_S_WINDOW_CLASS_ENABLED: + window_class_enabled = atoi(value); + break; + case SWM_S_WINDOW_INSTANCE_ENABLED: + window_instance_enabled = atoi(value); + break; case SWM_S_WINDOW_NAME_ENABLED: window_name_enabled = atoi(value); break; @@ -6994,19 +7444,19 @@ setconfvalue(char *selector, char *value, int flags) } int -setconfmodkey(char *selector, char *value, int flags) +setconfmodkey(const char *selector, const char *value, int flags) { /* suppress unused warnings since vars are needed */ (void)selector; (void)flags; - if (!strncasecmp(value, "Mod1", strlen("Mod1"))) + if (strncasecmp(value, "Mod1", strlen("Mod1")) == 0) update_modkey(XCB_MOD_MASK_1); - else if (!strncasecmp(value, "Mod2", strlen("Mod2"))) + else if (strncasecmp(value, "Mod2", strlen("Mod2")) == 0) update_modkey(XCB_MOD_MASK_2); - else if (!strncasecmp(value, "Mod3", strlen("Mod3"))) + else if (strncasecmp(value, "Mod3", strlen("Mod3")) == 0) update_modkey(XCB_MOD_MASK_3); - else if (!strncasecmp(value, "Mod4", strlen("Mod4"))) + else if (strncasecmp(value, "Mod4", strlen("Mod4")) == 0) update_modkey(XCB_MOD_MASK_4); else return (1); @@ -7014,14 +7464,14 @@ setconfmodkey(char *selector, char *value, int flags) } int -setconfcolor(char *selector, char *value, int flags) +setconfcolor(const char *selector, const char *value, int flags) { setscreencolor(value, ((selector == NULL)?-1:atoi(selector)), flags); return (0); } int -setconfregion(char *selector, char *value, int flags) +setconfregion(const char *selector, const char *value, int flags) { /* suppress unused warnings since vars are needed */ (void)selector; @@ -7032,7 +7482,7 @@ setconfregion(char *selector, char *value, int flags) } int -setautorun(char *selector, char *value, int flags) +setautorun(const char *selector, const char *value, int flags) { int ws_id; char s[1024]; @@ -7104,7 +7554,7 @@ setautorun(char *selector, char *value, int flags) } int -setlayout(char *selector, char *value, int flags) +setlayout(const char *selector, const char *value, int flags) { int ws_id, i, x, mg, ma, si, ar, f = 0; int st = SWM_V_STACK, num_screens; @@ -7128,24 +7578,24 @@ setlayout(char *selector, char *value, int flags) if (ws_id < 0 || ws_id >= workspace_limit) errx(1, "layout: invalid workspace %d", ws_id + 1); - if (!strcasecmp(s, "vertical")) + if (strcasecmp(s, "vertical") == 0) st = SWM_V_STACK; - else if (!strcasecmp(s, "vertical_flip")) { + else if (strcasecmp(s, "vertical_flip") == 0) { st = SWM_V_STACK; f = 1; - } else if (!strcasecmp(s, "horizontal")) + } else if (strcasecmp(s, "horizontal") == 0) st = SWM_H_STACK; - else if (!strcasecmp(s, "horizontal_flip")) { + else if (strcasecmp(s, "horizontal_flip") == 0) { st = SWM_H_STACK; f = 1; - } else if (!strcasecmp(s, "fullscreen")) + } else if (strcasecmp(s, "fullscreen") == 0) st = SWM_MAX_STACK; else errx(1, "invalid layout entry, should be 'ws[]:" "::::" "'"); - 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]; @@ -7191,7 +7641,7 @@ setlayout(char *selector, char *value, int flags) /* config options */ struct config_option { char *optname; - int (*func)(char*, char*, int); + int (*func)(const char*, const char*, int); int funcflags; }; struct config_option configopt[] = { @@ -7211,6 +7661,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 }, @@ -7223,6 +7674,7 @@ struct config_option configopt[] = { { "focus_close_wrap", setconfvalue, SWM_S_FOCUS_CLOSE_WRAP }, { "focus_default", setconfvalue, SWM_S_FOCUS_DEFAULT }, { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE }, + { "iconic_enabled", setconfvalue, SWM_S_ICONIC_ENABLED }, { "keyboard_mapping", setkeymapping, 0 }, { "layout", setlayout, 0 }, { "modkey", setconfmodkey, 0 }, @@ -7237,10 +7689,12 @@ struct config_option configopt[] = { { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED }, { "term_width", setconfvalue, SWM_S_TERM_WIDTH }, { "tile_gap", setconfvalue, SWM_S_TILE_GAP }, - { "title_class_enabled", setconfvalue, SWM_S_TITLE_CLASS_ENABLED }, - { "title_name_enabled", setconfvalue, SWM_S_TITLE_NAME_ENABLED }, + { "title_class_enabled", setconfvalue, SWM_S_WINDOW_CLASS_ENABLED }, /* For backwards compat. */ + { "title_name_enabled", setconfvalue, SWM_S_WINDOW_INSTANCE_ENABLED }, /* For backwards compat. */ { "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED }, { "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT }, + { "window_class_enabled", setconfvalue, SWM_S_WINDOW_CLASS_ENABLED }, + { "window_instance_enabled", setconfvalue, SWM_S_WINDOW_INSTANCE_ENABLED }, { "window_name_enabled", setconfvalue, SWM_S_WINDOW_NAME_ENABLED }, { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT }, }; @@ -7274,9 +7728,9 @@ int conf_load(const char *filename, int keymapping) { FILE *config; - char *line = NULL, *cp, *optsub, *optval = NULL; + char *line = NULL, *cp, *ce, *optsub, *optval = NULL; size_t linelen, lineno = 0; - int wordlen, i, optidx; + int wordlen, i, optidx, count; struct config_option *opt = NULL; DNPRINTF(SWM_D_CONF, "conf_load: begin\n"); @@ -7320,7 +7774,7 @@ conf_load(const char *filename, int keymapping) optidx = -1; for (i = 0; i < LENGTH(configopt); i++) { opt = &configopt[i]; - if (!strncasecmp(cp, opt->optname, wordlen) && + if (strncasecmp(cp, opt->optname, wordlen) == 0 && (int)strlen(opt->optname) == wordlen) { optidx = i; break; @@ -7339,55 +7793,47 @@ conf_load(const char *filename, int keymapping) 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; + count = 0; if (*cp == '[') { - cp++; - wordlen = strcspn(cp, "]"); - if (*cp != ']') { - if (wordlen == 0) { - add_startup_exception("%s: line %zd: " - "syntax error", filename, lineno); - goto invalid; + ++count; + /* Get length of selector. */ + for (ce = ++cp; *ce != '\0'; ++ce) { + /* Find matching (not escaped) bracket. */ + if (*ce == ']' && *(ce - 1) != '\\') { + --count; + break; } + } - if (asprintf(&optsub, "%.*s", wordlen, cp) == - -1) { - add_startup_exception("%s: line %zd: " - "unable to allocatememory for " - "selector", filename, lineno); - goto invalid; - } + if (count > 0) { + add_startup_exception("%s: line %zd: syntax " + "error: unterminated selector", filename, + lineno); + continue; } - cp += wordlen; - cp += strspn(cp, "] \t\n"); /* eat trailing */ + + /* ce points at ']'; terminate optsub. */ + *ce = '\0'; + optsub = cp; + cp = ce + 1; } cp += strspn(cp, "= \t\n"); /* eat trailing */ /* get RHS value */ - optval = strdup(cp); + optval = cp; if (strlen(optval) == 0) { add_startup_exception("%s: line %zd: must supply value " "to %s", filename, lineno, configopt[optidx].optname); - goto invalid; + continue; } /* call function to deal with it all */ if (configopt[optidx].func(optsub, optval, 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; + continue; } } @@ -7414,7 +7860,7 @@ set_child_transient(struct ws_win *win, xcb_window_t *trans) DNPRINTF(SWM_D_MISC, "set_child_transient: parent doesn't exist" " for 0x%x trans 0x%x\n", win->id, win->transient); - r = root_to_region(win->wa->root, SWM_CK_ALL); + r = root_to_region(win->s->root, SWM_CK_ALL); ws = r->ws; /* parent doen't exist in our window list */ TAILQ_FOREACH(w, &ws->winlist, entry) { @@ -7453,7 +7899,7 @@ window_get_pid(xcb_window_t win) pc = xcb_get_property(conn, 0, win, apid, XCB_ATOM_CARDINAL, 0, 1); pr = xcb_get_property_reply(conn, pc, NULL); - if (!pr) + if (pr == NULL) goto tryharder; if (pr->type != XCB_ATOM_CARDINAL) { free(pr); @@ -7471,7 +7917,7 @@ tryharder: pc = xcb_get_property(conn, 0, win, apid, XCB_ATOM_STRING, 0, SWM_PROPLEN); pr = xcb_get_property_reply(conn, pc, NULL); - if (!pr) + if (pr == NULL) return (0); if (pr->type != apid) { free(pr); @@ -7497,7 +7943,7 @@ get_ws_idx(xcb_window_t id) xcb_get_property(conn, 0, id, a_swm_ws, XCB_ATOM_STRING, 0, SWM_PROPLEN), NULL); - if (!gpr) + if (gpr == NULL) return (-1); if (gpr->type) { proplen = xcb_get_property_value_length(gpr); @@ -7533,11 +7979,12 @@ manage_window(xcb_window_t id, uint16_t mapped) struct ws_win *win, *ww; int ws_idx; char ws_idx_str[SWM_PROPLEN]; + char *name; struct swm_region *r; struct pid_e *p; struct quirk *qp; uint32_t i, wa[2]; - xcb_icccm_get_wm_protocols_reply_t wpr; + xcb_get_geometry_reply_t *gr; if ((win = find_window(id)) != NULL) { DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x already " @@ -7559,6 +8006,13 @@ manage_window(xcb_window_t id, uint16_t mapped) DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x is new.\n", id); } + /* Try to get initial window geometry. */ + gr = xcb_get_geometry_reply(conn, xcb_get_geometry(conn, id), NULL); + if (gr == NULL) { + DNPRINTF(SWM_D_MISC, "manage_window: get geometry failed.\n"); + return (NULL); + } + /* Create and initialize ws_win object. */ if ((win = calloc(1, sizeof(struct ws_win))) == NULL) err(1, "manage_window: calloc: failed to allocate memory for " @@ -7566,26 +8020,32 @@ manage_window(xcb_window_t id, uint16_t mapped) win->id = id; - /* Get window geometry. */ - win->wa = xcb_get_geometry_reply(conn, - xcb_get_geometry(conn, win->id), - NULL); - - /* Figure out which region the window belongs to. */ - r = root_to_region(win->wa->root, SWM_CK_ALL); + /* Figureout which region the window belongs to. */ + r = root_to_region(gr->root, SWM_CK_ALL); /* Ignore window border if there is one. */ - WIDTH(win) = win->wa->width; - HEIGHT(win) = win->wa->height; - X(win) = win->wa->x + win->wa->border_width - border_width; - Y(win) = win->wa->y + win->wa->border_width - border_width; + WIDTH(win) = gr->width; + HEIGHT(win) = gr->height; + X(win) = gr->x + gr->border_width - border_width; + Y(win) = gr->y + gr->border_width - border_width; win->bordered = 1; win->mapped = mapped; win->floatmaxed = 0; win->ewmh_flags = 0; win->s = r->s; /* this never changes */ - store_float_geom(win, r); + free(gr); + + /* Select which X events to monitor and set border pixel color. */ + wa[0] = win->s->c[SWM_S_COLOR_UNFOCUS].pixel; + wa[1] = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_PROPERTY_CHANGE | + XCB_EVENT_MASK_STRUCTURE_NOTIFY; +#ifdef SWM_DEBUG + wa[1] |= XCB_EVENT_MASK_LEAVE_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE; +#endif + + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL | + XCB_CW_EVENT_MASK, wa); /* Get WM_SIZE_HINTS. */ xcb_icccm_get_wm_normal_hints_reply(conn, @@ -7606,18 +8066,8 @@ manage_window(xcb_window_t id, uint16_t mapped) set_child_transient(win, &win->transient); } - /* Get supported protocols. */ - if (xcb_icccm_get_wm_protocols_reply(conn, - xcb_icccm_get_wm_protocols(conn, win->id, a_prot), - &wpr, NULL)) { - for (i = 0; i < wpr.atoms_len; i++) { - if (wpr.atoms[i] == a_takefocus) - win->take_focus = 1; - if (wpr.atoms[i] == a_delete) - win->can_delete = 1; - } - xcb_icccm_get_wm_protocols_reply_wipe(&wpr); - } + /* Get WM_PROTOCOLS. */ + get_wm_protocols(win); win->iconic = get_swm_iconic(win); @@ -7648,6 +8098,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); @@ -7655,8 +8108,11 @@ manage_window(xcb_window_t id, uint16_t mapped) if (xcb_icccm_get_wm_class_reply(conn, xcb_icccm_get_wm_class(conn, win->id), &win->ch, NULL)) { - DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n", - win->ch.class_name, win->ch.instance_name); + name = get_win_name(win->id); + + DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, instance: %s, " + "name: %s\n", + win->ch.class_name, win->ch.instance_name, name); /* java is retarded so treat it special */ if (strstr(win->ch.instance_name, "sun-awt")) { @@ -7666,15 +8122,21 @@ manage_window(xcb_window_t id, uint16_t mapped) } TAILQ_FOREACH(qp, &quirks, entry) { - if (!strcmp(win->ch.class_name, qp->class) && - !strcmp(win->ch.instance_name, qp->name)) { - DNPRINTF(SWM_D_CLASS, "manage_window: on quirks" - "list; mask: 0x%lx\n", qp->quirk); + if (regexec(&qp->regex_class, win->ch.class_name, 0, + NULL, 0) == 0 && regexec(&qp->regex_instance, + win->ch.instance_name, 0, NULL, 0) == 0 && + regexec(&qp->regex_name, name, 0, NULL, 0) == 0) { + DNPRINTF(SWM_D_CLASS, "manage_window: matched " + "quirk: %s:%s:%s mask: %#lx\n", qp->class, + qp->instance, qp->name, qp->quirk); if (qp->quirk & SWM_Q_FLOAT) win->floating = 1; win->quirks = qp->quirk; } + } + + free(name); } /* Alter window position if quirky */ @@ -7691,21 +8153,11 @@ 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); } - /* Select which X events to monitor and set border pixel color. */ - wa[0] = win->s->c[SWM_S_COLOR_UNFOCUS].pixel; - wa[1] = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_PROPERTY_CHANGE | - XCB_EVENT_MASK_STRUCTURE_NOTIFY; -#ifdef SWM_DEBUG - wa[1] |= XCB_EVENT_MASK_LEAVE_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE; -#endif - - xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL | - XCB_CW_EVENT_MASK, wa); - out: /* Figure out where to stack the window in the workspace. */ if (trans && (ww = find_window(trans))) @@ -7751,9 +8203,6 @@ free_window(struct ws_win *win) TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); - if (win->wa) - free(win->wa); - xcb_icccm_get_wm_class_reply_wipe(&win->ch); kill_refs(win); @@ -7793,7 +8242,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)) @@ -7939,8 +8388,7 @@ print_win_geom(xcb_window_t w) xcb_get_geometry_reply_t *wa; wa = xcb_get_geometry_reply(conn, xcb_get_geometry(conn, w), NULL); - - if (!wa) { + if (wa == NULL) { DNPRINTF(SWM_D_MISC, "print_win_geom: window not found: 0x%x\n", w); return; @@ -8156,10 +8604,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); } } @@ -8300,13 +8751,13 @@ mapnotify(xcb_map_notify_event_t *e) DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%x\n", e->window); - if ((win = find_window(e->window)) == NULL) - win = manage_window(e->window, 1); + if ((win = manage_window(e->window, 1)) == NULL) + return; 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; @@ -8351,20 +8802,29 @@ maprequest(xcb_map_request_event_t *e) win = manage_window(e->window, (war->map_state == XCB_MAP_STATE_VIEWABLE)); + if (win == NULL) + goto out; /* The new window should get focus; prepare. */ if (focus_mode != SWM_FOCUS_FOLLOW && - !(win->quirks & SWM_Q_NOFOCUSONMAP)) { + !(win->quirks & SWM_Q_NOFOCUSONMAP) && + (!(win->hints.flags & XCB_ICCCM_WM_HINT_INPUT) || + (win->hints.flags & XCB_ICCCM_WM_HINT_INPUT && + win->hints.input))) { 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 (!strcmp(w->ch.class_name, - win->ch.class_name) && - !strcmp(w->ch.instance_name, - win->ch.instance_name)) + if (w->ch.class_name && + win->ch.class_name && + strcmp(w->ch.class_name, + win->ch.class_name) == 0 && + w->ch.instance_name && + win->ch.instance_name && + strcmp(w->ch.instance_name, + win->ch.instance_name) == 0) break; } } @@ -8401,7 +8861,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; @@ -8419,7 +8882,7 @@ char * get_atom_name(xcb_atom_t atom) { char *name = NULL; -#if 0 +#ifdef SWM_DEBUG_ATOM_NAMES /* * This should be disabled during most debugging since * xcb_get_* causes an xcb_flush. @@ -8452,6 +8915,7 @@ void propertynotify(xcb_property_notify_event_t *e) { struct ws_win *win; + struct workspace *ws; #ifdef SWM_DEBUG char *name; @@ -8465,28 +8929,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(); @@ -8496,17 +8972,19 @@ 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; } } } } else if (e->atom == XCB_ATOM_WM_CLASS || e->atom == XCB_ATOM_WM_NAME) { bar_draw(); + } else if (e->atom == a_prot) { + get_wm_protocols(win); } xcb_flush(conn); @@ -8552,13 +9030,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); } } } @@ -8569,15 +9049,6 @@ unmapnotify(xcb_unmap_notify_event_t *e) focus_flush(); } -#if 0 -void -visibilitynotify(xcb_visibility_notify_event_t *e) -{ - DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%x\n", - e->window); -} -#endif - void clientmessage(xcb_client_message_event_t *e) { @@ -8606,7 +9077,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"); @@ -8693,7 +9167,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); @@ -8825,7 +9299,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"); @@ -8906,7 +9380,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) @@ -8957,11 +9431,11 @@ 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); - if (!qtr) + if (qtr == NULL) continue; wins = xcb_query_tree_children(qtr); no = xcb_query_tree_children_length(qtr); @@ -8983,7 +9457,7 @@ grab_windows(void) gac = xcb_get_window_attributes(conn, wins[j]); gar = xcb_get_window_attributes_reply(conn, gac, NULL); - if (!gar) { + if (gar == NULL) { DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " "doesn't exist.\n", wins[j]); continue; @@ -9017,7 +9491,7 @@ grab_windows(void) for (j = 0; j < no; j++) { gac = xcb_get_window_attributes(conn, wins[j]); gar = xcb_get_window_attributes_reply(conn, gac, NULL); - if (!gar) { + if (gar == NULL) { DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " "doesn't exist.\n", wins[j]); continue; @@ -9055,7 +9529,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 " @@ -9156,10 +9630,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"); } @@ -9174,7 +9645,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; @@ -9188,7 +9659,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"); } } @@ -9209,9 +9681,9 @@ 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) + if (screens[i].bar_gc != XCB_NONE) xcb_free_gc(conn, screens[i].bar_gc); if (!bar_font_legacy) XftColorFree(display, DefaultVisual(display, i), @@ -9289,7 +9761,7 @@ event_handle(xcb_generic_event_t *evt) /*EVENT(XCB_SELECTION_NOTIFY, );*/ /*EVENT(XCB_SELECTION_REQUEST, );*/ EVENT(XCB_UNMAP_NOTIFY, unmapnotify); - /*EVENT(XCB_VISIBILITY_NOTIFY, visibilitynotify);*/ + /*EVENT(XCB_VISIBILITY_NOTIFY, );*/ #undef EVENT } if (type - xrandr_eventbase == XCB_RANDR_SCREEN_CHANGE_NOTIFY) @@ -9318,7 +9790,7 @@ main(int argc, char *argv[]) start_argv = argv; warnx("Welcome to spectrwm V%s Build: %s", SPECTRWM_VERSION, buildstr); - if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "")) + if (setlocale(LC_CTYPE, "") == NULL || setlocale(LC_TIME, "") == NULL) warnx("no locale support"); /* handle some signals */ @@ -9335,7 +9807,7 @@ main(int argc, char *argv[]) sact.sa_flags = SA_NOCLDSTOP; sigaction(SIGCHLD, &sact, NULL); - if (!(display = XOpenDisplay(0))) + if ((display = XOpenDisplay(0)) == NULL) errx(1, "can not open display"); conn = XGetXCBConnection(display); @@ -9362,7 +9834,7 @@ main(int argc, char *argv[]) free(evt); } - if (enable_wm() != 0) + if (enable_wm()) errx(1, "another window manager is currently running"); /* Load Xcursors and/or cursorfont glyph cursors. */ @@ -9428,7 +9900,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);