X-Git-Url: https://code.delx.au/spectrwm/blobdiff_plain/bc6ee31c0fb608fa2c091a4a332934f3c66fa2df..0847b1d8e4a234d87ba41504416f60a7a1e0f3c7:/spectrwm.c diff --git a/spectrwm.c b/spectrwm.c index 4aff709..e202f9c 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -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 @@ -283,8 +285,8 @@ xcb_atom_t a_takefocus; xcb_atom_t a_utf8_string; xcb_atom_t a_swm_iconic; xcb_atom_t a_swm_ws; -volatile sig_atomic_t running = 1; -volatile sig_atomic_t restart_wm = 0; +volatile sig_atomic_t running = 1; +volatile sig_atomic_t restart_wm = 0; xcb_timestamp_t last_event_time = 0; int outputs = 0; int other_wm; @@ -343,10 +345,10 @@ double dialog_ratio = 0.6; #define SWM_BAR_JUSTIFY_CENTER (1) #define SWM_BAR_JUSTIFY_RIGHT (2) #define SWM_BAR_OFFSET (4) -#define SWM_BAR_FONTS "-*-terminus-medium-*-*-*-12-*-*-*-*-*-*-*," \ - "-*-profont-*-*-*-*-12-*-*-*-*-*-*-*," \ - "-*-times-medium-r-*-*-12-*-*-*-*-*-*-*," \ - "-misc-fixed-medium-r-*-*-12-*-*-*-*-*-*-*," \ +#define SWM_BAR_FONTS "-*-terminus-medium-*-*-*-12-*-*-*-*-*-*-*,"\ + "-*-profont-*-*-*-*-12-*-*-*-*-*-*-*,"\ + "-*-times-medium-r-*-*-12-*-*-*-*-*-*-*,"\ + "-misc-fixed-medium-r-*-*-12-*-*-*-*-*-*-*,"\ "-*-*-*-r-*-*-*-*-*-*-*-*-*-*" #ifdef X_HAVE_UTF8_STRING @@ -371,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; @@ -451,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; @@ -569,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) @@ -612,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 */ @@ -665,33 +672,33 @@ struct ewmh_hint { char *name; xcb_atom_t atom; } ewmh[SWM_EWMH_HINT_MAX] = { - /* must be in same order as in the enum */ - {"_NET_ACTIVE_WINDOW", XCB_ATOM_NONE}, - {"_NET_CLOSE_WINDOW", XCB_ATOM_NONE}, - {"_NET_MOVERESIZE_WINDOW", XCB_ATOM_NONE}, - {"_NET_WM_ACTION_ABOVE", XCB_ATOM_NONE}, - {"_NET_WM_ACTION_CLOSE", XCB_ATOM_NONE}, - {"_NET_WM_ACTION_FULLSCREEN", XCB_ATOM_NONE}, - {"_NET_WM_ACTION_MOVE", XCB_ATOM_NONE}, - {"_NET_WM_ACTION_RESIZE", XCB_ATOM_NONE}, - {"_NET_WM_ALLOWED_ACTIONS", XCB_ATOM_NONE}, - {"_NET_WM_NAME", XCB_ATOM_NONE}, - {"_NET_WM_STATE", XCB_ATOM_NONE}, - {"_NET_WM_STATE_ABOVE", XCB_ATOM_NONE}, - {"_NET_WM_STATE_FULLSCREEN", XCB_ATOM_NONE}, - {"_NET_WM_STATE_HIDDEN", XCB_ATOM_NONE}, - {"_NET_WM_STATE_MAXIMIZED_HORZ", XCB_ATOM_NONE}, - {"_NET_WM_STATE_MAXIMIZED_VERT", XCB_ATOM_NONE}, - {"_NET_WM_STATE_SKIP_PAGER", XCB_ATOM_NONE}, - {"_NET_WM_STATE_SKIP_TASKBAR", XCB_ATOM_NONE}, - {"_NET_WM_WINDOW_TYPE", XCB_ATOM_NONE}, - {"_NET_WM_WINDOW_TYPE_DIALOG", XCB_ATOM_NONE}, - {"_NET_WM_WINDOW_TYPE_DOCK", XCB_ATOM_NONE}, - {"_NET_WM_WINDOW_TYPE_NORMAL", XCB_ATOM_NONE}, - {"_NET_WM_WINDOW_TYPE_SPLASH", XCB_ATOM_NONE}, - {"_NET_WM_WINDOW_TYPE_TOOLBAR", XCB_ATOM_NONE}, - {"_NET_WM_WINDOW_TYPE_UTILITY", XCB_ATOM_NONE}, - {"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE}, + /* must be in same order as in the enum */ + {"_NET_ACTIVE_WINDOW", XCB_ATOM_NONE}, + {"_NET_CLOSE_WINDOW", XCB_ATOM_NONE}, + {"_NET_MOVERESIZE_WINDOW", XCB_ATOM_NONE}, + {"_NET_WM_ACTION_ABOVE", XCB_ATOM_NONE}, + {"_NET_WM_ACTION_CLOSE", XCB_ATOM_NONE}, + {"_NET_WM_ACTION_FULLSCREEN", XCB_ATOM_NONE}, + {"_NET_WM_ACTION_MOVE", XCB_ATOM_NONE}, + {"_NET_WM_ACTION_RESIZE", XCB_ATOM_NONE}, + {"_NET_WM_ALLOWED_ACTIONS", XCB_ATOM_NONE}, + {"_NET_WM_NAME", XCB_ATOM_NONE}, + {"_NET_WM_STATE", XCB_ATOM_NONE}, + {"_NET_WM_STATE_ABOVE", XCB_ATOM_NONE}, + {"_NET_WM_STATE_FULLSCREEN", XCB_ATOM_NONE}, + {"_NET_WM_STATE_HIDDEN", XCB_ATOM_NONE}, + {"_NET_WM_STATE_MAXIMIZED_HORZ", XCB_ATOM_NONE}, + {"_NET_WM_STATE_MAXIMIZED_VERT", XCB_ATOM_NONE}, + {"_NET_WM_STATE_SKIP_PAGER", XCB_ATOM_NONE}, + {"_NET_WM_STATE_SKIP_TASKBAR", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_DIALOG", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_DOCK", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_NORMAL", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_SPLASH", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_TOOLBAR", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_UTILITY", XCB_ATOM_NONE}, + {"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE}, }; /* Cursors */ @@ -744,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, @@ -852,240 +860,237 @@ enum keyfuncid { }; struct key { - RB_ENTRY(key) entry; - unsigned int mod; - KeySym keysym; - enum keyfuncid funcid; - char *spawn_name; + RB_ENTRY(key) entry; + unsigned int mod; + KeySym keysym; + enum keyfuncid funcid; + char *spawn_name; }; RB_HEAD(key_tree, key); /* function prototypes */ -void adjust_font(struct ws_win *); -void bar_class_name(char *, size_t, struct swm_region *); -void bar_class_title_name(char *, size_t, struct swm_region *); -void bar_cleanup(struct swm_region *); -void bar_extra_setup(void); -void bar_extra_stop(void); -int bar_extra_update(void); -void bar_fmt(const char *, char *, struct swm_region *, size_t); -void bar_fmt_expand(char *, size_t); -void bar_draw(void); -void bar_print(struct swm_region *, const char *); -void bar_print_legacy(struct swm_region *, const char *); -void bar_replace(char *, char *, struct swm_region *, size_t); -void bar_replace_pad(char *, int *, size_t); +void adjust_font(struct ws_win *); +char *argsep(char **); +void bar_cleanup(struct swm_region *); +void bar_extra_setup(void); +void bar_extra_stop(void); +int bar_extra_update(void); +void bar_fmt(const char *, char *, struct swm_region *, size_t); +void bar_fmt_expand(char *, size_t); +void bar_draw(void); +void bar_print(struct swm_region *, const char *); +void bar_print_legacy(struct swm_region *, const char *); +void bar_replace(char *, char *, struct swm_region *, size_t); +void bar_replace_pad(char *, int *, size_t); char *bar_replace_seq(char *, char *, struct swm_region *, size_t *, size_t); -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_float(char *, size_t, struct swm_region *); -void bar_window_name(char *, size_t, struct swm_region *); -void bar_workspace_name(char *, size_t, struct swm_region *); -void buttonpress(xcb_button_press_event_t *); -void check_conn(void); -void clear_keys(void); -void clientmessage(xcb_client_message_event_t *); -void client_msg(struct ws_win *, xcb_atom_t, xcb_timestamp_t); -int conf_load(const char *, int); -void configurenotify(xcb_configure_notify_event_t *); -void configurerequest(xcb_configure_request_event_t *); -void config_win(struct ws_win *, xcb_configure_request_event_t *); -void constrain_window(struct ws_win *, struct swm_geometry *, int *); -int count_win(struct workspace *, int); -void cursors_cleanup(void); -void cursors_load(void); -void custom_region(char *); -void cyclerg(struct swm_region *, union arg *); -void cyclews(struct swm_region *, union arg *); -void cycle_layout(struct swm_region *, union arg *); -void destroynotify(xcb_destroy_notify_event_t *); -void dumpwins(struct swm_region *, union arg *); -int enable_wm(void); -void enternotify(xcb_enter_notify_event_t *); -void event_drain(uint8_t); -void event_error(xcb_generic_error_t *); -void event_handle(xcb_generic_event_t *); -void ewmh_autoquirk(struct ws_win *); -void ewmh_get_win_state(struct ws_win *); -int ewmh_set_win_fullscreen(struct ws_win *, int); -void ewmh_update_actions(struct ws_win *); -void ewmh_update_win_state(struct ws_win *, xcb_atom_t, long); +void bar_setup(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 *); +void check_conn(void); +void clear_keys(void); +void clientmessage(xcb_client_message_event_t *); +void client_msg(struct ws_win *, xcb_atom_t, xcb_timestamp_t); +int conf_load(const char *, int); +void configurenotify(xcb_configure_notify_event_t *); +void configurerequest(xcb_configure_request_event_t *); +void config_win(struct ws_win *, xcb_configure_request_event_t *); +void constrain_window(struct ws_win *, struct swm_geometry *, int *); +int count_win(struct workspace *, int); +void cursors_cleanup(void); +void cursors_load(void); +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 *); +void destroynotify(xcb_destroy_notify_event_t *); +void dumpwins(struct swm_region *, union arg *); +int enable_wm(void); +void enternotify(xcb_enter_notify_event_t *); +void event_drain(uint8_t); +void event_error(xcb_generic_error_t *); +void event_handle(xcb_generic_event_t *); +void ewmh_autoquirk(struct ws_win *); +void ewmh_get_win_state(struct ws_win *); +int ewmh_set_win_fullscreen(struct ws_win *, int); +void ewmh_update_actions(struct ws_win *); +void ewmh_update_win_state(struct ws_win *, xcb_atom_t, long); char *expand_tilde(const char *); -void expose(xcb_expose_event_t *); -void fake_keypress(struct ws_win *, xcb_keysym_t, uint16_t); +void expose(xcb_expose_event_t *); +void fake_keypress(struct ws_win *, xcb_keysym_t, uint16_t); +void floating_toggle(struct swm_region *, union arg *); +int floating_toggle_win(struct ws_win *); +void focus(struct swm_region *, union arg *); +void focus_flush(void); +void focus_region(struct swm_region *); +void focusrg(struct swm_region *, union arg *); +void focus_win(struct ws_win *); +void fontset_init(void); +void free_window(struct ws_win *); +void search_do_resp(void); +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 *, 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(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(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); +void setup_keys(void); +void setup_quirks(void); +void setup_screens(void); +void setup_spawn(void); +void set_child_transient(struct ws_win *, xcb_window_t *); +void set_swm_iconic(struct ws_win *, int); +void set_win_state(struct ws_win *, uint16_t); +void shutdown_cleanup(void); +void sighdlr(int); +void socket_setnonblock(int); +void sort_windows(struct ws_win_list *); +void spawn(int, union arg *, int); +void spawn_custom(struct swm_region *, union arg *, const char *); +int spawn_expand(struct swm_region *, union arg *, const char *, char ***); +void spawn_insert(const char *, const char *, int); +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); +void grabbuttons(struct ws_win *); +void grabkeys(void); +void grab_windows(void); +void iconify(struct swm_region *, union arg *); +int isxlfd(char *); +void keypress(xcb_key_press_event_t *); +int key_cmp(struct key *, struct key *); +void key_insert(unsigned int, KeySym, enum keyfuncid, const char *); +void key_remove(struct key *); +void key_replace(struct key *, unsigned int, KeySym, enum keyfuncid, + const char *); +void kill_bar_extra_atexit(void); +void kill_refs(struct ws_win *); +void load_float_geom(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(int, const char *); +void name_workspace(struct swm_region *, union arg *); +void new_region(struct swm_screen *, int, int, int, int); +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 *); +void propertynotify(xcb_property_notify_event_t *); +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 *, 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); +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 *); +void screenchange(xcb_randr_screen_change_notify_event_t *); +void scan_xrandr(int); +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 *); +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 *); +void unmapnotify(xcb_unmap_notify_event_t *); +void unmap_all(void); +void unmap_window(struct ws_win *); +void updatenumlockmask(void); +void update_modkey(unsigned int); +void update_window(struct ws_win *); +void validate_spawns(void); +int validate_win(struct ws_win *); +int validate_ws(struct workspace *); +void version(struct swm_region *, union arg *); +void win_to_ws(struct ws_win *, int, int); +pid_t window_get_pid(xcb_window_t); +void wkill(struct swm_region *, union arg *); +void workaround(void); +void xft_init(struct swm_region *); +void _add_startup_exception(const char *, va_list); +void add_startup_exception(const char *, ...); +#ifdef SWM_DEBUG +void focusin(xcb_focus_in_event_t *); +void focusout(xcb_focus_out_event_t *); +void leavenotify(xcb_leave_notify_event_t *); +void print_win_geom(xcb_window_t); +#endif + struct pid_e *find_pid(pid_t); struct ws_win *find_unmanaged_window(xcb_window_t); struct ws_win *find_window(xcb_window_t); -void floating_toggle(struct swm_region *, union arg *); -int floating_toggle_win(struct ws_win *); -void focus(struct swm_region *, union arg *); -#ifdef SWM_DEBUG -void focusin(xcb_focus_in_event_t *); -void focusout(xcb_focus_out_event_t *); -#endif -void focus_flush(void); -void focus_region(struct swm_region *); -void focusrg(struct swm_region *, union arg *); -void focus_win(struct ws_win *); -void fontset_init(void); -void free_window(struct ws_win *); -xcb_atom_t get_atom_from_string(const char *); -#ifdef SWM_DEBUG -char *get_atom_name(xcb_atom_t); -#endif -struct ws_win *get_focus_magic(struct ws_win *); -struct ws_win *get_focus_prev(struct ws_win *); -#ifdef SWM_DEBUG -char *get_notify_detail_label(uint8_t); -char *get_notify_mode_label(uint8_t); -#endif +struct ws_win *get_focus_magic(struct ws_win *); +struct ws_win *get_focus_prev(struct ws_win *); 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 *); +struct ws_win *manage_window(xcb_window_t, uint16_t); +int get_region_index(struct swm_region *); +xcb_atom_t get_atom_from_string(const char *); 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); -int get_ws_idx(xcb_window_t); -uint32_t getstate(xcb_window_t); -void grabbuttons(struct ws_win *); -void grabkeys(void); -void grab_windows(void); -void iconify(struct swm_region *, union arg *); -int isxlfd(char *); -void keypress(xcb_key_press_event_t *); -int key_cmp(struct key *, struct key *); -void key_insert(unsigned int, KeySym, enum keyfuncid, const char *); +xcb_window_t get_sibling(struct ws_win *, int); +int get_screen_count(void); +uint32_t getstate(xcb_window_t); struct key *key_lookup(unsigned int, KeySym); -void key_remove(struct key *); -void key_replace(struct key *, unsigned int, KeySym, enum keyfuncid, - const char *); -void kill_bar_extra_atexit(void); -void kill_refs(struct ws_win *); #ifdef SWM_DEBUG -void leavenotify(xcb_leave_notify_event_t *); +char *get_atom_name(xcb_atom_t); +char *get_notify_detail_label(uint8_t); +char *get_notify_mode_label(uint8_t); +char *get_stack_mode_name(uint8_t); #endif -void load_float_geom(struct ws_win *); -struct ws_win *manage_window(xcb_window_t, uint16_t); -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(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 parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *); -void pressbutton(struct swm_region *, union arg *); -void priorws(struct swm_region *, union arg *); -#ifdef SWM_DEBUG -void print_win_geom(xcb_window_t); -#endif -void propertynotify(xcb_property_notify_event_t *); -void quirk_insert(const char *, const char *, unsigned long); -void quirk_remove(struct quirk *); -void quirk_replace(struct quirk *, const char *, const char *, - unsigned long); -void quit(struct swm_region *, union arg *); -void raise_toggle(struct swm_region *, union arg *); -void 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 *); 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 *, size_t); -void search_resp_search_window(const char *); -void search_resp_search_workspace(const char *); -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); -void setkeybinding(unsigned int, KeySym, enum keyfuncid, const char *); -int setkeymapping(char *, char *, int); -int setlayout(char *, char *, int); -void setquirk(const char *, const char *, unsigned long); -void setscreencolor(char *, int, int); -void setspawn(const char *, const char *, int); -void setup_ewmh(void); -void setup_globals(void); -void setup_keys(void); -void setup_quirks(void); -void setup_screens(void); -void setup_spawn(void); -void set_child_transient(struct ws_win *, xcb_window_t *); -void set_swm_iconic(struct ws_win *, int); -void set_win_state(struct ws_win *, uint16_t); -void shutdown_cleanup(void); -void sighdlr(int); -void socket_setnonblock(int); -void sort_windows(struct ws_win_list *); -void spawn(int, union arg *, int); -void spawn_custom(struct swm_region *, union arg *, const char *); -int spawn_expand(struct swm_region *, union arg *, const char *, char ***); -void spawn_insert(const char *, const char *, 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 *); -char *strdupsafe(const char *); -void swapwin(struct swm_region *, union arg *); -void switchws(struct swm_region *, union arg *); -void teardown_ewmh(void); -void unfocus_win(struct ws_win *); -void uniconify(struct swm_region *, union arg *); -void unmanage_window(struct ws_win *); -void unmapnotify(xcb_unmap_notify_event_t *); -void unmap_all(void); -void unmap_window(struct ws_win *); -void updatenumlockmask(void); -void update_modkey(unsigned int); -void update_window(struct ws_win *); -void validate_spawns(void); -int validate_win(struct ws_win *); -int validate_ws(struct workspace *); -/*void visibilitynotify(xcb_visibility_notify_event_t *);*/ -void version(struct swm_region *, union arg *); -void win_to_ws(struct ws_win *, int, int); -pid_t window_get_pid(xcb_window_t); -void wkill(struct swm_region *, union arg *); -void workaround(void); -void xft_init(struct swm_region *); -void _add_startup_exception(const char *, va_list); -void add_startup_exception(const char *, ...); RB_PROTOTYPE(key_tree, key, entry, key_cmp); RB_GENERATE(key_tree, key, entry, key_cmp); -struct key_tree keys; +struct key_tree keys; void cursors_load(void) @@ -1129,11 +1134,11 @@ cursors_cleanup(void) char * expand_tilde(const char *s) { - struct passwd *ppwd; - int i; + struct passwd *ppwd; + int i; long max; - char *user; - const char *sc = s; + char *user; + const char *sc = s; char *result; if (s == NULL) @@ -1268,6 +1273,24 @@ get_atom_from_string(const char *str) return (XCB_ATOM_NONE); } +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) { @@ -1291,7 +1314,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; @@ -1344,7 +1367,7 @@ teardown_ewmh(void) 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)); @@ -1368,7 +1391,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); @@ -1405,7 +1428,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) @@ -1448,9 +1471,9 @@ ewmh_update_actions(struct ws_win *win) ewmh[_NET_WM_ALLOWED_ACTIONS].atom, XCB_ATOM_ATOM, 32, 1, actions); } -#define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ -#define _NET_WM_STATE_ADD 1 /* add/set property */ -#define _NET_WM_STATE_TOGGLE 2 /* toggle property */ +#define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ +#define _NET_WM_STATE_ADD 1 /* add/set property */ +#define _NET_WM_STATE_TOGGLE 2 /* toggle property */ void ewmh_update_win_state(struct ws_win *win, xcb_atom_t state, long action) @@ -1548,7 +1571,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); @@ -1717,7 +1740,7 @@ name_to_pixel(int sidx, 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), @@ -1734,7 +1757,7 @@ name_to_pixel(int sidx, const char *colorname) } void -setscreencolor(char *val, int i, int c) +setscreencolor(const char *val, int i, int c) { int num_screens; @@ -1783,7 +1806,7 @@ 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; @@ -1885,12 +1908,12 @@ bar_print_legacy(struct swm_region *r, const char *s) void bar_print(struct swm_region *r, const char *s) { - size_t len; - xcb_rectangle_t rect; - uint32_t gcv[1]; - int32_t x = 0; - XGlyphInfo info; - XftDraw *draw; + size_t len; + xcb_rectangle_t rect; + uint32_t gcv[1]; + int32_t x = 0; + XGlyphInfo info; + XftDraw *draw; len = strlen(s); @@ -1953,7 +1976,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; @@ -1962,7 +1985,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; @@ -1971,14 +1994,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 @@ -1997,9 +2020,8 @@ 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); } @@ -2051,6 +2073,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); @@ -2068,6 +2092,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) { @@ -2079,16 +2112,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); } @@ -2117,9 +2150,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 */ @@ -2146,7 +2180,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); @@ -2157,17 +2191,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); @@ -2518,7 +2560,7 @@ xft_init(struct swm_region *r) font); } - if (!bar_font) { + if (bar_font == NULL) { warnx("unable to load font %s", font); continue; } else { @@ -2639,7 +2681,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)); @@ -2985,7 +3026,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); @@ -3039,7 +3079,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 */ @@ -3332,6 +3372,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) { @@ -3631,7 +3674,7 @@ cyclews(struct swm_region *r, union arg *args) void priorws(struct swm_region *r, union arg *args) { - union arg a; + union arg a; (void)args; @@ -3945,86 +3988,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 @@ -4872,29 +4936,25 @@ get_win_name(xcb_window_t win) 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); } @@ -4937,8 +4997,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); } @@ -5132,8 +5190,6 @@ search_resp_uniconify(const char *resp, size_t 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; @@ -5186,7 +5242,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; @@ -5217,7 +5273,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; @@ -5301,7 +5357,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; @@ -5321,7 +5378,7 @@ floating_toggle_win(struct ws_win *win) if (win == NULL) return (0); - if (!win->ws->r) + if (win->ws->r == NULL) return (0); /* reject floating toggles in max stack mode */ @@ -5561,7 +5618,7 @@ resize(struct ws_win *win, union arg *args) /* 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; @@ -5788,7 +5845,7 @@ 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; } @@ -5879,6 +5936,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} }, @@ -6054,7 +6112,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) { @@ -6070,43 +6128,43 @@ spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name, 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 (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")) { + } 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")) { + } 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")) { + } 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")) { + } 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")) { + } 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")) { + } 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")) { + } 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")) { + } else if (strcasecmp(ap, "$dmenu_bottom") == 0) { if (!bar_at_bottom) continue; if ((real_args[c] = strdup("-b")) == NULL) @@ -6192,24 +6250,73 @@ spawn_select(struct swm_region *r, union arg *args, const char *spawn_name, free(real_args); } +/* Argument tokenizer. */ +char * +argsep(char **sp) { + int single_quoted = 0, double_quoted = 0; + char *arg, *cp, *next; + + if (*sp == NULL) + return NULL; + + /* Eat and move characters until end of argument is found. */ + for (arg = next = cp = *sp; *cp != '\0'; ++cp) { + if (!double_quoted && *cp == '\'') { + /* Eat single-quote. */ + single_quoted = !single_quoted; + } else if (!single_quoted && *cp == '"') { + /* Eat double-quote. */ + double_quoted = !double_quoted; + } else if (!single_quoted && *cp == '\\' && *(cp + 1) == '"') { + /* Eat backslash; copy escaped character to arg. */ + *next++ = *(++cp); + } else if (!single_quoted && !double_quoted && *cp == '\\' && + (*(cp + 1) == '\'' || *(cp + 1) == ' ')) { + /* Eat backslash; move escaped character. */ + *next++ = *(++cp); + } else if (!single_quoted && !double_quoted && + (*cp == ' ' || *cp == '\t')) { + /* Terminate argument. */ + *next++ = '\0'; + /* Point sp to beginning of next argument. */ + *sp = ++cp; + break; + } else { + /* Move regular character. */ + *next++ = *cp; + } + } + + /* Terminate argument if end of string. */ + if (*cp == '\0') { + *next = '\0'; + *sp = NULL; + } + + return arg; +} + void spawn_insert(const char *name, const char *args, int flags) { - char *arg, *cp, *ptr; struct spawn_prog *sp; + char *arg, *dup, *ptr; + + DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s[%s]\n", name, args); - DNPRINTF(SWM_D_SPAWN, "spawn_insert: %s\n", name); + if (args == NULL || *args == '\0') + return; if ((sp = calloc(1, sizeof *sp)) == NULL) err(1, "spawn_insert: calloc"); if ((sp->name = strdup(name)) == NULL) err(1, "spawn_insert: strdup"); - /* convert the arguments to an argument list */ - if ((ptr = cp = strdup(args)) == NULL) + /* Convert the arguments to an argument list. */ + if ((ptr = dup = strdup(args)) == NULL) err(1, "spawn_insert: strdup"); - while ((arg = strsep(&ptr, " \t")) != NULL) { - /* empty field; skip it */ + while ((arg = argsep(&ptr)) != NULL) { + /* Null argument; skip it. */ if (*arg == '\0') continue; @@ -6220,10 +6327,11 @@ spawn_insert(const char *name, const char *args, int flags) if ((sp->argv[sp->argc - 1] = strdup(arg)) == NULL) err(1, "spawn_insert: strdup"); } - free(cp); + free(dup); sp->flags = flags; + DNPRINTF(SWM_D_SPAWN, "arg %d: [%s]\n", sp->argc, sp->argv[sp->argc-1]); TAILQ_INSERT_TAIL(&spawns, sp, entry); DNPRINTF(SWM_D_SPAWN, "spawn_insert: leave\n"); } @@ -6251,7 +6359,7 @@ spawn_find(const char *name) struct spawn_prog *sp; TAILQ_FOREACH(sp, &spawns, entry) - if (!strcasecmp(sp->name, name)) + if (strcasecmp(sp->name, name) == 0) return sp; return NULL; @@ -6280,10 +6388,13 @@ 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; + if (selector == NULL || strlen(selector) == 0) + return (1); + args = expand_tilde(value); DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args); @@ -6372,10 +6483,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"); @@ -6385,7 +6497,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) { @@ -6394,13 +6509,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; @@ -6413,10 +6528,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); } @@ -6515,7 +6633,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; @@ -6525,8 +6643,9 @@ setconfbinding(char *selector, char *value, int flags) /* suppress unused warning since var is needed */ (void)flags; - DNPRINTF(SWM_D_KEY, "setconfbinding: enter\n"); - if (selector == NULL) { + DNPRINTF(SWM_D_KEY, "setconfbinding: enter selector: [%s], " + "value: [%s]\n", selector, value); + if (selector == NULL || strlen(selector) == 0) { DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value); if (parsekeys(value, mod_key, &mod, &ks) == 0) { kfid = KF_INVALID; @@ -6578,6 +6697,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); @@ -6702,7 +6822,7 @@ clear_keys(void) } int -setkeymapping(char *selector, char *value, int flags) +setkeymapping(const char *selector, const char *value, int flags) { char *keymapping_file; @@ -6747,9 +6867,11 @@ updatenumlockmask(void) + j]; keycode = xcb_key_symbols_get_keycode(syms, XK_Num_Lock); - if (kc == *keycode) - numlockmask = (1 << i); - free(keycode); + if (keycode) { + if (kc == *keycode) + numlockmask = (1 << i); + free(keycode); + } } } free(modmap_r); @@ -6843,25 +6965,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); @@ -6871,30 +6998,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"); } @@ -6905,41 +7075,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; } @@ -6947,49 +7130,99 @@ 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 */ (void)flags; - if (selector == NULL) + if (selector == NULL || strlen(selector) == 0) 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 */ @@ -7018,6 +7251,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, @@ -7026,23 +7260,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; - - /* suppress unused warning since var is needed */ - (void)selector; + char *b, *str; switch (flags) { case SWM_S_BAR_ACTION: @@ -7087,8 +7318,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)) { @@ -7096,6 +7330,8 @@ setconfvalue(char *selector, char *value, int flags) break; } } + + free(str); break; case SWM_S_BAR_FORMAT: free(bar_format); @@ -7103,11 +7339,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"); @@ -7147,13 +7383,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"); @@ -7162,37 +7398,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"); @@ -7218,12 +7457,6 @@ setconfvalue(char *selector, char *value, int flags) case SWM_S_TILE_GAP: tile_gap = atoi(value); 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); break; @@ -7236,6 +7469,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; @@ -7253,19 +7492,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); @@ -7273,14 +7512,16 @@ 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); + setscreencolor(value, + (selector == NULL || strlen(selector) == 0) ? -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; @@ -7291,7 +7532,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]; @@ -7363,7 +7604,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; @@ -7387,17 +7628,17 @@ 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[]:" @@ -7450,7 +7691,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[] = { @@ -7483,6 +7724,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 }, @@ -7497,10 +7739,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 }, }; @@ -7534,9 +7778,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"); @@ -7580,7 +7824,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; @@ -7599,55 +7843,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; } } @@ -7674,7 +7910,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) { @@ -7713,7 +7949,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); @@ -7731,7 +7967,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); @@ -7757,7 +7993,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); @@ -7793,11 +8029,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 *class, *instance, *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 " @@ -7819,6 +8056,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 " @@ -7826,25 +8070,33 @@ 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 */ + 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, xcb_icccm_get_wm_normal_hints(conn, win->id), @@ -7864,18 +8116,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); @@ -7913,31 +8155,38 @@ manage_window(xcb_window_t id, uint16_t mapped) ewmh_autoquirk(win); /* Determine initial quirks. */ - if (xcb_icccm_get_wm_class_reply(conn, + 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); - - /* java is retarded so treat it special */ - if (strstr(win->ch.instance_name, "sun-awt")) { - DNPRINTF(SWM_D_CLASS, "manage_window: java window " - "detected.\n"); - win->java = 1; - } - - 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 (qp->quirk & SWM_Q_FLOAT) - win->floating = 1; - win->quirks = qp->quirk; - } + &win->ch, NULL); + + class = win->ch.class_name ? win->ch.class_name : ""; + instance = win->ch.instance_name ? win->ch.instance_name : ""; + name = get_win_name(win->id); + + DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, instance: %s, " + "name: %s\n", class, instance, name); + + /* java is retarded so treat it special */ + if (win->ch.instance_name && strstr(win->ch.instance_name, "sun-awt")) { + DNPRINTF(SWM_D_CLASS, "manage_window: java window detected.\n"); + win->java = 1; + } + + TAILQ_FOREACH(qp, &quirks, entry) { + if (regexec(&qp->regex_class, class, 0, NULL, 0) == 0 && + regexec(&qp->regex_instance, instance, 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 */ if (win->quirks & SWM_Q_ANYWHERE) win->manual = 1; @@ -7957,17 +8206,6 @@ manage_window(xcb_window_t id, uint16_t mapped) 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))) @@ -8013,9 +8251,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); @@ -8201,8 +8436,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; @@ -8565,8 +8799,8 @@ 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); @@ -8585,10 +8819,22 @@ mapnotify(xcb_map_notify_event_t *e) void mappingnotify(xcb_mapping_notify_event_t *e) { + struct ws_win *w; + int i, j, num_screens; + xcb_refresh_keyboard_mapping(syms, e); - if (e->request == XCB_MAPPING_KEYBOARD) + if (e->request == XCB_MAPPING_KEYBOARD) { grabkeys(); + + /* Regrab buttons on all managed windows. */ + num_screens = get_screen_count(); + for (i = 0; i < num_screens; i++) + for (j = 0; j < workspace_limit; j++) + TAILQ_FOREACH(w, &screens[i].ws[j].winlist, + entry) + grabbuttons(w); + } } void @@ -8616,10 +8862,15 @@ 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) { @@ -8628,12 +8879,12 @@ maprequest(xcb_map_request_event_t *e) if (w->ch.class_name && win->ch.class_name && - !strcmp(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)) + strcmp(w->ch.instance_name, + win->ch.instance_name) == 0) break; } } @@ -8691,7 +8942,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. @@ -8769,6 +9020,10 @@ propertynotify(xcb_property_notify_event_t *e) focus_flush(); } } else if (e->state == XCB_PROPERTY_DELETE) { + /* Reload floating geometry in case region changed. */ + if (win->floating) + load_float_geom(win); + /* The window is no longer iconic, restack ws. */ if (focus_mode != SWM_FOCUS_FOLLOW) ws->focus_pending = get_focus_magic(win); @@ -8792,6 +9047,8 @@ propertynotify(xcb_property_notify_event_t *e) } 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); @@ -8856,19 +9113,10 @@ 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) { - struct ws_win *win; + struct ws_win *win; xcb_map_request_event_t mre; #ifdef SWM_DEBUG char *name; @@ -9251,7 +9499,7 @@ grab_windows(void) 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); @@ -9273,7 +9521,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; @@ -9307,7 +9555,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; @@ -9337,10 +9585,10 @@ grab_windows(void) void setup_screens(void) { - int i, j, k, num_screens; - struct workspace *ws; - uint32_t gcv[1], wa[1]; - const xcb_query_extension_reply_t *qep; + int i, j, k, num_screens; + struct workspace *ws; + uint32_t gcv[1], wa[1]; + const xcb_query_extension_reply_t *qep; xcb_screen_t *screen; xcb_randr_query_version_cookie_t c; xcb_randr_query_version_reply_t *r; @@ -9499,7 +9747,7 @@ shutdown_cleanup(void) 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), @@ -9577,7 +9825,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) @@ -9593,7 +9841,7 @@ main(int argc, char *argv[]) int xfd, i, num_screens, startup = 1; struct sigaction sact; xcb_generic_event_t *evt; - struct timeval tv; + struct timeval tv; fd_set rd; int rd_max; int stdin_ready = 0; @@ -9606,7 +9854,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 */ @@ -9623,7 +9871,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); @@ -9650,7 +9898,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. */