X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=6abbe872a25b17e3342be77f7114283d2ac4cde9;hb=0b083dbf59966860e74a2cd974f307d1bbf10eec;hp=ecf9170ee510effa54d144b71528ace6e4a57e13;hpb=aebdf727369b160f67cf8dcac8adc240b4e00b2a;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index ecf9170..10a82be 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -8,6 +8,7 @@ * Copyright (c) 2011-2012 Reginald Kennedy * Copyright (c) 2011-2012 Lawrence Teo * Copyright (c) 2011-2012 Tiago Cunha + * Copyright (c) 2012 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 @@ -89,7 +90,9 @@ #include #include #include -#include +#include +#include +#include #include #include #include @@ -110,20 +113,23 @@ static const char *buildstr = SPECTRWM_BUILDSTR; static const char *buildstr = SPECTRWM_VERSION; #endif -#if RANDR_MAJOR < 1 -# error XRandR versions less than 1.0 are not supported +#if !defined(__CYGWIN__) /* cygwin chokes on xrandr stuff */ +# if RANDR_MAJOR < 1 +# error XRandR versions less than 1.0 are not supported #endif -#if RANDR_MAJOR >= 1 -#if RANDR_MINOR >= 2 -#define SWM_XRR_HAS_CRTC -#endif -#endif +# if RANDR_MAJOR >= 1 +# if RANDR_MINOR >= 2 +# define SWM_XRR_HAS_CRTC +# endif +# endif +#endif /* __CYGWIN__ */ -#if defined(__OpenBSD__) +#ifndef XCB_ICCCM_NUM_WM_HINTS_ELEMENTS #define XCB_ICCCM_SIZE_HINT_P_MIN_SIZE XCB_SIZE_HINT_P_MIN_SIZE #define XCB_ICCCM_SIZE_HINT_P_MAX_SIZE XCB_SIZE_HINT_P_MAX_SIZE #define XCB_ICCCM_SIZE_HINT_P_RESIZE_INC XCB_SIZE_HINT_P_RESIZE_INC +#define XCB_ICCCM_WM_HINT_INPUT XCB_WM_HINT_INPUT #define XCB_ICCCM_WM_HINT_X_URGENCY XCB_WM_HINT_X_URGENCY #define XCB_ICCCM_WM_STATE_ICONIC XCB_WM_STATE_ICONIC #define XCB_ICCCM_WM_STATE_WITHDRAWN XCB_WM_STATE_WITHDRAWN @@ -149,7 +155,7 @@ static const char *buildstr = SPECTRWM_VERSION; #define xcb_icccm_wm_hints_t xcb_wm_hints_t #endif -#define SWM_DEBUG +/*#define SWM_DEBUG*/ #ifdef SWM_DEBUG #define DPRINTF(x...) do { \ if (swm_debug) \ @@ -201,11 +207,21 @@ u_int32_t swm_debug = 0 #define DNPRINTF(n,x...) #endif -#define LENGTH(x) (int)(sizeof x / sizeof x[0]) -#define MODKEY Mod1Mask -#define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) -#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) -#define MOUSEMASK (BUTTONMASK|PointerMotionMask) +/* convert 8-bit to 16-bit */ +#define RGB_8_TO_16(col) ((col) << 8) + (col) + +#define PIXEL_TO_XRENDERCOLOR(px, xrc) \ + xrc.red = RGB_8_TO_16((px) >> 16 & 0xff); \ + xrc.green = RGB_8_TO_16((px) >> 8 & 0xff); \ + xrc.blue = RGB_8_TO_16((px) & 0xff); \ + xrc.alpha = 0xffff; + +#define LENGTH(x) (int)(sizeof (x) / sizeof (x)[0]) +#define MODKEY XCB_MOD_MASK_1 +#define CLEANMASK(mask) ((mask) & ~(numlockmask | XCB_MOD_MASK_LOCK)) +#define BUTTONMASK (XCB_EVENT_MASK_BUTTON_PRESS | \ + XCB_EVENT_MASK_BUTTON_RELEASE) +#define MOUSEMASK (BUTTONMASK|XCB_EVENT_MASK_POINTER_MOTION) #define SWM_PROPLEN (16) #define SWM_FUNCNAME_LEN (32) #define SWM_KEYS_LEN (255) @@ -214,7 +230,7 @@ u_int32_t swm_debug = 0 #define Y(r) (r)->g.y #define WIDTH(r) (r)->g.w #define HEIGHT(r) (r)->g.h -#define BORDER(w) (w->bordered ? border_width : 0) +#define BORDER(w) ((w)->bordered ? border_width : 0) #define MAX_X(r) ((r)->g.x + (r)->g.w) #define MAX_Y(r) ((r)->g.y + (r)->g.h) #define SH_MIN(w) (w)->sh.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE @@ -231,8 +247,15 @@ u_int32_t swm_debug = 0 #define YESNO(x) ((x) ? "yes" : "no") #define SWM_FOCUS_DEFAULT (0) -#define SWM_FOCUS_SYNERGY (1) -#define SWM_FOCUS_FOLLOW (2) +#define SWM_FOCUS_FOLLOW (1) +#define SWM_FOCUS_MANUAL (2) + +#define SWM_CK_NONE 0 +#define SWM_CK_ALL 0xf +#define SWM_CK_FOCUS 0x1 +#define SWM_CK_POINTER 0x2 +#define SWM_CK_FALLBACK 0x4 +#define SWM_CK_REGION 0x8 #define SWM_CONF_DEFAULT (0) #define SWM_CONF_KEYMAPPING (1) @@ -251,15 +274,17 @@ 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; volatile sig_atomic_t restart_wm = 0; +xcb_timestamp_t last_event_time = 0; int outputs = 0; -/*int last_focus_event = FocusOut;*/ int other_wm; -int ss_enabled = 0; int xrandr_support; int xrandr_eventbase; unsigned int numlockmask = 0; + +Display *display; xcb_connection_t *conn; xcb_key_symbols_t *syms; @@ -309,51 +334,60 @@ 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-*-*-*-*-*-*-*-*-*-*-*," \ - "-*-profont-*-*-*-*-*-*-*-*-*-*-*-*," \ - "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*," \ - "-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*," \ - "-*-*-*-r-*--*-*-*-*-*-*-*-*" - -char *bar_argv[] = { NULL, NULL }; -int bar_pipe[2]; -unsigned char bar_ext[SWM_BAR_MAX]; -char bar_vertext[SWM_BAR_MAX]; -int bar_version = 0; -sig_atomic_t bar_alarm = 0; -int bar_delay = 30; -int bar_enabled = 1; -int bar_border_width = 1; -int bar_at_bottom = 0; -int bar_extra = 1; -int bar_extra_running = 0; -int bar_verbose = 1; -int bar_height = 0; -int bar_justify = SWM_BAR_JUSTIFY_LEFT; -char *bar_format = NULL; -int stack_enabled = 1; -int clock_enabled = 1; -int urgent_enabled = 0; -char *clock_format = NULL; -int title_name_enabled = 0; -int title_class_enabled = 0; -int window_name_enabled = 0; -int focus_mode = SWM_FOCUS_DEFAULT; -int focus_close = SWM_STACK_BELOW; -int focus_close_wrap = 1; -int focus_default = SWM_STACK_TOP; -int spawn_position = SWM_STACK_TOP; -int disable_border = 0; -int border_width = 1; -int verbose_layout = 0; -time_t time_started; -pid_t bar_pid; -xcb_font_t bar_fs; -#if 0 -XFontSetExtents *bar_fs_extents; +#define SWM_BAR_FONTS "-*-terminus-medium-*-*-*-12-*-*-*-*-*-*-*," \ + "-*-profont-*-*-*-*-12-*-*-*-*-*-*-*," \ + "-*-times-medium-r-*-*-12-*-*-*-*-*-*-*," \ + "-misc-fixed-medium-r-*-*-12-*-*-*-*-*-*-*," \ + "-*-*-*-r-*-*-*-*-*-*-*-*-*-*" + +#ifdef X_HAVE_UTF8_STRING +#define DRAWSTRING(x...) Xutf8DrawString(x) +#else +#define DRAWSTRING(x...) XmbDrawString(x) #endif -char *bar_fonts; -struct passwd *pwd; + +char *bar_argv[] = { NULL, NULL }; +int bar_pipe[2]; +char bar_ext[SWM_BAR_MAX]; +char bar_ext_buf[SWM_BAR_MAX]; +char bar_vertext[SWM_BAR_MAX]; +int bar_version = 0; +int bar_enabled = 1; +int bar_border_width = 1; +int bar_at_bottom = 0; +int bar_extra = 0; +int bar_verbose = 1; +int bar_height = 0; +int bar_justify = SWM_BAR_JUSTIFY_LEFT; +char *bar_format = NULL; +int stack_enabled = 1; +int clock_enabled = 1; +int urgent_enabled = 0; +char *clock_format = NULL; +int title_name_enabled = 0; +int title_class_enabled = 0; +int window_name_enabled = 0; +int focus_mode = SWM_FOCUS_DEFAULT; +int focus_close = SWM_STACK_BELOW; +int focus_close_wrap = 1; +int focus_default = SWM_STACK_TOP; +int spawn_position = SWM_STACK_TOP; +int disable_border = 0; +int border_width = 1; +int region_padding = 0; +int tile_gap = 0; +int verbose_layout = 0; +time_t time_started; +pid_t bar_pid; +XFontSet bar_fs; +XFontSetExtents *bar_fs_extents; +XftFont *bar_font; +int bar_font_legacy = 1; +char *bar_fonts; +XftColor bar_font_color; +struct passwd *pwd; +char *startup_exception; +unsigned int nr_exceptions = 0; /* layout manager data */ struct swm_geometry { @@ -375,6 +409,7 @@ struct swm_bar { /* virtual "screens" */ struct swm_region { TAILQ_ENTRY(swm_region) entry; + xcb_window_t id; struct swm_geometry g; struct workspace *ws; /* current workspace on this region */ struct workspace *ws_prior; /* prior workspace on this region */ @@ -387,13 +422,14 @@ struct ws_win { TAILQ_ENTRY(ws_win) entry; xcb_window_t id; xcb_window_t transient; - struct ws_win *child_trans; /* transient child window */ + struct ws_win *focus_child; /* focus on child transient */ struct swm_geometry g; /* current geometry */ struct swm_geometry g_float; /* region coordinates */ int g_floatvalid; /* g_float geometry validity */ int floatmaxed; /* whether maxed by max_stack */ int floating; int manual; + int32_t mapped; int32_t iconic; int bordered; unsigned int ewmh_flags; @@ -461,9 +497,11 @@ struct workspace { int idx; /* workspace index */ char *name; /* workspace name */ int always_raise; /* raise windows on focus */ + int bar_enabled; /* bar visibility */ struct layout *cur_layout; /* current layout handlers */ struct ws_win *focus; /* may be NULL */ struct ws_win *focus_prev; /* may be NULL */ + struct ws_win *focus_pending; /* may be NULL */ struct swm_region *r; /* may be NULL */ struct swm_region *old_r; /* may be NULL */ struct ws_win_list winlist; /* list of windows in ws */ @@ -486,6 +524,7 @@ struct workspace { enum { SWM_S_COLOR_BAR, SWM_S_COLOR_BAR_BORDER, + SWM_S_COLOR_BAR_BORDER_UNFOCUS, SWM_S_COLOR_BAR_FONT, SWM_S_COLOR_FOCUS, SWM_S_COLOR_UNFOCUS, @@ -502,14 +541,16 @@ struct swm_screen { struct swm_region_list orl; /* list of old regions */ xcb_window_t root; struct workspace ws[SWM_WS_MAX]; + struct swm_region *r_focus; /* colors */ struct { - uint32_t color; + uint32_t pixel; char *name; } c[SWM_S_COLOR_MAX]; xcb_gcontext_t bar_gc; + GC bar_gc_legacy; }; struct swm_screen *screens; @@ -519,7 +560,6 @@ union arg { #define SWM_ARG_ID_FOCUSNEXT (0) #define SWM_ARG_ID_FOCUSPREV (1) #define SWM_ARG_ID_FOCUSMAIN (2) -#define SWM_ARG_ID_FOCUSCUR (4) #define SWM_ARG_ID_SWAPNEXT (10) #define SWM_ARG_ID_SWAPPREV (11) #define SWM_ARG_ID_SWAPMAIN (12) @@ -533,10 +573,12 @@ union arg { #define SWM_ARG_ID_STACKINIT (31) #define SWM_ARG_ID_CYCLEWS_UP (40) #define SWM_ARG_ID_CYCLEWS_DOWN (41) -#define SWM_ARG_ID_CYCLESC_UP (42) -#define SWM_ARG_ID_CYCLESC_DOWN (43) +#define SWM_ARG_ID_CYCLERG_UP (42) +#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) @@ -553,6 +595,8 @@ union arg { #define SWM_ARG_ID_MOVEDOWN (101) #define SWM_ARG_ID_MOVELEFT (102) #define SWM_ARG_ID_MOVERIGHT (103) +#define SWM_ARG_ID_BAR_TOGGLE (110) +#define SWM_ARG_ID_BAR_TOGGLE_WS (111) char **argv; }; @@ -568,6 +612,8 @@ struct quirk { #define SWM_Q_XTERM_FONTADJ (1<<3) /* adjust xterm fonts when resizing */ #define SWM_Q_FULLSCREEN (1<<4) /* remove border */ #define SWM_Q_FOCUSPREV (1<<5) /* focus on caller */ +#define SWM_Q_NOFOCUSONMAP (1<<6) /* Don't focus on window when mapped. */ +#define SWM_Q_FOCUSONMAP_SINGLE (1<<7) /* Only focus if single win of type. */ }; TAILQ_HEAD(quirk_list, quirk); struct quirk_list quirks = TAILQ_HEAD_INITIALIZER(quirks); @@ -580,11 +626,13 @@ enum { _NET_ACTIVE_WINDOW, _NET_CLOSE_WINDOW, _NET_MOVERESIZE_WINDOW, + _NET_WM_ACTION_ABOVE, _NET_WM_ACTION_CLOSE, _NET_WM_ACTION_FULLSCREEN, _NET_WM_ACTION_MOVE, _NET_WM_ACTION_RESIZE, _NET_WM_ALLOWED_ACTIONS, + _NET_WM_NAME, _NET_WM_STATE, _NET_WM_STATE_ABOVE, _NET_WM_STATE_FULLSCREEN, @@ -612,11 +660,13 @@ struct ewmh_hint { {"_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}, @@ -635,29 +685,478 @@ struct ewmh_hint { {"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE}, }; +/* Cursors */ +enum { + XC_FLEUR, + XC_LEFT_PTR, + XC_BOTTOM_LEFT_CORNER, + XC_BOTTOM_RIGHT_CORNER, + XC_SIZING, + XC_TOP_LEFT_CORNER, + XC_TOP_RIGHT_CORNER, + XC_MAX +}; + +struct cursors { + char *name; /* Name used by Xcursor .*/ + uint8_t cf_char; /* cursorfont index. */ + xcb_cursor_t cid; +} cursors[XC_MAX] = { + {"fleur", XC_fleur, XCB_CURSOR_NONE}, + {"left_ptr", XC_left_ptr, XCB_CURSOR_NONE}, + {"bottom_left_corner", XC_bottom_left_corner, XCB_CURSOR_NONE}, + {"bottom_right_corner", XC_bottom_right_corner, XCB_CURSOR_NONE}, + {"sizing", XC_sizing, XCB_CURSOR_NONE}, + {"top_left_corner", XC_top_left_corner, XCB_CURSOR_NONE}, + {"top_right_corner", XC_top_right_corner, XCB_CURSOR_NONE}, +}; + +#define SWM_SPAWN_OPTIONAL 0x1 + +/* spawn */ +struct spawn_prog { + TAILQ_ENTRY(spawn_prog) entry; + char *name; + int argc; + char **argv; + int flags; +}; +TAILQ_HEAD(spawn_list, spawn_prog); +struct spawn_list spawns = TAILQ_HEAD_INITIALIZER(spawns); + +/* user/key callable function IDs */ +enum keyfuncid { + KF_BAR_TOGGLE, + KF_BAR_TOGGLE_WS, + KF_BUTTON2, + KF_CYCLE_LAYOUT, + KF_FLIP_LAYOUT, + KF_FLOAT_TOGGLE, + KF_FOCUS_MAIN, + KF_FOCUS_NEXT, + KF_FOCUS_PREV, + KF_HEIGHT_GROW, + KF_HEIGHT_SHRINK, + KF_ICONIFY, + KF_MASTER_SHRINK, + KF_MASTER_GROW, + KF_MASTER_ADD, + KF_MASTER_DEL, + KF_MOVE_DOWN, + KF_MOVE_LEFT, + KF_MOVE_RIGHT, + KF_MOVE_UP, + KF_MVRG_1, + KF_MVRG_2, + KF_MVRG_3, + KF_MVRG_4, + KF_MVRG_5, + KF_MVRG_6, + KF_MVRG_7, + KF_MVRG_8, + KF_MVRG_9, + KF_MVWS_1, + KF_MVWS_2, + KF_MVWS_3, + KF_MVWS_4, + KF_MVWS_5, + KF_MVWS_6, + KF_MVWS_7, + KF_MVWS_8, + KF_MVWS_9, + KF_MVWS_10, + KF_MVWS_11, + KF_MVWS_12, + KF_MVWS_13, + KF_MVWS_14, + KF_MVWS_15, + KF_MVWS_16, + KF_MVWS_17, + KF_MVWS_18, + KF_MVWS_19, + KF_MVWS_20, + KF_MVWS_21, + KF_MVWS_22, + KF_NAME_WORKSPACE, + KF_QUIT, + KF_RAISE_TOGGLE, + KF_RESTART, + KF_RG_1, + KF_RG_2, + KF_RG_3, + KF_RG_4, + KF_RG_5, + KF_RG_6, + KF_RG_7, + KF_RG_8, + KF_RG_9, + KF_RG_NEXT, + KF_RG_PREV, + KF_SCREEN_NEXT, + KF_SCREEN_PREV, + KF_SEARCH_WIN, + KF_SEARCH_WORKSPACE, + KF_SPAWN_CUSTOM, + KF_STACK_INC, + KF_STACK_DEC, + KF_STACK_RESET, + KF_SWAP_MAIN, + KF_SWAP_NEXT, + KF_SWAP_PREV, + KF_UNICONIFY, + KF_VERSION, + KF_WIDTH_GROW, + KF_WIDTH_SHRINK, + KF_WIND_DEL, + KF_WIND_KILL, + KF_WS_1, + KF_WS_2, + KF_WS_3, + KF_WS_4, + KF_WS_5, + KF_WS_6, + KF_WS_7, + KF_WS_8, + KF_WS_9, + KF_WS_10, + KF_WS_11, + KF_WS_12, + KF_WS_13, + KF_WS_14, + KF_WS_15, + KF_WS_16, + KF_WS_17, + KF_WS_18, + KF_WS_19, + KF_WS_20, + KF_WS_21, + KF_WS_22, + KF_WS_NEXT, + KF_WS_NEXT_ALL, + KF_WS_NEXT_MOVE, + KF_WS_PREV, + KF_WS_PREV_ALL, + KF_WS_PREV_MOVE, + KF_WS_PRIOR, + KF_DUMPWINS, /* MUST BE LAST */ + KF_INVALID +}; + +struct key { + RB_ENTRY(key) entry; + unsigned int mod; + KeySym keysym; + enum keyfuncid funcid; + char *spawn_name; +}; +RB_HEAD(key_tree, key); + /* function prototypes */ -int conf_load(char *, int); +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); +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_region *, int); -void do_sync(void); +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); +char *expand_tilde(const char *); +void expose(xcb_expose_event_t *); +void fake_keypress(struct ws_win *, xcb_keysym_t, uint16_t); +struct pid_e *find_pid(pid_t); +struct ws_win *find_unmanaged_window(xcb_window_t); struct ws_win *find_window(xcb_window_t); +void floating_toggle(struct swm_region *, union arg *); int floating_toggle_win(struct ws_win *); void focus(struct swm_region *, union arg *); -void focus_magic(struct ws_win *); +#ifdef SWM_DEBUG +void focusin(xcb_focus_in_event_t *); +void focusout(xcb_focus_out_event_t *); +#endif +void focus_flush(void); +void focus_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_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); +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); -uint16_t getstate(xcb_window_t); -void grabbuttons(struct ws_win *, int); -void map_window_raised(xcb_window_t); +int get_ws_idx(xcb_window_t); +uint32_t getstate(xcb_window_t); +void grabbuttons(struct ws_win *); +void grabkeys(void); +void grab_windows(void); +void iconify(struct swm_region *, union arg *); +int isxlfd(char *); +void keypress(xcb_key_press_event_t *); +int key_cmp(struct key *, struct key *); +void key_insert(unsigned int, KeySym, enum keyfuncid, const char *); +struct key *key_lookup(unsigned int, KeySym); +void key_remove(struct key *); +void key_replace(struct key *, unsigned int, KeySym, enum keyfuncid, + const char *); +void kill_bar_extra_atexit(void); +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 *); +struct ws_win *manage_window(xcb_window_t, uint16_t); +void map_window(struct ws_win *); +void mapnotify(xcb_map_notify_event_t *); +void mappingnotify(xcb_mapping_notify_event_t *); +void maprequest(xcb_map_request_event_t *); +void 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 spawn_select(struct swm_region *, union arg *, char *, int *); +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 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); +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 *); +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 *); +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; + +void +cursors_load(void) +{ + xcb_font_t cf = XCB_NONE; + int i; + + for (i = 0; i < LENGTH(cursors); ++i) { + /* try to load Xcursor first. */ + cursors[i].cid = XcursorLibraryLoadCursor(display, + cursors[i].name); + + /* fallback to cursorfont. */ + if (cursors[i].cid == XCB_CURSOR_NONE) { + if (cf == XCB_NONE) { + cf = xcb_generate_id(conn); + xcb_open_font(conn, cf, strlen("cursor"), + "cursor"); + } + + cursors[i].cid = xcb_generate_id(conn); + xcb_create_glyph_cursor(conn, cursors[i].cid, cf, cf, + cursors[i].cf_char, cursors[i].cf_char + 1, 0, 0, 0, + 0xffff, 0xffff, 0xffff); + + } + } + + if (cf != XCB_NONE) + xcb_close_font(conn, cf); +} + +void +cursors_cleanup(void) +{ + int i; + for (i = 0; i < LENGTH(cursors); ++i) + xcb_free_cursor(conn, cursors[i].cid); +} + +char * +expand_tilde(const char *s) +{ + struct passwd *ppwd; + int i; + long max; + char *user; + const char *sc = s; + char *result; + + if (s == NULL) + errx(1, "expand_tilde: NULL string."); + + if (s[0] != '~') { + result = strdup(sc); + goto out; + } + + ++s; + + if ((max = sysconf(_SC_LOGIN_NAME_MAX)) == -1) + errx(1, "expand_tilde: sysconf"); + + if ((user = calloc(1, max + 1)) == NULL) + errx(1, "expand_tilde: calloc"); + + for (i = 0; s[i] != '/' && s[i] != '\0'; ++i) + user[i] = s[i]; + user[i] = '\0'; + s = &s[i]; + + ppwd = strlen(user) == 0 ? getpwuid(getuid()) : getpwnam(user); + free(user); + + if (ppwd == NULL) + result = strdup(sc); + else + if (asprintf(&result, "%s%s", ppwd->pw_dir, s) == -1) + result = NULL; +out: + if (result == NULL) + errx(1, "expand_tilde: failed to allocate memory."); + + return result; +} -/* function definitions */ int parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb) { @@ -666,9 +1165,9 @@ parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb) if (sscanf(rgb, "rgb:%x/%x/%x", &tmpr, &tmpg, &tmpb) != 3) return (-1); - *rr = tmpr << 8; - *gg = tmpg << 8; - *bb = tmpb << 8; + *rr = RGB_8_TO_16(tmpr); + *gg = RGB_8_TO_16(tmpg); + *bb = RGB_8_TO_16(tmpb); return (0); } @@ -676,39 +1175,63 @@ parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb) xcb_screen_t * get_screen(int screen) { - xcb_screen_iterator_t i; + const xcb_setup_t *r; + xcb_screen_iterator_t iter; + + if ((r = xcb_get_setup(conn)) == NULL) { + DNPRINTF(SWM_D_MISC, "get_screen: xcb_get_setup\n"); + check_conn(); + } - i = xcb_setup_roots_iterator(xcb_get_setup(conn)); - for (; i.rem; --screen, xcb_screen_next(&i)) + iter = xcb_setup_roots_iterator(r); + for (; iter.rem; --screen, xcb_screen_next(&iter)) if (screen == 0) - return (i.data); + return (iter.data); return (NULL); } -void -do_sync(void) +int +get_screen_count(void) { - xcb_get_input_focus_cookie_t c; - xcb_get_input_focus_reply_t *r; + const xcb_setup_t *r; - /* mimic XSync() */ - c = xcb_get_input_focus(conn); - xcb_flush(conn); - r = xcb_get_input_focus_reply(conn, c, NULL); - if (r) - free(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); } -void -map_window_raised(xcb_window_t win) +int +get_region_index(struct swm_region *r) { - uint32_t val = XCB_STACK_MODE_ABOVE; + struct swm_region *rr; + int ridx = 0; - xcb_configure_window(conn, win, - XCB_CONFIG_WINDOW_STACK_MODE, &val); + if (r == NULL) + return -1; - xcb_map_window(conn, win); + TAILQ_FOREACH(rr, &r->s->rl, entry) { + if (rr == r) + break; + ++ridx; + } + + if (rr == NULL) + return -1; + + return ridx; +} + +void +focus_flush(void) +{ + if (focus_mode == SWM_FOCUS_DEFAULT) + event_drain(XCB_ENTER_NOTIFY); + else + xcb_flush(conn); } xcb_atom_t @@ -718,7 +1241,7 @@ get_atom_from_string(const char *str) xcb_intern_atom_reply_t *r; xcb_atom_t atom; - c = xcb_intern_atom(conn, False, strlen(str), str); + c = xcb_intern_atom(conn, 0, strlen(str), str); r = xcb_intern_atom_reply(conn, c, NULL); if (r) { atom = r->atom; @@ -731,38 +1254,28 @@ get_atom_from_string(const char *str) } void -update_iconic(struct ws_win *win, int newv) +set_swm_iconic(struct ws_win *win, int newv) { int32_t v = newv; - xcb_atom_t iprop; win->iconic = newv; - iprop = get_atom_from_string("_SWM_ICONIC"); - if (iprop == XCB_ATOM_NONE) - return; - if (newv) xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, - iprop, XCB_ATOM_INTEGER, 32, 1, &v); + a_swm_iconic, XCB_ATOM_INTEGER, 32, 1, &v); else - xcb_delete_property(conn, win->id, iprop); + xcb_delete_property(conn, win->id, a_swm_iconic); } int32_t -get_iconic(struct ws_win *win) +get_swm_iconic(struct ws_win *win) { int32_t v = 0; - xcb_atom_t iprop; xcb_get_property_reply_t *pr = NULL; - iprop = get_atom_from_string("_SWM_ICONIC"); - if (iprop == XCB_ATOM_NONE) - goto out; - pr = xcb_get_property_reply(conn, - xcb_get_property(conn, False, win->id, iprop, XCB_ATOM_INTEGER, - 0, 1), NULL); + xcb_get_property(conn, 0, win->id, a_swm_iconic, + XCB_ATOM_INTEGER, 0, 1), NULL); if (!pr) goto out; if (pr->type != XCB_ATOM_INTEGER || pr->format != 32) @@ -785,7 +1298,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(). */ @@ -809,22 +1322,23 @@ 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, False, screens[i].root, sup_check, + 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) + continue; + if (pr->format == sup_check) { id = *((xcb_window_t *)xcb_get_property_value(pr)); xcb_destroy_window(conn, id); xcb_delete_property(conn, screens[i].root, sup_check); xcb_delete_property(conn, screens[i].root, sup_list); - - free(pr); } + free(pr); } } @@ -836,7 +1350,7 @@ ewmh_autoquirk(struct ws_win *win) xcb_get_property_cookie_t c; xcb_get_property_reply_t *r; - c = xcb_get_property(conn, False, win->id, + 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) @@ -892,12 +1406,7 @@ ewmh_set_win_fullscreen(struct ws_win *win, int fs) win->g = win->ws->r->g; win->bordered = 0; } else { - if (win->g_floatvalid) { - /* refloat at last floating relative position */ - win->g = win->g_float; - X(win) += X(win->ws->r); - Y(win) += Y(win->ws->r); - } + load_float_geom(win, win->ws->r); } return (1); @@ -917,6 +1426,7 @@ ewmh_update_actions(struct ws_win *win) if (win->floating) { actions[n++] = ewmh[_NET_WM_ACTION_MOVE].atom; actions[n++] = ewmh[_NET_WM_ACTION_RESIZE].atom; + actions[n++] = ewmh[_NET_WM_ACTION_ABOVE].atom; } xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, @@ -928,7 +1438,7 @@ ewmh_update_actions(struct ws_win *win) #define _NET_WM_STATE_TOGGLE 2 /* toggle property */ void -ewmh_update_win_state(struct ws_win *win, long state, long action) +ewmh_update_win_state(struct ws_win *win, xcb_atom_t state, long action) { unsigned int mask = 0; unsigned int changed = 0; @@ -937,18 +1447,20 @@ ewmh_update_win_state(struct ws_win *win, long state, long action) if (win == NULL) return; + DNPRINTF(SWM_D_PROP, "ewmh_update_win_state: window: 0x%x, state: %ld, " + "action: %ld\n", win->id, (unsigned long)state, action); + if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom) mask = EWMH_F_FULLSCREEN; - if (state == ewmh[_NET_WM_STATE_ABOVE].atom) + else if (state == ewmh[_NET_WM_STATE_ABOVE].atom) mask = EWMH_F_ABOVE; - if (state == ewmh[_SWM_WM_STATE_MANUAL].atom) + else if (state == ewmh[_SWM_WM_STATE_MANUAL].atom) mask = SWM_F_MANUAL; - if (state == ewmh[_NET_WM_STATE_SKIP_PAGER].atom) + else if (state == ewmh[_NET_WM_STATE_SKIP_PAGER].atom) mask = EWMH_F_SKIP_PAGER; - if (state == ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom) + else if (state == ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom) mask = EWMH_F_SKIP_TASKBAR; - orig_flags = win->ewmh_flags; switch (action) { @@ -965,18 +1477,17 @@ ewmh_update_win_state(struct ws_win *win, long state, long action) changed = (win->ewmh_flags & mask) ^ (orig_flags & mask) ? 1 : 0; - if (state == ewmh[_NET_WM_STATE_ABOVE].atom) - if (changed) - if (!floating_toggle_win(win)) + if (state == ewmh[_NET_WM_STATE_ABOVE].atom) { + if (changed && !floating_toggle_win(win)) win->ewmh_flags = orig_flags; /* revert */ - if (state == ewmh[_SWM_WM_STATE_MANUAL].atom) + } else if (state == ewmh[_SWM_WM_STATE_MANUAL].atom) { if (changed) win->manual = (win->ewmh_flags & SWM_F_MANUAL) != 0; - if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom) - if (changed) - if (!ewmh_set_win_fullscreen(win, + } else if (state == ewmh[_NET_WM_STATE_FULLSCREEN].atom) { + if (changed && !ewmh_set_win_fullscreen(win, win->ewmh_flags & EWMH_F_FULLSCREEN)) win->ewmh_flags = orig_flags; /* revert */ + } xcb_delete_property(conn, win->id, ewmh[_NET_WM_STATE].atom); @@ -984,19 +1495,19 @@ ewmh_update_win_state(struct ws_win *win, long state, long action) xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, &ewmh[_NET_WM_STATE_FULLSCREEN].atom); - if (win->ewmh_flags & EWMH_F_SKIP_PAGER) + else if (win->ewmh_flags & EWMH_F_SKIP_PAGER) xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, &ewmh[_NET_WM_STATE_SKIP_PAGER].atom); - if (win->ewmh_flags & EWMH_F_SKIP_TASKBAR) + else if (win->ewmh_flags & EWMH_F_SKIP_TASKBAR) xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, &ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom); - if (win->ewmh_flags & EWMH_F_ABOVE) + else if (win->ewmh_flags & EWMH_F_ABOVE) xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, &ewmh[_NET_WM_STATE_ABOVE].atom); - if (win->ewmh_flags & SWM_F_MANUAL) + else if (win->ewmh_flags & SWM_F_MANUAL) xcb_change_property(conn, XCB_PROP_MODE_APPEND, win->id, ewmh[_NET_WM_STATE].atom, XCB_ATOM_ATOM, 32, 1, &ewmh[_SWM_WM_STATE_MANUAL].atom); @@ -1019,7 +1530,7 @@ ewmh_get_win_state(struct ws_win *win) if (win->manual) win->ewmh_flags |= SWM_F_MANUAL; - c = xcb_get_property(conn, False, win->id, ewmh[_NET_WM_STATE].atom, + 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) @@ -1040,10 +1551,13 @@ void dumpwins(struct swm_region *r, union arg *args) { struct ws_win *win; - uint16_t state; + uint32_t state; xcb_get_window_attributes_cookie_t c; xcb_get_window_attributes_reply_t *wa; + /* suppress unused warning since var is needed */ + (void)args; + if (r->ws == NULL) { warnx("dumpwins: invalid workspace"); return; @@ -1083,28 +1597,13 @@ dumpwins(struct swm_region *r, union arg *args) } #else void -dumpwins(struct swm_region *r, union arg *args) +dumpwins(struct swm_region *r, union arg *s) { + (void)r; + (void)s; } #endif /* SWM_DEBUG */ -void event_error(xcb_generic_error_t *); -void expose(xcb_expose_event_t *); -void keypress(xcb_key_press_event_t *); -void buttonpress(xcb_button_press_event_t *); -void configurerequest(xcb_configure_request_event_t *); -void configurenotify(xcb_configure_notify_event_t *); -void destroynotify(xcb_destroy_notify_event_t *); -void enternotify(xcb_enter_notify_event_t *); -void mapnotify(xcb_map_notify_event_t *); -void mappingnotify(xcb_mapping_notify_event_t *); -void maprequest(xcb_map_request_event_t *); -void propertynotify(xcb_property_notify_event_t *); -void unmapnotify(xcb_unmap_notify_event_t *); -/*void visibilitynotify(xcb_visibility_notify_event_t *);*/ -void clientmessage(xcb_client_message_event_t *); -void screenchange(xcb_randr_screen_change_notify_event_t *); - void sighdlr(int sig) { @@ -1172,7 +1671,7 @@ find_pid(pid_t pid) } uint32_t -name_to_color(const char *colorname) +name_to_pixel(int sidx, const char *colorname) { uint32_t result = 0; char cname[32] = "#"; @@ -1182,7 +1681,7 @@ name_to_color(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 */ @@ -1224,15 +1723,15 @@ setscreencolor(char *val, int i, int c) { int num_screens; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); if (i > 0 && i <= num_screens) { - screens[i - 1].c[c].color = name_to_color(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].color = name_to_color(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"); @@ -1275,7 +1774,7 @@ custom_region(char *val) int sidx, num_screens; xcb_screen_t *screen; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); if (sscanf(val, "screen[%d]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5) errx(1, "invalid custom region, " "should be 'screen[]:x++"); @@ -1284,7 +1783,9 @@ custom_region(char *val) sidx, num_screens); sidx--; - screen = get_screen(sidx); + if ((screen = get_screen(sidx)) == NULL) + errx(1, "ERROR: can't get screen %d.", sidx); + if (w < 1 || h < 1) errx(1, "region %ux%u+%u+%u too small", w, h, x, y); @@ -1314,17 +1815,17 @@ socket_setnonblock(int fd) } void -bar_print(struct swm_region *r, const char *s) +bar_print_legacy(struct swm_region *r, const char *s) { - size_t len; xcb_rectangle_t rect; uint32_t gcv[1]; - - len = strlen(s); - /* FIXME fix bar font position calculations */ -#if 0 + XGCValues gcvd; int x = 0; + size_t len; XRectangle ibox, lbox; + GC draw; + + len = strlen(s); XmbTextExtents(bar_fs, s, len, &ibox, &lbox); switch (bar_justify) { @@ -1341,7 +1842,6 @@ bar_print(struct swm_region *r, const char *s) if (x < SWM_BAR_OFFSET) x = SWM_BAR_OFFSET; -#endif rect.x = 0; rect.y = 0; @@ -1349,26 +1849,18 @@ bar_print(struct swm_region *r, const char *s) rect.height = HEIGHT(r->bar); /* clear back buffer */ - gcv[0] = r->s->c[SWM_S_COLOR_BAR].color; + gcv[0] = r->s->c[SWM_S_COLOR_BAR].pixel; xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv); - xcb_poly_fill_rectangle(conn, r->bar->buffer, r->s->bar_gc, - sizeof(rect), &rect); + xcb_poly_fill_rectangle(conn, r->bar->buffer, r->s->bar_gc, 1, &rect); /* draw back buffer */ - gcv[0] = r->s->c[SWM_S_COLOR_BAR].color; - xcb_change_gc(conn, r->s->bar_gc, XCB_GC_BACKGROUND, gcv); - gcv[0] = r->s->c[SWM_S_COLOR_BAR_FONT].color; - xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv); - gcv[0] = bar_fs; - xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FONT, gcv); -#if 0 - xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, x, - (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 - - lbox.y, s); -#else - /* workaround */ - xcb_image_text_8(conn, len, r->bar->buffer, r->s->bar_gc, 4, 14, s); -#endif + gcvd.graphics_exposures = 0; + draw = XCreateGC(display, r->bar->buffer, GCGraphicsExposures, &gcvd); + XSetForeground(display, draw, r->s->c[SWM_S_COLOR_BAR_FONT].pixel); + DRAWSTRING(display, r->bar->buffer, bar_fs, draw, + x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 - + lbox.y, s, len); + XFreeGC(display, draw); /* blt */ xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0, @@ -1376,33 +1868,88 @@ bar_print(struct swm_region *r, const char *s) } void -bar_extra_stop(void) +bar_print(struct swm_region *r, const char *s) { - if (bar_pipe[0]) { - close(bar_pipe[0]); - bzero(bar_pipe, sizeof bar_pipe); - } - if (bar_pid) { - kill(bar_pid, SIGTERM); - bar_pid = 0; - } - strlcpy((char *)bar_ext, "", sizeof bar_ext); - bar_extra = 0; -} + size_t len; + xcb_rectangle_t rect; + uint32_t gcv[1]; + int32_t x = 0; + XGlyphInfo info; + XftDraw *draw; -void -bar_class_name(char *s, size_t sz, struct swm_region *r) -{ - if (r == NULL || r->ws == NULL || r->ws->focus == NULL) - return; - if (r->ws->focus->ch.class_name != NULL) - strlcat(s, r->ws->focus->ch.class_name, sz); -} + len = strlen(s); -void -bar_title_name(char *s, size_t sz, struct swm_region *r) -{ - if (r == NULL || r->ws == NULL || r->ws->focus == NULL) + XftTextExtentsUtf8(display, bar_font, (FcChar8 *)s, len, &info); + + switch (bar_justify) { + case SWM_BAR_JUSTIFY_LEFT: + x = SWM_BAR_OFFSET; + break; + case SWM_BAR_JUSTIFY_CENTER: + x = (WIDTH(r) - info.width) / 2; + break; + case SWM_BAR_JUSTIFY_RIGHT: + x = WIDTH(r) - info.width - SWM_BAR_OFFSET; + break; + } + + if (x < SWM_BAR_OFFSET) + x = SWM_BAR_OFFSET; + + rect.x = 0; + rect.y = 0; + rect.width = WIDTH(r->bar); + rect.height = HEIGHT(r->bar); + + /* clear back buffer */ + gcv[0] = r->s->c[SWM_S_COLOR_BAR].pixel; + xcb_change_gc(conn, r->s->bar_gc, XCB_GC_FOREGROUND, gcv); + xcb_poly_fill_rectangle(conn, r->bar->buffer, r->s->bar_gc, 1, &rect); + + /* draw back buffer */ + draw = XftDrawCreate(display, r->bar->buffer, + DefaultVisual(display, r->s->idx), + DefaultColormap(display, r->s->idx)); + + XftDrawStringUtf8(draw, &bar_font_color, bar_font, x, + (HEIGHT(r->bar) + bar_font->height) / 2 - bar_font->descent, + (FcChar8 *)s, len); + + XftDrawDestroy(draw); + + /* blt */ + xcb_copy_area(conn, r->bar->buffer, r->bar->id, r->s->bar_gc, 0, 0, + 0, 0, WIDTH(r->bar), HEIGHT(r->bar)); +} + +void +bar_extra_stop(void) +{ + if (bar_pipe[0]) { + close(bar_pipe[0]); + bzero(bar_pipe, sizeof bar_pipe); + } + if (bar_pid) { + kill(bar_pid, SIGTERM); + bar_pid = 0; + } + strlcpy(bar_ext, "", sizeof bar_ext); + bar_extra = 0; +} + +void +bar_class_name(char *s, size_t sz, struct swm_region *r) +{ + if (r == NULL || r->ws == NULL || r->ws->focus == NULL) + return; + if (r->ws->focus->ch.class_name != NULL) + strlcat(s, r->ws->focus->ch.class_name, sz); +} + +void +bar_title_name(char *s, size_t sz, struct swm_region *r) +{ + if (r == NULL || r->ws == NULL || r->ws->focus == NULL) return; if (r->ws->focus->ch.instance_name != NULL) strlcat(s, r->ws->focus->ch.instance_name, sz); @@ -1455,7 +2002,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) { @@ -1519,7 +2066,7 @@ bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz) if (title_class_enabled) { strlcat(fmtnew, "+C", sz); - if (title_name_enabled == 0) + if (!title_name_enabled) strlcat(fmtnew, "+4<", sz); } @@ -1693,8 +2240,9 @@ bar_fmt_expand(char *fmtexp, size_t sz) #endif } +/* Redraws the bar; need to follow with xcb_flush() or focus_flush(). */ void -bar_fmt_print(void) +bar_draw(void) { char fmtexp[SWM_BAR_MAX], fmtnew[SWM_BAR_MAX]; char fmtrep[SWM_BAR_MAX]; @@ -1704,48 +2252,82 @@ bar_fmt_print(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) continue; - bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew); - bar_replace(fmtnew, fmtrep, r, sizeof fmtrep); - bar_print(r, fmtrep); + + if (bar_enabled && r->ws->bar_enabled) + xcb_map_window(conn, r->bar->id); + else { + xcb_unmap_window(conn, r->bar->id); + continue; + } + + if (startup_exception) + snprintf(fmtrep, sizeof fmtrep, "total " + "exceptions: %d, first exception: %s", + nr_exceptions, + startup_exception); + else { + bar_fmt(fmtexp, fmtnew, r, sizeof fmtnew); + bar_replace(fmtnew, fmtrep, r, sizeof fmtrep); + } + if (bar_font_legacy) + bar_print_legacy(r, fmtrep); + else + bar_print(r, fmtrep); } } } -void -bar_update(void) +/* + * Reads external script output; call when stdin is readable. + * Returns 1 if bar_ext was updated; otherwise 0. + */ +int +bar_extra_update(void) { - size_t len; - char *b; + size_t len; + char b[SWM_BAR_MAX]; + int changed = 0; - if (bar_enabled == 0) - return; - if (bar_extra && bar_extra_running) { - /* ignore short reads; it'll correct itself */ - while ((b = fgetln(stdin, &len)) != NULL) - if (b && b[len - 1] == '\n') { - b[len - 1] = '\0'; - strlcpy((char *)bar_ext, b, sizeof bar_ext); + if (!bar_extra) + return changed; + + while (fgets(b, sizeof(b), stdin) != NULL) { + if (bar_enabled) { + len = strlen(b); + if (b[len - 1] == '\n') { + /* Remove newline. */ + b[--len] = '\0'; + + /* "Clear" bar_ext. */ + bar_ext[0] = '\0'; + + /* Flush buffered output. */ + strlcpy(bar_ext, bar_ext_buf, sizeof(bar_ext)); + bar_ext_buf[0] = '\0'; + + /* Append new output to bar. */ + strlcat(bar_ext, b, sizeof(bar_ext)); + + changed = 1; + } else { + /* Buffer output. */ + strlcat(bar_ext_buf, b, sizeof(bar_ext_buf)); } - if (b == NULL && errno != EAGAIN) { - warn("bar_update: bar_extra failed"); - bar_extra_stop(); } - } else - strlcpy((char *)bar_ext, "", sizeof bar_ext); + } - bar_fmt_print(); - alarm(bar_delay); -} + if (errno != EAGAIN) { + warn("bar_action failed"); + bar_extra_stop(); + changed = 1; + } -void -bar_signal(int sig) -{ - bar_alarm = 1; + return changed; } void @@ -1754,49 +2336,64 @@ bar_toggle(struct swm_region *r, union arg *args) struct swm_region *tmpr; int i, num_screens; + /* suppress unused warnings since vars are needed */ + (void)r; + (void)args; + DNPRINTF(SWM_D_BAR, "bar_toggle\n"); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); - if (bar_enabled) { - for (i = 0; i < num_screens; i++) - TAILQ_FOREACH(tmpr, &screens[i].rl, entry) - if (tmpr->bar) - xcb_unmap_window(conn, tmpr->bar->id); - } else { - for (i = 0; i < num_screens; i++) - TAILQ_FOREACH(tmpr, &screens[i].rl, entry) - if (tmpr->bar) - map_window_raised(tmpr->bar->id); + switch (args->id) { + case SWM_ARG_ID_BAR_TOGGLE_WS: + /* Only change if master switch is enabled. */ + if (bar_enabled) + r->ws->bar_enabled = !r->ws->bar_enabled; + else + bar_enabled = r->ws->bar_enabled = 1; + break; + case SWM_ARG_ID_BAR_TOGGLE: + bar_enabled = !bar_enabled; + break; } - bar_enabled = !bar_enabled; + /* update bars as necessary */ + num_screens = get_screen_count(); + for (i = 0; i < num_screens; i++) + TAILQ_FOREACH(tmpr, &screens[i].rl, entry) + if (tmpr->bar) { + if (bar_enabled && tmpr->ws->bar_enabled) + xcb_map_window(conn, tmpr->bar->id); + else + xcb_unmap_window(conn, tmpr->bar->id); + } stack(); + /* must be after stack */ - bar_update(); + bar_draw(); - xcb_flush(conn); + focus_flush(); } void -bar_refresh(void) +bar_extra_setup(void) { - struct swm_region *r; - uint32_t wa[2]; - int i, num_screens; - /* do this here because the conf file is in memory */ - if (bar_extra && bar_extra_running == 0 && bar_argv[0]) { + if (!bar_extra && bar_argv[0]) { /* launch external status app */ - bar_extra_running = 1; + bar_extra = 1; if (pipe(bar_pipe) == -1) err(1, "pipe error"); socket_setnonblock(bar_pipe[0]); socket_setnonblock(bar_pipe[1]); /* XXX hmmm, really? */ - if (dup2(bar_pipe[0], 0) == -1) + + /* Set stdin to read from the pipe. */ + if (dup2(bar_pipe[0], STDIN_FILENO) == -1) err(1, "dup2"); - if (dup2(bar_pipe[1], 1) == -1) + + /* Set stdout to write to the pipe. */ + if (dup2(bar_pipe[1], STDOUT_FILENO) == -1) err(1, "dup2"); + if (signal(SIGPIPE, SIG_IGN) == SIG_ERR) err(1, "could not disable SIGPIPE"); switch (bar_pid = fork()) { @@ -1812,67 +2409,48 @@ bar_refresh(void) close(bar_pipe[1]); break; } - } - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); - for (i = 0; i < num_screens; i++) - TAILQ_FOREACH(r, &screens[i].rl, entry) { - if (r->bar == NULL) - continue; - wa[0] = screens[i].c[SWM_S_COLOR_BAR].color; - wa[1] = screens[i].c[SWM_S_COLOR_BAR_BORDER].color; - xcb_change_window_attributes(conn, r->bar->id, - XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa); - } - bar_update(); + atexit(kill_bar_extra_atexit); + } } void -bar_setup(struct swm_region *r) +kill_bar_extra_atexit(void) { - char *bar_font; - xcb_screen_t *screen = get_screen(r->s->idx); - uint32_t wa[3]; - xcb_generic_error_t *error; - xcb_void_cookie_t voc; - - if (bar_fs) { - xcb_close_font(conn, bar_fs); - bar_fs = 0; - } + if (bar_pid) + kill(bar_pid, SIGTERM); +} - if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL) - err(1, "bar_setup: calloc: failed to allocate memory."); +int +isxlfd(char *s) +{ + int count = 0; - bar_fs = xcb_generate_id(conn); + while ((s = index(s, '-'))) { + ++count; + ++s; + } - while ((bar_font = strsep(&bar_fonts, " ,")) != NULL) { - if (*bar_font == '\0') - continue; + return (count == 14); +} - DNPRINTF(SWM_D_INIT, "bar_setup: try font %s\n", bar_font); - voc = xcb_open_font_checked(conn, bar_fs, strlen(bar_font), - bar_font); +void +fontset_init(void) +{ + char *default_string; + char **missing_charsets; + int num_missing_charsets = 0; + int i; - if ((error = xcb_request_check(conn, voc))) { - DNPRINTF(SWM_D_INIT, - "bar_setup: unable to open font: %s\n", - bar_font); - free(error); - warnx("unable to load font %s", bar_font); - } else { - DNPRINTF(SWM_D_INIT, - "bar_setup: successfully opened font: %s\n", - bar_font); - break; - } + if (bar_fs) { + XFreeFontSet(display, bar_fs); + bar_fs = NULL; } -#if 0 - DNPRINTF(SWM_D_BAR, "bar_setup: loading bar_fonts: %s\n", bar_fonts); + DNPRINTF(SWM_D_INIT, "fontset_init: loading bar_fonts: %s\n", bar_fonts); bar_fs = XCreateFontSet(display, bar_fonts, &missing_charsets, - &num_missing_charsets, &default_string);*/ + &num_missing_charsets, &default_string); if (num_missing_charsets > 0) { warnx("Unable to load charset(s):"); @@ -1899,21 +2477,94 @@ bar_setup(struct swm_region *r) if (bar_height < 1) bar_height = 1; -#else - /* workaround */ - bar_height = 24; -#endif +} + +void +xft_init(struct swm_region *r) +{ + char *font, *d, *search; + XRenderColor color; + + if (bar_font == NULL) { + if ((d = strdup(bar_fonts)) == NULL) + errx(1, "insufficient memory."); + search = d; + while ((font = strsep(&search, ",")) != NULL) { + if (*font == '\0') + continue; + + DNPRINTF(SWM_D_INIT, "xft_init: try font %s\n", font); + + if (isxlfd(font)) { + bar_font = XftFontOpenXlfd(display, r->s->idx, + font); + } else { + bar_font = XftFontOpenName(display, r->s->idx, + font); + } + + if (!bar_font) { + warnx("unable to load font %s", font); + continue; + } else { + DNPRINTF(SWM_D_INIT, "successfully opened " + "font %s\n", font); + break; + } + } + free(d); + } + + if (bar_font == NULL) + errx(1, "unable to open a font"); + + PIXEL_TO_XRENDERCOLOR(r->s->c[SWM_S_COLOR_BAR_FONT].pixel, color); + + if (!XftColorAllocValue(display, DefaultVisual(display, r->s->idx), + DefaultColormap(display, r->s->idx), &color, &bar_font_color)) + warn("Xft error: unable to allocate color."); + + bar_height = bar_font->height + 2 * bar_border_width; + + if (bar_height < 1) + bar_height = 1; +} + +void +bar_setup(struct swm_region *r) +{ + xcb_screen_t *screen; + uint32_t wa[3]; + + DNPRINTF(SWM_D_BAR, "bar_setup: screen %d.\n", + r->s->idx); + + if ((screen = get_screen(r->s->idx)) == NULL) + errx(1, "ERROR: can't get screen %d.", r->s->idx); + + if (r->bar != NULL) + return; + + if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL) + err(1, "bar_setup: calloc: failed to allocate memory."); + + if (bar_font_legacy) + fontset_init(); + else + xft_init(r); + X(r->bar) = X(r); Y(r->bar) = bar_at_bottom ? (Y(r) + HEIGHT(r) - bar_height) : Y(r); WIDTH(r->bar) = WIDTH(r) - 2 * bar_border_width; HEIGHT(r->bar) = bar_height - 2 * bar_border_width; + /* Assume region is unfocused when we create the bar. */ r->bar->id = xcb_generate_id(conn); - wa[0] = r->s->c[SWM_S_COLOR_BAR].color; - wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER].color; - wa[2] = XCB_EVENT_MASK_EXPOSURE; - DNPRINTF(SWM_D_BAR, "bar_setup: create_window: (x,y) w x h: (%d,%d) " - "%d x %d\n", X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar)); + wa[0] = r->s->c[SWM_S_COLOR_BAR].pixel; + wa[1] = r->s->c[SWM_S_COLOR_BAR_BORDER_UNFOCUS].pixel; + wa[2] = XCB_EVENT_MASK_EXPOSURE | XCB_EVENT_MASK_POINTER_MOTION | + XCB_EVENT_MASK_POINTER_MOTION_HINT; + xcb_create_window(conn, XCB_COPY_FROM_PARENT, r->bar->id, r->s->root, X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar), bar_border_width, XCB_WINDOW_CLASS_INPUT_OUTPUT, @@ -1924,19 +2575,18 @@ bar_setup(struct swm_region *r) xcb_create_pixmap(conn, screen->root_depth, r->bar->buffer, r->bar->id, WIDTH(r->bar), HEIGHT(r->bar)); - xcb_randr_select_input(conn, r->bar->id, - XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE); + if (xrandr_support) + xcb_randr_select_input(conn, r->bar->id, + XCB_RANDR_NOTIFY_MASK_OUTPUT_CHANGE); if (bar_enabled) - map_window_raised(r->bar->id); + xcb_map_window(conn, r->bar->id); DNPRINTF(SWM_D_BAR, "bar_setup: window: 0x%x, (x,y) w x h: (%d,%d) " "%d x %d\n", WINID(r->bar), X(r->bar), Y(r->bar), WIDTH(r->bar), HEIGHT(r->bar)); - if (signal(SIGALRM, bar_signal) == SIG_ERR) - err(1, "could not install bar_signal"); - bar_refresh(); + bar_extra_setup(); } void @@ -1955,7 +2605,8 @@ set_win_state(struct ws_win *win, uint16_t state) { uint16_t data[2] = { state, XCB_ATOM_NONE }; - DNPRINTF(SWM_D_EVENT, "set_win_state: window: 0x%x\n", win->id); + DNPRINTF(SWM_D_EVENT, "set_win_state: window: 0x%x, state: %u\n", + win->id, state); if (win == NULL) return; @@ -1964,18 +2615,19 @@ set_win_state(struct ws_win *win, uint16_t state) a_state, 32, 2, data); } -uint16_t +uint32_t getstate(xcb_window_t w) { - uint16_t result = 0; + uint32_t result = 0; xcb_get_property_cookie_t c; xcb_get_property_reply_t *r; - c = xcb_get_property(conn, False, w, a_state, a_state, 0L, 2L); + c = xcb_get_property(conn, 0, w, a_state, a_state, 0L, 2L); r = xcb_get_property_reply(conn, c, NULL); if (r) { - result = *((uint16_t *)xcb_get_property_value(r)); + if (r->type == a_state && r->format == 32 && r->length == 2) + result = *((uint32_t *)xcb_get_property_value(r)); free(r); } @@ -1987,24 +2639,38 @@ getstate(xcb_window_t w) void version(struct swm_region *r, union arg *args) { + /* suppress unused warnings since vars are needed */ + (void)r; + (void)args; + bar_version = !bar_version; if (bar_version) snprintf(bar_vertext, sizeof bar_vertext, "Version: %s Build: %s", SPECTRWM_VERSION, buildstr); else strlcpy(bar_vertext, "", sizeof bar_vertext); - bar_update(); + bar_draw(); xcb_flush(conn); } void -client_msg(struct ws_win *win, xcb_atom_t a) +client_msg(struct ws_win *win, xcb_atom_t a, xcb_timestamp_t t) { xcb_client_message_event_t ev; +#ifdef SWM_DEBUG + char *name; +#endif if (win == NULL) return; +#ifdef SWM_DEBUG + name = get_atom_name(a); + DNPRINTF(SWM_D_EVENT, "client_msg: window: 0x%x, atom: %s(%u), " + "time: %#x\n", + win->id, name, a, t); + free(name); +#endif bzero(&ev, sizeof ev); ev.response_type = XCB_CLIENT_MESSAGE; @@ -2012,9 +2678,9 @@ client_msg(struct ws_win *win, xcb_atom_t a) ev.type = a_prot; ev.format = 32; ev.data.data32[0] = a; - ev.data.data32[1] = XCB_CURRENT_TIME; + ev.data.data32[1] = t; - xcb_send_event(conn, False, win->id, + xcb_send_event(conn, 0, win->id, XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); } @@ -2034,7 +2700,7 @@ config_win(struct ws_win *win, xcb_configure_request_event_t *ev) ce.y = Y(win); ce.width = WIDTH(win); ce.height = HEIGHT(win); - ce.override_redirect = False; + ce.override_redirect = 0; if (ev == NULL) { /* EWMH */ @@ -2048,12 +2714,13 @@ config_win(struct ws_win *win, xcb_configure_request_event_t *ev) ce.window = ev->window; /* make response appear more WM_SIZE_HINTS-compliant */ - if (win->sh.flags) + if (win->sh.flags) { DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%x," " sh.flags: %u, min: %d x %d, max: %d x %d, inc: " "%d x %d\n", win->id, win->sh.flags, SH_MIN_W(win), SH_MIN_H(win), SH_MAX_W(win), SH_MAX_H(win), SH_INC_W(win), SH_INC_H(win)); + } /* min size */ if (SH_MIN(win)) { @@ -2094,8 +2761,8 @@ config_win(struct ws_win *win, xcb_configure_request_event_t *ev) "(%d,%d) %d x %d, border: %d\n", YESNO(ev == NULL), win->id, ce.x, ce.y, ce.width, ce.height, ce.border_width); - xcb_send_event(conn, False, win->id, XCB_EVENT_MASK_STRUCTURE_NOTIFY, - (char *)&ce); + xcb_send_event(conn, 0, win->id, XCB_EVENT_MASK_STRUCTURE_NOTIFY, + (char *)&ce); } int @@ -2105,9 +2772,9 @@ count_win(struct workspace *ws, int count_transient) int count = 0; TAILQ_FOREACH(win, &ws->winlist, entry) { - if (count_transient == 0 && win->floating) + if (!count_transient && win->floating) continue; - if (count_transient == 0 && win->transient) + if (!count_transient && win->transient) continue; if (win->iconic) continue; @@ -2121,25 +2788,51 @@ count_win(struct workspace *ws, int count_transient) void quit(struct swm_region *r, union arg *args) { + /* suppress unused warnings since vars are needed */ + (void)r; + (void)args; + DNPRINTF(SWM_D_MISC, "quit\n"); running = 0; } void -unmap_window(struct ws_win *win) +map_window(struct ws_win *win) { + uint32_t val = XCB_STACK_MODE_ABOVE; + if (win == NULL) return; - /* don't unmap again */ - if (getstate(win->id) == XCB_ICCCM_WM_STATE_ICONIC) + DNPRINTF(SWM_D_EVENT, "map_window: win 0x%x, mapped: %s\n", win->id, + YESNO(win->mapped)); + + xcb_configure_window(conn, win->id, + XCB_CONFIG_WINDOW_STACK_MODE, &val); + + if (win->mapped) + return; + + xcb_map_window(conn, win->id); + set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL); + win->mapped = 1; +} + +void +unmap_window(struct ws_win *win) +{ + if (win == NULL) return; - set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC); + DNPRINTF(SWM_D_EVENT, "unmap_window: win 0x%x, mapped: %s\n", win->id, + YESNO(win->mapped)); + + if (!win->mapped) + return; xcb_unmap_window(conn, win->id); - xcb_change_window_attributes(conn, win->id, - XCB_CW_BORDER_PIXEL, &win->s->c[SWM_S_COLOR_UNFOCUS].color); + set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC); + win->mapped = 0; } void @@ -2148,7 +2841,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) @@ -2178,73 +2871,116 @@ fake_keypress(struct ws_win *win, xcb_keysym_t keysym, uint16_t modifiers) event.event_y = Y(win); event.root_x = 1; event.root_y = 1; - event.same_screen = True; + event.same_screen = 1; event.detail = *keycode; event.state = modifiers; event.response_type = XCB_KEY_PRESS; - xcb_send_event(conn, True, win->id, + xcb_send_event(conn, 1, win->id, XCB_EVENT_MASK_KEY_PRESS, (const char *)&event); event.response_type = XCB_KEY_RELEASE; - xcb_send_event(conn, True, win->id, + xcb_send_event(conn, 1, win->id, XCB_EVENT_MASK_KEY_RELEASE, (const char *)&event); + + free(keycode); } void restart(struct swm_region *r, union arg *args) { - DNPRINTF(SWM_D_MISC, "restart: %s\n", start_argv[0]); - - /* disable alarm because the following code may not be interrupted */ - alarm(0); - if (signal(SIGALRM, SIG_IGN) == SIG_ERR) - err(1, "can't disable alarm"); + /* suppress unused warning since var is needed */ + (void)r; + (void)args; - bar_extra_stop(); - bar_extra = 1; - unmap_all(); + DNPRINTF(SWM_D_MISC, "restart: %s\n", start_argv[0]); - xcb_key_symbols_free(syms); - xcb_flush(conn); - xcb_disconnect(conn); + shutdown_cleanup(); execvp(start_argv[0], start_argv); warn("execvp failed"); quit(NULL, NULL); } +struct ws_win * +get_pointer_win(xcb_window_t root) +{ + struct ws_win *win = NULL; + xcb_query_pointer_reply_t *r; + + DNPRINTF(SWM_D_EVENT, "get_pointer_win: root: 0x%x.\n", root); + + r = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, root), NULL); + if (r) { + win = find_window(r->child); + if (win) { + DNPRINTF(SWM_D_EVENT, "get_pointer_win: 0x%x.\n", + win->id); + } else { + DNPRINTF(SWM_D_EVENT, "get_pointer_win: none.\n"); + } + free(r); + } + + return win; +} + struct swm_region * -root_to_region(xcb_window_t root) +root_to_region(xcb_window_t root, int check) { + struct ws_win *cfw; struct swm_region *r = NULL; int i, num_screens; xcb_query_pointer_reply_t *qpr; + xcb_get_input_focus_reply_t *gifr; 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; - qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, - screens[i].root), NULL); + if (check & SWM_CK_REGION) + r = screens[i].r_focus; - if (qpr) { - DNPRINTF(SWM_D_MISC, "root_to_region: pointer: (%d,%d)\n", - qpr->root_x, qpr->root_y); - /* choose a region based on pointer location */ - TAILQ_FOREACH(r, &screens[i].rl, entry) - if (X(r) <= qpr->root_x && qpr->root_x < MAX_X(r) && - Y(r) <= qpr->root_y && qpr->root_y < MAX_Y(r)) - break; - free(qpr); + if (r == NULL && check & SWM_CK_FOCUS) { + /* Try to find an actively focused window */ + gifr = xcb_get_input_focus_reply(conn, + xcb_get_input_focus(conn), NULL); + if (gifr) { + cfw = find_window(gifr->focus); + if (cfw && cfw->ws->r) + r = cfw->ws->r; + + free(gifr); + } } - if (r == NULL) + if (r == NULL && check & SWM_CK_POINTER) { + /* 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); + TAILQ_FOREACH(r, &screens[i].rl, entry) + if (X(r) <= qpr->root_x && + qpr->root_x < MAX_X(r) && + Y(r) <= qpr->root_y && + qpr->root_y < MAX_Y(r)) + break; + free(qpr); + } + } + + /* Last resort. */ + 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); } @@ -2254,7 +2990,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, @@ -2271,7 +3007,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) @@ -2283,8 +3019,10 @@ find_window(xcb_window_t id) return (NULL); /* if we were looking for the parent return that window instead */ - if (r->parent == 0 || r->root == r->parent) + if (r->parent == 0 || r->root == r->parent) { + free(r); return (NULL); + } /* look for parent */ for (i = 0; i < num_screens; i++) @@ -2364,7 +3102,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++) { @@ -2387,7 +3125,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++) { @@ -2407,7 +3145,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++) { @@ -2427,16 +3165,23 @@ unfocus_win(struct ws_win *win) if (win == NULL) return; - if (win->ws == NULL) + if (win->ws == NULL) { + DNPRINTF(SWM_D_FOCUS, "unfocus_win: NULL ws.\n"); return; + } - if (validate_ws(win->ws)) - return; /* XXX this gets hit with thunderbird, needs fixing */ + if (validate_ws(win->ws)) { + DNPRINTF(SWM_D_FOCUS, "unfocus_win: invalid ws.\n"); + return; + } - if (win->ws->r == NULL) + if (win->ws->r == NULL) { + DNPRINTF(SWM_D_FOCUS, "unfocus_win: NULL region.\n"); return; + } if (validate_win(win)) { + DNPRINTF(SWM_D_FOCUS, "unfocus_win: invalid win.\n"); kill_refs(win); return; } @@ -2450,96 +3195,162 @@ unfocus_win(struct ws_win *win) kill_refs(win->ws->focus); win->ws->focus = NULL; } + if (validate_win(win->ws->focus_prev)) { kill_refs(win->ws->focus_prev); win->ws->focus_prev = NULL; } - grabbuttons(win, 0); xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL, - &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); + &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); + + DNPRINTF(SWM_D_FOCUS, "unfocus_win: done.\n"); } void -unfocus_all(void) +focus_win(struct ws_win *win) { - struct ws_win *win; - int i, j, num_screens; + struct ws_win *cfw = NULL, *parent = NULL, *w; + struct workspace *ws; + xcb_get_input_focus_reply_t *r; - DNPRINTF(SWM_D_FOCUS, "unfocus_all\n"); - - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); - for (i = 0; i < num_screens; i++) - for (j = 0; j < workspace_limit; j++) - TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) - unfocus_win(win); -} - -void -focus_win(struct ws_win *win) -{ - struct ws_win *cfw = NULL; - xcb_get_input_focus_reply_t *r; - xcb_window_t cur_focus = XCB_WINDOW_NONE; - - DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%x\n", WINID(win)); + DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%x\n", WINID(win)); if (win == NULL) - return; + goto out; + if (win->ws == NULL) - return; + goto out; - if (validate_ws(win->ws)) - return; /* XXX this gets hit with thunderbird, needs fixing */ + if (!win->mapped) + goto out; - if (validate_win(win)) { - kill_refs(win); - return; - } + ws = win->ws; + + if (validate_ws(ws)) + goto out; if (validate_win(win)) { kill_refs(win); - return; + goto out; } r = xcb_get_input_focus_reply(conn, xcb_get_input_focus(conn), NULL); if (r) { - cur_focus = r->focus; + cfw = find_window(r->focus); + if (cfw != win) + unfocus_win(cfw); free(r); } - if ((cfw = find_window(cur_focus)) != NULL) - unfocus_win(cfw); - else { - /* use larger hammer since the window was killed somehow */ - /* TAILQ_FOREACH(cfw, &win->ws->winlist, entry) - if (cfw->ws && cfw->ws->r && cfw->ws->r->s) - xcb_change_window_attributes(conn, cfw->id, - XCB_CW_BORDER_PIXEL, - &cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);*/ + + if (ws->focus != win) { + if (ws->focus && ws->focus != cfw) + unfocus_win(ws->focus); + ws->focus = win; } - win->ws->focus = win; + /* If this window directs focus to a child window, then clear. */ + if (win->focus_child) + win->focus_child = NULL; + + /* If transient, adjust parent's focus child for focus_magic. */ + if (win->transient) { + parent = find_window(win->transient); + if (parent && parent->focus_child != win) + parent->focus_child = win; + } - if (win->ws->r != NULL) { - if (win->java == 0) + if (cfw != win && ws->r != NULL) { + /* Set input focus if no input hint, or indicated by hint. */ + if (!(win->hints.flags & XCB_ICCCM_WM_HINT_INPUT) || + (win->hints.flags & XCB_ICCCM_WM_HINT_INPUT && + win->hints.input)) xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, - win->id, XCB_CURRENT_TIME); - grabbuttons(win, 1); - xcb_change_window_attributes(conn, win->id, - XCB_CW_BORDER_PIXEL, - &win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); - if (win->ws->cur_layout->flags & SWM_L_MAPONFOCUS || - win->ws->always_raise) - map_window_raised(win->id); + win->id, last_event_time); + + /* Tell app it can adjust focus to a specific window. */ + if (win->take_focus) { + /* java is special; always tell parent */ + if (win->transient && win->java) + client_msg(parent, a_takefocus, + last_event_time); + else + client_msg(win, a_takefocus, last_event_time); + } + + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL, + &ws->r->s->c[SWM_S_COLOR_FOCUS].pixel); + + if (ws->cur_layout->flags & SWM_L_MAPONFOCUS || + ws->always_raise) { + /* If a parent exists, map it first. */ + if (parent) { + map_window(parent); + + /* Map siblings next. */ + TAILQ_FOREACH(w, &ws->winlist, entry) + if (w != win && !w->iconic && + w->transient == parent->id) + map_window(w); + } + + /* Map focused window. */ + map_window(win); + + /* Finally, map children of focus window. */ + TAILQ_FOREACH(w, &ws->winlist, entry) + if (w->transient == win->id && !w->iconic) + map_window(w); + } + + set_region(ws->r); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root, ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, &win->id); } - bar_update(); +out: + bar_draw(); + + DNPRINTF(SWM_D_FOCUS, "focus_win: done.\n"); +} + +/* If a child window should have focus instead, return it. */ +struct ws_win * +get_focus_magic(struct ws_win *win) +{ + struct ws_win *parent = NULL; + struct ws_win *child = NULL; + + DNPRINTF(SWM_D_FOCUS, "get_focus_magic: window: 0x%x\n", WINID(win)); + if (win == NULL) + return win; + + if (win->transient) { + parent = find_window(win->transient); + + /* If parent prefers focus elsewhere, then try to do so. */ + if (parent && (child = parent->focus_child)) { + if (validate_win(child) == 0 && child->mapped) + win = child; + else + parent->focus_child = NULL; + } + } + + /* If this window prefers focus elsewhere, then try to do so. */ + if ((child = win->focus_child)) { + if (validate_win(child) == 0 && child->mapped) + win = child; + else + win->focus_child = NULL; + } + + return win; } void @@ -2547,7 +3358,8 @@ event_drain(uint8_t rt) { xcb_generic_event_t *evt; - xcb_flush(conn); + /* ensure all pending requests have been processed before filtering. */ + xcb_aux_sync(conn); while ((evt = xcb_poll_for_event(conn))) { if (XCB_EVENT_RESPONSE_TYPE(evt) != rt) event_handle(evt); @@ -2557,13 +3369,66 @@ event_drain(uint8_t rt) } void +set_region(struct swm_region *r) +{ + struct swm_region *rf; + + if (r == NULL) + return; + + rf = r->s->r_focus; + /* Unfocus old region bar. */ + if (rf) { + if (rf == r) + return; + + xcb_change_window_attributes(conn, rf->bar->id, + XCB_CW_BORDER_PIXEL, + &r->s->c[SWM_S_COLOR_BAR_BORDER_UNFOCUS].pixel); + } + + /* Set region bar border to focus_color. */ + xcb_change_window_attributes(conn, r->bar->id, + XCB_CW_BORDER_PIXEL, &r->s->c[SWM_S_COLOR_BAR_BORDER].pixel); + + r->s->r_focus = r; +} + +void +focus_region(struct swm_region *r) +{ + struct ws_win *nfw; + struct swm_region *old_r; + + if (r == NULL) + return; + + old_r = r->s->r_focus; + set_region(r); + + nfw = get_region_focus(r); + if (nfw) { + focus_win(nfw); + } else { + /* New region is empty; need to manually unfocus win. */ + if (old_r) + unfocus_win(old_r->ws->focus); + + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, r->id, + XCB_CURRENT_TIME); + + /* Clear bar since empty. */ + bar_draw(); + } +} + +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; - union arg a; if (!(r && r->s)) return; @@ -2583,6 +3448,8 @@ switchws(struct swm_region *r, union arg *args) if (new_ws == old_ws) return; + unfocus_win(old_ws->focus); + other_r = new_ws->r; if (other_r == NULL) { /* the other workspace is hidden, hide this one */ @@ -2598,22 +3465,35 @@ switchws(struct swm_region *r, union arg *args) this_r->ws = new_ws; new_ws->r = this_r; - /* this is needed so that we can click on a window after a restart */ - unfocus_all(); + /* Set focus_pending before stacking. */ + if (focus_mode != SWM_FOCUS_FOLLOW) + new_ws->focus_pending = get_region_focus(new_ws->r); stack(); - a.id = SWM_ARG_ID_FOCUSCUR; - focus(new_ws->r, &a); /* unmap old windows */ if (unmap_old) TAILQ_FOREACH(win, &old_ws->winlist, entry) unmap_window(win); - if (focus_mode == SWM_FOCUS_DEFAULT) - event_drain(XCB_ENTER_NOTIFY); - else - xcb_flush(conn); + /* if workspaces were swapped, then don't wait to set focus */ + if (old_ws->r && focus_mode != SWM_FOCUS_FOLLOW) { + if (new_ws->focus_pending) { + focus_win(new_ws->focus_pending); + 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(); + + DNPRINTF(SWM_D_WS, "switchws: done.\n"); } void @@ -2622,41 +3502,46 @@ 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; }; if (!cycle_all && - (cycle_empty == 0 && TAILQ_EMPTY(&s->ws[a.id].winlist))) + (!cycle_empty && TAILQ_EMPTY(&s->ws[a.id].winlist))) continue; - if (cycle_visible == 0 && s->ws[a.id].r != NULL) + 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); } @@ -2666,6 +3551,8 @@ priorws(struct swm_region *r, union arg *args) { union arg a; + (void)args; + DNPRINTF(SWM_D_WS, "priorws: 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); @@ -2677,25 +3564,48 @@ priorws(struct swm_region *r, union arg *args) } void -cyclescr(struct swm_region *r, union arg *args) +focusrg(struct swm_region *r, union arg *args) { + int ridx = args->id, i, num_screens; struct swm_region *rr = NULL; - union arg a; - int i, x, y, 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; + + DNPRINTF(SWM_D_FOCUS, "focusrg: id: %d\n", ridx); + + rr = TAILQ_FIRST(&r->s->rl); + for (i = 0; i < ridx; ++i) + rr = TAILQ_NEXT(rr, entry); + + if (rr == NULL) + return; + + focus_region(rr); + focus_flush(); +} + +void +cyclerg(struct swm_region *r, union arg *args) +{ + struct swm_region *rr = NULL; + int i, num_screens; + + num_screens = get_screen_count(); /* do nothing if we don't have more than one screen */ if (!(num_screens > 1 || outputs > 1)) return; i = r->s->idx; switch (args->id) { - case SWM_ARG_ID_CYCLESC_UP: + case SWM_ARG_ID_CYCLERG_UP: rr = TAILQ_NEXT(r, entry); if (rr == NULL) rr = TAILQ_FIRST(&screens[i].rl); break; - case SWM_ARG_ID_CYCLESC_DOWN: + case SWM_ARG_ID_CYCLERG_DOWN: rr = TAILQ_PREV(r, swm_region_list, entry); if (rr == NULL) rr = TAILQ_LAST(&screens[i].rl, swm_region_list); @@ -2706,22 +3616,8 @@ cyclescr(struct swm_region *r, union arg *args) if (rr == NULL) return; - /* move mouse to region */ - x = X(rr) + 1; - y = Y(rr) + 1 + (bar_enabled ? bar_height : 0); - xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0, 0, - x, y); - - a.id = SWM_ARG_ID_FOCUSCUR; - focus(rr, &a); - - if (rr->ws->focus) { - /* move to focus window */ - x = X(rr->ws->focus) + 1; - y = Y(rr->ws->focus) + 1; - xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0, - 0, x, y); - } + focus_region(rr); + focus_flush(); } void @@ -2754,7 +3650,6 @@ swapwin(struct swm_region *r, union arg *args) struct ws_win *cur_focus; struct ws_win_list *wl; - DNPRINTF(SWM_D_WS, "swapwin: 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); @@ -2819,11 +3714,11 @@ swapwin(struct swm_region *r, union arg *args) stack(); - xcb_flush(conn); + focus_flush(); } -void -focus_prev(struct ws_win *win) +struct ws_win * +get_focus_prev(struct ws_win *win) { struct ws_win *winfocus = NULL; struct ws_win *cur_focus = NULL; @@ -2831,13 +3726,13 @@ focus_prev(struct ws_win *win) struct workspace *ws = NULL; if (!(win && win->ws)) - return; + return NULL; ws = win->ws; wl = &ws->winlist; cur_focus = ws->focus; - DNPRINTF(SWM_D_FOCUS, "focus_prev: window: 0x%x, cur_focus: 0x%x\n", + DNPRINTF(SWM_D_FOCUS, "get_focus_prev: window: 0x%x, cur_focus: 0x%x\n", WINID(win), WINID(cur_focus)); /* pickle, just focus on whatever */ @@ -2866,53 +3761,106 @@ focus_prev(struct ws_win *win) goto done; } - DNPRINTF(SWM_D_FOCUS, "focus_prev: focus_close: %d\n", focus_close); + DNPRINTF(SWM_D_FOCUS, "get_focus_prev: focus_close: %d\n", focus_close); if (winfocus == NULL || winfocus == win) { switch (focus_close) { case SWM_STACK_BOTTOM: - winfocus = TAILQ_FIRST(wl); + TAILQ_FOREACH(winfocus, wl, entry) + if (!winfocus->iconic && winfocus != cur_focus) + break; break; case SWM_STACK_TOP: - winfocus = TAILQ_LAST(wl, ws_win_list); + TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry) + if (!winfocus->iconic && winfocus != cur_focus) + break; break; case SWM_STACK_ABOVE: - if ((winfocus = TAILQ_NEXT(cur_focus, entry)) == NULL) { - if (focus_close_wrap) - winfocus = TAILQ_FIRST(wl); - else - winfocus = TAILQ_PREV(cur_focus, - ws_win_list, entry); + winfocus = TAILQ_NEXT(cur_focus, entry); + while (winfocus && winfocus->iconic) + winfocus = TAILQ_NEXT(winfocus, entry); + + if (winfocus == NULL) { + if (focus_close_wrap) { + TAILQ_FOREACH(winfocus, wl, entry) + if (!winfocus->iconic && + winfocus != cur_focus) + break; + } else { + TAILQ_FOREACH_REVERSE(winfocus, wl, + ws_win_list, entry) + if (!winfocus->iconic && + winfocus != cur_focus) + break; + } } break; case SWM_STACK_BELOW: - if ((winfocus = TAILQ_PREV(cur_focus, ws_win_list, - entry)) == NULL) { - if (focus_close_wrap) - winfocus = TAILQ_LAST(wl, ws_win_list); - else - winfocus = TAILQ_NEXT(cur_focus, entry); + winfocus = TAILQ_PREV(cur_focus, ws_win_list, entry); + while (winfocus && winfocus->iconic) + winfocus = TAILQ_PREV(winfocus, ws_win_list, + entry); + + if (winfocus == NULL) { + if (focus_close_wrap) { + TAILQ_FOREACH_REVERSE(winfocus, wl, + ws_win_list, entry) + if (!winfocus->iconic && + winfocus != cur_focus) + break; + } else { + TAILQ_FOREACH(winfocus, wl, entry) + if (!winfocus->iconic && + winfocus != cur_focus) + break; + } } break; } } done: - if (winfocus == NULL) { - if (focus_default == SWM_STACK_TOP) - winfocus = TAILQ_LAST(wl, ws_win_list); - else - winfocus = TAILQ_FIRST(wl); + if (winfocus == NULL || + (winfocus && (winfocus->iconic || winfocus == cur_focus))) { + if (focus_default == SWM_STACK_TOP) { + TAILQ_FOREACH_REVERSE(winfocus, wl, ws_win_list, entry) + if (!winfocus->iconic && winfocus != cur_focus) + break; + } else { + TAILQ_FOREACH(winfocus, wl, entry) + if (!winfocus->iconic && winfocus != cur_focus) + break; + } } kill_refs(win); - focus_magic(winfocus); + + return get_focus_magic(winfocus); +} + +struct ws_win * +get_region_focus(struct swm_region *r) +{ + struct ws_win *winfocus = NULL; + + if (!(r && r->ws)) + return NULL; + + if (r->ws->focus && !r->ws->focus->iconic) + winfocus = r->ws->focus; + else if (r->ws->focus_prev && !r->ws->focus_prev->iconic) + winfocus = r->ws->focus_prev; + else + TAILQ_FOREACH(winfocus, &r->ws->winlist, entry) + if (!winfocus->iconic) + break; + + return get_focus_magic(winfocus); } void focus(struct swm_region *r, union arg *args) { - struct ws_win *winfocus = NULL, *head; - struct ws_win *cur_focus = NULL; + struct ws_win *head, *cur_focus = NULL, *winfocus = NULL; struct ws_win_list *wl = NULL; struct workspace *ws = NULL; int all_iconics; @@ -2922,21 +3870,6 @@ focus(struct swm_region *r, union arg *args) DNPRINTF(SWM_D_FOCUS, "focus: id: %d\n", args->id); - /* treat FOCUS_CUR special */ - if (args->id == SWM_ARG_ID_FOCUSCUR) { - if (r->ws->focus && r->ws->focus->iconic == 0) - winfocus = r->ws->focus; - else if (r->ws->focus_prev && r->ws->focus_prev->iconic == 0) - winfocus = r->ws->focus_prev; - else - TAILQ_FOREACH(winfocus, &r->ws->winlist, entry) - if (winfocus->iconic == 0) - break; - - focus_magic(winfocus); - return; - } - if ((cur_focus = r->ws->focus) == NULL) return; ws = r->ws; @@ -2946,7 +3879,7 @@ focus(struct swm_region *r, union arg *args) /* make sure there is at least one uniconified window */ all_iconics = 1; TAILQ_FOREACH(winfocus, wl, entry) - if (winfocus->iconic == 0) { + if (!winfocus->iconic) { all_iconics = 0; break; } @@ -2971,7 +3904,7 @@ focus(struct swm_region *r, union arg *args) while (winfocus != cur_focus) { if (winfocus == NULL) winfocus = TAILQ_LAST(wl, ws_win_list); - if (winfocus->iconic == 0) + if (!winfocus->iconic) break; winfocus = TAILQ_PREV(winfocus, ws_win_list, entry); @@ -2990,7 +3923,7 @@ focus(struct swm_region *r, union arg *args) while (winfocus != cur_focus) { if (winfocus == NULL) winfocus = TAILQ_FIRST(wl); - if (winfocus->iconic == 0) + if (!winfocus->iconic) break; winfocus = TAILQ_NEXT(winfocus, entry); } @@ -3007,16 +3940,18 @@ focus(struct swm_region *r, union arg *args) return; } - focus_magic(winfocus); + focus_win(get_focus_magic(winfocus)); - xcb_flush(conn); + focus_flush(); } void cycle_layout(struct swm_region *r, union arg *args) { struct workspace *ws = r->ws; - union arg a; + + /* suppress unused warning since var is needed */ + (void)args; DNPRINTF(SWM_D_EVENT, "cycle_layout: workspace: %d\n", ws->idx); @@ -3025,13 +3960,11 @@ cycle_layout(struct swm_region *r, union arg *args) ws->cur_layout = &layouts[0]; stack(); - bar_update(); + bar_draw(); - if (focus_mode == SWM_FOCUS_DEFAULT) - event_drain(XCB_ENTER_NOTIFY); + focus_win(get_region_focus(r)); - a.id = SWM_ARG_ID_FOCUSCUR; - focus(r, &a); + focus_flush(); } void @@ -3047,7 +3980,9 @@ stack_config(struct swm_region *r, union arg *args) if (args->id != SWM_ARG_ID_STACKINIT) stack(); - bar_update(); + bar_draw(); + + focus_flush(); } void @@ -3061,7 +3996,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; @@ -3070,11 +4005,13 @@ stack(void) { DNPRINTF(SWM_D_STACK, "stack: workspace: %d " "(screen: %d, region: %d)\n", r->ws->idx, i, j++); - /* start with screen geometry, adjust for bar */ + /* Adjust stack area for region bar and padding. */ g = r->g; - g.w -= 2 * border_width; - g.h -= 2 * border_width; - if (bar_enabled) { + g.x += region_padding; + g.y += region_padding; + g.w -= 2 * border_width + 2 * region_padding; + g.h -= 2 * border_width + 2 * region_padding; + if (bar_enabled && r->ws->bar_enabled) { if (!bar_at_bottom) g.y += bar_height; g.h -= bar_height; @@ -3088,15 +4025,15 @@ stack(void) { if (font_adjusted) font_adjusted--; - if (focus_mode == SWM_FOCUS_DEFAULT) - event_drain(XCB_ENTER_NOTIFY); - DNPRINTF(SWM_D_STACK, "stack: end\n"); } void store_float_geom(struct ws_win *win, struct swm_region *r) { + if (win == NULL || r == NULL) + return; + /* retain window geom and region geom */ win->g_float = win->g; win->g_float.x -= X(r); @@ -3109,6 +4046,25 @@ store_float_geom(struct ws_win *win, struct swm_region *r) } void +load_float_geom(struct ws_win *win, struct swm_region *r) +{ + if (win == NULL || r == NULL) + return; + + if (win->g_floatvalid) { + win->g = win->g_float; + X(win) += X(r); + Y(win) += Y(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)); + } else { + DNPRINTF(SWM_D_MISC, "load_float_geom: window: 0x%x, g_float " + "is not set.\n", win->id); + } +} + +void stack_floater(struct ws_win *win, struct swm_region *r) { if (win == NULL) @@ -3120,12 +4076,10 @@ stack_floater(struct ws_win *win, struct swm_region *r) * to allow windows to change their size (e.g. mplayer fs) only retrieve * geom on ws switches or return from max mode */ - if (win->g_floatvalid && (win->floatmaxed || (r != r->ws->old_r && - !(win->ewmh_flags & EWMH_F_FULLSCREEN)))) { - /* refloat at last floating relative position */ - win->g = win->g_float; - X(win) += X(r); - Y(win) += Y(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); } win->floatmaxed = 0; @@ -3137,7 +4091,7 @@ stack_floater(struct ws_win *win, struct swm_region *r) if (!win->g_floatvalid) store_float_geom(win, win->ws->r); - win->g = win->ws->r->g; + win->g = r->g; } /* @@ -3163,13 +4117,16 @@ stack_floater(struct ws_win *win, struct swm_region *r) HEIGHT(win) = (double)HEIGHT(r) * dialog_ratio; } - if (!win->manual) { + if (!win->manual && !(win->ewmh_flags & EWMH_F_FULLSCREEN) && + !(win->quirks & SWM_Q_ANYWHERE)) { /* - * floaters and transients are auto-centred unless moved - * or resized + * floaters and transients are auto-centred unless moved, + * resized or ANYWHERE quirk is set. */ 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); } /* keep window within region bounds */ @@ -3197,13 +4154,13 @@ adjust_font(struct ws_win *win) win->font_steps++; font_adjusted++; win->last_inc = win->sh.width_inc; - fake_keypress(win, XK_KP_Subtract, ShiftMask); + fake_keypress(win, XK_KP_Subtract, XCB_MOD_MASK_SHIFT); } else if (win->font_steps && win->last_inc != win->sh.width_inc && WIDTH(win) > win->font_size_boundary[win->font_steps - 1]) { win->font_steps--; font_adjusted++; win->last_inc = win->sh.width_inc; - fake_keypress(win, XK_KP_Add, ShiftMask); + fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT); } } @@ -3221,9 +4178,8 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) int w_inc = 1, h_inc, w_base = 1, h_base; int hrh, extra = 0, h_slice, last_h = 0; int split, colno, winno, mwin, msize, mscale; - int remain, missing, v_slice, reconfigure; + int remain, missing, v_slice, reconfigure = 0; int bordered = 1; - xcb_get_window_attributes_reply_t *war; DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d, rot: %s, " "flip: %s\n", ws->idx, YESNO(rot), YESNO(flip)); @@ -3233,8 +4189,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) return; TAILQ_FOREACH(win, &ws->winlist, entry) - if (win->transient == 0 && win->floating == 0 - && win->iconic == 0) + if (!win->transient && !win->floating && !win->iconic) break; if (win == NULL) @@ -3291,9 +4246,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) /* stack all the tiled windows */ i = j = 0, s = stacks; TAILQ_FOREACH(win, &ws->winlist, entry) { - if (win->transient != 0 || win->floating != 0) - continue; - if (win->iconic != 0) + if (win->transient || win->floating || win->iconic) continue; if (win->ewmh_flags & EWMH_F_FULLSCREEN) { @@ -3311,16 +4264,20 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) if (flip) win_g.x = r_g.x; else - win_g.x += win_g.w + 2 * border_width; + win_g.x += win_g.w + 2 * border_width + + tile_gap; win_g.w = (r_g.w - msize - - (stacks * 2 * border_width)) / stacks; + (stacks * (2 * border_width + tile_gap))) / stacks; if (s == 1) win_g.w += (r_g.w - msize - - (stacks * 2 * border_width)) % stacks; + (stacks * (2 * border_width + tile_gap))) % + stacks; s--; j = 0; } - win_g.h = hrh - 2 * border_width; + + win_g.h = hrh - 2 * border_width - tile_gap; + if (rot) { h_inc = win->sh.width_inc; h_base = win->sh.base_width; @@ -3328,6 +4285,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) h_inc = win->sh.height_inc; h_base = win->sh.base_height; } + if (j == colno - 1) { win_g.h = hrh + extra; } else if (h_inc > 1 && h_inc < h_slice) { @@ -3347,15 +4305,17 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) if (j == 0) win_g.y = r_g.y; else - win_g.y += last_h + 2 * border_width; + win_g.y += last_h + 2 * border_width + tile_gap; - if (disable_border && bar_enabled == 0 && winno == 1){ + if (disable_border && !(bar_enabled && ws->bar_enabled) && + winno == 1){ bordered = 0; win_g.w += 2 * border_width; win_g.h += 2 * border_width; } else { bordered = 1; } + if (rot) { if (X(win) != win_g.y || Y(win) != win_g.x || WIDTH(win) != win_g.h || HEIGHT(win) != win_g.w) { @@ -3386,14 +4346,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) update_window(win); } - war = xcb_get_window_attributes_reply(conn, - xcb_get_window_attributes(conn, win->id), - NULL); - if (war) { - if (war->map_state == XCB_MAP_STATE_UNMAPPED) - map_window_raised(win->id); - free(war); - } + map_window(win); last_h = win_g.h; i++; @@ -3403,9 +4356,9 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) notiles: /* now, stack all the floaters and transients */ TAILQ_FOREACH(win, &ws->winlist, entry) { - if (win->transient == 0 && win->floating == 0) + if (!win->transient && !win->floating) continue; - if (win->iconic == 1) + if (win->iconic) continue; if (win->ewmh_flags & EWMH_F_FULLSCREEN) { fs_win = win; @@ -3413,12 +4366,13 @@ notiles: } stack_floater(win, ws->r); - map_window_raised(win->id); + map_window(win); } + /* Make sure fs_win is stacked last so it's on top. */ if (fs_win) { stack_floater(fs_win, ws->r); - map_window_raised(fs_win->id); + map_window(fs_win); } } @@ -3528,8 +4482,8 @@ void max_stack(struct workspace *ws, struct swm_geometry *g) { struct swm_geometry gg = *g; - struct ws_win *win, *wintrans = NULL, *parent = NULL; - int winno, num_screens; + struct ws_win *w, *win = NULL, *parent = NULL; + int winno; DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx); @@ -3540,50 +4494,102 @@ max_stack(struct workspace *ws, struct swm_geometry *g) if (winno == 0 && count_win(ws, 1) == 0) return; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); - TAILQ_FOREACH(win, &ws->winlist, entry) { - if (win->transient) { - wintrans = win; - parent = find_window(win->transient); + /* Figure out which top level window should be visible. */ + if (ws->focus_pending) + win = ws->focus_pending; + else if (ws->focus) + win = ws->focus; + else if (ws->focus_prev) + win = ws->focus_prev; + else + win = TAILQ_FIRST(&ws->winlist); + + if (win->transient) + parent = find_window(win->transient); + + DNPRINTF(SWM_D_STACK, "max_stack: win: 0x%x\n", win->id); + + /* maximize all top level windows */ + TAILQ_FOREACH(w, &ws->winlist, entry) { + if (w->transient || w->iconic) continue; - } - if (win->floating && win->floatmaxed == 0 ) { + if (!w->mapped && w != win) + map_window(w); + + if (w->floating && !w->floatmaxed) { /* * retain geometry for retrieval on exit from * max_stack mode */ - store_float_geom(win, ws->r); - win->floatmaxed = 1; + store_float_geom(w, ws->r); + w->floatmaxed = 1; } /* only reconfigure if necessary */ - if (X(win) != gg.x || Y(win) != gg.y || WIDTH(win) != gg.w || - HEIGHT(win) != gg.h) { - win->g = gg; - if (bar_enabled){ - win->bordered = 1; + if (X(w) != gg.x || Y(w) != gg.y || WIDTH(w) != gg.w || + HEIGHT(w) != gg.h) { + w->g = gg; + if (bar_enabled && ws->bar_enabled){ + w->bordered = 1; } else { - win->bordered = 0; - WIDTH(win) += 2 * border_width; - HEIGHT(win) += 2 * border_width; + w->bordered = 0; + WIDTH(w) += 2 * border_width; + HEIGHT(w) += 2 * border_width; } - update_window(win); + update_window(w); } - /* unmap only if we don't have multi screen */ - if (win != ws->focus) - if (!(num_screens > 1 || outputs > 1)) - unmap_window(win); } - /* put the last transient on top */ - if (wintrans) { - if (parent) - map_window_raised(parent->id); - stack_floater(wintrans, ws->r); - focus_magic(wintrans); + /* If a parent exists, map/raise it first. */ + if (parent) { + map_window(parent); + + /* Map siblings next. */ + TAILQ_FOREACH(w, &ws->winlist, entry) + if (w != win && !w->iconic && + w->transient == parent->id) { + stack_floater(w, ws->r); + map_window(w); + } } + + /* Map/raise focused window. */ + map_window(win); + + /* 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); + } +} + +void +send_to_rg(struct swm_region *r, union arg *args) +{ + int ridx = args->id, i, num_screens; + struct swm_region *rr = NULL; + union arg a; + + num_screens = get_screen_count(); + /* do nothing if we don't have more than one screen */ + if (!(num_screens > 1 || outputs > 1)) + return; + + DNPRINTF(SWM_D_FOCUS, "send_to_rg: id: %d\n", ridx); + + rr = TAILQ_FIRST(&r->s->rl); + for (i = 0; i < ridx; ++i) + rr = TAILQ_NEXT(rr, entry); + + if (rr == NULL) + return; + + a.id = rr->ws->idx; + + send_to_ws(r, &a); } void @@ -3591,10 +4597,8 @@ send_to_ws(struct swm_region *r, union arg *args) { int wsid = args->id; struct ws_win *win = NULL, *parent; - struct workspace *ws, *nws; - xcb_atom_t ws_idx_atom = XCB_ATOM_NONE; + struct workspace *ws, *nws, *pws; char ws_idx_str[SWM_PROPLEN]; - union arg a; if (wsid >= workspace_limit) return; @@ -3603,55 +4607,104 @@ send_to_ws(struct swm_region *r, union arg *args) win = r->ws->focus; else return; - if (win == NULL) - return; + if (win->ws->idx == wsid) return; - DNPRINTF(SWM_D_MOVE, "send_to_ws: window: 0x%x\n", win->id); + DNPRINTF(SWM_D_MOVE, "send_to_ws: win 0x%x, ws %d -> %d\n", win->id, + win->ws->idx, wsid); ws = win->ws; nws = &win->s->ws[wsid]; - a.id = SWM_ARG_ID_FOCUSPREV; - focus(r, &a); - if (win->transient) { - parent = find_window(win->transient); - if (parent) { - unmap_window(parent); - TAILQ_REMOVE(&ws->winlist, parent, entry); - TAILQ_INSERT_TAIL(&nws->winlist, parent, entry); - parent->ws = nws; - } - } - unmap_window(win); - TAILQ_REMOVE(&ws->winlist, win, entry); - TAILQ_INSERT_TAIL(&nws->winlist, win, entry); - if (TAILQ_EMPTY(&ws->winlist)) - r->ws->focus = NULL; - win->ws = nws; - - /* Try to update the window's workspace property */ - ws_idx_atom = get_atom_from_string("_SWM_WS"); - if (ws_idx_atom && - snprintf(ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < - SWM_PROPLEN) { - DNPRINTF(SWM_D_PROP, "send_to_ws: set property: _SWM_WS: %s\n", - ws_idx_str); - xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, - ws_idx_atom, XCB_ATOM_STRING, 8, strlen(ws_idx_str), - ws_idx_str); - } - - stack(); - bar_update(); + /* 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) + ws->focus_pending = get_focus_prev(win); - xcb_flush(conn); + /* Move the parent if this is a transient window. */ + if (win->transient) { + parent = find_window(win->transient); + if (parent) { + pws = parent->ws; + /* Set new focus in parent's ws if needed. */ + if (pws->focus == parent) { + if (focus_mode != SWM_FOCUS_FOLLOW) + pws->focus_pending = + get_focus_prev(parent); + + unfocus_win(parent); + + if (focus_mode != SWM_FOCUS_FOLLOW) { + pws->focus = pws->focus_pending; + pws->focus_pending = NULL; + } + } + + /* Don't unmap parent if new ws is visible */ + if (nws->r == NULL) + unmap_window(parent); + + /* Transfer */ + TAILQ_REMOVE(&ws->winlist, parent, entry); + TAILQ_INSERT_TAIL(&nws->winlist, parent, entry); + parent->ws = nws; + + DNPRINTF(SWM_D_PROP, "send_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, + strlen(ws_idx_str), ws_idx_str); + } + } + + unfocus_win(win); + + /* Don't unmap if new ws is visible */ + if (nws->r == NULL) + unmap_window(win); + + /* Transfer */ + TAILQ_REMOVE(&ws->winlist, win, entry); + TAILQ_INSERT_TAIL(&nws->winlist, win, entry); + win->ws = nws; + + /* Set focus on new ws. */ + unfocus_win(nws->focus); + nws->focus = win; + + DNPRINTF(SWM_D_PROP, "send_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) { + if (ws->focus_pending) { + focus_win(ws->focus_pending); + ws->focus_pending = NULL; + } else { + xcb_set_input_focus(conn, + XCB_INPUT_FOCUS_PARENT, r->id, + XCB_CURRENT_TIME); + } + } + + focus_flush(); + } + + DNPRINTF(SWM_D_MOVE, "send_to_ws: done.\n"); } void pressbutton(struct swm_region *r, union arg *args) { + /* suppress unused warning since var is needed */ + (void)r; + xcb_test_fake_input(conn, XCB_BUTTON_PRESS, args->id, XCB_CURRENT_TIME, XCB_WINDOW_NONE, 0, 0, 0); xcb_test_fake_input(conn, XCB_BUTTON_RELEASE, args->id, @@ -3661,32 +4714,31 @@ pressbutton(struct swm_region *r, union arg *args) void raise_toggle(struct swm_region *r, union arg *args) { + /* suppress unused warning since var is needed */ + (void)args; + if (r == NULL || r->ws == NULL) return; r->ws->always_raise = !r->ws->always_raise; /* bring floaters back to top */ - if (r->ws->always_raise == 0) + if (!r->ws->always_raise) stack(); - xcb_flush(conn); + focus_flush(); } void iconify(struct swm_region *r, union arg *args) { - union arg a; + /* suppress unused warning since var is needed */ + (void)args; if (r->ws->focus == NULL) return; - unmap_window(r->ws->focus); - update_iconic(r->ws->focus, 1); - stack(); - r->ws->focus = NULL; - a.id = SWM_ARG_ID_FOCUSCUR; - focus(r, &a); + set_swm_iconic(r->ws->focus, 1); xcb_flush(conn); } @@ -3696,20 +4748,33 @@ get_win_name(xcb_window_t win) { char *name = NULL; xcb_get_property_cookie_t c; - xcb_icccm_get_text_property_reply_t r; - - c = xcb_icccm_get_wm_name(conn, win); - if (xcb_icccm_get_wm_name_reply(conn, c, &r, NULL)) { - if (r.name_len > 0) { - name = malloc(r.name_len + 1); - if (!name) { - xcb_icccm_get_text_property_reply_wipe(&r); + xcb_get_property_reply_t *r; + + /* First try _NET_WM_NAME for UTF-8. */ + c = xcb_get_property(conn, 0, win, a_netwmname, + 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); } - memcpy(name, r.name, r.name_len); - name[r.name_len] = '\0'; } - xcb_icccm_get_text_property_reply_wipe(&r); + if (r->length > 0) + name = strndup(xcb_get_property_value(r), + xcb_get_property_value_length(r)); + + free(r); } return (name); @@ -3732,7 +4797,7 @@ uniconify(struct swm_region *r, union arg *args) TAILQ_FOREACH(win, &r->ws->winlist, entry) { if (win->ws == NULL) continue; /* should never happen */ - if (win->iconic == 0) + if (!win->iconic) continue; count++; } @@ -3750,7 +4815,7 @@ uniconify(struct swm_region *r, union arg *args) TAILQ_FOREACH(win, &r->ws->winlist, entry) { if (win->ws == NULL) continue; /* should never happen */ - if (win->iconic == 0) + if (!win->iconic) continue; name = get_win_name(win->id); @@ -3761,8 +4826,6 @@ uniconify(struct swm_region *r, union arg *args) } fclose(lfile); - - xcb_flush(conn); } void @@ -3825,7 +4888,6 @@ search_win_cleanup(void) while ((sw = TAILQ_FIRST(&search_wl)) != NULL) { xcb_destroy_window(conn, sw->indicator); - xcb_free_gc(conn, sw->gc); TAILQ_REMOVE(&search_wl, sw, entry); free(sw); } @@ -3837,12 +4899,16 @@ search_win(struct swm_region *r, union arg *args) struct ws_win *win = NULL; struct search_window *sw = NULL; xcb_window_t w; - uint32_t gcv[3], wa[2]; - int i; + uint32_t wa[2]; + int i, width, height; char s[8]; FILE *lfile; size_t len; - XRectangle ibox, lbox; + XftDraw *draw; + XGlyphInfo info; + GC l_draw; + XGCValues l_gcv; + XRectangle l_ibox, l_lbox; DNPRINTF(SWM_D_MISC, "search_win\n"); @@ -3858,7 +4924,7 @@ search_win(struct swm_region *r, union arg *args) i = 1; TAILQ_FOREACH(win, &r->ws->winlist, entry) { - if (win->iconic == 1) + if (win->iconic) continue; sw = calloc(1, sizeof(struct search_window)); @@ -3874,46 +4940,55 @@ search_win(struct swm_region *r, union arg *args) snprintf(s, sizeof s, "%d", i); len = strlen(s); - /* FIXME fix calculations */ -#if 0 - XmbTextExtents(bar_fs, s, len, &ibox, &lbox); -#endif - w = xcb_generate_id(conn); - wa[0] = r->s->c[SWM_S_COLOR_FOCUS].color; - wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].color; -#if 0 - xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0, - lbox.width + 4, bar_fs_extents->max_logical_extent.height, - 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, - XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa); -#else - /* workaround */ + wa[0] = r->s->c[SWM_S_COLOR_FOCUS].pixel; + wa[1] = r->s->c[SWM_S_COLOR_UNFOCUS].pixel; + + if (bar_font_legacy) { + XmbTextExtents(bar_fs, s, len, &l_ibox, &l_lbox); + width = l_lbox.width + 4; + height = bar_fs_extents->max_logical_extent.height + 4; + } else { + XftTextExtentsUtf8(display, bar_font, (FcChar8 *)s, len, + &info); + width = info.width + 4; + height = bar_font->height + 4; + } + xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0, - 22, 20, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, + width, height, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa); -#endif + + xcb_map_window(conn, w); sw->indicator = w; TAILQ_INSERT_TAIL(&search_wl, sw, entry); - sw->gc = xcb_generate_id(conn); - gcv[0] = r->s->c[SWM_S_COLOR_BAR].color; - gcv[1] = r->s->c[SWM_S_COLOR_FOCUS].color; - gcv[2] = 0; - xcb_create_gc(conn, sw->gc, w, XCB_GC_FOREGROUND | - XCB_GC_BACKGROUND | XCB_GC_GRAPHICS_EXPOSURES, gcv); - map_window_raised(w); + if (bar_font_legacy) { + l_gcv.graphics_exposures = 0; + l_draw = XCreateGC(display, w, 0, &l_gcv); -#if 0 - xcb_image_text_8(conn, len, w, sw->gc, 2, - (bar_fs_extents->max_logical_extent.height - - lbox.height) / 2 - lbox.y, s); -#else - /* workaround */ - xcb_image_text_8(conn, len, w, sw->gc, 6, 14, s); -#endif + XSetForeground(display, l_draw, + r->s->c[SWM_S_COLOR_BAR].pixel); + + DRAWSTRING(display, w, bar_fs, l_draw, 2, + (bar_fs_extents->max_logical_extent.height - + l_lbox.height) / 2 - l_lbox.y, s, len); + + XFreeGC(display, l_draw); + } else { + + draw = XftDrawCreate(display, w, + DefaultVisual(display, r->s->idx), + DefaultColormap(display, r->s->idx)); + + XftDrawStringUtf8(draw, &bar_font_color, bar_font, 2, + (HEIGHT(r->bar) + bar_font->height) / 2 - + bar_font->descent, (FcChar8 *)s, len); + + XftDrawDestroy(draw); + } DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w); @@ -3927,7 +5002,7 @@ search_win(struct swm_region *r, union arg *args) } void -search_resp_uniconify(char *resp, unsigned long len) +search_resp_uniconify(const char *resp, size_t len) { char *name; struct ws_win *win; @@ -3936,7 +5011,7 @@ search_resp_uniconify(char *resp, unsigned long len) DNPRINTF(SWM_D_MISC, "search_resp_uniconify: resp: %s\n", resp); TAILQ_FOREACH(win, &search_r->ws->winlist, entry) { - if (win->iconic == 0) + if (!win->iconic) continue; name = get_win_name(win->id); if (name == NULL) @@ -3948,7 +5023,7 @@ search_resp_uniconify(char *resp, unsigned long len) free(name); if (strncmp(s, resp, len) == 0) { /* XXX this should be a callback to generalize */ - update_iconic(win, 0); + set_swm_iconic(win, 0); free(s); break; } @@ -3957,7 +5032,7 @@ search_resp_uniconify(char *resp, unsigned long len) } void -search_resp_name_workspace(char *resp, unsigned long len) +search_resp_name_workspace(const char *resp, size_t len) { struct workspace *ws; @@ -3983,7 +5058,7 @@ search_resp_name_workspace(char *resp, unsigned long len) } void -search_resp_search_workspace(char *resp, unsigned long len) +search_resp_search_workspace(const char *resp) { char *p, *q; int ws_idx; @@ -4014,7 +5089,7 @@ search_resp_search_workspace(char *resp, unsigned long len) } void -search_resp_search_window(char *resp, unsigned long len) +search_resp_search_window(const char *resp) { char *s; int idx; @@ -4053,7 +5128,7 @@ search_do_resp(void) { ssize_t rbytes; char *resp; - unsigned long len; + size_t len; DNPRINTF(SWM_D_MISC, "search_do_resp:\n"); @@ -4087,10 +5162,10 @@ search_do_resp(void) search_resp_name_workspace(resp, len); break; case SWM_SEARCH_SEARCH_WORKSPACE: - search_resp_search_workspace(resp, len); + search_resp_search_workspace(resp); break; case SWM_SEARCH_SEARCH_WINDOW: - search_resp_search_window(resp, len); + search_resp_search_window(resp); break; } @@ -4101,6 +5176,8 @@ done: search_resp_action = SWM_SEARCH_NONE; close(select_resp_pipe[0]); free(resp); + + xcb_flush(conn); } void @@ -4115,12 +5192,11 @@ wkill(struct swm_region *r, union arg *args) xcb_kill_client(conn, r->ws->focus->id); else if (r->ws->focus->can_delete) - client_msg(r->ws->focus, a_delete); + client_msg(r->ws->focus, a_delete, 0); - xcb_flush(conn); + focus_flush(); } - int floating_toggle_win(struct ws_win *win) { @@ -4145,13 +5221,7 @@ floating_toggle_win(struct ws_win *win) } win->floating = 0; } else { - if (win->g_floatvalid) { - /* refloat at last floating relative position */ - X(win) = win->g_float.x + X(r); - Y(win) = win->g_float.y + Y(r); - WIDTH(win) = win->g_float.w; - HEIGHT(win) = win->g_float.h; - } + load_float_geom(win, r); win->floating = 1; } @@ -4164,23 +5234,25 @@ void floating_toggle(struct swm_region *r, union arg *args) { struct ws_win *win = r->ws->focus; - union arg a; + + /* suppress unused warning since var is needed */ + (void)args; if (win == NULL) return; + if (win->ewmh_flags & EWMH_F_FULLSCREEN) + return; + ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom, _NET_WM_STATE_TOGGLE); stack(); - if (win == win->ws->focus) { - a.id = SWM_ARG_ID_FOCUSCUR; - focus(win->ws->r, &a); - } + if (win == win->ws->focus) + focus_win(win); - xcb_flush(conn); - event_drain(XCB_ENTER_NOTIFY); + focus_flush(); } void @@ -4229,8 +5301,8 @@ update_window(struct ws_win *win) uint32_t wc[5]; mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | - XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT | - XCB_CONFIG_WINDOW_BORDER_WIDTH; + XCB_CONFIG_WINDOW_WIDTH | XCB_CONFIG_WINDOW_HEIGHT | + XCB_CONFIG_WINDOW_BORDER_WIDTH; wc[0] = X(win); wc[1] = Y(win); wc[2] = WIDTH(win); @@ -4251,16 +5323,12 @@ resize(struct ws_win *win, union arg *args) { xcb_timestamp_t timestamp = 0; struct swm_region *r = NULL; - int resize_step = 0; + int resize_stp = 0; struct swm_geometry g; int top = 0, left = 0, resizing; int dx, dy; - unsigned int shape; /* cursor style */ - xcb_cursor_t cursor; - xcb_font_t cursor_font; - xcb_grab_pointer_cookie_t gpc; - xcb_grab_pointer_reply_t *gpr; - xcb_query_pointer_reply_t *xpr; + xcb_cursor_t cursor; + xcb_query_pointer_reply_t *xpr = NULL; xcb_generic_event_t *evt; xcb_motion_notify_event_t *mne; @@ -4275,7 +5343,7 @@ resize(struct ws_win *win, union arg *args) "transient: 0x%x\n", win->id, YESNO(win->floating), win->transient); - if (!(win->transient != 0 || win->floating != 0)) + if (!win->transient && !win->floating) return; /* reject resizes in max mode for floaters (transient ok) */ @@ -4288,27 +5356,35 @@ resize(struct ws_win *win, union arg *args) stack(); + focus_flush(); + + /* It's possible for win to have been freed during focus_flush(). */ + if (validate_win(win)) { + DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + goto out; + } + switch (args->id) { case SWM_ARG_ID_WIDTHSHRINK: WIDTH(win) -= SWM_RESIZE_STEPS; - resize_step = 1; + resize_stp = 1; break; case SWM_ARG_ID_WIDTHGROW: WIDTH(win) += SWM_RESIZE_STEPS; - resize_step = 1; + resize_stp = 1; break; case SWM_ARG_ID_HEIGHTSHRINK: HEIGHT(win) -= SWM_RESIZE_STEPS; - resize_step = 1; + resize_stp = 1; break; case SWM_ARG_ID_HEIGHTGROW: HEIGHT(win) += SWM_RESIZE_STEPS; - resize_step = 1; + resize_stp = 1; break; default: break; } - if (resize_step) { + if (resize_stp) { constrain_window(win, r, 1); update_window(win); store_float_geom(win,r); @@ -4330,33 +5406,21 @@ resize(struct ws_win *win, union arg *args) top = 1; if (args->id == SWM_ARG_ID_CENTER) - shape = XC_sizing; + cursor = cursors[XC_SIZING].cid; else if (top) - shape = (left) ? XC_top_left_corner : XC_top_right_corner; + cursor = cursors[left ? XC_TOP_LEFT_CORNER : + XC_TOP_RIGHT_CORNER].cid; else - shape = (left) ? XC_bottom_left_corner : XC_bottom_right_corner; - - cursor_font = xcb_generate_id(conn); - xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor"); + cursor = cursors[left ? XC_BOTTOM_LEFT_CORNER : + XC_BOTTOM_RIGHT_CORNER].cid; - cursor = xcb_generate_id(conn); - xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font, - shape, shape + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff); - - gpc = xcb_grab_pointer(conn, False, win->id, MOUSEMASK, + xcb_grab_pointer(conn, 0, win->id, MOUSEMASK, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME), - gpr = xcb_grab_pointer_reply(conn, gpc, NULL); - if (!gpr) { - xcb_free_cursor(conn, cursor); - xcb_close_font(conn, cursor_font); - free(xpr); - return; - } xcb_flush(conn); resizing = 1; - while ((evt = xcb_wait_for_event(conn)) && resizing) { + while (resizing && (evt = xcb_wait_for_event(conn))) { switch (XCB_EVENT_RESPONSE_TYPE(evt)) { case XCB_BUTTON_RELEASE: DNPRINTF(SWM_D_EVENT, "resize: BUTTON_RELEASE\n"); @@ -4413,28 +5477,31 @@ resize(struct ws_win *win, union arg *args) /* not free, don't sync more than 120 times / second */ if ((mne->time - timestamp) > (1000 / 120) ) { timestamp = mne->time; - do_sync(); update_window(win); + xcb_flush(conn); } break; default: event_handle(evt); + + /* It's possible for win to have been freed above. */ + if (validate_win(win)) { + DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + goto out; + } break; } free(evt); } if (timestamp) { - do_sync(); update_window(win); + xcb_flush(conn); } store_float_geom(win,r); - +out: xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); - xcb_free_cursor(conn, cursor); - xcb_close_font(conn, cursor_font); - free(gpr); free(xpr); - DNPRINTF(SWM_D_EVENT, "resize: done\n"); + DNPRINTF(SWM_D_EVENT, "resize: done.\n"); } void @@ -4448,6 +5515,7 @@ resize_step(struct swm_region *r, union arg *args) return; resize(win, args); + focus_flush(); } #define SWM_MOVE_STEPS (50) @@ -4456,13 +5524,9 @@ void move(struct ws_win *win, union arg *args) { xcb_timestamp_t timestamp = 0; - int move_step = 0, moving; + int move_stp = 0, moving; struct swm_region *r = NULL; - xcb_font_t cursor_font; - xcb_cursor_t cursor; - xcb_grab_pointer_cookie_t gpc; - xcb_grab_pointer_reply_t *gpr; - xcb_query_pointer_reply_t *qpr; + xcb_query_pointer_reply_t *qpr = NULL; xcb_generic_event_t *evt; xcb_motion_notify_event_t *mne; @@ -4481,7 +5545,7 @@ move(struct ws_win *win, union arg *args) return; win->manual = 1; - if (win->floating == 0 && !win->transient) { + if (!win->floating && !win->transient) { store_float_geom(win, r); ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom, _NET_WM_STATE_ADD); @@ -4491,64 +5555,57 @@ move(struct ws_win *win, union arg *args) stack(); - move_step = 0; + focus_flush(); + + /* It's possible for win to have been freed during focus_flush(). */ + if (validate_win(win)) { + DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + goto out; + } + + move_stp = 0; switch (args->id) { case SWM_ARG_ID_MOVELEFT: X(win) -= (SWM_MOVE_STEPS - border_width); - move_step = 1; + move_stp = 1; break; case SWM_ARG_ID_MOVERIGHT: X(win) += (SWM_MOVE_STEPS - border_width); - move_step = 1; + move_stp = 1; break; case SWM_ARG_ID_MOVEUP: Y(win) -= (SWM_MOVE_STEPS - border_width); - move_step = 1; + move_stp = 1; break; case SWM_ARG_ID_MOVEDOWN: Y(win) += (SWM_MOVE_STEPS - border_width); - move_step = 1; + move_stp = 1; break; default: break; } - if (move_step) { + if (move_stp) { constrain_window(win, r, 0); update_window(win); store_float_geom(win, r); return; } - cursor_font = xcb_generate_id(conn); - xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor"); - - cursor = xcb_generate_id(conn); - xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font, - XC_fleur, XC_fleur + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff); - - gpc = xcb_grab_pointer(conn, False, win->id, MOUSEMASK, + xcb_grab_pointer(conn, 0, win->id, MOUSEMASK, XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, - XCB_WINDOW_NONE, cursor, XCB_CURRENT_TIME); - gpr = xcb_grab_pointer_reply(conn, gpc, NULL); - if (!gpr) { - xcb_free_cursor(conn, cursor); - xcb_close_font(conn, cursor_font); - return; - } + XCB_WINDOW_NONE, cursors[XC_FLEUR].cid, XCB_CURRENT_TIME); /* get cursor offset from window root */ qpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id), NULL); if (!qpr) { xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); - xcb_free_cursor(conn, cursor); - xcb_close_font(conn, cursor_font); return; } xcb_flush(conn); moving = 1; - while ((evt = xcb_wait_for_event(conn)) && moving) { + while (moving && (evt = xcb_wait_for_event(conn))) { switch (XCB_EVENT_RESPONSE_TYPE(evt)) { case XCB_BUTTON_RELEASE: DNPRINTF(SWM_D_EVENT, "move: BUTTON_RELEASE\n"); @@ -4564,26 +5621,31 @@ move(struct ws_win *win, union arg *args) /* not free, don't sync more than 120 times / second */ if ((mne->time - timestamp) > (1000 / 120) ) { timestamp = mne->time; - do_sync(); update_window(win); + xcb_flush(conn); } break; default: event_handle(evt); + + /* It's possible for win to have been freed above. */ + if (validate_win(win)) { + DNPRINTF(SWM_D_EVENT, "move: invalid win.\n"); + goto out; + } break; } free(evt); } if (timestamp) { - do_sync(); update_window(win); + xcb_flush(conn); } store_float_geom(win, r); +out: free(qpr); - xcb_free_cursor(conn, cursor); - xcb_close_font(conn, cursor_font); xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); - DNPRINTF(SWM_D_EVENT, "move: done\n"); + DNPRINTF(SWM_D_EVENT, "move: done.\n"); } void @@ -4596,108 +5658,13 @@ move_step(struct swm_region *r, union arg *args) else return; - if (!(win->transient != 0 || win->floating != 0)) + if (!win->transient && !win->floating) return; move(win, args); + focus_flush(); } - -/* user/key callable function IDs */ -enum keyfuncid { - KF_BAR_TOGGLE, - KF_BUTTON2, - KF_CYCLE_LAYOUT, - KF_FLIP_LAYOUT, - KF_FLOAT_TOGGLE, - KF_FOCUS_MAIN, - KF_FOCUS_NEXT, - KF_FOCUS_PREV, - KF_HEIGHT_GROW, - KF_HEIGHT_SHRINK, - KF_ICONIFY, - KF_MASTER_SHRINK, - KF_MASTER_GROW, - KF_MASTER_ADD, - KF_MASTER_DEL, - KF_MOVE_DOWN, - KF_MOVE_LEFT, - KF_MOVE_RIGHT, - KF_MOVE_UP, - KF_MVWS_1, - KF_MVWS_2, - KF_MVWS_3, - KF_MVWS_4, - KF_MVWS_5, - KF_MVWS_6, - KF_MVWS_7, - KF_MVWS_8, - KF_MVWS_9, - KF_MVWS_10, - KF_MVWS_11, - KF_MVWS_12, - KF_MVWS_13, - KF_MVWS_14, - KF_MVWS_15, - KF_MVWS_16, - KF_MVWS_17, - KF_MVWS_18, - KF_MVWS_19, - KF_MVWS_20, - KF_MVWS_21, - KF_MVWS_22, - KF_NAME_WORKSPACE, - KF_QUIT, - KF_RAISE_TOGGLE, - KF_RESTART, - KF_SCREEN_NEXT, - KF_SCREEN_PREV, - KF_SEARCH_WIN, - KF_SEARCH_WORKSPACE, - KF_SPAWN_CUSTOM, - KF_STACK_INC, - KF_STACK_DEC, - KF_STACK_RESET, - KF_SWAP_MAIN, - KF_SWAP_NEXT, - KF_SWAP_PREV, - KF_UNICONIFY, - KF_VERSION, - KF_WIDTH_GROW, - KF_WIDTH_SHRINK, - KF_WIND_DEL, - KF_WIND_KILL, - KF_WS_1, - KF_WS_2, - KF_WS_3, - KF_WS_4, - KF_WS_5, - KF_WS_6, - KF_WS_7, - KF_WS_8, - KF_WS_9, - KF_WS_10, - KF_WS_11, - KF_WS_12, - KF_WS_13, - KF_WS_14, - KF_WS_15, - KF_WS_16, - KF_WS_17, - KF_WS_18, - KF_WS_19, - KF_WS_20, - KF_WS_21, - KF_WS_22, - KF_WS_NEXT, - KF_WS_NEXT_ALL, - KF_WS_PREV, - KF_WS_PREV_ALL, - KF_WS_PRIOR, - KF_DUMPWINS, /* MUST BE LAST */ - KF_INVALID -}; - /* key definitions */ struct keyfunc { char name[SWM_FUNCNAME_LEN]; @@ -4705,7 +5672,8 @@ struct keyfunc { union arg args; } keyfuncs[KF_INVALID + 1] = { /* name function argument */ - { "bar_toggle", bar_toggle, {0} }, + { "bar_toggle", bar_toggle, {.id = SWM_ARG_ID_BAR_TOGGLE} }, + { "bar_toggle_ws", bar_toggle, {.id = SWM_ARG_ID_BAR_TOGGLE_WS} }, { "button2", pressbutton, {2} }, { "cycle_layout", cycle_layout, {0} }, { "flip_layout", stack_config, {.id = SWM_ARG_ID_FLIPLAYOUT} }, @@ -4724,6 +5692,15 @@ struct keyfunc { { "move_left", move_step, {.id = SWM_ARG_ID_MOVELEFT} }, { "move_right", move_step, {.id = SWM_ARG_ID_MOVERIGHT} }, { "move_up", move_step, {.id = SWM_ARG_ID_MOVEUP} }, + { "mvrg_1", send_to_rg, {.id = 0} }, + { "mvrg_2", send_to_rg, {.id = 1} }, + { "mvrg_3", send_to_rg, {.id = 2} }, + { "mvrg_4", send_to_rg, {.id = 3} }, + { "mvrg_5", send_to_rg, {.id = 4} }, + { "mvrg_6", send_to_rg, {.id = 5} }, + { "mvrg_7", send_to_rg, {.id = 6} }, + { "mvrg_8", send_to_rg, {.id = 7} }, + { "mvrg_9", send_to_rg, {.id = 8} }, { "mvws_1", send_to_ws, {.id = 0} }, { "mvws_2", send_to_ws, {.id = 1} }, { "mvws_3", send_to_ws, {.id = 2} }, @@ -4750,8 +5727,19 @@ struct keyfunc { { "quit", quit, {0} }, { "raise_toggle", raise_toggle, {0} }, { "restart", restart, {0} }, - { "screen_next", cyclescr, {.id = SWM_ARG_ID_CYCLESC_UP} }, - { "screen_prev", cyclescr, {.id = SWM_ARG_ID_CYCLESC_DOWN} }, + { "rg_1", focusrg, {.id = 0} }, + { "rg_2", focusrg, {.id = 1} }, + { "rg_3", focusrg, {.id = 2} }, + { "rg_4", focusrg, {.id = 3} }, + { "rg_5", focusrg, {.id = 4} }, + { "rg_6", focusrg, {.id = 5} }, + { "rg_7", focusrg, {.id = 6} }, + { "rg_8", focusrg, {.id = 7} }, + { "rg_9", focusrg, {.id = 8} }, + { "rg_next", cyclerg, {.id = SWM_ARG_ID_CYCLERG_UP} }, + { "rg_prev", cyclerg, {.id = SWM_ARG_ID_CYCLERG_DOWN} }, + { "screen_next", cyclerg, {.id = SWM_ARG_ID_CYCLERG_UP} }, + { "screen_prev", cyclerg, {.id = SWM_ARG_ID_CYCLERG_DOWN} }, { "search_win", search_win, {0} }, { "search_workspace", search_workspace, {0} }, { "spawn_custom", NULL, {0} }, @@ -4791,20 +5779,14 @@ 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} }, }; -struct key { - RB_ENTRY(key) entry; - unsigned int mod; - KeySym keysym; - enum keyfuncid funcid; - char *spawn_name; -}; -RB_HEAD(key_tree, key); int key_cmp(struct key *kp1, struct key *kp2) @@ -4822,9 +5804,6 @@ key_cmp(struct key *kp1, struct key *kp2) return (0); } -RB_GENERATE(key_tree, key, entry, key_cmp); -struct key_tree keys; - /* mouse */ enum { client_click, root_click }; struct button { @@ -4834,10 +5813,12 @@ struct button { void (*func)(struct ws_win *, union arg *); union arg args; } buttons[] = { +#define MODKEY_SHIFT MODKEY | XCB_MOD_MASK_SHIFT /* action key mouse button func args */ - { client_click, MODKEY, Button3, resize, {.id = SWM_ARG_ID_DONTCENTER} }, - { client_click, MODKEY | ShiftMask, Button3, resize, {.id = SWM_ARG_ID_CENTER} }, - { client_click, MODKEY, Button1, move, {0} }, + { client_click, MODKEY, XCB_BUTTON_INDEX_3, resize, {.id = SWM_ARG_ID_DONTCENTER} }, + { client_click, MODKEY_SHIFT, XCB_BUTTON_INDEX_3, resize, {.id = SWM_ARG_ID_CENTER} }, + { client_click, MODKEY, XCB_BUTTON_INDEX_1, move, {0} }, +#undef MODKEY_SHIFT }; void @@ -4848,36 +5829,29 @@ update_modkey(unsigned int mod) mod_key = mod; RB_FOREACH(kp, key_tree, &keys) - if (kp->mod & ShiftMask) - kp->mod = mod | ShiftMask; + if (kp->mod & XCB_MOD_MASK_SHIFT) + kp->mod = mod | XCB_MOD_MASK_SHIFT; else kp->mod = mod; for (i = 0; i < LENGTH(buttons); i++) - if (buttons[i].mask & ShiftMask) - buttons[i].mask = mod | ShiftMask; + if (buttons[i].mask & XCB_MOD_MASK_SHIFT) + buttons[i].mask = mod | XCB_MOD_MASK_SHIFT; else buttons[i].mask = mod; } -/* spawn */ -struct spawn_prog { - TAILQ_ENTRY(spawn_prog) entry; - char *name; - int argc; - char **argv; -}; -TAILQ_HEAD(spawn_list, spawn_prog); -struct spawn_list spawns = TAILQ_HEAD_INITIALIZER(spawns); - int -spawn_expand(struct swm_region *r, union arg *args, char *spawn_name, +spawn_expand(struct swm_region *r, union arg *args, const char *spawn_name, char ***ret_args) { struct spawn_prog *prog = NULL; int i; char *ap, **real_args; + /* suppress unused warning since var is needed */ + (void)args; + DNPRINTF(SWM_D_SPAWN, "spawn_expand: %s\n", spawn_name); /* find program */ @@ -4927,6 +5901,13 @@ spawn_expand(struct swm_region *r, union arg *args, char *spawn_name, 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", + 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) + err(1, "spawn_custom workspace index"); } else { /* no match --> copy as is */ if ((real_args[i] = strdup(ap)) == NULL) @@ -4947,7 +5928,7 @@ spawn_expand(struct swm_region *r, union arg *args, char *spawn_name, } void -spawn_custom(struct swm_region *r, union arg *args, char *spawn_name) +spawn_custom(struct swm_region *r, union arg *args, const char *spawn_name) { union arg a; char **real_args; @@ -4965,7 +5946,8 @@ spawn_custom(struct swm_region *r, union arg *args, char *spawn_name) } void -spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid) +spawn_select(struct swm_region *r, union arg *args, const char *spawn_name, + int *pid) { union arg a; char **real_args; @@ -4987,9 +5969,9 @@ spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid) err(1, "cannot fork"); break; case 0: /* child */ - if (dup2(select_list_pipe[0], 0) == -1) + if (dup2(select_list_pipe[0], STDIN_FILENO) == -1) err(1, "dup2"); - if (dup2(select_resp_pipe[1], 1) == -1) + if (dup2(select_resp_pipe[1], STDOUT_FILENO) == -1) err(1, "dup2"); close(select_list_pipe[1]); close(select_resp_pipe[0]); @@ -5007,7 +5989,7 @@ spawn_select(struct swm_region *r, union arg *args, char *spawn_name, int *pid) } void -spawn_insert(char *name, char *args) +spawn_insert(const char *name, const char *args, int flags) { char *arg, *cp, *ptr; struct spawn_prog *sp; @@ -5036,6 +6018,8 @@ spawn_insert(char *name, char *args) } free(cp); + sp->flags = flags; + TAILQ_INSERT_TAIL(&spawns, sp, entry); DNPRINTF(SWM_D_SPAWN, "spawn_insert: leave\n"); } @@ -5058,18 +6042,7 @@ spawn_remove(struct spawn_prog *sp) } void -spawn_replace(struct spawn_prog *sp, char *name, char *args) -{ - DNPRINTF(SWM_D_SPAWN, "spawn_replace: %s [%s]\n", sp->name, name); - - spawn_remove(sp); - spawn_insert(name, args); - - DNPRINTF(SWM_D_SPAWN, "spawn_replace: leave\n"); -} - -void -setspawn(char *name, char *args) +setspawn(const char *name, const char *args, int flags) { struct spawn_prog *sp; @@ -5078,51 +6051,89 @@ setspawn(char *name, char *args) if (name == NULL) return; - TAILQ_FOREACH(sp, &spawns, entry) { + /* Remove any old spawn under the same name. */ + TAILQ_FOREACH(sp, &spawns, entry) if (!strcmp(sp->name, name)) { - if (*args == '\0') - spawn_remove(sp); - else - spawn_replace(sp, name, args); - DNPRINTF(SWM_D_SPAWN, "setspawn: leave\n"); - return; + spawn_remove(sp); + break; } - } - if (*args == '\0') { + + if (*args != '\0') + spawn_insert(name, args, flags); + else warnx("error: setspawn: cannot find program: %s", name); - return; - } - spawn_insert(name, args); DNPRINTF(SWM_D_SPAWN, "setspawn: leave\n"); } int setconfspawn(char *selector, char *value, int flags) { - DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, value); + char *args; + + args = expand_tilde(value); - setspawn(selector, value); + DNPRINTF(SWM_D_SPAWN, "setconfspawn: [%s] [%s]\n", selector, args); - DNPRINTF(SWM_D_SPAWN, "setconfspawn: done\n"); + setspawn(selector, args, flags); + free(args); + + DNPRINTF(SWM_D_SPAWN, "setconfspawn: done.\n"); return (0); } void -setup_spawn(void) +validate_spawns(void) { - setconfspawn("term", "xterm", 0); - setconfspawn("spawn_term", "xterm", 0); - setconfspawn("screenshot_all", "screenshot.sh full", 0); - setconfspawn("screenshot_wind", "screenshot.sh window", 0); - setconfspawn("lock", "xlock", 0); - setconfspawn("initscr", "initscreen.sh", 0); - setconfspawn("menu", "dmenu_run" - " -fn $bar_font" - " -nb $bar_color" + struct spawn_prog *sp; + char which[PATH_MAX]; + size_t i; + + struct key *kp; + + RB_FOREACH(kp, key_tree, &keys) { + if (kp->funcid != KF_SPAWN_CUSTOM) + continue; + + /* find program */ + TAILQ_FOREACH(sp, &spawns, entry) { + if (!strcasecmp(kp->spawn_name, sp->name)) + break; + } + + if (sp == NULL || sp->flags & SWM_SPAWN_OPTIONAL) + continue; + + /* verify we have the goods */ + snprintf(which, sizeof which, "which %s", sp->argv[0]); + DNPRINTF(SWM_D_CONF, "validate_spawns: which %s\n", + sp->argv[0]); + for (i = strlen("which "); i < strlen(which); i++) + if (which[i] == ' ') { + which[i] = '\0'; + break; + } + if (system(which) != 0) + add_startup_exception("could not find %s", + &which[strlen("which ")]); + } +} + +void +setup_spawn(void) +{ + setconfspawn("lock", "xlock", 0); + + setconfspawn("term", "xterm", 0); + setconfspawn("spawn_term", "xterm", 0); + + setconfspawn("menu", "dmenu_run" + " -fn $bar_font" + " -nb $bar_color" " -nf $bar_font_color" " -sb $bar_border" " -sf $bar_color", 0); + setconfspawn("search", "dmenu" " -i" " -fn $bar_font" @@ -5130,6 +6141,7 @@ setup_spawn(void) " -nf $bar_font_color" " -sb $bar_border" " -sf $bar_color", 0); + setconfspawn("name_workspace", "dmenu" " -p Workspace" " -fn $bar_font" @@ -5137,6 +6149,11 @@ setup_spawn(void) " -nf $bar_font_color" " -sb $bar_border" " -sf $bar_color", 0); + + /* These are not verified for existence, even with a binding set. */ + setconfspawn("screenshot_all", "screenshot.sh full", SWM_SPAWN_OPTIONAL); + setconfspawn("screenshot_wind", "screenshot.sh window", SWM_SPAWN_OPTIONAL); + setconfspawn("initscr", "initscreen.sh", SWM_SPAWN_OPTIONAL); } /* key bindings */ @@ -5166,17 +6183,17 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) if (strncasecmp(name, "MOD", SWM_MODNAME_SIZE) == 0) *mod |= currmod; else if (!strncasecmp(name, "Mod1", SWM_MODNAME_SIZE)) - *mod |= Mod1Mask; + *mod |= XCB_MOD_MASK_1; else if (!strncasecmp(name, "Mod2", SWM_MODNAME_SIZE)) - *mod += Mod2Mask; + *mod += XCB_MOD_MASK_2; else if (!strncmp(name, "Mod3", SWM_MODNAME_SIZE)) - *mod |= Mod3Mask; + *mod |= XCB_MOD_MASK_3; else if (!strncmp(name, "Mod4", SWM_MODNAME_SIZE)) - *mod |= Mod4Mask; + *mod |= XCB_MOD_MASK_4; else if (strncasecmp(name, "SHIFT", SWM_MODNAME_SIZE) == 0) - *mod |= ShiftMask; + *mod |= XCB_MOD_MASK_SHIFT; else if (strncasecmp(name, "CONTROL", SWM_MODNAME_SIZE) == 0) - *mod |= ControlMask; + *mod |= XCB_MOD_MASK_CONTROL; else { *ks = XStringToKeysym(name); XConvertCase(*ks, ks, &uks); @@ -5193,7 +6210,7 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) } char * -strdupsafe(char *str) +strdupsafe(const char *str) { if (str == NULL) return (NULL); @@ -5202,7 +6219,8 @@ strdupsafe(char *str) } void -key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid, char *spawn_name) +key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid, + const char *spawn_name) { struct key *kp; @@ -5246,7 +6264,7 @@ key_remove(struct key *kp) void key_replace(struct key *kp, unsigned int mod, KeySym ks, enum keyfuncid kfid, - char *spawn_name) + const char *spawn_name) { DNPRINTF(SWM_D_KEY, "key_replace: %s [%s]\n", keyfuncs[kp->funcid].name, spawn_name); @@ -5259,7 +6277,7 @@ key_replace(struct key *kp, unsigned int mod, KeySym ks, enum keyfuncid kfid, void setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid, - char *spawn_name) + const char *spawn_name) { struct key *kp; @@ -5275,7 +6293,7 @@ setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid, return; } if (kfid == KF_INVALID) { - warnx("error: setkeybinding: cannot find mod/key combination"); + warnx("bind: Key combination already unbound."); DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n"); return; } @@ -5291,6 +6309,10 @@ setconfbinding(char *selector, char *value, int flags) unsigned int mod; KeySym ks; struct spawn_prog *sp; + + /* suppress unused warning since var is needed */ + (void)flags; + DNPRINTF(SWM_D_KEY, "setconfbinding: enter\n"); if (selector == NULL) { DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value); @@ -5305,8 +6327,8 @@ setconfbinding(char *selector, char *value, int flags) for (kfid = 0; kfid < KF_INVALID; (kfid)++) { if (strncasecmp(selector, keyfuncs[kfid].name, SWM_FUNCNAME_LEN) == 0) { - DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n", - selector); + DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match " + "keyfunc\n", selector); if (parsekeys(value, mod_key, &mod, &ks) == 0) { setkeybinding(mod, ks, kfid, NULL); return (0); @@ -5317,8 +6339,8 @@ setconfbinding(char *selector, char *value, int flags) /* search by custom spawn name */ TAILQ_FOREACH(sp, &spawns, entry) { if (strcasecmp(selector, sp->name) == 0) { - DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n", - selector); + 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); @@ -5334,25 +6356,95 @@ setconfbinding(char *selector, char *value, int flags) void setup_keys(void) { +#define MODKEY_SHIFT MODKEY | XCB_MOD_MASK_SHIFT + setkeybinding(MODKEY, XK_b, KF_BAR_TOGGLE, NULL); + setkeybinding(MODKEY_SHIFT, XK_b, KF_BAR_TOGGLE_WS,NULL); + setkeybinding(MODKEY, XK_v, KF_BUTTON2, NULL); setkeybinding(MODKEY, XK_space, KF_CYCLE_LAYOUT,NULL); - setkeybinding(MODKEY|ShiftMask, XK_backslash, KF_FLIP_LAYOUT, NULL); - setkeybinding(MODKEY|ShiftMask, XK_space, KF_STACK_RESET, NULL); + setkeybinding(MODKEY_SHIFT, XK_backslash, KF_FLIP_LAYOUT, NULL); + setkeybinding(MODKEY, XK_t, KF_FLOAT_TOGGLE,NULL); + setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, NULL); + setkeybinding(MODKEY, XK_j, KF_FOCUS_NEXT, NULL); + 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_SHIFT, XK_equal, KF_HEIGHT_GROW,NULL); + setkeybinding(MODKEY_SHIFT, XK_minus, KF_HEIGHT_SHRINK,NULL); + setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL); setkeybinding(MODKEY, XK_h, KF_MASTER_SHRINK, NULL); setkeybinding(MODKEY, XK_l, KF_MASTER_GROW, NULL); setkeybinding(MODKEY, XK_comma, KF_MASTER_ADD, NULL); setkeybinding(MODKEY, XK_period, KF_MASTER_DEL, NULL); - setkeybinding(MODKEY|ShiftMask, XK_comma, KF_STACK_INC, NULL); - setkeybinding(MODKEY|ShiftMask, XK_period, KF_STACK_DEC, NULL); - setkeybinding(MODKEY, XK_Return, KF_SWAP_MAIN, NULL); - setkeybinding(MODKEY, XK_j, KF_FOCUS_NEXT, NULL); - setkeybinding(MODKEY, XK_k, KF_FOCUS_PREV, NULL); - setkeybinding(MODKEY|ShiftMask, XK_j, KF_SWAP_NEXT, NULL); - setkeybinding(MODKEY|ShiftMask, XK_k, KF_SWAP_PREV, NULL); - setkeybinding(MODKEY|ShiftMask, XK_Return, KF_SPAWN_CUSTOM,"term"); - setkeybinding(MODKEY, XK_p, KF_SPAWN_CUSTOM,"menu"); - setkeybinding(MODKEY|ShiftMask, XK_q, KF_QUIT, NULL); + setkeybinding(MODKEY_SHIFT, XK_bracketright,KF_MOVE_DOWN,NULL); + setkeybinding(MODKEY, XK_bracketleft, KF_MOVE_LEFT,NULL); + setkeybinding(MODKEY, XK_bracketright,KF_MOVE_RIGHT,NULL); + setkeybinding(MODKEY_SHIFT, XK_bracketleft, KF_MOVE_UP, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_End, KF_MVRG_1, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_Down, KF_MVRG_2, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_Next, KF_MVRG_3, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_Left, KF_MVRG_4, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_Begin, KF_MVRG_5, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_Right, KF_MVRG_6, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_Home, KF_MVRG_7, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_Up, KF_MVRG_8, NULL); + setkeybinding(MODKEY_SHIFT, XK_KP_Prior, KF_MVRG_9, NULL); + setkeybinding(MODKEY_SHIFT, XK_1, KF_MVWS_1, NULL); + setkeybinding(MODKEY_SHIFT, XK_2, KF_MVWS_2, NULL); + setkeybinding(MODKEY_SHIFT, XK_3, KF_MVWS_3, NULL); + setkeybinding(MODKEY_SHIFT, XK_4, KF_MVWS_4, NULL); + setkeybinding(MODKEY_SHIFT, XK_5, KF_MVWS_5, NULL); + setkeybinding(MODKEY_SHIFT, XK_6, KF_MVWS_6, NULL); + setkeybinding(MODKEY_SHIFT, XK_7, KF_MVWS_7, NULL); + setkeybinding(MODKEY_SHIFT, XK_8, KF_MVWS_8, NULL); + setkeybinding(MODKEY_SHIFT, XK_9, KF_MVWS_9, NULL); + setkeybinding(MODKEY_SHIFT, XK_0, KF_MVWS_10, NULL); + setkeybinding(MODKEY_SHIFT, XK_F1, KF_MVWS_11, NULL); + setkeybinding(MODKEY_SHIFT, XK_F2, KF_MVWS_12, NULL); + setkeybinding(MODKEY_SHIFT, XK_F3, KF_MVWS_13, NULL); + setkeybinding(MODKEY_SHIFT, XK_F4, KF_MVWS_14, NULL); + setkeybinding(MODKEY_SHIFT, XK_F5, KF_MVWS_15, NULL); + setkeybinding(MODKEY_SHIFT, XK_F6, KF_MVWS_16, NULL); + setkeybinding(MODKEY_SHIFT, XK_F7, KF_MVWS_17, NULL); + setkeybinding(MODKEY_SHIFT, XK_F8, KF_MVWS_18, NULL); + setkeybinding(MODKEY_SHIFT, XK_F9, KF_MVWS_19, NULL); + setkeybinding(MODKEY_SHIFT, XK_F10, KF_MVWS_20, NULL); + setkeybinding(MODKEY_SHIFT, XK_F11, KF_MVWS_21, NULL); + setkeybinding(MODKEY_SHIFT, XK_F12, KF_MVWS_22, NULL); + setkeybinding(MODKEY_SHIFT, XK_slash, KF_NAME_WORKSPACE,NULL); + setkeybinding(MODKEY_SHIFT, XK_q, KF_QUIT, NULL); + setkeybinding(MODKEY_SHIFT, XK_r, KF_RAISE_TOGGLE,NULL); setkeybinding(MODKEY, XK_q, KF_RESTART, NULL); - setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, NULL); + setkeybinding(MODKEY, XK_KP_End, KF_RG_1, NULL); + setkeybinding(MODKEY, XK_KP_Down, KF_RG_2, NULL); + setkeybinding(MODKEY, XK_KP_Next, KF_RG_3, NULL); + setkeybinding(MODKEY, XK_KP_Left, KF_RG_4, NULL); + setkeybinding(MODKEY, XK_KP_Begin, KF_RG_5, NULL); + setkeybinding(MODKEY, XK_KP_Right, KF_RG_6, NULL); + setkeybinding(MODKEY, XK_KP_Home, KF_RG_7, NULL); + setkeybinding(MODKEY, XK_KP_Up, KF_RG_8, NULL); + setkeybinding(MODKEY, XK_KP_Prior, KF_RG_9, NULL); + setkeybinding(MODKEY_SHIFT, XK_Right, KF_RG_NEXT, NULL); + setkeybinding(MODKEY_SHIFT, XK_Left, KF_RG_PREV, NULL); + setkeybinding(MODKEY, XK_f, KF_SEARCH_WIN, NULL); + setkeybinding(MODKEY, XK_slash, KF_SEARCH_WORKSPACE,NULL); + setkeybinding(MODKEY_SHIFT, XK_i, KF_SPAWN_CUSTOM,"initscr"); + setkeybinding(MODKEY_SHIFT, XK_Delete, KF_SPAWN_CUSTOM,"lock"); + setkeybinding(MODKEY, XK_p, KF_SPAWN_CUSTOM,"menu"); + setkeybinding(MODKEY, XK_s, KF_SPAWN_CUSTOM,"screenshot_all"); + setkeybinding(MODKEY_SHIFT, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind"); + setkeybinding(MODKEY_SHIFT, XK_Return, KF_SPAWN_CUSTOM,"term"); + setkeybinding(MODKEY_SHIFT, XK_comma, KF_STACK_INC, NULL); + setkeybinding(MODKEY_SHIFT, XK_period, KF_STACK_DEC, NULL); + setkeybinding(MODKEY_SHIFT, XK_space, KF_STACK_RESET, NULL); + setkeybinding(MODKEY, XK_Return, KF_SWAP_MAIN, NULL); + setkeybinding(MODKEY_SHIFT, XK_j, KF_SWAP_NEXT, NULL); + setkeybinding(MODKEY_SHIFT, XK_k, KF_SWAP_PREV, NULL); + setkeybinding(MODKEY_SHIFT, XK_w, KF_UNICONIFY, NULL); + setkeybinding(MODKEY_SHIFT, XK_v, KF_VERSION, NULL); + setkeybinding(MODKEY, XK_equal, KF_WIDTH_GROW, NULL); + setkeybinding(MODKEY, XK_minus, KF_WIDTH_SHRINK,NULL); + setkeybinding(MODKEY, XK_x, KF_WIND_DEL, NULL); + setkeybinding(MODKEY_SHIFT, XK_x, KF_WIND_KILL, NULL); setkeybinding(MODKEY, XK_1, KF_WS_1, NULL); setkeybinding(MODKEY, XK_2, KF_WS_2, NULL); setkeybinding(MODKEY, XK_3, KF_WS_3, NULL); @@ -5379,60 +6471,13 @@ 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); - setkeybinding(MODKEY|ShiftMask, XK_Right, KF_SCREEN_NEXT, NULL); - setkeybinding(MODKEY|ShiftMask, XK_Left, KF_SCREEN_PREV, NULL); - setkeybinding(MODKEY|ShiftMask, XK_1, KF_MVWS_1, NULL); - setkeybinding(MODKEY|ShiftMask, XK_2, KF_MVWS_2, NULL); - setkeybinding(MODKEY|ShiftMask, XK_3, KF_MVWS_3, NULL); - setkeybinding(MODKEY|ShiftMask, XK_4, KF_MVWS_4, NULL); - setkeybinding(MODKEY|ShiftMask, XK_5, KF_MVWS_5, NULL); - setkeybinding(MODKEY|ShiftMask, XK_6, KF_MVWS_6, NULL); - setkeybinding(MODKEY|ShiftMask, XK_7, KF_MVWS_7, NULL); - setkeybinding(MODKEY|ShiftMask, XK_8, KF_MVWS_8, NULL); - setkeybinding(MODKEY|ShiftMask, XK_9, KF_MVWS_9, NULL); - setkeybinding(MODKEY|ShiftMask, XK_0, KF_MVWS_10, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F1, KF_MVWS_11, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F2, KF_MVWS_12, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F3, KF_MVWS_13, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F4, KF_MVWS_14, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F5, KF_MVWS_15, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F6, KF_MVWS_16, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F7, KF_MVWS_17, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F8, KF_MVWS_18, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F9, KF_MVWS_19, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F10, KF_MVWS_20, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F11, KF_MVWS_21, NULL); - setkeybinding(MODKEY|ShiftMask, XK_F12, KF_MVWS_22, NULL); - setkeybinding(MODKEY, XK_b, KF_BAR_TOGGLE, NULL); - setkeybinding(MODKEY, XK_Tab, KF_FOCUS_NEXT, NULL); - setkeybinding(MODKEY|ShiftMask, XK_Tab, KF_FOCUS_PREV, NULL); - setkeybinding(MODKEY|ShiftMask, XK_x, KF_WIND_KILL, NULL); - setkeybinding(MODKEY, XK_x, KF_WIND_DEL, NULL); - setkeybinding(MODKEY, XK_s, KF_SPAWN_CUSTOM,"screenshot_all"); - setkeybinding(MODKEY|ShiftMask, XK_s, KF_SPAWN_CUSTOM,"screenshot_wind"); - setkeybinding(MODKEY, XK_t, KF_FLOAT_TOGGLE,NULL); - setkeybinding(MODKEY|ShiftMask, XK_v, KF_VERSION, NULL); - setkeybinding(MODKEY|ShiftMask, XK_Delete, KF_SPAWN_CUSTOM,"lock"); - setkeybinding(MODKEY|ShiftMask, XK_i, KF_SPAWN_CUSTOM,"initscr"); - setkeybinding(MODKEY, XK_w, KF_ICONIFY, NULL); - setkeybinding(MODKEY|ShiftMask, XK_w, KF_UNICONIFY, NULL); - setkeybinding(MODKEY|ShiftMask, XK_r, KF_RAISE_TOGGLE,NULL); - setkeybinding(MODKEY, XK_v, KF_BUTTON2, NULL); - setkeybinding(MODKEY, XK_equal, KF_WIDTH_GROW, NULL); - setkeybinding(MODKEY, XK_minus, KF_WIDTH_SHRINK,NULL); - setkeybinding(MODKEY|ShiftMask, XK_equal, KF_HEIGHT_GROW,NULL); - setkeybinding(MODKEY|ShiftMask, XK_minus, KF_HEIGHT_SHRINK,NULL); - setkeybinding(MODKEY, XK_bracketleft, KF_MOVE_LEFT,NULL); - setkeybinding(MODKEY, XK_bracketright,KF_MOVE_RIGHT,NULL); - setkeybinding(MODKEY|ShiftMask, XK_bracketleft, KF_MOVE_UP, NULL); - setkeybinding(MODKEY|ShiftMask, XK_bracketright,KF_MOVE_DOWN,NULL); - setkeybinding(MODKEY|ShiftMask, XK_slash, KF_NAME_WORKSPACE,NULL); - setkeybinding(MODKEY, XK_slash, KF_SEARCH_WORKSPACE,NULL); - setkeybinding(MODKEY, XK_f, KF_SEARCH_WIN, NULL); #ifdef SWM_DEBUG - setkeybinding(MODKEY|ShiftMask, XK_d, KF_DUMPWINS, NULL); + setkeybinding(MODKEY_SHIFT, XK_d, KF_DUMPWINS, NULL); #endif +#undef MODKEY_SHIFT } void @@ -5449,19 +6494,25 @@ clear_keys(void) int setkeymapping(char *selector, char *value, int flags) { - char keymapping_file[PATH_MAX]; + char *keymapping_file; + + /* suppress unused warnings since vars are needed */ + (void)selector; + (void)flags; + DNPRINTF(SWM_D_KEY, "setkeymapping: enter\n"); - if (value[0] == '~') - snprintf(keymapping_file, sizeof keymapping_file, "%s/%s", - pwd->pw_dir, &value[1]); - else - strlcpy(keymapping_file, value, sizeof keymapping_file); + + keymapping_file = expand_tilde(value); + clear_keys(); /* load new key bindings; if it fails, revert to default bindings */ if (conf_load(keymapping_file, SWM_CONF_KEYMAPPING)) { clear_keys(); setup_keys(); } + + free(keymapping_file); + DNPRINTF(SWM_D_KEY, "setkeymapping: leave\n"); return (0); } @@ -5471,9 +6522,8 @@ updatenumlockmask(void) { unsigned int i, j; xcb_get_modifier_mapping_reply_t *modmap_r; - xcb_keycode_t *modmap, kc; + xcb_keycode_t *modmap, kc, *keycode; - DNPRINTF(SWM_D_MISC, "updatenumlockmask\n"); numlockmask = 0; modmap_r = xcb_get_modifier_mapping_reply(conn, @@ -5485,74 +6535,87 @@ updatenumlockmask(void) for (j = 0; j < modmap_r->keycodes_per_modifier; j++) { kc = modmap[i * modmap_r->keycodes_per_modifier + j]; - - if (kc == *((xcb_keycode_t *)xcb_key_symbols_get_keycode(syms, - XK_Num_Lock))) + keycode = xcb_key_symbols_get_keycode(syms, + XK_Num_Lock); + if (kc == *keycode) numlockmask = (1 << i); + free(keycode); } } free(modmap_r); } + DNPRINTF(SWM_D_MISC, "updatenumlockmask: %d\n", numlockmask); } void grabkeys(void) { - int num_screens, k; - unsigned int j; - xcb_keycode_t *code; - unsigned int modifiers[] = - { 0, LockMask, numlockmask, numlockmask | LockMask }; struct key *kp; + int num_screens, k, j; + unsigned int modifiers[4]; + xcb_keycode_t *code; DNPRINTF(SWM_D_MISC, "grabkeys\n"); updatenumlockmask(); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + modifiers[0] = 0; + modifiers[1] = numlockmask; + modifiers[2] = XCB_MOD_MASK_LOCK; + modifiers[3] = numlockmask | XCB_MOD_MASK_LOCK; + + 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))) + kp->keysym))) { for (j = 0; j < LENGTH(modifiers); j++) - xcb_grab_key(conn, True, + xcb_grab_key(conn, 1, screens[k].root, kp->mod | modifiers[j], - *code, XCB_GRAB_MODE_ASYNC, - XCB_GRAB_MODE_ASYNC); + *code, XCB_GRAB_MODE_SYNC, + XCB_GRAB_MODE_SYNC); + free(code); + } } } } void -grabbuttons(struct ws_win *win, int focused) +grabbuttons(struct ws_win *win) { - unsigned int i, j; - unsigned int modifiers[] = - { 0, LockMask, numlockmask, numlockmask|LockMask }; + unsigned int modifiers[4]; + int i, j; + DNPRINTF(SWM_D_MOUSE, "grabbuttons: win 0x%x\n", win->id); updatenumlockmask(); - xcb_ungrab_button(conn, XCB_BUTTON_INDEX_ANY, win->id, - XCB_BUTTON_MASK_ANY); - if (focused) { - for (i = 0; i < LENGTH(buttons); i++) - if (buttons[i].action == client_click) - for (j = 0; j < LENGTH(modifiers); j++) - xcb_grab_button(conn, False, win->id, - BUTTONMASK, - XCB_GRAB_MODE_ASYNC, - XCB_GRAB_MODE_SYNC, - XCB_WINDOW_NONE, - XCB_CURSOR_NONE, - buttons[i].button, - buttons[i].mask); - } else - xcb_grab_button(conn, False, win->id, BUTTONMASK, - XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_SYNC, XCB_WINDOW_NONE, - XCB_CURSOR_NONE, XCB_BUTTON_INDEX_ANY, XCB_BUTTON_MASK_ANY); + + modifiers[0] = 0; + modifiers[1] = numlockmask; + modifiers[2] = XCB_MOD_MASK_LOCK; + modifiers[3] = numlockmask | XCB_MOD_MASK_LOCK; + + for (i = 0; i < LENGTH(buttons); i++) + if (buttons[i].action == client_click) + for (j = 0; j < LENGTH(modifiers); ++j) + xcb_grab_button(conn, 0, win->id, BUTTONMASK, + XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, + XCB_WINDOW_NONE, XCB_CURSOR_NONE, + buttons[i].button, buttons[i].mask | + modifiers[j]); } const char *quirkname[] = { @@ -5563,6 +6626,8 @@ const char *quirkname[] = { "XTERM_FONTADJ", "FULLSCREEN", "FOCUSPREV", + "NOFOCUSONMAP", + "FOCUSONMAP_SINGLE", }; /* SWM_Q_WS: retain '|' for back compat for now (2009-08-11) */ @@ -5658,6 +6723,7 @@ setquirk(const char *class, const char *name, unsigned long quirk) DNPRINTF(SWM_D_QUIRK, "setquirk: enter %s:%s [%lu]\n", class, name, quirk); + /* Remove/replace existing quirk. */ TAILQ_FOREACH(qp, &quirks, entry) { if (!strcmp(qp->class, class) && !strcmp(qp->name, name)) { if (!quirk) @@ -5668,12 +6734,11 @@ setquirk(const char *class, const char *name, unsigned long quirk) return; } } - if (!quirk) { - warnx("error: setquirk: cannot find class/name combination"); - return; - } - quirk_insert(class, name, quirk); + /* Only insert if quirk is not NONE. */ + if (quirk) + quirk_insert(class, name, quirk); + DNPRINTF(SWM_D_QUIRK, "setquirk: leave\n"); } @@ -5682,7 +6747,11 @@ setconfquirk(char *selector, char *value, int flags) { char *cp, *class, *name; int retval; - unsigned long quirks; + unsigned long qrks; + + /* suppress unused warning since var is needed */ + (void)flags; + if (selector == NULL) return (0); if ((cp = strchr(selector, ':')) == NULL) @@ -5690,8 +6759,8 @@ setconfquirk(char *selector, char *value, int flags) *cp = '\0'; class = selector; name = cp + 1; - if ((retval = parsequirks(value, &quirks)) == 0) - setquirk(class, name, quirks); + if ((retval = parsequirks(value, &qrks)) == 0) + setquirk(class, name, qrks); return (retval); } @@ -5723,6 +6792,7 @@ enum { SWM_S_BAR_BORDER_WIDTH, SWM_S_BAR_DELAY, SWM_S_BAR_ENABLED, + SWM_S_BAR_ENABLED_WS, SWM_S_BAR_FONT, SWM_S_BAR_FORMAT, SWM_S_BAR_JUSTIFY, @@ -5737,12 +6807,14 @@ enum { SWM_S_FOCUS_CLOSE_WRAP, SWM_S_FOCUS_DEFAULT, SWM_S_FOCUS_MODE, + SWM_S_REGION_PADDING, SWM_S_SPAWN_ORDER, SWM_S_SPAWN_TERM, SWM_S_SS_APP, SWM_S_SS_ENABLED, 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, @@ -5754,13 +6826,17 @@ enum { int setconfvalue(char *selector, char *value, int flags) { - int i; - char *b; + struct workspace *ws; + int i, ws_id, num_screens; + char *b; + + /* suppress unused warning since var is needed */ + (void)selector; switch (flags) { case SWM_S_BAR_ACTION: free(bar_argv[0]); - if ((bar_argv[0] = strdup(value)) == NULL) + if ((bar_argv[0] = expand_tilde(value)) == NULL) err(1, "setconfvalue: bar_action"); break; case SWM_S_BAR_AT_BOTTOM: @@ -5772,17 +6848,43 @@ setconfvalue(char *selector, char *value, int flags) bar_border_width = 0; break; case SWM_S_BAR_DELAY: - bar_delay = atoi(value); + /* No longer needed; leave to not break old conf files. */ break; case SWM_S_BAR_ENABLED: bar_enabled = atoi(value); break; + case SWM_S_BAR_ENABLED_WS: + ws_id = atoi(selector) - 1; + if (ws_id < 0 || ws_id >= workspace_limit) + errx(1, "setconfvalue: bar_enabled_ws: invalid " + "workspace %d.", ws_id + 1); + + 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); + } + break; case SWM_S_BAR_FONT: b = bar_fonts; if (asprintf(&bar_fonts, "%s,%s", value, bar_fonts) == -1) err(1, "setconfvalue: asprintf: failed to allocate " "memory for bar_fonts."); free(b); + + /* If already in xft mode, then we are done. */ + if (!bar_font_legacy) + break; + + /* If there are any non-XLFD entries, switch to Xft mode. */ + while ((b = strsep(&value, ",")) != NULL) { + if (*b == '\0') + continue; + if (!isxlfd(b)) { + bar_font_legacy = 0; + break; + } + } break; case SWM_S_BAR_FORMAT: free(bar_format); @@ -5854,13 +6956,19 @@ setconfvalue(char *selector, char *value, int flags) case SWM_S_FOCUS_MODE: if (!strcmp(value, "default")) focus_mode = SWM_FOCUS_DEFAULT; - else if (!strcmp(value, "follow_cursor")) + else if (!strcmp(value, "follow") || + !strcmp(value, "follow_cursor")) focus_mode = SWM_FOCUS_FOLLOW; - else if (!strcmp(value, "synergy")) - focus_mode = SWM_FOCUS_SYNERGY; + else if (!strcmp(value, "manual")) + focus_mode = SWM_FOCUS_MANUAL; else errx(1, "focus_mode"); 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")) spawn_position = SWM_STACK_BOTTOM; @@ -5878,9 +6986,10 @@ setconfvalue(char *selector, char *value, int flags) setconfspawn("spawn_term", value, 0); break; case SWM_S_SS_APP: + /* No longer needed; leave to not break old conf files. */ break; case SWM_S_SS_ENABLED: - ss_enabled = atoi(value); + /* No longer needed; leave to not break old conf files. */ break; case SWM_S_STACK_ENABLED: stack_enabled = atoi(value); @@ -5890,6 +6999,11 @@ setconfvalue(char *selector, char *value, int flags) if (term_width < 0) term_width = 0; 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; @@ -5927,14 +7041,18 @@ setconfvalue(char *selector, char *value, int flags) int setconfmodkey(char *selector, char *value, int flags) { + /* suppress unused warnings since vars are needed */ + (void)selector; + (void)flags; + if (!strncasecmp(value, "Mod1", strlen("Mod1"))) - update_modkey(Mod1Mask); + update_modkey(XCB_MOD_MASK_1); else if (!strncasecmp(value, "Mod2", strlen("Mod2"))) - update_modkey(Mod2Mask); + update_modkey(XCB_MOD_MASK_2); else if (!strncasecmp(value, "Mod3", strlen("Mod3"))) - update_modkey(Mod3Mask); + update_modkey(XCB_MOD_MASK_3); else if (!strncasecmp(value, "Mod4", strlen("Mod4"))) - update_modkey(Mod4Mask); + update_modkey(XCB_MOD_MASK_4); else return (1); return (0); @@ -5950,6 +7068,10 @@ setconfcolor(char *selector, char *value, int flags) int setconfregion(char *selector, char *value, int flags) { + /* suppress unused warnings since vars are needed */ + (void)selector; + (void)flags; + custom_region(value); return (0); } @@ -5959,12 +7081,16 @@ setautorun(char *selector, char *value, int flags) { int ws_id; char s[1024]; - char *ap, *sp = s; + char *ap, *sp; union arg a; int argc = 0; pid_t pid; struct pid_e *p; + /* suppress unused warnings since vars are needed */ + (void)selector; + (void)flags; + if (getenv("SWM_STARTED")) return (0); @@ -5975,6 +7101,8 @@ setautorun(char *selector, char *value, int flags) if (ws_id < 0 || ws_id >= workspace_limit) errx(1, "autorun: invalid workspace %d", ws_id + 1); + sp = expand_tilde((char *)&s); + /* * This is a little intricate * @@ -5992,6 +7120,7 @@ setautorun(char *selector, char *value, int flags) err(1, "setautorun: realloc"); a.argv[argc - 1] = ap; } + free(sp); if ((a.argv = realloc(a.argv, (argc + 1) * sizeof(char *))) == NULL) err(1, "setautorun: realloc"); @@ -6022,17 +7151,21 @@ setautorun(char *selector, char *value, int flags) int setlayout(char *selector, char *value, int flags) { - int ws_id, i, x, mg, ma, si, raise, f = 0; + int ws_id, i, x, mg, ma, si, ar, f = 0; int st = SWM_V_STACK, num_screens; char s[1024]; struct workspace *ws; + /* suppress unused warnings since vars are needed */ + (void)selector; + (void)flags; + if (getenv("SWM_STARTED")) return (0); bzero(s, sizeof s); if (sscanf(value, "ws[%d]:%d:%d:%d:%d:%1023c", - &ws_id, &mg, &ma, &si, &raise, s) != 6) + &ws_id, &mg, &ma, &si, &ar, s) != 6) errx(1, "invalid layout entry, should be 'ws[]:" "::::" "'"); @@ -6057,12 +7190,12 @@ setlayout(char *selector, char *value, int flags) "::::" "'"); - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + num_screens = get_screen_count(); for (i = 0; i < num_screens; i++) { ws = (struct workspace *)&screens[i].ws; ws[ws_id].cur_layout = &layouts[st]; - ws[ws_id].always_raise = raise; + ws[ws_id].always_raise = ar; if (st == SWM_MAX_STACK) continue; @@ -6095,6 +7228,8 @@ setlayout(char *selector, char *value, int flags) } } + focus_flush(); + return (0); } @@ -6105,61 +7240,89 @@ struct config_option { int funcflags; }; struct config_option configopt[] = { - { "bar_enabled", setconfvalue, SWM_S_BAR_ENABLED }, + { "autorun", setautorun, 0 }, + { "bar_action", setconfvalue, SWM_S_BAR_ACTION }, { "bar_at_bottom", setconfvalue, SWM_S_BAR_AT_BOTTOM }, { "bar_border", setconfcolor, SWM_S_COLOR_BAR_BORDER }, + { "bar_border_unfocus", setconfcolor, SWM_S_COLOR_BAR_BORDER_UNFOCUS }, { "bar_border_width", setconfvalue, SWM_S_BAR_BORDER_WIDTH }, { "bar_color", setconfcolor, SWM_S_COLOR_BAR }, - { "bar_font_color", setconfcolor, SWM_S_COLOR_BAR_FONT }, - { "bar_font", setconfvalue, SWM_S_BAR_FONT }, - { "bar_action", setconfvalue, SWM_S_BAR_ACTION }, { "bar_delay", setconfvalue, SWM_S_BAR_DELAY }, - { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY }, + { "bar_enabled", setconfvalue, SWM_S_BAR_ENABLED }, + { "bar_enabled_ws", setconfvalue, SWM_S_BAR_ENABLED_WS }, + { "bar_font", setconfvalue, SWM_S_BAR_FONT }, + { "bar_font_color", setconfcolor, SWM_S_COLOR_BAR_FONT }, { "bar_format", setconfvalue, SWM_S_BAR_FORMAT }, - { "keyboard_mapping", setkeymapping, 0 }, + { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY }, { "bind", setconfbinding, 0 }, - { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED }, + { "border_width", setconfvalue, SWM_S_BORDER_WIDTH }, { "clock_enabled", setconfvalue, SWM_S_CLOCK_ENABLED }, { "clock_format", setconfvalue, SWM_S_CLOCK_FORMAT }, { "color_focus", setconfcolor, SWM_S_COLOR_FOCUS }, { "color_unfocus", setconfcolor, SWM_S_COLOR_UNFOCUS }, { "cycle_empty", setconfvalue, SWM_S_CYCLE_EMPTY }, { "cycle_visible", setconfvalue, SWM_S_CYCLE_VISIBLE }, - { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT }, { "dialog_ratio", setconfvalue, SWM_S_DIALOG_RATIO }, - { "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT }, + { "disable_border", setconfvalue, SWM_S_DISABLE_BORDER }, + { "focus_close", setconfvalue, SWM_S_FOCUS_CLOSE }, + { "focus_close_wrap", setconfvalue, SWM_S_FOCUS_CLOSE_WRAP }, + { "focus_default", setconfvalue, SWM_S_FOCUS_DEFAULT }, + { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE }, + { "keyboard_mapping", setkeymapping, 0 }, + { "layout", setlayout, 0 }, { "modkey", setconfmodkey, 0 }, { "program", setconfspawn, 0 }, { "quirk", setconfquirk, 0 }, { "region", setconfregion, 0 }, - { "spawn_term", setconfvalue, SWM_S_SPAWN_TERM }, - { "screenshot_enabled", setconfvalue, SWM_S_SS_ENABLED }, + { "region_padding", setconfvalue, SWM_S_REGION_PADDING }, { "screenshot_app", setconfvalue, SWM_S_SS_APP }, - { "window_name_enabled", setconfvalue, SWM_S_WINDOW_NAME_ENABLED }, - { "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED }, + { "screenshot_enabled", setconfvalue, SWM_S_SS_ENABLED }, + { "spawn_position", setconfvalue, SWM_S_SPAWN_ORDER }, + { "spawn_term", setconfvalue, SWM_S_SPAWN_TERM }, + { "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 }, - { "focus_mode", setconfvalue, SWM_S_FOCUS_MODE }, - { "focus_close", setconfvalue, SWM_S_FOCUS_CLOSE }, - { "focus_close_wrap", setconfvalue, SWM_S_FOCUS_CLOSE_WRAP }, - { "focus_default", setconfvalue, SWM_S_FOCUS_DEFAULT }, - { "spawn_position", setconfvalue, SWM_S_SPAWN_ORDER }, - { "disable_border", setconfvalue, SWM_S_DISABLE_BORDER }, - { "border_width", setconfvalue, SWM_S_BORDER_WIDTH }, - { "autorun", setautorun, 0 }, - { "layout", setlayout, 0 }, + { "urgent_enabled", setconfvalue, SWM_S_URGENT_ENABLED }, + { "verbose_layout", setconfvalue, SWM_S_VERBOSE_LAYOUT }, + { "window_name_enabled", setconfvalue, SWM_S_WINDOW_NAME_ENABLED }, + { "workspace_limit", setconfvalue, SWM_S_WORKSPACE_LIMIT }, }; +void +_add_startup_exception(const char *fmt, va_list ap) +{ + if (vasprintf(&startup_exception, fmt, ap) == -1) + warn("%s: asprintf", __func__); +} + +void +add_startup_exception(const char *fmt, ...) +{ + va_list ap; + + nr_exceptions++; + + if (startup_exception) + return; + + /* force bar to be enabled due to exception */ + bar_enabled = 1; + + va_start(ap, fmt); + _add_startup_exception(fmt, ap); + va_end(ap); +} int -conf_load(char *filename, int keymapping) +conf_load(const char *filename, int keymapping) { FILE *config; - char *line, *cp, *optsub, *optval; + char *line = NULL, *cp, *optsub, *optval = NULL; size_t linelen, lineno = 0; - int wordlen, i, optind; - struct config_option *opt; + int wordlen, i, optidx; + struct config_option *opt = NULL; DNPRINTF(SWM_D_CONF, "conf_load: begin\n"); @@ -6167,14 +7330,20 @@ conf_load(char *filename, int keymapping) warnx("conf_load: no filename"); return (1); } + + DNPRINTF(SWM_D_CONF, "conf_load: open %s\n", filename); + if ((config = fopen(filename, "r")) == NULL) { warn("conf_load: fopen: %s", filename); return (1); } while (!feof(config)) { - if ((line = fparseln(config, &linelen, &lineno, NULL, 0)) - == NULL) { + if (line) + free(line); + + if ((line = fparseln(config, &linelen, &lineno, NULL, + FPARSELN_UNESCCOMM | FPARSELN_UNESCCONT)) == NULL) { if (ferror(config)) err(1, "%s", filename); else @@ -6184,37 +7353,39 @@ conf_load(char *filename, int keymapping) cp += strspn(cp, " \t\n"); /* eat whitespace */ if (cp[0] == '\0') { /* empty line */ - free(line); continue; } /* get config option */ wordlen = strcspn(cp, "=[ \t\n"); if (wordlen == 0) { - warnx("%s: line %zd: no option found", + add_startup_exception("%s: line %zd: no option found", filename, lineno); - goto out; + continue; } - optind = -1; + optidx = -1; for (i = 0; i < LENGTH(configopt); i++) { opt = &configopt[i]; if (!strncasecmp(cp, opt->optname, wordlen) && (int)strlen(opt->optname) == wordlen) { - optind = i; + optidx = i; break; } } - if (optind == -1) { - warnx("%s: line %zd: unknown option %.*s", - filename, lineno, wordlen, cp); - goto out; + if (optidx == -1) { + add_startup_exception("%s: line %zd: unknown option " + "%.*s", filename, lineno, wordlen, cp); + continue; } - if (keymapping && strcmp(opt->optname, "bind")) { - warnx("%s: line %zd: invalid option %.*s", - filename, lineno, wordlen, cp); - goto out; + if (keymapping && opt && strcmp(opt->optname, "bind")) { + add_startup_exception("%s: line %zd: invalid option " + "%.*s", filename, lineno, wordlen, cp); + continue; } cp += wordlen; cp += strspn(cp, " \t\n"); /* eat whitespace */ + + /* from here on out we call goto invalid to continue */ + /* get [selector] if any */ optsub = NULL; if (*cp == '[') { @@ -6222,17 +7393,17 @@ conf_load(char *filename, int keymapping) wordlen = strcspn(cp, "]"); if (*cp != ']') { if (wordlen == 0) { - warnx("%s: line %zd: syntax error", - filename, lineno); - goto out; + add_startup_exception("%s: line %zd: " + "syntax error", filename, lineno); + goto invalid; } if (asprintf(&optsub, "%.*s", wordlen, cp) == -1) { - warnx("%s: line %zd: unable to allocate" - "memory for selector", filename, - lineno); - goto out; + add_startup_exception("%s: line %zd: " + "unable to allocatememory for " + "selector", filename, lineno); + goto invalid; } } cp += wordlen; @@ -6241,27 +7412,36 @@ conf_load(char *filename, int keymapping) cp += strspn(cp, "= \t\n"); /* eat trailing */ /* get RHS value */ optval = strdup(cp); + if (strlen(optval) == 0) { + add_startup_exception("%s: line %zd: must supply value " + "to %s", filename, lineno, + configopt[optidx].optname); + goto invalid; + } /* call function to deal with it all */ - if (configopt[optind].func(optsub, optval, - configopt[optind].funcflags) != 0) - errx(1, "%s: line %zd: invalid data for %s", - filename, lineno, configopt[optind].optname); - free(optval); - free(optsub); - free(line); + 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; + } } + if (line) + free(line); fclose(config); DNPRINTF(SWM_D_CONF, "conf_load: end\n"); return (0); - -out: - free(line); - fclose(config); - DNPRINTF(SWM_D_CONF, "conf_load: end with error.\n"); - - return (1); } void @@ -6274,12 +7454,12 @@ set_child_transient(struct ws_win *win, xcb_window_t *trans) parent = find_window(win->transient); if (parent) - parent->child_trans = win; + parent->focus_child = win; else { 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); + r = root_to_region(win->wa->root, SWM_CK_ALL); ws = r->ws; /* parent doen't exist in our window list */ TAILQ_FOREACH(w, &ws->winlist, entry) { @@ -6293,7 +7473,7 @@ set_child_transient(struct ws_win *win, xcb_window_t *trans) if (win->hints.window_group != wmh.window_group) continue; - w->child_trans = win; + w->focus_child = win; win->transient = w->id; *trans = w->id; DNPRINTF(SWM_D_MISC, "set_child_transient: adjusting " @@ -6316,7 +7496,7 @@ window_get_pid(xcb_window_t win) if (apid == XCB_ATOM_NONE) goto tryharder; - pc = xcb_get_property(conn, False, win, apid, XCB_ATOM_CARDINAL, 0, 1); + pc = xcb_get_property(conn, 0, win, apid, XCB_ATOM_CARDINAL, 0, 1); pr = xcb_get_property_reply(conn, pc, NULL); if (!pr) goto tryharder; @@ -6325,19 +7505,20 @@ window_get_pid(xcb_window_t win) goto tryharder; } - ret = *((pid_t *)xcb_get_property_value(pr)); + if (pr->type == apid && pr->format == 32) + ret = *((pid_t *)xcb_get_property_value(pr)); free(pr); return (ret); tryharder: apid = get_atom_from_string("_SWM_PID"); - pc = xcb_get_property(conn, False, win, apid, XCB_ATOM_STRING, + pc = xcb_get_property(conn, 0, win, apid, XCB_ATOM_STRING, 0, SWM_PROPLEN); pr = xcb_get_property_reply(conn, pc, NULL); if (!pr) return (0); - if (pr->type != XCB_ATOM_STRING) { + if (pr->type != apid) { free(pr); return (0); } @@ -6348,114 +7529,131 @@ tryharder: return (ret); } +int +get_ws_idx(xcb_window_t id) +{ + int ws_idx = -1; + char *prop = NULL; + size_t proplen; + const char *errstr; + xcb_get_property_reply_t *gpr; + + gpr = xcb_get_property_reply(conn, + xcb_get_property(conn, 0, id, a_swm_ws, + XCB_ATOM_STRING, 0, SWM_PROPLEN), + NULL); + if (!gpr) + return (-1); + if (gpr->type) { + proplen = xcb_get_property_value_length(gpr); + if (proplen > 0) { + prop = malloc(proplen + 1); + if (prop) { + memcpy(prop, + xcb_get_property_value(gpr), + proplen); + prop[proplen] = '\0'; + } + } + } + free(gpr); + + if (prop) { + DNPRINTF(SWM_D_PROP, "get_ws_idx: _SWM_WS: %s\n", prop); + ws_idx = (int)strtonum(prop, 0, workspace_limit - 1, &errstr); + if (errstr) { + DNPRINTF(SWM_D_PROP, "get_ws_idx: window: #%s: %s", + errstr, prop); + } + free(prop); + } + + return ws_idx; +} + struct ws_win * -manage_window(xcb_window_t id) +manage_window(xcb_window_t id, uint16_t mapped) { xcb_window_t trans = XCB_WINDOW_NONE; - struct workspace *ws; struct ws_win *win, *ww; - int ws_idx, border_me = 0; - xcb_atom_t ws_idx_atom = XCB_ATOM_NONE; - char ws_idx_str[SWM_PROPLEN], *prop = NULL; - size_t proplen; + int ws_idx; + char ws_idx_str[SWM_PROPLEN]; struct swm_region *r; - const char *errstr; struct pid_e *p; struct quirk *qp; - uint32_t event_mask, i; - xcb_atom_t prot; - xcb_get_property_reply_t *gpr; + uint32_t i, wa[2]; xcb_icccm_get_wm_protocols_reply_t wpr; - if ((win = find_window(id)) != NULL) - return (win); /* already being managed */ + if ((win = find_window(id)) != NULL) { + DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x already " + "managed; skipping.)\n", id); + return (win); /* Already managed. */ + } - /* see if we are on the unmanaged list */ + /* See if window is on the unmanaged list. */ if ((win = find_unmanaged_window(id)) != NULL) { - DNPRINTF(SWM_D_MISC, "manage_window: previously unmanaged " - "window: 0x%x\n", win->id); + DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x found on " + "unmanaged list.\n", id); TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); + if (win->transient) set_child_transient(win, &trans); - if (trans && (ww = find_window(trans))) - TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry); - else if ((ww = win->ws->focus) && - spawn_position == SWM_STACK_ABOVE) - TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, - win, entry); - else if (ww && spawn_position == SWM_STACK_BELOW) - TAILQ_INSERT_BEFORE(win->ws->focus, win, entry); - else switch (spawn_position) { - default: - case SWM_STACK_TOP: - case SWM_STACK_ABOVE: - TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry); - break; - case SWM_STACK_BOTTOM: - case SWM_STACK_BELOW: - TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry); - } - - ewmh_update_actions(win); - return (win); + goto out; + } else { + DNPRINTF(SWM_D_MISC, "manage_window: win 0x%x is new.\n", id); } + /* 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 " "new window"); win->id = id; - win->bordered = 0; - - /* see if we need to override the workspace */ - p = find_pid(window_get_pid(id)); - - /* Get all the window data in one shot */ - ws_idx_atom = get_atom_from_string("_SWM_WS"); - if (ws_idx_atom) { - gpr = xcb_get_property_reply(conn, - xcb_get_property(conn, False, id, ws_idx_atom, - XCB_ATOM_STRING, 0, SWM_PROPLEN), - NULL); - if (gpr) { - proplen = xcb_get_property_value_length(gpr); - if (proplen > 0) { - prop = malloc(proplen + 1); - if (prop) { - memcpy(prop, - xcb_get_property_value(gpr), - proplen); - prop[proplen] = '\0'; - } - } - free(gpr); - } - } + + /* Get window geometry. */ win->wa = xcb_get_geometry_reply(conn, - xcb_get_geometry(conn, id), + 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); + + /* 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; + 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); + + /* Get WM_SIZE_HINTS. */ xcb_icccm_get_wm_normal_hints_reply(conn, - xcb_icccm_get_wm_normal_hints(conn, id), + xcb_icccm_get_wm_normal_hints(conn, win->id), &win->sh, NULL); + + /* Get WM_HINTS. */ xcb_icccm_get_wm_hints_reply(conn, - xcb_icccm_get_wm_hints(conn, id), + xcb_icccm_get_wm_hints(conn, win->id), &win->hints, NULL); + + /* Get WM_TRANSIENT_FOR; see if window is a transient. */ xcb_icccm_get_wm_transient_for_reply(conn, - xcb_icccm_get_wm_transient_for(conn, id), + xcb_icccm_get_wm_transient_for(conn, win->id), &trans, NULL); if (trans) { win->transient = trans; - set_child_transient(win, &trans); - DNPRINTF(SWM_D_MISC, "manage_window: window: 0x%x, " - "transient: 0x%x\n", win->id, win->transient); + set_child_transient(win, &win->transient); } - prot = get_atom_from_string("WM_PROTOCOLS"); - - /* get supported protocols */ + /* Get supported protocols. */ if (xcb_icccm_get_wm_protocols_reply(conn, - xcb_icccm_get_wm_protocols(conn, id, prot), + 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) @@ -6466,97 +7664,39 @@ manage_window(xcb_window_t id) xcb_icccm_get_wm_protocols_reply_wipe(&wpr); } - win->iconic = get_iconic(win); + win->iconic = get_swm_iconic(win); - /* - * Figure out where to put the window. If it was previously assigned to - * a workspace (either by spawn() or manually moving), and isn't - * transient, * put it in the same workspace - */ - r = root_to_region(win->wa->root); - if (p) { - ws = &r->s->ws[p->ws]; + /* Figure out which workspace the window belongs to. */ + if ((p = find_pid(window_get_pid(win->id))) != NULL) { + win->ws = &r->s->ws[p->ws]; TAILQ_REMOVE(&pidlist, p, entry); free(p); p = NULL; - } else if (prop && win->transient == 0) { - DNPRINTF(SWM_D_PROP, "manage_window: get _SWM_WS: %s\n", prop); - ws_idx = (int)strtonum(prop, 0, workspace_limit - 1, - &errstr); - if (errstr) { - DNPRINTF(SWM_D_EVENT, "manage_window: window: #%s: %s", - errstr, prop); - } - ws = &r->s->ws[ws_idx]; + } else if ((ws_idx = get_ws_idx(win->id)) != -1 && + !win->transient) { + /* _SWM_WS is set; use that. */ + win->ws = &r->s->ws[ws_idx]; + } else if (trans && (ww = find_window(trans)) != NULL) { + /* Launch transients in the same ws as parent. */ + win->ws = ww->ws; } else { - ws = r->ws; - /* this should launch transients in the same ws as parent */ - if (id && trans) - if ((ww = find_window(trans)) != NULL) - if (ws->r) { - ws = ww->ws; - if (ww->ws->r) - r = ww->ws->r; - else - warnx("manage_window: fix this " - "bug mcbride"); - border_me = 1; - } + win->ws = r->ws; } - /* set up the window layout */ - win->id = id; - win->ws = ws; - win->s = r->s; /* this never changes */ - if (trans && (ww = find_window(trans))) - TAILQ_INSERT_AFTER(&ws->winlist, ww, win, entry); - else if (win->ws->focus && spawn_position == SWM_STACK_ABOVE) - TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win, - entry); - else if (win->ws->focus && spawn_position == SWM_STACK_BELOW) - TAILQ_INSERT_BEFORE(win->ws->focus, win, entry); - else switch (spawn_position) { - default: - case SWM_STACK_TOP: - case SWM_STACK_ABOVE: - TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry); - break; - case SWM_STACK_BOTTOM: - case SWM_STACK_BELOW: - TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry); - } - - /* 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; - Y(win) = win->wa->y + win->wa->border_width; - win->bordered = 0; - win->g_floatvalid = 0; - win->floatmaxed = 0; - win->ewmh_flags = 0; - - DNPRINTF(SWM_D_MISC, "manage_window: window: 0x%x, (x,y) w x h: " - "(%d,%d) %d x %d, ws: %d\n", win->id, X(win), Y(win), WIDTH(win), - HEIGHT(win), ws->idx); - - constrain_window(win, r, 0); - - /* Set window properties so we can remember this after reincarnation */ - if (ws_idx_atom && prop == NULL && - snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) < - SWM_PROPLEN) { + /* Set the _SWM_WS atom so we can remember this after reincarnation. */ + if (snprintf(ws_idx_str, SWM_PROPLEN, "%d", win->ws->idx) < + SWM_PROPLEN) { DNPRINTF(SWM_D_PROP, "manage_window: set _SWM_WS: %s\n", ws_idx_str); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, - ws_idx_atom, XCB_ATOM_STRING, 8, strlen(ws_idx_str), + a_swm_ws, XCB_ATOM_STRING, 8, strlen(ws_idx_str), ws_idx_str); } - if (prop) - free(prop); + /* Handle EWMH */ ewmh_autoquirk(win); + /* Determine initial quirks. */ if (xcb_icccm_get_wm_class_reply(conn, xcb_icccm_get_wm_class(conn, win->id), &win->ch, NULL)) { @@ -6565,63 +7705,83 @@ manage_window(xcb_window_t id) /* 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; - border_me = 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: found: " - "class: %s, name: %s\n", win->ch.class_name, - win->ch.instance_name); - if (qp->quirk & SWM_Q_FLOAT) { + DNPRINTF(SWM_D_CLASS, "manage_window: on quirks" + "list; mask: 0x%lx\n", qp->quirk); + if (qp->quirk & SWM_Q_FLOAT) win->floating = 1; - border_me = 1; - } win->quirks = qp->quirk; } } } - /* alter window position if quirky */ - if (win->quirks & SWM_Q_ANYWHERE) { - win->manual = 1; /* don't center the quirky windows */ - if (bar_enabled && Y(win) < bar_height) - Y(win) = bar_height; - if (WIDTH(win) + X(win) > WIDTH(r)) - X(win) = WIDTH(r) - WIDTH(win) - 2; - border_me = 1; - } + /* Alter window position if quirky */ + if (win->quirks & SWM_Q_ANYWHERE) + win->manual = 1; /* Reset font sizes (the bruteforce way; no default keybinding). */ if (win->quirks & SWM_Q_XTERM_FONTADJ) { for (i = 0; i < SWM_MAX_FONT_STEPS; i++) - fake_keypress(win, XK_KP_Subtract, ShiftMask); + fake_keypress(win, XK_KP_Subtract, XCB_MOD_MASK_SHIFT); for (i = 0; i < SWM_MAX_FONT_STEPS; i++) - fake_keypress(win, XK_KP_Add, ShiftMask); + fake_keypress(win, XK_KP_Add, XCB_MOD_MASK_SHIFT); } - ewmh_get_win_state(win); - ewmh_update_actions(win); - ewmh_update_win_state(win, None, _NET_WM_STATE_REMOVE); - - /* border me */ - if (border_me) { - win->bordered = 1; - X(win) -= border_width; - Y(win) -= border_width; + /* Make sure window is positioned inside its region, if its active. */ + if (win->ws->r) { + constrain_window(win, win->ws->r, 0); update_window(win); } - event_mask = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE | - XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY; + /* 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, id, XCB_CW_EVENT_MASK, &event_mask); + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL | + XCB_CW_EVENT_MASK, wa); - /* floaters need to be mapped if they are in the current workspace */ - if ((win->floating || win->transient) && (ws->idx == r->ws->idx)) - map_window_raised(win->id); +out: + /* Figure out where to stack the window in the workspace. */ + if (trans && (ww = find_window(trans))) + TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry); + else if (win->ws->focus && spawn_position == SWM_STACK_ABOVE) + TAILQ_INSERT_AFTER(&win->ws->winlist, win->ws->focus, win, + entry); + else if (win->ws->focus && spawn_position == SWM_STACK_BELOW) + TAILQ_INSERT_BEFORE(win->ws->focus, win, entry); + else switch (spawn_position) { + default: + case SWM_STACK_TOP: + case SWM_STACK_ABOVE: + TAILQ_INSERT_TAIL(&win->ws->winlist, win, entry); + break; + case SWM_STACK_BOTTOM: + case SWM_STACK_BELOW: + TAILQ_INSERT_HEAD(&win->ws->winlist, win, entry); + } + + /* Get initial _NET_WM_STATE */ + ewmh_get_win_state(win); + /* Set initial _NET_WM_ALLOWED_ACTIONS */ + ewmh_update_actions(win); + + grabbuttons(win); + + DNPRINTF(SWM_D_MISC, "manage_window: done. window: 0x%x, (x,y) w x h: " + "(%d,%d) %d x %d, ws: %d, iconic: %s, transient: 0x%x\n", win->id, + X(win), Y(win), WIDTH(win), HEIGHT(win), win->ws->idx, + YESNO(win->iconic), win->transient); return (win); } @@ -6647,14 +7807,13 @@ free_window(struct ws_win *win) memset(win, 0xff, sizeof *win); /* XXX kill later */ free(win); - DNPRINTF(SWM_D_MISC, "free_window: done\n"); + DNPRINTF(SWM_D_MISC, "free_window: done.\n"); } void unmanage_window(struct ws_win *win) { struct ws_win *parent; - xcb_screen_t *screen; if (win == NULL) return; @@ -6664,60 +7823,14 @@ unmanage_window(struct ws_win *win) if (win->transient) { parent = find_window(win->transient); if (parent) - parent->child_trans = NULL; + parent->focus_child = NULL; } - /* focus on root just in case */ - screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; - xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, - screen->root, XCB_CURRENT_TIME); - - focus_prev(win); - TAILQ_REMOVE(&win->ws->winlist, win, entry); TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry); } void -focus_magic(struct ws_win *win) -{ - DNPRINTF(SWM_D_FOCUS, "focus_magic: window: 0x%x\n", WINID(win)); - - if (win == NULL) { - /* if there are no windows clear the status-bar */ - bar_update(); - return; - } - - if (win->child_trans) { - /* win = parent & has a transient so focus on that */ - if (win->java) { - focus_win(win->child_trans); - if (win->child_trans->take_focus) - client_msg(win, a_takefocus); - } else { - /* make sure transient hasn't disappeared */ - if (validate_win(win->child_trans) == 0) { - focus_win(win->child_trans); - if (win->child_trans->take_focus) - client_msg(win->child_trans, - a_takefocus); - } else { - win->child_trans = NULL; - focus_win(win); - if (win->take_focus) - client_msg(win, a_takefocus); - } - } - } else { - /* regular focus */ - focus_win(win); - if (win->take_focus) - client_msg(win, a_takefocus); - } -} - -void expose(xcb_expose_event_t *e) { int i, num_screens; @@ -6725,15 +7838,33 @@ 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)) - bar_update(); + bar_draw(); xcb_flush(conn); } +#ifdef SWM_DEBUG +void +focusin(xcb_focus_in_event_t *e) +{ + DNPRINTF(SWM_D_EVENT, "focusin: window: 0x%x, mode: %s(%u), " + "detail: %s(%u)\n", e->event, get_notify_mode_label(e->mode), + e->mode, get_notify_detail_label(e->detail), e->detail); +} + +void +focusout(xcb_focus_out_event_t *e) +{ + DNPRINTF(SWM_D_EVENT, "focusout: window: 0x%x, mode: %s(%u), " + "detail: %s(%u)\n", e->event, get_notify_mode_label(e->mode), + e->mode, get_notify_detail_label(e->detail), e->detail); +} +#endif + void keypress(xcb_key_press_event_t *e) { @@ -6742,40 +7873,106 @@ keypress(xcb_key_press_event_t *e) keysym = xcb_key_press_lookup_keysym(syms, e, 0); - DNPRINTF(SWM_D_EVENT, "keypress: %u %u\n", e->detail, keysym); + DNPRINTF(SWM_D_EVENT, "keypress: keysym: %u, win (x,y): 0x%x (%d,%d), " + "detail: %u, time: %u, root (x,y): 0x%x (%d,%d), child: 0x%x, " + "state: %u, same_screen: %s\n", keysym, e->event, e->event_x, + e->event_y, e->detail, e->time, e->root, e->root_x, e->root_y, + e->child, e->state, YESNO(e->same_screen)); if ((kp = key_lookup(CLEANMASK(e->state), keysym)) == NULL) - return; + goto out; + + last_event_time = e->time; if (kp->funcid == KF_SPAWN_CUSTOM) - spawn_custom(root_to_region(e->root), + spawn_custom(root_to_region(e->root, SWM_CK_ALL), &(keyfuncs[kp->funcid].args), kp->spawn_name); else if (keyfuncs[kp->funcid].func) - keyfuncs[kp->funcid].func(root_to_region(e->root), + keyfuncs[kp->funcid].func(root_to_region(e->root, SWM_CK_ALL), &(keyfuncs[kp->funcid].args)); + +out: + /* Unfreeze grab events. */ + xcb_allow_events(conn, XCB_ALLOW_ASYNC_KEYBOARD, e->time); + xcb_flush(conn); + + DNPRINTF(SWM_D_EVENT, "keypress: done.\n"); } void buttonpress(xcb_button_press_event_t *e) { - struct ws_win *win; + struct ws_win *win = NULL; + struct swm_region *r, *old_r; int i; - unsigned int action; + int handled = 0; + + DNPRINTF(SWM_D_EVENT, "buttonpress: win (x,y): 0x%x (%d,%d), " + "detail: %u, time: %u, root (x,y): 0x%x (%d,%d), child: 0x%x, " + "state: %u, same_screen: %s\n", e->event, e->event_x, e->event_y, + e->detail, e->time, e->root, e->root_x, e->root_y, e->child, + e->state, YESNO(e->same_screen)); + + if (e->event == e->root) { + if (e->child != 0) { + win = find_window(e->child); + /* Pass ButtonPress to window if it isn't managed. */ + if (win == NULL) + goto out; + } else { + /* Focus on empty region */ + /* If no windows on region if its empty. */ + r = root_to_region(e->root, SWM_CK_POINTER); + if (r == NULL) { + DNPRINTF(SWM_D_EVENT, "buttonpress: " + "NULL region; ignoring.\n"); + goto out; + } - DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n", - e->event, e->detail); + if (TAILQ_EMPTY(&r->ws->winlist)) { + old_r = root_to_region(e->root, SWM_CK_FOCUS); + if (old_r && old_r != r) + unfocus_win(old_r->ws->focus); - if ((win = find_window(e->event)) == NULL) - return; + xcb_set_input_focus(conn, + XCB_INPUT_FOCUS_PARENT, e->root, e->time); + + /* Clear bar since empty. */ + bar_draw(); + + handled = 1; + goto out; + } + } + } else { + win = find_window(e->event); + } - focus_magic(win); - action = client_click; + if (win == NULL) + goto out; + + last_event_time = e->time; + + focus_win(get_focus_magic(win)); for (i = 0; i < LENGTH(buttons); i++) - if (action == buttons[i].action && buttons[i].func && + if (client_click == buttons[i].action && buttons[i].func && buttons[i].button == e->detail && - CLEANMASK(buttons[i].mask) == CLEANMASK(e->state)) + CLEANMASK(buttons[i].mask) == CLEANMASK(e->state)) { buttons[i].func(win, &buttons[i].args); + handled = 1; + } + +out: + if (!handled) { + DNPRINTF(SWM_D_EVENT, "buttonpress: passing to window.\n"); + /* Replay event to event window */ + xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, e->time); + } else { + DNPRINTF(SWM_D_EVENT, "buttonpress: handled.\n"); + /* Unfreeze grab events. */ + xcb_allow_events(conn, XCB_ALLOW_SYNC_POINTER, e->time); + } xcb_flush(conn); } @@ -6786,9 +7983,14 @@ 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) { + DNPRINTF(SWM_D_MISC, "print_win_geom: window not found: 0x%x\n", + w); + return; + } + DNPRINTF(SWM_D_MISC, "print_win_geom: window: 0x%x, root: 0x%x, " "depth: %u, (x,y) w x h: (%d,%d) %d x %d, border: %d\n", w, wa->root, wa->depth, wa->x, wa->y, wa->width, wa->height, @@ -6798,10 +8000,41 @@ print_win_geom(xcb_window_t w) } #endif +#ifdef SWM_DEBUG +char * +get_stack_mode_name(uint8_t mode) +{ + char *name; + + switch(mode) { + case XCB_STACK_MODE_ABOVE: + name = "Above"; + break; + case XCB_STACK_MODE_BELOW: + name = "Below"; + break; + case XCB_STACK_MODE_TOP_IF: + name = "TopIf"; + break; + case XCB_STACK_MODE_BOTTOM_IF: + name = "BottomIf"; + break; + case XCB_STACK_MODE_OPPOSITE: + name = "Opposite"; + break; + default: + name = "Unknown"; + } + + return name; +} +#endif + void configurerequest(xcb_configure_request_event_t *e) { struct ws_win *win; + struct swm_region *r = NULL; int new = 0, i = 0; uint16_t mask = 0; uint32_t wc[7] = {0}; @@ -6809,73 +8042,116 @@ configurerequest(xcb_configure_request_event_t *e) if ((win = find_window(e->window)) == NULL) if ((win = find_unmanaged_window(e->window)) == NULL) new = 1; + #ifdef SWM_DEBUG - print_win_geom(e->window); + if (swm_debug & SWM_D_EVENT) { + print_win_geom(e->window); + + DNPRINTF(SWM_D_EVENT, "configurerequest: window: 0x%x, " + "parent: 0x%x, new: %s, value_mask: %u { ", e->window, + e->parent, YESNO(new), e->value_mask); + if (e->value_mask & XCB_CONFIG_WINDOW_X) + DPRINTF("X: %d ", e->x); + if (e->value_mask & XCB_CONFIG_WINDOW_Y) + DPRINTF("Y: %d ", e->y); + if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH) + DPRINTF("W: %u ", e->width); + if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT) + DPRINTF("H: %u ", e->height); + if (e->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH) + DPRINTF("Border: %u ", e->border_width); + if (e->value_mask & XCB_CONFIG_WINDOW_SIBLING) + DPRINTF("Sibling: 0x%x ", e->sibling); + if (e->value_mask & XCB_CONFIG_WINDOW_STACK_MODE) + DPRINTF("StackMode: %s(%u) ", + get_stack_mode_name(e->stack_mode), e->stack_mode); + DPRINTF("}\n"); + } #endif + if (new) { - DNPRINTF(SWM_D_EVENT, "configurerequest: new window: 0x%x, " - "value_mask: 0x%x", e->window, e->value_mask); if (e->value_mask & XCB_CONFIG_WINDOW_X) { mask |= XCB_CONFIG_WINDOW_X; wc[i++] = e->x; - DPRINTF(", X: %d", e->x); } if (e->value_mask & XCB_CONFIG_WINDOW_Y) { mask |= XCB_CONFIG_WINDOW_Y; wc[i++] = e->y; - DPRINTF(", Y: %d", e->y); } if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH) { mask |= XCB_CONFIG_WINDOW_WIDTH; wc[i++] = e->width; - DPRINTF(", W: %u", e->width); } if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT) { mask |= XCB_CONFIG_WINDOW_HEIGHT; wc[i++] = e->height; - DPRINTF(", H: %u", e->height); } if (e->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH) { mask |= XCB_CONFIG_WINDOW_BORDER_WIDTH; wc[i++] = e->border_width; - DPRINTF(", Border: %u", e->border_width); } if (e->value_mask & XCB_CONFIG_WINDOW_SIBLING) { mask |= XCB_CONFIG_WINDOW_SIBLING; wc[i++] = e->sibling; - DPRINTF(", Sibling: 0x%x", e->sibling); } if (e->value_mask & XCB_CONFIG_WINDOW_STACK_MODE) { mask |= XCB_CONFIG_WINDOW_STACK_MODE; wc[i++] = e->stack_mode; - DPRINTF(", StackMode: %u", e->stack_mode); } - if (mask != 0) + if (mask != 0) { xcb_configure_window(conn, e->window, mask, wc); - - DPRINTF(", Sent: %s\n", YESNO((mask != 0))); + xcb_flush(conn); + } } else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) && !(win->ewmh_flags & EWMH_F_FULLSCREEN)) { - win->g_float.x = e->x - X(win->ws->r); - win->g_float.y = e->y - Y(win->ws->r); - win->g_float.w = e->width; - win->g_float.h = e->height; + if (win->ws->r) + r = win->ws->r; + else if (win->ws->old_r) + r = win->ws->old_r; + + /* windows are centered unless ANYWHERE quirk is set. */ + if (win->quirks & SWM_Q_ANYWHERE) { + if (e->value_mask & XCB_CONFIG_WINDOW_X) { + win->g_float.x = e->x; + if (r) + win->g_float.x -= X(r); + } + + if (e->value_mask & XCB_CONFIG_WINDOW_Y) { + win->g_float.y = e->y; + if (r) + win->g_float.y -= Y(r); + } + } + + if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH) + win->g_float.w = e->width; + + if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT) + win->g_float.h = e->height; + win->g_floatvalid = 1; - if (win->floating) { - win->g = win->g_float; - win->g.x += X(win->ws->r); - win->g.y += Y(win->ws->r); - update_window(win); + if (win->floating && r && (win->transient || + win->ws->cur_layout != &layouts[SWM_MAX_STACK])) { + WIDTH(win) = win->g_float.w; + HEIGHT(win) = win->g_float.h; + + if (r) { + stack_floater(win, r); + focus_flush(); + } } else { config_win(win, e); + xcb_flush(conn); } } else { config_win(win, e); + xcb_flush(conn); } - xcb_flush(conn); + DNPRINTF(SWM_D_EVENT, "configurerequest: done.\n"); } void @@ -6883,8 +8159,11 @@ configurenotify(xcb_configure_notify_event_t *e) { struct ws_win *win; - DNPRINTF(SWM_D_EVENT, "configurenotify: window: 0x%x\n", - e->window); + DNPRINTF(SWM_D_EVENT, "configurenotify: win 0x%x, event win: 0x%x, " + "(x,y) WxH: (%d,%d) %ux%u, border: %u, above_sibling: 0x%x, " + "override_redirect: %s\n", e->window, e->event, e->x, e->y, + e->width, e->height, e->border_width, e->above_sibling, + YESNO(e->override_redirect)); win = find_window(e->window); if (win) { @@ -6892,8 +8171,10 @@ configurenotify(xcb_configure_notify_event_t *e) xcb_icccm_get_wm_normal_hints(conn, win->id), &win->sh, NULL); adjust_font(win); - if (font_adjusted) + if (font_adjusted) { stack(); + xcb_flush(conn); + } } } @@ -6911,50 +8192,154 @@ destroynotify(xcb_destroy_notify_event_t *e) return; } - /* make sure we focus on something */ - win->floating = 0; + if (focus_mode != SWM_FOCUS_FOLLOW) { + /* If we were focused, make sure we focus on something else. */ + if (win == win->ws->focus) + win->ws->focus_pending = get_focus_prev(win); + } unmanage_window(win); stack(); + + if (focus_mode != SWM_FOCUS_FOLLOW) { + if (win->ws->focus_pending) { + focus_win(win->ws->focus_pending); + win->ws->focus_pending = NULL; + } else if (win == win->ws->focus && win->ws->r) { + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + win->ws->r->id, XCB_CURRENT_TIME); + } + } + free_window(win); + + focus_flush(); } -void -enternotify(xcb_enter_notify_event_t *e) +#ifdef SWM_DEBUG +char * +get_notify_detail_label(uint8_t detail) { - struct ws_win *win; - DNPRINTF(SWM_D_FOCUS, "enternotify: window: 0x%x, mode: %d, detail: " - "%d, root: 0x%x, subwindow: 0x%x, same_screen_focus: %s, " - "state: %d\n", e->event, e->mode, e->detail, e->root, - e->child, YESNO(e->same_screen_focus), e->state); - - if (e->mode != XCB_NOTIFY_MODE_NORMAL) { - DNPRINTF(SWM_D_EVENT, "skip enternotify: generated by " - "cursor grab.\n"); - return; + char *label; + + switch (detail) { + case XCB_NOTIFY_DETAIL_ANCESTOR: + label = "Ancestor"; + break; + case XCB_NOTIFY_DETAIL_VIRTUAL: + label = "Virtual"; + break; + case XCB_NOTIFY_DETAIL_INFERIOR: + label = "Inferior"; + break; + case XCB_NOTIFY_DETAIL_NONLINEAR: + label = "Nonlinear"; + break; + case XCB_NOTIFY_DETAIL_NONLINEAR_VIRTUAL: + label = "NonlinearVirtual"; + break; + case XCB_NOTIFY_DETAIL_POINTER: + label = "Pointer"; + break; + case XCB_NOTIFY_DETAIL_POINTER_ROOT: + label = "PointerRoot"; + break; + case XCB_NOTIFY_DETAIL_NONE: + label = "None"; + break; + default: + label = "Unknown"; } - switch (focus_mode) { - case SWM_FOCUS_DEFAULT: + return label; +} + +char * +get_notify_mode_label(uint8_t mode) +{ + char *label; + + switch (mode) { + case XCB_NOTIFY_MODE_NORMAL: + label = "Normal"; + break; + case XCB_NOTIFY_MODE_GRAB: + label = "Grab"; break; - case SWM_FOCUS_FOLLOW: + case XCB_NOTIFY_MODE_UNGRAB: + label = "Ungrab"; break; - case SWM_FOCUS_SYNERGY: + case XCB_NOTIFY_MODE_WHILE_GRABBED: + label = "WhileGrabbed"; break; + default: + label = "Unknown"; } - if ((win = find_window(e->event)) == NULL) { - DNPRINTF(SWM_D_EVENT, "skip enternotify: window is NULL\n"); + return label; +} +#endif + +void +enternotify(xcb_enter_notify_event_t *e) +{ + struct ws_win *win; + struct swm_region *r; + + DNPRINTF(SWM_D_FOCUS, "enternotify: time: %u, win (x,y): 0x%x " + "(%d,%d), mode: %s(%d), detail: %s(%d), root (x,y): 0x%x (%d,%d), " + "child: 0x%x, same_screen_focus: %s, state: %d\n", + e->time, e->event, e->event_x, e->event_y, + get_notify_mode_label(e->mode), e->mode, + get_notify_detail_label(e->detail), e->detail, + e->root, e->root_x, e->root_y, e->child, + YESNO(e->same_screen_focus), e->state); + + if (focus_mode == SWM_FOCUS_MANUAL && + e->mode == XCB_NOTIFY_MODE_NORMAL) { + DNPRINTF(SWM_D_EVENT, "enternotify: manual focus; ignoring.\n"); return; } - focus_magic(win); + last_event_time = e->time; + + if ((win = find_window(e->event)) == NULL) { + if (e->event == e->root) { + /* If no windows on pointer region, then focus root. */ + r = root_to_region(e->root, SWM_CK_POINTER); + if (r == NULL) { + DNPRINTF(SWM_D_EVENT, "enternotify: " + "NULL region; ignoring.\n"); + return; + } + + focus_region(r); + } else { + DNPRINTF(SWM_D_EVENT, "enternotify: window is NULL; " + "ignoring\n"); + return; + } + } else { + focus_win(get_focus_magic(win)); + } xcb_flush(conn); } -/* lets us use one switch statement for arbitrary mode/detail combinations */ -#define MERGE_MEMBERS(a,b) (((a & 0xffff) << 16) | (b & 0xffff)) +#ifdef SWM_DEBUG +void +leavenotify(xcb_leave_notify_event_t *e) +{ + DNPRINTF(SWM_D_FOCUS, "leavenotify: time: %u, win (x,y): 0x%x " + "(%d,%d), mode: %s(%d), detail: %s(%d), root (x,y): 0x%x (%d,%d), " + "child: 0x%x, same_screen_focus: %s, state: %d\n", + e->time, e->event, e->event_x, e->event_y, + get_notify_mode_label(e->mode), e->mode, + get_notify_detail_label(e->detail), e->detail, + e->root, e->root_x, e->root_y, e->child, + YESNO(e->same_screen_focus), e->state); +} +#endif void mapnotify(xcb_map_notify_event_t *e) @@ -6963,16 +8348,21 @@ mapnotify(xcb_map_notify_event_t *e) DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%x\n", e->window); - win = manage_window(e->window); - if (win) - set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL); + if ((win = find_window(e->window)) == NULL) + win = manage_window(e->window, 1); - /* - * focus_win can only set input focus on a mapped window. - * make sure the window really has focus since it is just being mapped. - */ - if (win->ws->focus == win) - focus_win(win); + win->mapped = 1; + set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL); + + if (focus_mode != SWM_FOCUS_FOLLOW) { + if (win->ws->focus_pending == win) { + focus_win(win); + win->ws->focus_pending = NULL; + focus_flush(); + } + } + + xcb_flush(conn); } void @@ -6987,45 +8377,103 @@ mappingnotify(xcb_mapping_notify_event_t *e) void maprequest(xcb_map_request_event_t *e) { - struct ws_win *win; - struct swm_region *r; + struct ws_win *win, *w = NULL; xcb_get_window_attributes_reply_t *war; - DNPRINTF(SWM_D_EVENT, "maprequest: window: 0x%x\n", + DNPRINTF(SWM_D_EVENT, "maprequest: win 0x%x\n", e->window); war = xcb_get_window_attributes_reply(conn, xcb_get_window_attributes(conn, e->window), NULL); - if (!war) - return; + if (war == NULL) { + DNPRINTF(SWM_D_EVENT, "maprequest: window lost.\n"); + goto out; + } + if (war->override_redirect) { - free(war); - return; + DNPRINTF(SWM_D_EVENT, "maprequest: override_redirect; " + "skipping.\n"); + goto out; } - free(war); - win = manage_window(e->window); - if (win == NULL) { - return; /* can't happen */ + win = manage_window(e->window, + (war->map_state == XCB_MAP_STATE_VIEWABLE)); + + /* The new window should get focus; prepare. */ + if (focus_mode != SWM_FOCUS_FOLLOW && + !(win->quirks & SWM_Q_NOFOCUSONMAP)) { + if (win->quirks & SWM_Q_FOCUSONMAP_SINGLE) { + /* See if other wins of same type are already mapped. */ + TAILQ_FOREACH(w, &win->ws->winlist, entry) { + if (w == win || !w->mapped) + continue; + + if (!strcmp(w->ch.class_name, + win->ch.class_name) && + !strcmp(w->ch.instance_name, + win->ch.instance_name)) + break; + } + } + + if (w == NULL) + win->ws->focus_pending = get_focus_magic(win); } - stack(); + /* All windows need to be mapped if they are in the current workspace.*/ + if (win->ws->r) + stack(); + + /* Ignore EnterNotify to handle the mapnotify without interference. */ + if (focus_mode == SWM_FOCUS_DEFAULT) + event_drain(XCB_ENTER_NOTIFY); +out: + free(war); + DNPRINTF(SWM_D_EVENT, "maprequest: done.\n"); +} + +void +motionnotify(xcb_motion_notify_event_t *e) +{ + struct swm_region *r; + int i, num_screens; + + DNPRINTF(SWM_D_FOCUS, "motionnotify: time: %u, win (x,y): 0x%x " + "(%d,%d), detail: %s(%d), root (x,y): 0x%x (%d,%d), " + "child: 0x%x, same_screen_focus: %s, state: %d\n", + e->time, e->event, e->event_x, e->event_y, + get_notify_detail_label(e->detail), e->detail, + e->root, e->root_x, e->root_y, e->child, + YESNO(e->same_screen), e->state); + + last_event_time = e->time; + + num_screens = get_screen_count(); + for (i = 0; i < num_screens; i++) + if (screens[i].root == e->root) + break; - /* make new win focused */ - r = root_to_region(win->wa->root); - if (win->ws == r->ws) - focus_magic(win); + TAILQ_FOREACH(r, &screens[i].rl, entry) + if (X(r) <= e->root_x && e->root_x < MAX_X(r) && + Y(r) <= e->root_y && e->root_y < MAX_Y(r)) + break; + + focus_region(r); } #ifdef SWM_DEBUG char * get_atom_name(xcb_atom_t atom) { - char *name; + char *name = NULL; +#if 0 + /* + * This should be disabled during most debugging since + * xcb_get_* causes an xcb_flush. + */ size_t len; xcb_get_atom_name_reply_t *r; - xcb_map_request_event_t mre; r = xcb_get_atom_name_reply(conn, xcb_get_atom_name(conn, atom), @@ -7037,14 +8485,14 @@ get_atom_name(xcb_atom_t atom) if (name) { memcpy(name, xcb_get_atom_name_name(r), len); name[len] = '\0'; - - return name; } } free(r); } - - return NULL; +#else + (void)atom; +#endif + return (name); } #endif @@ -7052,65 +8500,144 @@ void propertynotify(xcb_property_notify_event_t *e) { struct ws_win *win; + struct workspace *ws; #ifdef SWM_DEBUG char *name; name = get_atom_name(e->atom); - DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%x, atom: %s(%u)\n", - e->window, name, e->atom); + DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%x, atom: %s(%u), " + "time: %#x, state: %u\n", e->window, name, e->atom, e->time, + e->state); free(name); #endif - win = find_window(e->window); if (win == NULL) return; - if (e->state == XCB_PROPERTY_DELETE && e->atom == a_swm_iconic) { - update_iconic(win, 0); - map_window_raised(win->id); - stack(); - focus_win(win); - return; - } + ws = win->ws; - switch (e->atom) { - case XCB_ATOM_WM_CLASS: - case XCB_ATOM_WM_NAME: - bar_update(); - break; - default: - break; + last_event_time = e->time; + + if (e->atom == a_swm_iconic) { + if (e->state == XCB_PROPERTY_NEW_VALUE) { + if (focus_mode != SWM_FOCUS_FOLLOW) + ws->focus_pending = get_focus_prev(win); + + unfocus_win(win); + unmap_window(win); + + if (ws->r) { + stack(); + + if (focus_mode != SWM_FOCUS_FOLLOW) { + 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) + ws->focus_pending = get_focus_magic(win); + + stack(); + + /* Flush EnterNotify for mapnotify, if needed. */ + focus_flush(); + } + } 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 (win->mapped && + 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(); } + + xcb_flush(conn); } void unmapnotify(xcb_unmap_notify_event_t *e) { struct ws_win *win; + struct workspace *ws; DNPRINTF(SWM_D_EVENT, "unmapnotify: window: 0x%x\n", e->window); - /* determine if we need to help unmanage this window */ + /* If we aren't managing the window, then ignore. */ win = find_window(e->window); - if (win == NULL) + if (win == NULL || win->id != e->window) return; - if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL) { + ws = win->ws; + + if (getstate(e->window) != XCB_ICCCM_WM_STATE_ICONIC) + set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC); + + if (win->mapped) { + /* window unmapped itself */ + /* do unmap/unfocus/restack and unmanage */ + win->mapped = 0; + + /* If win was focused, make sure to focus on something else. */ + if (win == ws->focus) { + if (focus_mode != SWM_FOCUS_FOLLOW) { + ws->focus_pending = get_focus_prev(win); + DNPRINTF(SWM_D_EVENT, "unmapnotify: " + "focus_pending: 0x%x\n", + WINID(ws->focus_pending)); + } + + unfocus_win(win); + } + unmanage_window(win); - stack(); - /* resend unmap because we ated it */ - xcb_unmap_window(conn, e->window); - xcb_flush(conn); + if (ws->r) + stack(); + + if (focus_mode == SWM_FOCUS_FOLLOW) { + if (ws->r) + focus_win(get_pointer_win(ws->r->s->root)); + } else if (ws->focus_pending) { + focus_win(ws->focus_pending); + ws->focus_pending = NULL; + } else if (ws->focus == NULL && ws->r) { + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + ws->r->id, XCB_CURRENT_TIME); + } } + + if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL) + set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC); + + focus_flush(); } -/*void +#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) @@ -7129,6 +8656,7 @@ clientmessage(xcb_client_message_event_t *e) if (win == NULL) { if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) { + /* Manage the window with maprequest. */ DNPRINTF(SWM_D_EVENT, "clientmessage: request focus on " "unmanaged window.\n"); mre.window = e->window; @@ -7144,7 +8672,7 @@ clientmessage(xcb_client_message_event_t *e) if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_CLOSE_WINDOW\n"); if (win->can_delete) - client_msg(win, a_delete); + client_msg(win, a_delete, 0); else xcb_kill_client(conn, win->id); } @@ -7179,32 +8707,72 @@ clientmessage(xcb_client_message_event_t *e) stack(); } - xcb_flush(conn); + focus_flush(); +} + +void +check_conn(void) +{ + int errcode = xcb_connection_has_error(conn); +#ifdef XCB_CONN_ERROR + char *s; + switch (errcode) { + case XCB_CONN_ERROR: + s = "Socket error, pipe error or other stream error."; + break; + case XCB_CONN_CLOSED_EXT_NOTSUPPORTED: + s = "Extension not supported."; + break; + case XCB_CONN_CLOSED_MEM_INSUFFICIENT: + s = "Insufficient memory."; + break; + case XCB_CONN_CLOSED_REQ_LEN_EXCEED: + s = "Request length was exceeded."; + break; + case XCB_CONN_CLOSED_PARSE_ERR: + s = "Error parsing display string."; + break; + default: + s = "Unknown error."; + } + if (errcode) + errx(errcode, "X CONNECTION ERROR: %s", s); +#else + if (errcode) + errx(errcode, "X CONNECTION ERROR"); +#endif } int enable_wm(void) { int num_screens, i; - const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT; + const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | + XCB_EVENT_MASK_ENTER_WINDOW; xcb_screen_t *sc; xcb_void_cookie_t wac; 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++) { - sc = get_screen(i); + if ((sc = get_screen(i)) == NULL) + errx(1, "ERROR: can't get screen %d.", i); DNPRINTF(SWM_D_INIT, "enable_wm: screen %d, root: 0x%x\n", i, sc->root); wac = xcb_change_window_attributes_checked(conn, sc->root, - XCB_CW_EVENT_MASK, &val); + XCB_CW_EVENT_MASK, &val); if ((error = xcb_request_check(conn, wac))) { DNPRINTF(SWM_D_INIT, "enable_wm: error_code: %u\n", error->error_code); free(error); return 1; } + + /* click to focus on empty region */ + xcb_grab_button(conn, 1, sc->root, BUTTONMASK, + XCB_GRAB_MODE_SYNC, XCB_GRAB_MODE_ASYNC, XCB_WINDOW_NONE, + XCB_CURSOR_NONE, XCB_BUTTON_INDEX_1, XCB_BUTTON_MASK_ANY); } return 0; @@ -7216,6 +8784,7 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) struct swm_region *r, *n; struct workspace *ws = NULL; int i; + uint32_t wa[1]; DNPRINTF(SWM_D_MISC, "new region: screen[%d]:%dx%d+%d+%d\n", s->idx, w, h, x, y); @@ -7225,14 +8794,13 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) while (n) { r = n; n = TAILQ_NEXT(r, entry); - if (X(r) < (x + w) && - (X(r) + WIDTH(r)) > x && - Y(r) < (y + h) && - (Y(r) + HEIGHT(r)) > y) { + if (X(r) < (x + w) && (X(r) + WIDTH(r)) > x && + Y(r) < (y + h) && (Y(r) + HEIGHT(r)) > y) { if (r->ws->r != NULL) r->ws->old_r = r->ws->r; r->ws->r = NULL; bar_cleanup(r); + xcb_destroy_window(conn, r->id); TAILQ_REMOVE(&s->rl, r, entry); TAILQ_INSERT_TAIL(&s->orl, r, entry); } @@ -7283,6 +8851,17 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) ws->r = r; outputs++; TAILQ_INSERT_TAIL(&s->rl, r, entry); + + /* Invisible region window to detect pointer events on empty regions. */ + r->id = xcb_generate_id(conn); + wa[0] = XCB_EVENT_MASK_POINTER_MOTION | + XCB_EVENT_MASK_POINTER_MOTION_HINT; + + xcb_create_window(conn, XCB_COPY_FROM_PARENT, r->id, r->s->root, + X(r), Y(r), WIDTH(r), HEIGHT(r), 0, XCB_WINDOW_CLASS_INPUT_ONLY, + XCB_COPY_FROM_PARENT, XCB_CW_EVENT_MASK, wa); + + xcb_map_window(conn, r->id); } void @@ -7293,15 +8872,21 @@ scan_xrandr(int i) int ncrtc = 0; #endif /* SWM_XRR_HAS_CRTC */ struct swm_region *r; + struct ws_win *win; int num_screens; xcb_randr_get_screen_resources_current_cookie_t src; xcb_randr_get_screen_resources_current_reply_t *srr; xcb_randr_get_crtc_info_cookie_t cic; xcb_randr_get_crtc_info_reply_t *cir = NULL; xcb_randr_crtc_t *crtc; - xcb_screen_t *screen = get_screen(i); + xcb_screen_t *screen; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + DNPRINTF(SWM_D_MISC, "scan_xrandr: screen: %d\n", i); + + if ((screen = get_screen(i)) == NULL) + errx(1, "ERROR: can't get screen %d.", i); + + num_screens = get_screen_count(); if (i >= num_screens) errx(1, "scan_xrandr: invalid screen"); @@ -7309,6 +8894,7 @@ scan_xrandr(int i) while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) { r->ws->old_r = r->ws->r = NULL; bar_cleanup(r); + xcb_destroy_window(conn, r->id); TAILQ_REMOVE(&screens[i].rl, r, entry); TAILQ_INSERT_TAIL(&screens[i].orl, r, entry); } @@ -7325,11 +8911,12 @@ scan_xrandr(int i) new_region(&screens[i], 0, 0, screen->width_in_pixels, screen->height_in_pixels); - return; + goto out; } else ncrtc = srr->num_crtcs; + + crtc = xcb_randr_get_screen_resources_current_crtcs(srr); for (c = 0; c < ncrtc; c++) { - crtc = xcb_randr_get_screen_resources_current_crtcs(srr); cic = xcb_randr_get_crtc_info(conn, crtc[c], XCB_CURRENT_TIME); cir = xcb_randr_get_crtc_info_reply(conn, cic, NULL); @@ -7350,12 +8937,26 @@ scan_xrandr(int i) free(cir); } free(srr); - } else + } #endif /* SWM_XRR_HAS_CRTC */ - { + + /* If detection failed, create a single region that spans the screen. */ + if (TAILQ_EMPTY(&screens[i].rl)) new_region(&screens[i], 0, 0, screen->width_in_pixels, screen->height_in_pixels); + +out: + /* Cleanup unused previously visible workspaces. */ + TAILQ_FOREACH(r, &screens[i].orl, entry) { + TAILQ_FOREACH(win, &r->ws->winlist, entry) + unmap_window(win); + + /* The screen shouldn't focus on an unused region. */ + if (screens[i].r_focus == r) + screens[i].r_focus = NULL; } + + DNPRINTF(SWM_D_MISC, "scan_xrandr: done.\n"); } void @@ -7366,7 +8967,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) @@ -7381,27 +8982,43 @@ screenchange(xcb_randr_screen_change_notify_event_t *e) print_win_geom(e->root); #endif /* add bars to all regions */ - for (i = 0; i < num_screens; i++) + for (i = 0; i < num_screens; i++) { TAILQ_FOREACH(r, &screens[i].rl, entry) bar_setup(r); + } + stack(); + + /* Make sure a region has focus on each screen. */ + for (i = 0; i < num_screens; i++) { + if (screens[i].r_focus == NULL) { + r = TAILQ_FIRST(&screens[i].rl); + if (r != NULL) + focus_region(r); + } + } + + bar_draw(); + focus_flush(); } void grab_windows(void) { - xcb_window_t *wins = NULL; + struct swm_region *r = NULL; + xcb_window_t *wins = NULL, trans; int no; int i, j, num_screens; - uint16_t state, manage; + uint16_t state, manage, mapped; xcb_query_tree_cookie_t qtc; xcb_query_tree_reply_t *qtr; - xcb_get_window_attributes_cookie_t c; - xcb_get_window_attributes_reply_t *r; + xcb_get_window_attributes_cookie_t gac; + xcb_get_window_attributes_reply_t *gar; xcb_get_property_cookie_t pc; - num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + DNPRINTF(SWM_D_INIT, "grab_windows: begin\n"); + 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); @@ -7411,50 +9028,81 @@ grab_windows(void) no = xcb_query_tree_children_length(qtr); /* attach windows to a region */ /* normal windows */ + DNPRINTF(SWM_D_INIT, "grab_windows: grab top level windows.\n"); for (j = 0; j < no; j++) { - c = xcb_get_window_attributes(conn, wins[j]); - r = xcb_get_window_attributes_reply(conn, c, NULL); - if (!r) + TAILQ_FOREACH(r, &screens[i].rl, entry) { + if (r->id == wins[j]) { + DNPRINTF(SWM_D_INIT, "grab_windows: " + "skip %#x; region input window.\n", + wins[j]); + break; + } + } + + if (r) continue; - if (r->override_redirect) { - free(r); + + gac = xcb_get_window_attributes(conn, wins[j]); + gar = xcb_get_window_attributes_reply(conn, gac, NULL); + if (!gar) { + DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " + "doesn't exist.\n", wins[j]); + continue; + } + + if (gar->override_redirect) { + DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " + "override_redirect set.\n", wins[j]); + free(gar); continue; } pc = xcb_icccm_get_wm_transient_for(conn, wins[j]); if (xcb_icccm_get_wm_transient_for_reply(conn, pc, - &wins[j], NULL)) { - free(r); + &trans, NULL)) { + DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " + "is transient for %#x.\n", wins[j], trans); + free(gar); continue; } state = getstate(wins[j]); - manage = state == XCB_ICCCM_WM_STATE_ICONIC; - if (r->map_state == XCB_MAP_STATE_VIEWABLE || manage) - manage_window(wins[j]); - free(r); + manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN; + mapped = gar->map_state != XCB_MAP_STATE_UNMAPPED; + if (mapped || manage) + manage_window(wins[j], mapped); + free(gar); } /* transient windows */ + DNPRINTF(SWM_D_INIT, "grab_windows: grab transient windows.\n"); for (j = 0; j < no; j++) { - c = xcb_get_window_attributes(conn, wins[j]); - r = xcb_get_window_attributes_reply(conn, c, NULL); - if (!r) + gac = xcb_get_window_attributes(conn, wins[j]); + gar = xcb_get_window_attributes_reply(conn, gac, NULL); + if (!gar) { + DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " + "doesn't exist.\n", wins[j]); continue; - if (r->override_redirect) { - free(r); + } + + if (gar->override_redirect) { + DNPRINTF(SWM_D_INIT, "grab_windows: skip %#x; " + "override_redirect set.\n", wins[j]); + free(gar); continue; } - free(r); state = getstate(wins[j]); - manage = state == XCB_ICCCM_WM_STATE_ICONIC; + manage = state != XCB_ICCCM_WM_STATE_WITHDRAWN; + mapped = gar->map_state != XCB_MAP_STATE_UNMAPPED; pc = xcb_icccm_get_wm_transient_for(conn, wins[j]); if (xcb_icccm_get_wm_transient_for_reply(conn, pc, - &wins[j], NULL) && manage) - manage_window(wins[j]); + &trans, NULL) && manage) + manage_window(wins[j], mapped); + free(gar); } free(qtr); } + DNPRINTF(SWM_D_INIT, "grab_windows: done.\n"); } void @@ -7464,49 +9112,51 @@ setup_screens(void) struct workspace *ws; uint32_t gcv[1], wa[1]; const xcb_query_extension_reply_t *qep; - xcb_cursor_t cursor; - xcb_font_t cursor_font; + xcb_screen_t *screen; 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 " "screens"); /* initial Xrandr setup */ - xrandr_support = False; - c = xcb_randr_query_version(conn, True, True); - r = xcb_randr_query_version_reply(conn, c, NULL); - if (r) { - if (r->major_version >= 1) - xrandr_support = True; - free(r); - } + xrandr_support = 0; qep = xcb_get_extension_data(conn, &xcb_randr_id); - xrandr_eventbase = qep->first_event; - - cursor_font = xcb_generate_id(conn); - xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor"); + if (qep->present) { + c = xcb_randr_query_version(conn, 1, 1); + r = xcb_randr_query_version_reply(conn, c, NULL); + if (r) { + if (r->major_version >= 1) { + xrandr_support = 1; + xrandr_eventbase = qep->first_event; + } + free(r); + } + } - cursor = xcb_generate_id(conn); - xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font, - XC_left_ptr, XC_left_ptr + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff); - wa[0] = cursor; + wa[0] = cursors[XC_LEFT_PTR].cid; /* map physical screens */ for (i = 0; i < num_screens; i++) { DNPRINTF(SWM_D_WS, "setup_screens: init screen: %d\n", i); screens[i].idx = i; + screens[i].r_focus = NULL; + TAILQ_INIT(&screens[i].rl); TAILQ_INIT(&screens[i].orl); - screens[i].root = get_screen(i)->root; + if ((screen = get_screen(i)) == NULL) + errx(1, "ERROR: can't get screen %d.", i); + screens[i].root = screen->root; /* set default colors */ setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS); setscreencolor("rgb:88/88/88", i + 1, SWM_S_COLOR_UNFOCUS); setscreencolor("rgb:00/80/80", i + 1, SWM_S_COLOR_BAR_BORDER); + setscreencolor("rgb:00/40/40", i + 1, + SWM_S_COLOR_BAR_BORDER_UNFOCUS); setscreencolor("black", i + 1, SWM_S_COLOR_BAR); setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT); @@ -7526,7 +9176,10 @@ setup_screens(void) ws = &screens[i].ws[j]; ws->idx = j; ws->name = NULL; + ws->bar_enabled = 1; ws->focus = NULL; + ws->focus_prev = NULL; + ws->focus_pending = NULL; ws->r = NULL; ws->old_r = NULL; TAILQ_INIT(&ws->winlist); @@ -7546,8 +9199,6 @@ setup_screens(void) xcb_randr_select_input(conn, screens[i].root, XCB_RANDR_NOTIFY_MASK_SCREEN_CHANGE); } - xcb_free_cursor(conn, cursor); - xcb_close_font(conn, cursor_font); } void @@ -7571,44 +9222,79 @@ setup_globals(void) 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"); } void workaround(void) { int i, num_screens; - xcb_atom_t netwmcheck, netwmname, utf8_string; + xcb_atom_t netwmcheck; xcb_window_t root, win; - uint32_t wa[2]; /* work around sun jdk bugs, code from wmname */ netwmcheck = get_atom_from_string("_NET_SUPPORTING_WM_CHECK"); - netwmname = get_atom_from_string("_NET_WM_NAME"); - utf8_string = get_atom_from_string("UTF8_STRING"); - 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; win = xcb_generate_id(conn); - wa[0] = screens[i].c[SWM_S_COLOR_UNFOCUS].color; - wa[1] = screens[i].c[SWM_S_COLOR_UNFOCUS].color; - xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, 0, 0, 0, 1, - 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, XCB_COPY_FROM_PARENT, - XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL, wa); + xcb_create_window(conn, XCB_COPY_FROM_PARENT, win, root, + 0, 0, 1, 1, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, + XCB_COPY_FROM_PARENT, 0, NULL); xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, netwmcheck, XCB_ATOM_WINDOW, 32, 1, &win); 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, - netwmname, utf8_string, 8, strlen("LG3D"), "LG3D"); + a_netwmname, a_utf8_string, 8, strlen("LG3D"), "LG3D"); + } +} + +void +shutdown_cleanup(void) +{ + int i, num_screens; + + /* disable alarm because the following code may not be interrupted */ + alarm(0); + if (signal(SIGALRM, SIG_IGN) == SIG_ERR) + err(1, "can't disable alarm"); + + bar_extra_stop(); + unmap_all(); + + cursors_cleanup(); + + teardown_ewmh(); + + num_screens = get_screen_count(); + for (i = 0; i < num_screens; ++i) { + if (screens[i].bar_gc != 0) + xcb_free_gc(conn, screens[i].bar_gc); + if (!bar_font_legacy) + XftColorFree(display, DefaultVisual(display, i), + DefaultColormap(display, i), &bar_font_color); } + + if (bar_font_legacy) + XFreeFontSet(display, bar_fs); + else { + XftFontClose(display, bar_font); + } + + xcb_key_symbols_free(syms); + xcb_flush(conn); + xcb_disconnect(conn); } void event_error(xcb_generic_error_t *e) { + (void)e; + DNPRINTF(SWM_D_EVENT, "event_error: %s(%u) from %s(%u), sequence: %u, " "resource_id: %u, minor_code: %u\n", xcb_event_get_error_label(e->error_code), e->error_code, @@ -7621,9 +9307,9 @@ event_handle(xcb_generic_event_t *evt) { uint8_t type = XCB_EVENT_RESPONSE_TYPE(evt); - DNPRINTF(SWM_D_EVENT, "XCB Event: %s(%d)\n", + DNPRINTF(SWM_D_EVENT, "XCB Event: %s(%d), seq %u\n", xcb_event_get_label(XCB_EVENT_RESPONSE_TYPE(evt)), - XCB_EVENT_RESPONSE_TYPE(evt)); + XCB_EVENT_RESPONSE_TYPE(evt), evt->sequence); switch (type) { #define EVENT(type, callback) case type: callback((void *)evt); return @@ -7640,18 +9326,22 @@ event_handle(xcb_generic_event_t *evt) EVENT(XCB_DESTROY_NOTIFY, destroynotify); EVENT(XCB_ENTER_NOTIFY, enternotify); EVENT(XCB_EXPOSE, expose); - /*EVENT(XCB_FOCUS_IN, );*/ - /*EVENT(XCB_FOCUS_OUT, );*/ +#ifdef SWM_DEBUG + EVENT(XCB_FOCUS_IN, focusin); + EVENT(XCB_FOCUS_OUT, focusout); +#endif /*EVENT(XCB_GRAPHICS_EXPOSURE, );*/ /*EVENT(XCB_GRAVITY_NOTIFY, );*/ EVENT(XCB_KEY_PRESS, keypress); /*EVENT(XCB_KEY_RELEASE, keypress);*/ /*EVENT(XCB_KEYMAP_NOTIFY, );*/ - /*EVENT(XCB_LEAVE_NOTIFY, );*/ +#ifdef SWM_DEBUG + EVENT(XCB_LEAVE_NOTIFY, leavenotify); +#endif EVENT(XCB_MAP_NOTIFY, mapnotify); EVENT(XCB_MAP_REQUEST, maprequest); EVENT(XCB_MAPPING_NOTIFY, mappingnotify); - /*EVENT(XCB_MOTION_NOTIFY, );*/ + EVENT(XCB_MOTION_NOTIFY, motionnotify); /*EVENT(XCB_NO_EXPOSURE, );*/ EVENT(XCB_PROPERTY_NOTIFY, propertynotify); /*EVENT(XCB_REPARENT_NOTIFY, );*/ @@ -7670,22 +9360,26 @@ event_handle(xcb_generic_event_t *evt) int main(int argc, char *argv[]) { - struct swm_region *r, *rr; - struct ws_win *winfocus = NULL; - union arg a; + struct swm_region *r; char conf[PATH_MAX], *cfile = NULL; struct stat sb; - int xfd, i, num_screens; + int xfd, i, num_screens, startup = 1; struct sigaction sact; xcb_generic_event_t *evt; struct timeval tv; fd_set rd; + int rd_max; + int stdin_ready = 0; + int num_readable; + + /* suppress unused warning since var is needed */ + (void)argc; time_started = time(NULL); 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, "") || !setlocale(LC_TIME, "")) warnx("no locale support"); /* handle some signals */ @@ -7702,10 +9396,15 @@ main(int argc, char *argv[]) sact.sa_flags = SA_NOCLDSTOP; sigaction(SIGCHLD, &sact, NULL); - conn = xcb_connect(NULL, NULL); + if (!(display = XOpenDisplay(0))) + errx(1, "can not open display"); + + conn = XGetXCBConnection(display); if (xcb_connection_has_error(conn)) errx(1, "can not get XCB connection"); + XSetEventQueueOwner(display, XCBOwnsEventQueue); + xcb_prefetch_extension_data(conn, &xcb_randr_id); xfd = xcb_get_file_descriptor(conn); @@ -7727,6 +9426,9 @@ main(int argc, char *argv[]) if (enable_wm() != 0) errx(1, "another window manager is currently running"); + /* Load Xcursors and/or cursorfont glyph cursors. */ + cursors_load(); + xcb_aux_sync(conn); setup_globals(); @@ -7775,6 +9477,8 @@ noconfig: if (cfile) conf_load(cfile, SWM_CONF_DEFAULT); + validate_spawns(); + setup_ewmh(); /* set some values to work around bad programs */ workaround(); @@ -7785,81 +9489,76 @@ 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) { - if (winfocus == NULL) - winfocus = TAILQ_FIRST(&r->ws->winlist); + TAILQ_FOREACH(r, &screens[i].rl, entry) bar_setup(r); - } - - //unfocus_all(); grabkeys(); stack(); + bar_draw(); xcb_ungrab_server(conn); xcb_flush(conn); + rd_max = xfd > STDIN_FILENO ? xfd : STDIN_FILENO; + while (running) { while ((evt = xcb_poll_for_event(conn))) { - if (running == 0) + if (!running) goto done; event_handle(evt); free(evt); } - /* if we are being restarted go focus on first window */ - if (winfocus) { - rr = winfocus->ws->r; - if (rr == NULL) { - /* not a visible window */ - winfocus = NULL; + /* If just (re)started, set default focus if needed. */ + if (startup) { + startup = 0; + + if (focus_mode != SWM_FOCUS_FOLLOW) { + r = TAILQ_FIRST(&screens[0].rl); + if (r) { + focus_region(r); + focus_flush(); + } continue; } - /* move pointer to first screen if multi screen */ - if (num_screens > 1 || outputs > 1) - xcb_warp_pointer(conn, XCB_WINDOW_NONE, - rr->s[0].root, 0, 0, 0, 0, X(rr), - Y(rr) + (bar_enabled ? bar_height : 0)); - - a.id = SWM_ARG_ID_FOCUSCUR; - focus(rr, &a); - winfocus = NULL; - continue; } FD_ZERO(&rd); + + if (bar_extra) + FD_SET(STDIN_FILENO, &rd); + FD_SET(xfd, &rd); tv.tv_sec = 1; tv.tv_usec = 0; - if (select(xfd + 1, &rd, NULL, NULL, &tv) == -1) - if (errno != EINTR) - DNPRINTF(SWM_D_MISC, "select failed"); - if (restart_wm == 1) + num_readable = select(rd_max + 1, &rd, NULL, NULL, &tv); + if (num_readable == -1 && errno != EINTR) { + DNPRINTF(SWM_D_MISC, "select failed"); + } else if (num_readable > 0 && FD_ISSET(STDIN_FILENO, &rd)) { + stdin_ready = 1; + } + + if (restart_wm) restart(NULL, NULL); - if (search_resp == 1) + + if (search_resp) search_do_resp(); - if (running == 0) + + if (!running) goto done; - if (bar_alarm) { - bar_alarm = 0; - bar_update(); + + if (stdin_ready) { + stdin_ready = 0; + bar_extra_update(); } + + bar_draw(); + xcb_flush(conn); } done: - teardown_ewmh(); - bar_extra_stop(); - - for (i = 0; i < num_screens; ++i) - if (screens[i].bar_gc != 0) - xcb_free_gc(conn, screens[i].bar_gc); -#if 0 - XFreeFontSet(display, bar_fs); -#endif - xcb_key_symbols_free(syms); - xcb_flush(conn); - xcb_disconnect(conn); + shutdown_cleanup(); return (0); }