X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=spectrwm.c;h=07c3d74057413ea64ffffded0df6d4661fa1054f;hb=cee196007501b8ef81b6713d284eef09fa929b6e;hp=a0ad55045a308a98abead3d9422fff937d4cad38;hpb=c57f45c70c2e32b511b92ce0776489fd254f9704;p=spectrwm.git diff --git a/spectrwm.c b/spectrwm.c index a0ad550..07c3d74 100644 --- a/spectrwm.c +++ b/spectrwm.c @@ -54,21 +54,7 @@ * DEALINGS IN THE SOFTWARE. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - +/* kernel includes */ #include #include #include @@ -86,21 +72,41 @@ #include "tree.h" #endif +/* /usr/includes */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include #include #include - +#include +#include +#include +#include +#include +#include +#include +#include + +/* local includes */ +#include "version.h" #ifdef __OSX__ #include #endif -#include "version.h" - #ifdef SPECTRWM_BUILDSTR static const char *buildstr = SPECTRWM_BUILDSTR; #else @@ -117,10 +123,47 @@ static const char *buildstr = SPECTRWM_VERSION; #endif #endif -/*#define SWM_DEBUG*/ +#if defined(__OpenBSD__) +#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_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 +#define XCB_ICCCM_WM_STATE_NORMAL XCB_WM_STATE_NORMAL +#define xcb_icccm_get_text_property_reply_t xcb_get_text_property_reply_t +#define xcb_icccm_get_text_property_reply_wipe xcb_get_text_property_reply_wipe +#define xcb_icccm_get_wm_class xcb_get_wm_class +#define xcb_icccm_get_wm_class_reply xcb_get_wm_class_reply +#define xcb_icccm_get_wm_class_reply_t xcb_get_wm_class_reply_t +#define xcb_icccm_get_wm_class_reply_wipe xcb_get_wm_class_reply_wipe +#define xcb_icccm_get_wm_hints xcb_get_wm_hints +#define xcb_icccm_get_wm_hints_reply xcb_get_wm_hints_reply +#define xcb_icccm_get_wm_name xcb_get_wm_name +#define xcb_icccm_get_wm_name_reply xcb_get_wm_name_reply +#define xcb_icccm_get_wm_normal_hints xcb_get_wm_normal_hints +#define xcb_icccm_get_wm_normal_hints_reply xcb_get_wm_normal_hints_reply +#define xcb_icccm_get_wm_protocols xcb_get_wm_protocols +#define xcb_icccm_get_wm_protocols_reply xcb_get_wm_protocols_reply +#define xcb_icccm_get_wm_protocols_reply_t xcb_get_wm_protocols_reply_t +#define xcb_icccm_get_wm_protocols_reply_wipe xcb_get_wm_protocols_reply_wipe +#define xcb_icccm_get_wm_transient_for xcb_get_wm_transient_for +#define xcb_icccm_get_wm_transient_for_reply xcb_get_wm_transient_for_reply +#define xcb_icccm_wm_hints_t xcb_wm_hints_t +#endif + +#define SWM_DEBUG #ifdef SWM_DEBUG -#define DPRINTF(x...) do { if (swm_debug) fprintf(stderr, x); } while (0) -#define DNPRINTF(n,x...) do { if (swm_debug & n) fprintf(stderr, x); } while (0) +#define DPRINTF(x...) do { \ + if (swm_debug) \ + fprintf(stderr, x); \ +} while (0) +#define DNPRINTF(n,x...) do { \ + if (swm_debug & n) { \ + fprintf(stderr, "%ld ", (long)(time(NULL) - time_started)); \ + fprintf(stderr, x); \ + } \ +} while (0) #define SWM_D_MISC 0x0001 #define SWM_D_EVENT 0x0002 #define SWM_D_WS 0x0004 @@ -159,7 +202,7 @@ u_int32_t swm_debug = 0 #define DNPRINTF(n,x...) #endif -#define LENGTH(x) (sizeof x / sizeof x[0]) +#define LENGTH(x) (int)(sizeof x / sizeof x[0]) #define MODKEY Mod1Mask #define CLEANMASK(mask) (mask & ~(numlockmask | LockMask)) #define BUTTONMASK (ButtonPressMask|ButtonReleaseMask) @@ -172,13 +215,16 @@ 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 SH_MIN(w) (w)->sh_mask & PMinSize +#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 #define SH_MIN_W(w) (w)->sh.min_width #define SH_MIN_H(w) (w)->sh.min_height -#define SH_MAX(w) (w)->sh_mask & PMaxSize +#define SH_MAX(w) (w)->sh.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE #define SH_MAX_W(w) (w)->sh.max_width #define SH_MAX_H(w) (w)->sh.max_height -#define SH_INC(w) (w)->sh_mask & PResizeInc +#define SH_INC(w) (w)->sh.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC #define SH_INC_W(w) (w)->sh.width_inc #define SH_INC_H(w) (w)->sh.height_inc #define SWM_MAX_FONT_STEPS (3) @@ -197,26 +243,26 @@ u_int32_t swm_debug = 0 #endif char **start_argv; -Atom astate; -Atom aprot; -Atom adelete; -Atom takefocus; -Atom a_wmname; -Atom a_netwmname; -Atom a_utf8_string; -Atom a_string; -Atom a_swm_iconic; +xcb_atom_t a_state; +xcb_atom_t a_prot; +xcb_atom_t a_delete; +xcb_atom_t a_takefocus; +xcb_atom_t a_wmname; +xcb_atom_t a_netwmname; +xcb_atom_t a_utf8_string; +xcb_atom_t a_string; +xcb_atom_t a_swm_iconic; volatile sig_atomic_t running = 1; volatile sig_atomic_t restart_wm = 0; int outputs = 0; -int last_focus_event = FocusOut; -int (*xerrorxlib)(Display *, XErrorEvent *); +/*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; int cycle_empty = 0; int cycle_visible = 0; @@ -236,12 +282,11 @@ struct search_window { TAILQ_ENTRY(search_window) entry; int idx; struct ws_win *win; - GC gc; - Window indicator; + xcb_gcontext_t gc; + xcb_window_t indicator; }; TAILQ_HEAD(search_winlist, search_window); - -struct search_winlist search_wl; +struct search_winlist search_wl; /* search actions */ enum { @@ -252,6 +297,11 @@ enum { SWM_SEARCH_SEARCH_WINDOW }; +#define SWM_STACK_TOP (0) +#define SWM_STACK_BOTTOM (1) +#define SWM_STACK_ABOVE (2) +#define SWM_STACK_BELOW (3) + /* dialog windows */ double dialog_ratio = 0.6; /* status bar */ @@ -263,13 +313,8 @@ double dialog_ratio = 0.6; #define SWM_BAR_FONTS "-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*," \ "-*-profont-*-*-*-*-*-*-*-*-*-*-*-*," \ "-*-times-medium-r-*-*-*-*-*-*-*-*-*-*," \ - "-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*" - -#ifdef X_HAVE_UTF8_STRING -#define DRAWSTRING(x...) Xutf8DrawString(x) -#else -#define DRAWSTRING(x...) XmbDrawString(x) -#endif + "-misc-fixed-medium-r-*-*-*-*-*-*-*-*-*-*," \ + "-*-*-*-r-*--*-*-*-*-*-*-*-*" char *bar_argv[] = { NULL, NULL }; int bar_pipe[2]; @@ -286,6 +331,7 @@ 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; @@ -294,14 +340,20 @@ 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; +#if 0 XFontSet bar_fs; XFontSetExtents *bar_fs_extents; +#endif char *bar_fonts; -char *spawn_term[] = { NULL, NULL }; /* XXX fully dynamic */ struct passwd *pwd; #define SWM_MENU_FN (2) @@ -321,6 +373,12 @@ struct swm_geometry { struct swm_screen; struct workspace; +struct swm_bar { + xcb_window_t id; + xcb_pixmap_t buffer; + struct swm_geometry g; +}; + /* virtual "screens" */ struct swm_region { TAILQ_ENTRY(swm_region) entry; @@ -328,23 +386,23 @@ struct swm_region { struct workspace *ws; /* current workspace on this region */ struct workspace *ws_prior; /* prior workspace on this region */ struct swm_screen *s; /* screen idx */ - Window bar_window; + struct swm_bar *bar; }; TAILQ_HEAD(swm_region_list, swm_region); struct ws_win { TAILQ_ENTRY(ws_win) entry; - Window id; - Window transient; + xcb_window_t id; + xcb_window_t transient; struct ws_win *child_trans; /* transient child window */ struct swm_geometry g; /* current geometry */ - struct swm_geometry g_float; /* geometry when floating */ - struct swm_geometry rg_float; /* region geom when floating */ + 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; - int iconic; + int32_t iconic; + int bordered; unsigned int ewmh_flags; int font_size_boundary[SWM_MAX_FONT_STEPS]; int font_steps; @@ -355,18 +413,17 @@ struct ws_win { unsigned long quirks; struct workspace *ws; /* always valid */ struct swm_screen *s; /* always valid, never changes */ - XWindowAttributes wa; - XSizeHints sh; - long sh_mask; - XClassHint ch; - XWMHints *hints; + xcb_get_geometry_reply_t *wa; + xcb_size_hints_t sh; + xcb_icccm_get_wm_class_reply_t ch; + xcb_icccm_wm_hints_t hints; }; TAILQ_HEAD(ws_win_list, ws_win); /* pid goo */ struct pid_e { TAILQ_ENTRY(pid_e) entry; - long pid; + pid_t pid; int ws; }; TAILQ_HEAD(pid_list, pid_e); @@ -382,15 +439,6 @@ void max_stack(struct workspace *, struct swm_geometry *); void plain_stacker(struct workspace *); void fancy_stacker(struct workspace *); -struct ws_win *find_window(Window); - -void grabbuttons(struct ws_win *, int); -void new_region(struct swm_screen *, int, int, int, int); -void unmanage_window(struct ws_win *); -long getstate(Window); - -int conf_load(char *, int); - struct layout { void (*l_stack)(struct workspace *, struct swm_geometry *); void (*l_config)(struct workspace *, int); @@ -442,28 +490,35 @@ struct workspace { } l_state; }; -enum { SWM_S_COLOR_BAR, SWM_S_COLOR_BAR_BORDER, SWM_S_COLOR_BAR_FONT, - SWM_S_COLOR_FOCUS, SWM_S_COLOR_UNFOCUS, SWM_S_COLOR_MAX }; +enum { + SWM_S_COLOR_BAR, + SWM_S_COLOR_BAR_BORDER, + SWM_S_COLOR_BAR_FONT, + SWM_S_COLOR_FOCUS, + SWM_S_COLOR_UNFOCUS, + SWM_S_COLOR_MAX +}; /* physical screen mapping */ -#define SWM_WS_MAX (10) +#define SWM_WS_MAX (22) /* hard limit */ +int workspace_limit = 10; /* soft limit */ + struct swm_screen { int idx; /* screen index */ struct swm_region_list rl; /* list of regions on this screen */ struct swm_region_list orl; /* list of old regions */ - Window root; + xcb_window_t root; struct workspace ws[SWM_WS_MAX]; /* colors */ struct { - unsigned long color; + uint32_t color; char *name; } c[SWM_S_COLOR_MAX]; - GC bar_gc; + xcb_gcontext_t bar_gc; }; struct swm_screen *screens; -int num_screens; /* args to functions */ union arg { @@ -508,9 +563,6 @@ union arg { char **argv; }; -void focus(struct swm_region *, union arg *); -void focus_magic(struct ws_win *); - /* quirks */ struct quirk { TAILQ_ENTRY(quirk) entry; @@ -531,209 +583,293 @@ struct quirk_list quirks = TAILQ_HEAD_INITIALIZER(quirks); * Supported EWMH hints should be added to * both the enum and the ewmh array */ -enum { _NET_ACTIVE_WINDOW, _NET_MOVERESIZE_WINDOW, _NET_CLOSE_WINDOW, - _NET_WM_WINDOW_TYPE, _NET_WM_WINDOW_TYPE_DOCK, - _NET_WM_WINDOW_TYPE_TOOLBAR, _NET_WM_WINDOW_TYPE_UTILITY, - _NET_WM_WINDOW_TYPE_SPLASH, _NET_WM_WINDOW_TYPE_DIALOG, - _NET_WM_WINDOW_TYPE_NORMAL, _NET_WM_STATE, - _NET_WM_STATE_MAXIMIZED_HORZ, _NET_WM_STATE_MAXIMIZED_VERT, - _NET_WM_STATE_SKIP_TASKBAR, _NET_WM_STATE_SKIP_PAGER, - _NET_WM_STATE_HIDDEN, _NET_WM_STATE_ABOVE, _SWM_WM_STATE_MANUAL, - _NET_WM_STATE_FULLSCREEN, _NET_WM_ALLOWED_ACTIONS, _NET_WM_ACTION_MOVE, - _NET_WM_ACTION_RESIZE, _NET_WM_ACTION_FULLSCREEN, _NET_WM_ACTION_CLOSE, - SWM_EWMH_HINT_MAX }; +enum { + _NET_ACTIVE_WINDOW, + _NET_CLOSE_WINDOW, + _NET_MOVERESIZE_WINDOW, + _NET_WM_ACTION_CLOSE, + _NET_WM_ACTION_FULLSCREEN, + _NET_WM_ACTION_MOVE, + _NET_WM_ACTION_RESIZE, + _NET_WM_ALLOWED_ACTIONS, + _NET_WM_STATE, + _NET_WM_STATE_ABOVE, + _NET_WM_STATE_FULLSCREEN, + _NET_WM_STATE_HIDDEN, + _NET_WM_STATE_MAXIMIZED_HORZ, + _NET_WM_STATE_MAXIMIZED_VERT, + _NET_WM_STATE_SKIP_PAGER, + _NET_WM_STATE_SKIP_TASKBAR, + _NET_WM_WINDOW_TYPE, + _NET_WM_WINDOW_TYPE_DIALOG, + _NET_WM_WINDOW_TYPE_DOCK, + _NET_WM_WINDOW_TYPE_NORMAL, + _NET_WM_WINDOW_TYPE_SPLASH, + _NET_WM_WINDOW_TYPE_TOOLBAR, + _NET_WM_WINDOW_TYPE_UTILITY, + _SWM_WM_STATE_MANUAL, + SWM_EWMH_HINT_MAX +}; struct ewmh_hint { - char *name; - Atom atom; + char *name; + xcb_atom_t atom; } ewmh[SWM_EWMH_HINT_MAX] = { /* must be in same order as in the enum */ - {"_NET_ACTIVE_WINDOW", None}, - {"_NET_MOVERESIZE_WINDOW", None}, - {"_NET_CLOSE_WINDOW", None}, - {"_NET_WM_WINDOW_TYPE", None}, - {"_NET_WM_WINDOW_TYPE_DOCK", None}, - {"_NET_WM_WINDOW_TYPE_TOOLBAR", None}, - {"_NET_WM_WINDOW_TYPE_UTILITY", None}, - {"_NET_WM_WINDOW_TYPE_SPLASH", None}, - {"_NET_WM_WINDOW_TYPE_DIALOG", None}, - {"_NET_WM_WINDOW_TYPE_NORMAL", None}, - {"_NET_WM_STATE", None}, - {"_NET_WM_STATE_MAXIMIZED_HORZ", None}, - {"_NET_WM_STATE_MAXIMIZED_VERT", None}, - {"_NET_WM_STATE_SKIP_TASKBAR", None}, - {"_NET_WM_STATE_SKIP_PAGER", None}, - {"_NET_WM_STATE_HIDDEN", None}, - {"_NET_WM_STATE_ABOVE", None}, - {"_SWM_WM_STATE_MANUAL", None}, - {"_NET_WM_STATE_FULLSCREEN", None}, - {"_NET_WM_ALLOWED_ACTIONS", None}, - {"_NET_WM_ACTION_MOVE", None}, - {"_NET_WM_ACTION_RESIZE", None}, - {"_NET_WM_ACTION_FULLSCREEN", None}, - {"_NET_WM_ACTION_CLOSE", None}, + {"_NET_ACTIVE_WINDOW", XCB_ATOM_NONE}, + {"_NET_CLOSE_WINDOW", XCB_ATOM_NONE}, + {"_NET_MOVERESIZE_WINDOW", 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_STATE", XCB_ATOM_NONE}, + {"_NET_WM_STATE_ABOVE", XCB_ATOM_NONE}, + {"_NET_WM_STATE_FULLSCREEN", XCB_ATOM_NONE}, + {"_NET_WM_STATE_HIDDEN", XCB_ATOM_NONE}, + {"_NET_WM_STATE_MAXIMIZED_HORZ", XCB_ATOM_NONE}, + {"_NET_WM_STATE_MAXIMIZED_VERT", XCB_ATOM_NONE}, + {"_NET_WM_STATE_SKIP_PAGER", XCB_ATOM_NONE}, + {"_NET_WM_STATE_SKIP_TASKBAR", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_DIALOG", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_DOCK", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_NORMAL", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_SPLASH", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_TOOLBAR", XCB_ATOM_NONE}, + {"_NET_WM_WINDOW_TYPE_UTILITY", XCB_ATOM_NONE}, + {"_SWM_WM_STATE_MANUAL", XCB_ATOM_NONE}, }; -void store_float_geom(struct ws_win *, struct swm_region *); -int floating_toggle_win(struct ws_win *); -void spawn_select(struct swm_region *, union arg *, char *, int *); -unsigned char *get_win_name(Window); - +/* function prototypes */ +int conf_load(char *, int); +void constrain_window(struct ws_win *, struct swm_region *, int); +void do_sync(void); +void event_handle(xcb_generic_event_t *); +struct ws_win *find_window(xcb_window_t); +int floating_toggle_win(struct ws_win *); +void focus(struct swm_region *, union arg *); +void focus_magic(struct ws_win *); +xcb_atom_t get_atom_from_string(const char *); +xcb_screen_t *get_screen(int); +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); +void new_region(struct swm_screen *, int, int, int, int); +int parse_rgb(const char *, uint16_t *, uint16_t *, uint16_t *); +void spawn_select(struct swm_region *, union arg *, char *, int *); +void store_float_geom(struct ws_win *, struct swm_region *); +void unmanage_window(struct ws_win *); +void update_window(struct ws_win *); + +/* function definitions */ int -get_property(Window id, Atom atom, long count, Atom type, unsigned long *nitems, - unsigned long *nbytes, unsigned char **data) +parse_rgb(const char *rgb, uint16_t *rr, uint16_t *gg, uint16_t *bb) +{ + unsigned int tmpr, tmpg, tmpb; + + if (sscanf(rgb, "rgb:%x/%x/%x", &tmpr, &tmpg, &tmpb) != 3) + return (-1); + + *rr = tmpr << 8; + *gg = tmpg << 8; + *bb = tmpb << 8; + + return (0); +} + +xcb_screen_t * +get_screen(int screen) { - int format, status; - unsigned long *nbytes_ret, *nitems_ret; - unsigned long nbytes_tmp, nitems_tmp; - Atom real; + xcb_screen_iterator_t i; - nbytes_ret = nbytes != NULL ? nbytes : &nbytes_tmp; - nitems_ret = nitems != NULL ? nitems : &nitems_tmp; + i = xcb_setup_roots_iterator(xcb_get_setup(conn)); + for (; i.rem; --screen, xcb_screen_next(&i)) + if (screen == 0) + return (i.data); - status = XGetWindowProperty(display, id, atom, 0L, count, False, type, - &real, &format, nitems_ret, nbytes_ret, data); + return (NULL); +} - if (status != Success) - return False; - if (real != type) - return False; +void +do_sync(void) +{ + xcb_get_input_focus_cookie_t c; + xcb_get_input_focus_reply_t *r; - return True; + /* mimic XSync() */ + c = xcb_get_input_focus(conn); + xcb_flush(conn); + r = xcb_get_input_focus_reply(conn, c, NULL); + if (r) + free(r); +} + +void +map_window_raised(xcb_window_t win) +{ + uint32_t val = XCB_STACK_MODE_ABOVE; + + xcb_configure_window(conn, win, + XCB_CONFIG_WINDOW_STACK_MODE, &val); + + xcb_map_window(conn, win); +} + +xcb_atom_t +get_atom_from_string(const char *str) +{ + xcb_intern_atom_cookie_t c; + xcb_intern_atom_reply_t *r; + xcb_atom_t atom; + + c = xcb_intern_atom(conn, False, strlen(str), str); + r = xcb_intern_atom_reply(conn, c, NULL); + if (r) { + atom = r->atom; + free(r); + + return (atom); + } + + return (XCB_ATOM_NONE); } void update_iconic(struct ws_win *win, int newv) { - int32_t v = newv; - Atom iprop; + int32_t v = newv; + xcb_atom_t iprop; win->iconic = newv; - iprop = XInternAtom(display, "_SWM_ICONIC", False); - if (!iprop) + iprop = get_atom_from_string("_SWM_ICONIC"); + if (iprop == XCB_ATOM_NONE) return; + if (newv) - XChangeProperty(display, win->id, iprop, XA_INTEGER, 32, - PropModeReplace, (unsigned char *)&v, 1); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, + iprop, XCB_ATOM_INTEGER, 32, 1, &v); else - XDeleteProperty(display, win->id, iprop); + xcb_delete_property(conn, win->id, iprop); } -int +int32_t get_iconic(struct ws_win *win) { - int32_t v = 0; - int retfmt, status; - Atom iprop, rettype; - unsigned long nitems, extra; - unsigned char *prop = NULL; + int32_t v = 0; + xcb_atom_t iprop; + xcb_get_property_reply_t *pr = NULL; - iprop = XInternAtom(display, "_SWM_ICONIC", False); - if (!iprop) - goto out; - status = XGetWindowProperty(display, win->id, iprop, 0L, 1L, - False, XA_INTEGER, &rettype, &retfmt, &nitems, &extra, &prop); - if (status != Success) + iprop = get_atom_from_string("_SWM_ICONIC"); + if (iprop == XCB_ATOM_NONE) goto out; - if (rettype != XA_INTEGER || retfmt != 32) + + pr = xcb_get_property_reply(conn, + xcb_get_property(conn, False, win->id, iprop, XCB_ATOM_INTEGER, + 0, 1), NULL); + if (!pr) goto out; - if (nitems != 1) + if (pr->type != XCB_ATOM_INTEGER || pr->format != 32) goto out; - v = *((int32_t *)prop); - + v = *((int32_t *)xcb_get_property_value(pr)); out: - if (prop != NULL) - XFree(prop); + if (pr) + free(pr); return (v); } void setup_ewmh(void) { - int i,j; - Atom sup_list; + xcb_atom_t sup_list; + int i, j, num_screens; - sup_list = XInternAtom(display, "_NET_SUPPORTED", False); + sup_list = get_atom_from_string("_NET_SUPPORTED"); for (i = 0; i < LENGTH(ewmh); i++) - ewmh[i].atom = XInternAtom(display, ewmh[i].name, False); + ewmh[i].atom = get_atom_from_string(ewmh[i].name); - for (i = 0; i < ScreenCount(display); i++) { + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { /* Support check window will be created by workaround(). */ /* Report supported atoms */ - XDeleteProperty(display, screens[i].root, sup_list); + xcb_delete_property(conn, screens[i].root, sup_list); for (j = 0; j < LENGTH(ewmh); j++) - XChangeProperty(display, screens[i].root, - sup_list, XA_ATOM, 32, - PropModeAppend, (unsigned char *)&ewmh[j].atom,1); + xcb_change_property(conn, XCB_PROP_MODE_APPEND, + screens[i].root, sup_list, XCB_ATOM_ATOM, 32, 1, + &ewmh[j].atom); } } void teardown_ewmh(void) { - int i, success; - unsigned char *data = NULL; - unsigned long n; - Atom sup_check, sup_list; - Window id; + int i, num_screens; + xcb_atom_t sup_check, sup_list; + xcb_window_t id; + xcb_get_property_cookie_t pc; + xcb_get_property_reply_t *pr; - sup_check = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False); - sup_list = XInternAtom(display, "_NET_SUPPORTED", False); + 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)); - for (i = 0; i < ScreenCount(display); i++) { + for (i = 0; i < num_screens; i++) { /* Get the support check window and destroy it */ - success = get_property(screens[i].root, sup_check, 1, XA_WINDOW, - &n, NULL, &data); - - if (success) { - id = data[0]; - XDestroyWindow(display, id); - XDeleteProperty(display, screens[i].root, sup_check); - XDeleteProperty(display, screens[i].root, sup_list); - } + pc = xcb_get_property(conn, False, screens[i].root, sup_check, + XCB_ATOM_WINDOW, 0, 1); + pr = xcb_get_property_reply(conn, pc, NULL); + if (pr) { + 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); - XFree(data); + free(pr); + } } } void ewmh_autoquirk(struct ws_win *win) { - int success, i; - unsigned long *data = NULL, n; - Atom type; - - success = get_property(win->id, ewmh[_NET_WM_WINDOW_TYPE].atom, (~0L), - XA_ATOM, &n, NULL, (void *)&data); + uint32_t i, n; + xcb_atom_t *type; + xcb_get_property_cookie_t c; + xcb_get_property_reply_t *r; - if (!success) { - XFree(data); + c = xcb_get_property(conn, False, win->id, + ewmh[_NET_WM_WINDOW_TYPE].atom, XCB_ATOM_ATOM, 0, UINT32_MAX); + r = xcb_get_property_reply(conn, c, NULL); + if (!r) return; - } + + n = xcb_get_property_value_length(r); + type = xcb_get_property_value(r); for (i = 0; i < n; i++) { - type = data[i]; - if (type == ewmh[_NET_WM_WINDOW_TYPE_NORMAL].atom) + if (type[i] == ewmh[_NET_WM_WINDOW_TYPE_NORMAL].atom) break; - if (type == ewmh[_NET_WM_WINDOW_TYPE_DOCK].atom || - type == ewmh[_NET_WM_WINDOW_TYPE_TOOLBAR].atom || - type == ewmh[_NET_WM_WINDOW_TYPE_UTILITY].atom) { + if (type[i] == ewmh[_NET_WM_WINDOW_TYPE_DOCK].atom || + type[i] == ewmh[_NET_WM_WINDOW_TYPE_TOOLBAR].atom || + type[i] == ewmh[_NET_WM_WINDOW_TYPE_UTILITY].atom) { win->floating = 1; win->quirks = SWM_Q_FLOAT | SWM_Q_ANYWHERE; break; } - if (type == ewmh[_NET_WM_WINDOW_TYPE_SPLASH].atom || - type == ewmh[_NET_WM_WINDOW_TYPE_DIALOG].atom) { + if (type[i] == ewmh[_NET_WM_WINDOW_TYPE_SPLASH].atom || + type[i] == ewmh[_NET_WM_WINDOW_TYPE_DIALOG].atom) { win->floating = 1; win->quirks = SWM_Q_FLOAT; break; } } - - XFree(data); + free(r); } #define SWM_EWMH_ACTION_COUNT_MAX (6) @@ -747,40 +883,37 @@ ewmh_autoquirk(struct ws_win *win) int ewmh_set_win_fullscreen(struct ws_win *win, int fs) { - struct swm_geometry rg; - if (!win->ws->r) - return 0; + return (0); if (!win->floating) - return 0; + return (0); - DNPRINTF(SWM_D_MISC, "ewmh_set_win_fullscreen: window: 0x%lx, " + DNPRINTF(SWM_D_MISC, "ewmh_set_win_fullscreen: window: 0x%x, " "fullscreen %s\n", win->id, YESNO(fs)); - rg = win->ws->r->g; - if (fs) { - store_float_geom(win, win->ws->r); + if (!win->g_floatvalid) + store_float_geom(win, win->ws->r); - win->g = rg; + win->g = win->ws->r->g; + win->bordered = 0; } else { if (win->g_floatvalid) { /* refloat at last floating relative position */ - X(win) = win->g_float.x - win->rg_float.x + rg.x; - Y(win) = win->g_float.y - win->rg_float.y + rg.y; - WIDTH(win) = win->g_float.w; - HEIGHT(win) = win->g_float.h; + win->g = win->g_float; + X(win) += X(win->ws->r); + Y(win) += Y(win->ws->r); } } - return 1; + return (1); } void ewmh_update_actions(struct ws_win *win) { - Atom actions[SWM_EWMH_ACTION_COUNT_MAX]; + xcb_atom_t actions[SWM_EWMH_ACTION_COUNT_MAX]; int n = 0; if (win == NULL) @@ -793,8 +926,8 @@ ewmh_update_actions(struct ws_win *win) actions[n++] = ewmh[_NET_WM_ACTION_RESIZE].atom; } - XChangeProperty(display, win->id, ewmh[_NET_WM_ALLOWED_ACTIONS].atom, - XA_ATOM, 32, PropModeReplace, (unsigned char *)actions, n); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, + ewmh[_NET_WM_ALLOWED_ACTIONS].atom, XCB_ATOM_ATOM, 32, 1, actions); } #define _NET_WM_STATE_REMOVE 0 /* remove/unset property */ @@ -852,36 +985,37 @@ ewmh_update_win_state(struct ws_win *win, long state, long action) win->ewmh_flags & EWMH_F_FULLSCREEN)) win->ewmh_flags = orig_flags; /* revert */ - XDeleteProperty(display, win->id, ewmh[_NET_WM_STATE].atom); + xcb_delete_property(conn, win->id, ewmh[_NET_WM_STATE].atom); if (win->ewmh_flags & EWMH_F_FULLSCREEN) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_NET_WM_STATE_FULLSCREEN].atom, 1); + 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) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_NET_WM_STATE_SKIP_PAGER].atom, 1); + 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) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_NET_WM_STATE_SKIP_TASKBAR].atom, 1); + 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) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_NET_WM_STATE_ABOVE].atom, 1); + 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) - XChangeProperty(display, win->id, ewmh[_NET_WM_STATE].atom, - XA_ATOM, 32, PropModeAppend, - (unsigned char *)&ewmh[_SWM_WM_STATE_MANUAL].atom, 1); + 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); } void ewmh_get_win_state(struct ws_win *win) { - int success, i; - unsigned long n; - Atom *states; + xcb_atom_t *states; + xcb_get_property_cookie_t c; + xcb_get_property_reply_t *r; + int i, n; if (win == NULL) return; @@ -892,154 +1026,30 @@ ewmh_get_win_state(struct ws_win *win) if (win->manual) win->ewmh_flags |= SWM_F_MANUAL; - success = get_property(win->id, ewmh[_NET_WM_STATE].atom, - (~0L), XA_ATOM, &n, NULL, (void *)&states); - - if (!success) + c = xcb_get_property(conn, False, win->id, ewmh[_NET_WM_STATE].atom, + XCB_ATOM_ATOM, 0, UINT32_MAX); + r = xcb_get_property_reply(conn, c, NULL); + if (!r) return; + states = xcb_get_property_value(r); + n = xcb_get_property_value_length(r); + for (i = 0; i < n; i++) ewmh_update_win_state(win, states[i], _NET_WM_STATE_ADD); - XFree(states); + free(r); } /* events */ #ifdef SWM_DEBUG -char * -geteventname(XEvent *e) -{ - char *name = NULL; - - switch (e->type) { - case KeyPress: - name = "KeyPress"; - break; - case KeyRelease: - name = "KeyRelease"; - break; - case ButtonPress: - name = "ButtonPress"; - break; - case ButtonRelease: - name = "ButtonRelease"; - break; - case MotionNotify: - name = "MotionNotify"; - break; - case EnterNotify: - name = "EnterNotify"; - break; - case LeaveNotify: - name = "LeaveNotify"; - break; - case FocusIn: - name = "FocusIn"; - break; - case FocusOut: - name = "FocusOut"; - break; - case KeymapNotify: - name = "KeymapNotify"; - break; - case Expose: - name = "Expose"; - break; - case GraphicsExpose: - name = "GraphicsExpose"; - break; - case NoExpose: - name = "NoExpose"; - break; - case VisibilityNotify: - name = "VisibilityNotify"; - break; - case CreateNotify: - name = "CreateNotify"; - break; - case DestroyNotify: - name = "DestroyNotify"; - break; - case UnmapNotify: - name = "UnmapNotify"; - break; - case MapNotify: - name = "MapNotify"; - break; - case MapRequest: - name = "MapRequest"; - break; - case ReparentNotify: - name = "ReparentNotify"; - break; - case ConfigureNotify: - name = "ConfigureNotify"; - break; - case ConfigureRequest: - name = "ConfigureRequest"; - break; - case GravityNotify: - name = "GravityNotify"; - break; - case ResizeRequest: - name = "ResizeRequest"; - break; - case CirculateNotify: - name = "CirculateNotify"; - break; - case CirculateRequest: - name = "CirculateRequest"; - break; - case PropertyNotify: - name = "PropertyNotify"; - break; - case SelectionClear: - name = "SelectionClear"; - break; - case SelectionRequest: - name = "SelectionRequest"; - break; - case SelectionNotify: - name = "SelectionNotify"; - break; - case ColormapNotify: - name = "ColormapNotify"; - break; - case ClientMessage: - name = "ClientMessage"; - break; - case MappingNotify: - name = "MappingNotify"; - break; - default: - name = "Unknown"; - } - - return name; -} - -char * -xrandr_geteventname(XEvent *e) -{ - char *name = NULL; - - switch(e->type - xrandr_eventbase) { - case RRScreenChangeNotify: - name = "RRScreenChangeNotify"; - break; - default: - name = "Unknown"; - } - - return name; -} - void dumpwins(struct swm_region *r, union arg *args) { - struct ws_win *win; - unsigned int state; - XWindowAttributes wa; + struct ws_win *win; + uint16_t state; + xcb_get_window_attributes_cookie_t c; + xcb_get_window_attributes_reply_t *wa; if (r->ws == NULL) { warnx("dumpwins: invalid workspace"); @@ -1047,26 +1057,33 @@ dumpwins(struct swm_region *r, union arg *args) } warnx("=== managed window list ws %02d ===", r->ws->idx); - TAILQ_FOREACH(win, &r->ws->winlist, entry) { state = getstate(win->id); - if (!XGetWindowAttributes(display, win->id, &wa)) - warnx("window: 0x%lx, failed XGetWindowAttributes", + c = xcb_get_window_attributes(conn, win->id); + wa = xcb_get_window_attributes_reply(conn, c, NULL); + if (wa) { + warnx("window: 0x%x, map_state: %d, state: %u, " + "transient: 0x%x", win->id, wa->map_state, + state, win->transient); + free(wa); + } else + warnx("window: 0x%x, failed xcb_get_window_attributes", win->id); - warnx("window: 0x%lx, map_state: %d, state: %d, " - "transient: 0x%lx", win->id, wa.map_state, state, - win->transient); } warnx("===== unmanaged window list ====="); TAILQ_FOREACH(win, &r->ws->unmanagedlist, entry) { state = getstate(win->id); - if (!XGetWindowAttributes(display, win->id, &wa)) - warnx("window: 0x%lx, failed XGetWindowAttributes", + c = xcb_get_window_attributes(conn, win->id); + wa = xcb_get_window_attributes_reply(conn, c, NULL); + if (wa) { + warnx("window: 0x%x, map_state: %d, state: %u, " + "transient: 0x%x", win->id, wa->map_state, + state, win->transient); + free(wa); + } else + warnx("window: 0x%x, failed xcb_get_window_attributes", win->id); - warnx("window: 0x%lx, map_state: %d, state: %d, " - "transient: 0x%lx", win->id, wa.map_state, state, - win->transient); } warnx("================================="); @@ -1078,40 +1095,22 @@ dumpwins(struct swm_region *r, union arg *args) } #endif /* SWM_DEBUG */ -void expose(XEvent *); -void keypress(XEvent *); -void buttonpress(XEvent *); -void configurerequest(XEvent *); -void configurenotify(XEvent *); -void destroynotify(XEvent *); -void enternotify(XEvent *); -void focusevent(XEvent *); -void mapnotify(XEvent *); -void mappingnotify(XEvent *); -void maprequest(XEvent *); -void propertynotify(XEvent *); -void unmapnotify(XEvent *); -void visibilitynotify(XEvent *); -void clientmessage(XEvent *); - -void (*handler[LASTEvent])(XEvent *) = { - [Expose] = expose, - [KeyPress] = keypress, - [ButtonPress] = buttonpress, - [ConfigureRequest] = configurerequest, - [ConfigureNotify] = configurenotify, - [DestroyNotify] = destroynotify, - [EnterNotify] = enternotify, - [FocusIn] = focusevent, - [FocusOut] = focusevent, - [MapNotify] = mapnotify, - [MappingNotify] = mappingnotify, - [MapRequest] = maprequest, - [PropertyNotify] = propertynotify, - [UnmapNotify] = unmapnotify, - [VisibilityNotify] = visibilitynotify, - [ClientMessage] = clientmessage, -}; +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) @@ -1162,11 +1161,11 @@ sighdlr(int sig) } struct pid_e * -find_pid(long pid) +find_pid(pid_t pid) { struct pid_e *p = NULL; - DNPRINTF(SWM_D_MISC, "find_pid: %lu\n", pid); + DNPRINTF(SWM_D_MISC, "find_pid: %d\n", pid); if (pid == 0) return (NULL); @@ -1179,27 +1178,50 @@ find_pid(long pid) return (NULL); } -unsigned long -name_to_color(char *colorname) +uint32_t +name_to_color(const char *colorname) { - Colormap cmap; - Status status; - XColor screen_def, exact_def; - unsigned long result = 0; - char cname[32] = "#"; + uint32_t result = 0; + char cname[32] = "#"; + xcb_screen_t *screen; + xcb_colormap_t cmap; + xcb_alloc_color_reply_t *cr; + xcb_alloc_named_color_reply_t *nr; + uint16_t rr, gg, bb; + + screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data; + cmap = screen->default_colormap; - cmap = DefaultColormap(display, screens[0].idx); - status = XAllocNamedColor(display, cmap, colorname, - &screen_def, &exact_def); - if (!status) { - strlcat(cname, colorname + 2, sizeof cname - 1); - status = XAllocNamedColor(display, cmap, cname, &screen_def, - &exact_def); + /* color is in format rgb://rr/gg/bb */ + if (strncmp(colorname, "rgb:", 4) == 0) { + if (parse_rgb(colorname, &rr, &gg, &bb) == -1) + warnx("could not parse rgb %s", colorname); + else { + cr = xcb_alloc_color_reply(conn, + xcb_alloc_color(conn, cmap, rr, gg, bb), + NULL); + if (cr) { + result = cr->pixel; + free(cr); + } else + warnx("color '%s' not found", colorname); + } + } else { + nr = xcb_alloc_named_color_reply(conn, + xcb_alloc_named_color(conn, cmap, strlen(colorname), + colorname), NULL); + if (!nr) { + strlcat(cname, colorname + 2, sizeof cname - 1); + nr = xcb_alloc_named_color_reply(conn, + xcb_alloc_named_color(conn, cmap, strlen(cname), + cname), NULL); + } + if (nr) { + result = nr->pixel; + free(nr); + } else + warnx("color '%s' not found", colorname); } - if (status) - result = screen_def.pixel; - else - warnx("color '%s' not found", colorname); return (result); } @@ -1207,13 +1229,16 @@ name_to_color(char *colorname) void setscreencolor(char *val, int i, int c) { - if (i > 0 && i <= ScreenCount(display)) { + int num_screens; + + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + if (i > 0 && i <= num_screens) { screens[i - 1].c[c].color = name_to_color(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 < ScreenCount(display); i++) { + for (i = 0; i < num_screens; i++) { screens[i].c[c].color = name_to_color(val); free(screens[i].c[c].name); if ((screens[i].c[c].name = strdup(val)) == NULL) @@ -1221,7 +1246,7 @@ setscreencolor(char *val, int i, int c) } } else errx(1, "invalid screen index: %d out of bounds (maximum %d)", - i, ScreenCount(display)); + i, num_screens); } void @@ -1254,25 +1279,29 @@ void custom_region(char *val) { unsigned int sidx, x, y, w, h; + int num_screens; + xcb_screen_t *screen; + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); if (sscanf(val, "screen[%u]:%ux%u+%u+%u", &sidx, &w, &h, &x, &y) != 5) errx(1, "invalid custom region, " "should be 'screen[]:x++"); - if (sidx < 1 || sidx > ScreenCount(display)) + if (sidx < 1 || sidx > num_screens) errx(1, "invalid screen index: %d out of bounds (maximum %d)", - sidx, ScreenCount(display)); + sidx, num_screens); sidx--; + screen = get_screen(sidx); if (w < 1 || h < 1) errx(1, "region %ux%u+%u+%u too small", w, h, x, y); - if (x > DisplayWidth(display, sidx) || - y > DisplayHeight(display, sidx) || - w + x > DisplayWidth(display, sidx) || - h + y > DisplayHeight(display, sidx)) { + if (x > screen->width_in_pixels || + y > screen->height_in_pixels || + w + x > screen->width_in_pixels || + h + y > screen->height_in_pixels) { warnx("ignoring region %ux%u+%u+%u - not within screen " "boundaries (%ux%u)", w, h, x, y, - DisplayWidth(display, sidx), DisplayHeight(display, sidx)); + screen->width_in_pixels, screen->height_in_pixels); return; } @@ -1292,15 +1321,17 @@ socket_setnonblock(int fd) } void -bar_print(struct swm_region *r, char *s) +bar_print(struct swm_region *r, const char *s) { int x = 0; size_t len; + xcb_rectangle_t rect; + uint32_t gcv[1]; XRectangle ibox, lbox; - XClearWindow(display, r->bar_window); - len = strlen(s); + /* FIXME fix bar font position calculations */ +#if 0 XmbTextExtents(bar_fs, s, len, &ibox, &lbox); switch (bar_justify) { @@ -1317,10 +1348,36 @@ bar_print(struct swm_region *r, char *s) if (x < SWM_BAR_OFFSET) x = SWM_BAR_OFFSET; +#endif + + 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].color; + 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); + + /* 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); +#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 - DRAWSTRING(display, r->bar_window, bar_fs, r->s->bar_gc, - x, (bar_fs_extents->max_logical_extent.height - lbox.height) / 2 - - lbox.y, s, len); + /* 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 @@ -1339,108 +1396,336 @@ bar_extra_stop(void) } void -bar_class_name(char *s, ssize_t sz, struct ws_win *cur_focus) +bar_class_name(char *s, size_t sz, struct swm_region *r) { - int do_class, do_name; - Status status; - XClassHint *xch = NULL; + 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); +} - if ((title_name_enabled == 1 || title_class_enabled == 1) && - cur_focus != NULL) { - if ((xch = XAllocClassHint()) == NULL) - goto out; - status = XGetClassHint(display, cur_focus->id, xch); - if (status == BadWindow || status == BadAlloc) - goto out; - do_class = (title_class_enabled && xch->res_class != NULL); - do_name = (title_name_enabled && xch->res_name != NULL); - if (do_class) - strlcat(s, xch->res_class, sz); - if (do_class && do_name) - strlcat(s, ":", sz); - if (do_name) - strlcat(s, xch->res_name, sz); - strlcat(s, " ", sz); - } -out: - if (xch) { - XFree(xch->res_name); - XFree(xch->res_class); - XFree(xch); - } +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); } void -bar_window_name(char *s, ssize_t sz, struct ws_win *cur_focus) +bar_class_title_name(char *s, size_t sz, struct swm_region *r) { - unsigned char *title; + if (r == NULL || r->ws == NULL || r->ws->focus == NULL) + return; - if (window_name_enabled && cur_focus != NULL) { - title = get_win_name(cur_focus->id); - if (title != NULL) { - DNPRINTF(SWM_D_BAR, "bar_window_name: title: %s\n", - title); + bar_class_name(s, sz, r); + strlcat(s, ":", sz); + bar_title_name(s, sz, r); +} - if (cur_focus->floating) - strlcat(s, "(f) ", sz); - strlcat(s, (char *)title, sz); - strlcat(s, " ", sz); - XFree(title); - } - } +void +bar_window_float(char *s, size_t sz, struct swm_region *r) +{ + if (r == NULL || r ->ws == NULL || r->ws->focus == NULL) + return; + if (r->ws->focus->floating) + strlcat(s, "(f)", sz); +} + +void +bar_window_name(char *s, size_t sz, struct swm_region *r) +{ + char *title; + + if (r == NULL || r->ws == NULL || r->ws->focus == NULL) + return; + if ((title = get_win_name(r->ws->focus->id)) == NULL) + return; + + strlcat(s, title, sz); + free(title); } int urgent[SWM_WS_MAX]; void -bar_urgent(char *s, ssize_t sz) +bar_urgent(char *s, size_t sz) { - XWMHints *wmh = NULL; struct ws_win *win; - int i, j; + int i, j, num_screens; char b[8]; + xcb_get_property_cookie_t c; + xcb_icccm_wm_hints_t hints; - if (urgent_enabled == 0) - return; - - for (i = 0; i < SWM_WS_MAX; i++) + for (i = 0; i < workspace_limit; i++) urgent[i] = 0; - for (i = 0; i < ScreenCount(display); i++) - for (j = 0; j < SWM_WS_MAX; j++) + 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) { - wmh = XGetWMHints(display, win->id); - if (wmh == NULL) + c = xcb_icccm_get_wm_hints(conn, win->id); + if (xcb_icccm_get_wm_hints_reply(conn, c, + &hints, NULL) == 0) continue; - - if (wmh->flags & XUrgencyHint) + if (hints.flags & XCB_ICCCM_WM_HINT_X_URGENCY) urgent[j] = 1; - XFree(wmh); } - strlcat(s, "* ", sz); - for (i = 0; i < SWM_WS_MAX; i++) { + for (i = 0; i < workspace_limit; i++) { if (urgent[i]) snprintf(b, sizeof b, "%d ", i + 1); else snprintf(b, sizeof b, "- "); strlcat(s, b, sz); } - strlcat(s, "* ", sz); } void -bar_update(void) +bar_workspace_name(char *s, size_t sz, struct swm_region *r) { - time_t tmt; + if (r == NULL || r->ws == NULL) + return; + if (r->ws->name != NULL) + strlcat(s, r->ws->name, sz); +} + +/* build the default bar format according to the defined enabled options */ +void +bar_fmt(const char *fmtexp, char *fmtnew, struct swm_region *r, size_t sz) +{ + /* if format provided, just copy the buffers */ + if (bar_format != NULL) { + strlcpy(fmtnew, fmtexp, sz); + return; + } + + /* reset the output buffer */ + *fmtnew = '\0'; + + strlcat(fmtnew, "+N:+I ", sz); + if (stack_enabled) + strlcat(fmtnew, "+S", sz); + strlcat(fmtnew, " ", sz); + + /* only show the workspace name if there's actually one */ + if (r != NULL && r->ws != NULL && r->ws->name != NULL) + strlcat(fmtnew, "<+D>", sz); + strlcat(fmtnew, "+3<", sz); + + if (clock_enabled) { + strlcat(fmtnew, fmtexp, sz); + strlcat(fmtnew, "+4<", sz); + } + + /* bar_urgent already adds the space before the last asterisk */ + if (urgent_enabled) + strlcat(fmtnew, "* +U*+4<", sz); + + if (title_class_enabled) { + strlcat(fmtnew, "+C", sz); + if (title_name_enabled == 0) + strlcat(fmtnew, "+4<", sz); + } + + /* checks needed by the colon and floating strlcat(3) calls below */ + if (r != NULL && r->ws != NULL && r->ws->focus != NULL) { + if (title_name_enabled) { + if (title_class_enabled) + strlcat(fmtnew, ":", sz); + strlcat(fmtnew, "+T+4<", sz); + } + if (window_name_enabled) { + if (r->ws->focus->floating) + strlcat(fmtnew, "+F ", sz); + strlcat(fmtnew, "+64W ", sz); + } + } + + /* finally add the action script output and the version */ + strlcat(fmtnew, "+4<+A+4<+V", sz); +} + +void +bar_replace_pad(char *tmp, int *limit, size_t sz) +{ + /* special case; no limit given, pad one space, instead */ + if (*limit == sz - 1) + *limit = 1; + snprintf(tmp, sz, "%*s", *limit, " "); +} + +/* replaces the bar format character sequences (like in tmux(1)) */ +char * +bar_replace_seq(char *fmt, char *fmtrep, struct swm_region *r, size_t *offrep, + size_t sz) +{ + char *ptr; + char tmp[SWM_BAR_MAX]; + int limit, size; + size_t len; + + /* reset strlcat(3) buffer */ + *tmp = '\0'; + + /* get number, if any */ + fmt++; + size = 0; + if (sscanf(fmt, "%d%n", &limit, &size) != 1) + limit = sizeof tmp - 1; + if (limit <= 0 || limit >= sizeof tmp) + limit = sizeof tmp - 1; + + /* there is nothing to replace (ie EOL) */ + fmt += size; + if (*fmt == '\0') + return (fmt); + + switch (*fmt) { + case '<': + bar_replace_pad(tmp, &limit, sizeof tmp); + break; + case 'A': + snprintf(tmp, sizeof tmp, "%s", bar_ext); + break; + case 'C': + bar_class_name(tmp, sizeof tmp, r); + break; + case 'D': + bar_workspace_name(tmp, sizeof tmp, r); + break; + case 'F': + bar_window_float(tmp, sizeof tmp, r); + break; + case 'I': + snprintf(tmp, sizeof tmp, "%d", r->ws->idx + 1); + break; + case 'N': + snprintf(tmp, sizeof tmp, "%d", r->s->idx + 1); + break; + case 'P': + bar_class_title_name(tmp, sizeof tmp, r); + break; + case 'S': + snprintf(tmp, sizeof tmp, "%s", r->ws->stacker); + break; + case 'T': + bar_title_name(tmp, sizeof tmp, r); + break; + case 'U': + bar_urgent(tmp, sizeof tmp); + break; + case 'V': + snprintf(tmp, sizeof tmp, "%s", bar_vertext); + break; + case 'W': + bar_window_name(tmp, sizeof tmp, r); + break; + default: + /* unknown character sequence; copy as-is */ + snprintf(tmp, sizeof tmp, "+%c", *fmt); + break; + } + + len = strlen(tmp); + ptr = tmp; + if (len < limit) + limit = len; + while (limit-- > 0) { + if (*offrep >= sz - 1) + break; + fmtrep[(*offrep)++] = *ptr++; + } + + fmt++; + return (fmt); +} + +void +bar_replace(char *fmt, char *fmtrep, struct swm_region *r, size_t sz) +{ + size_t off; + + off = 0; + while (*fmt != '\0') { + if (*fmt != '+') { + /* skip ordinary characters */ + if (off >= sz - 1) + break; + fmtrep[off++] = *fmt++; + continue; + } + + /* character sequence found; replace it */ + fmt = bar_replace_seq(fmt, fmtrep, r, &off, sz); + if (off >= sz - 1) + break; + } + + fmtrep[off] = '\0'; +} + +void +bar_fmt_expand(char *fmtexp, size_t sz) +{ + char *fmt = NULL; + size_t len; struct tm tm; + time_t tmt; + + /* start by grabbing the current time and date */ + time(&tmt); + localtime_r(&tmt, &tm); + + /* figure out what to expand */ + if (bar_format != NULL) + fmt = bar_format; + else if (bar_format == NULL && clock_enabled) + fmt = clock_format; + /* if nothing to expand bail out */ + if (fmt == NULL) { + *fmtexp = '\0'; + return; + } + + /* copy as-is, just in case the format shouldn't be expanded below */ + strlcpy(fmtexp, fmt, sz); + /* finally pass the string through strftime(3) */ +#ifndef SWM_DENY_CLOCK_FORMAT + if ((len = strftime(fmtexp, sz, fmt, &tm)) == 0) + warnx("format too long"); + fmtexp[len] = '\0'; +#endif +} + +void +bar_fmt_print(void) +{ + char fmtexp[SWM_BAR_MAX], fmtnew[SWM_BAR_MAX]; + char fmtrep[SWM_BAR_MAX]; + int i, num_screens; struct swm_region *r; - int i, x; + + /* 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)); + 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); + } + } +} + +void +bar_update(void) +{ size_t len; - char ws[SWM_BAR_MAX]; - char s[SWM_BAR_MAX]; - unsigned char cn[SWM_BAR_MAX]; - char loc[SWM_BAR_MAX]; - char *b, *stack = ""; + char *b; if (bar_enabled == 0) return; @@ -1458,52 +1743,11 @@ bar_update(void) } else strlcpy((char *)bar_ext, "", sizeof bar_ext); - if (clock_enabled == 0) - strlcpy(s, "", sizeof s); - else { - time(&tmt); - localtime_r(&tmt, &tm); - len = strftime(s, sizeof s, clock_format, &tm); - s[len] = '\0'; - strlcat(s, " ", sizeof s); - } - - for (i = 0; i < ScreenCount(display); i++) { - x = 1; - TAILQ_FOREACH(r, &screens[i].rl, entry) { - strlcpy((char *)cn, "", sizeof cn); - strlcpy(ws, "", sizeof ws); - if (r && r->ws) { - bar_urgent((char *)cn, sizeof cn); - bar_class_name((char *)cn, sizeof cn, - r->ws->focus); - bar_window_name((char *)cn, sizeof cn, - r->ws->focus); - if (r->ws->name) - snprintf(ws, sizeof ws, "<%s>", - r->ws->name); - if (stack_enabled) - stack = r->ws->stacker; - - snprintf(loc, sizeof loc, - "%d:%d %s %s %s%s %s %s", - x++, r->ws->idx + 1, stack, ws, s, cn, - bar_ext, bar_vertext); - bar_print(r, loc); - } - } - } + bar_fmt_print(); alarm(bar_delay); } void -bar_check_opts(void) -{ - if (title_class_enabled || title_name_enabled || window_name_enabled) - bar_update(); -} - -void bar_signal(int sig) { bar_alarm = 1; @@ -1513,32 +1757,38 @@ void bar_toggle(struct swm_region *r, union arg *args) { struct swm_region *tmpr; - int i, sc = ScreenCount(display); + int i, num_screens; DNPRINTF(SWM_D_BAR, "bar_toggle\n"); - if (bar_enabled) - for (i = 0; i < sc; i++) + 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) - XUnmapWindow(display, tmpr->bar_window); - else - for (i = 0; i < sc; i++) + 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) - XMapRaised(display, tmpr->bar_window); + if (tmpr->bar) + map_window_raised(tmpr->bar->id); + } bar_enabled = !bar_enabled; stack(); /* must be after stack */ bar_update(); + + xcb_flush(conn); } void bar_refresh(void) { - XSetWindowAttributes wa; struct swm_region *r; - int i; + 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]) { @@ -1569,15 +1819,15 @@ bar_refresh(void) } } - bzero(&wa, sizeof wa); - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) { - wa.border_pixel = - screens[i].c[SWM_S_COLOR_BAR_BORDER].color; - wa.background_pixel = - screens[i].c[SWM_S_COLOR_BAR].color; - XChangeWindowAttributes(display, r->bar_window, - CWBackPixel | CWBorderPixel, &wa); + 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(); } @@ -1588,18 +1838,24 @@ bar_setup(struct swm_region *r) char *default_string; char **missing_charsets; int num_missing_charsets = 0; - int i, x, y; + int i; + xcb_screen_t *screen = get_screen(r->s->idx); + uint32_t wa[3]; +#if 0 if (bar_fs) { XFreeFontSet(display, bar_fs); bar_fs = NULL; } +#endif - + if ((r->bar = calloc(1, sizeof(struct swm_bar))) == NULL) + err(1, "bar_setup: calloc: failed to allocate memory."); +#if 0 DNPRINTF(SWM_D_BAR, "bar_setup: 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):"); @@ -1626,19 +1882,40 @@ bar_setup(struct swm_region *r) if (bar_height < 1) bar_height = 1; +#else + /* workaround */ + bar_height = 24; +#endif + 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; + + 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)); + 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, + XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | XCB_CW_BORDER_PIXEL + | XCB_CW_EVENT_MASK, wa); + + r->bar->buffer = xcb_generate_id(conn); + 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); - x = X(r); - y = bar_at_bottom ? (Y(r) + HEIGHT(r) - bar_height) : Y(r); - - r->bar_window = XCreateSimpleWindow(display, - r->s->root, x, y, WIDTH(r) - 2 * bar_border_width, - bar_height - 2 * bar_border_width, - bar_border_width, r->s->c[SWM_S_COLOR_BAR_BORDER].color, - r->s->c[SWM_S_COLOR_BAR].color); - XSelectInput(display, r->bar_window, VisibilityChangeMask); if (bar_enabled) - XMapRaised(display, r->bar_window); - DNPRINTF(SWM_D_BAR, "bar_setup: bar_window: 0x%lx\n", r->bar_window); + map_window_raised(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"); @@ -1646,43 +1923,47 @@ bar_setup(struct swm_region *r) } void -drain_enter_notify(void) +bar_cleanup(struct swm_region *r) { - int i = 0; - XEvent cne; - - while (XCheckMaskEvent(display, EnterWindowMask, &cne)) - i++; - - DNPRINTF(SWM_D_MISC, "drain_enter_notify: drained: %d\n", i); + if (r->bar == NULL) + return; + xcb_destroy_window(conn, r->bar->id); + xcb_free_pixmap(conn, r->bar->buffer); + free(r->bar); + r->bar = NULL; } void -set_win_state(struct ws_win *win, long state) +set_win_state(struct ws_win *win, uint16_t state) { - long data[] = {state, None}; + uint16_t data[2] = { state, XCB_ATOM_NONE }; - DNPRINTF(SWM_D_EVENT, "set_win_state: window: 0x%lx\n", win->id); + DNPRINTF(SWM_D_EVENT, "set_win_state: window: 0x%x\n", win->id); if (win == NULL) return; - XChangeProperty(display, win->id, astate, astate, 32, PropModeReplace, - (unsigned char *)data, 2); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->id, a_state, + a_state, 32, 2, data); } -long -getstate(Window w) +uint16_t +getstate(xcb_window_t w) { - long result = -1; - unsigned char *p = NULL; - unsigned long n; + uint16_t result = 0; + xcb_get_property_cookie_t c; + xcb_get_property_reply_t *r; - if (!get_property(w, astate, 2L, astate, &n, NULL, &p)) - return (-1); - if (n != 0) - result = *((long *)p); - XFree(p); + c = xcb_get_property(conn, False, 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)); + free(r); + } + + DNPRINTF(SWM_D_MISC, "getstate property: win 0x%x state %u\n", w, + result); return (result); } @@ -1696,37 +1977,42 @@ version(struct swm_region *r, union arg *args) else strlcpy(bar_vertext, "", sizeof bar_vertext); bar_update(); + + xcb_flush(conn); } void -client_msg(struct ws_win *win, Atom a) +client_msg(struct ws_win *win, xcb_atom_t a) { - XClientMessageEvent cm; + xcb_client_message_event_t ev; if (win == NULL) return; - bzero(&cm, sizeof cm); - cm.type = ClientMessage; - cm.window = win->id; - cm.message_type = aprot; - cm.format = 32; - cm.data.l[0] = a; - cm.data.l[1] = CurrentTime; - XSendEvent(display, win->id, False, 0L, (XEvent *)&cm); + bzero(&ev, sizeof ev); + ev.response_type = XCB_CLIENT_MESSAGE; + ev.window = win->id; + ev.type = a_prot; + ev.format = 32; + ev.data.data32[0] = a; + ev.data.data32[1] = XCB_CURRENT_TIME; + + xcb_send_event(conn, False, win->id, + XCB_EVENT_MASK_NO_EVENT, (const char *)&ev); } /* synthetic response to a ConfigureRequest when not making a change */ void -config_win(struct ws_win *win, XConfigureRequestEvent *ev) +config_win(struct ws_win *win, xcb_configure_request_event_t *ev) { - XConfigureEvent ce; + xcb_configure_notify_event_t ce; if (win == NULL) return; /* send notification of unchanged state. */ - ce.type = ConfigureNotify; + bzero(&ce, sizeof(ce)); + ce.response_type = XCB_CONFIGURE_NOTIFY; ce.x = X(win); ce.y = Y(win); ce.width = WIDTH(win); @@ -1735,22 +2021,20 @@ config_win(struct ws_win *win, XConfigureRequestEvent *ev) if (ev == NULL) { /* EWMH */ - ce.display = display; ce.event = win->id; ce.window = win->id; - ce.border_width = border_width; - ce.above = None; + ce.border_width = BORDER(win); + ce.above_sibling = XCB_WINDOW_NONE; } else { /* normal */ - ce.display = ev->display; ce.event = ev->window; ce.window = ev->window; /* make response appear more WM_SIZE_HINTS-compliant */ - if (win->sh_mask) - DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%lx," - " sh_mask: %ld, min: %d x %d, max: %d x %d, inc: " - "%d x %d\n", win->id, win->sh_mask, SH_MIN_W(win), + 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)); @@ -1783,17 +2067,18 @@ config_win(struct ws_win *win, XConfigureRequestEvent *ev) } /* adjust x and y for requested border_width. */ - ce.x += border_width - ev->border_width; - ce.y += border_width - ev->border_width; + ce.x += BORDER(win) - ev->border_width; + ce.y += BORDER(win) - ev->border_width; ce.border_width = ev->border_width; - ce.above = ev->above; + ce.above_sibling = ev->sibling; } - DNPRINTF(SWM_D_MISC, "config_win: ewmh: %s, window: 0x%lx, (x,y) w x h: " + DNPRINTF(SWM_D_MISC, "config_win: ewmh: %s, window: 0x%x, (x,y) w x h: " "(%d,%d) %d x %d, border: %d\n", YESNO(ev == NULL), win->id, ce.x, ce.y, ce.width, ce.height, ce.border_width); - XSendEvent(display, win->id, False, StructureNotifyMask, (XEvent *)&ce); + xcb_send_event(conn, False, win->id, XCB_EVENT_MASK_STRUCTURE_NOTIFY, + (char *)&ce); } int @@ -1830,57 +2115,63 @@ unmap_window(struct ws_win *win) return; /* don't unmap again */ - if (getstate(win->id) == IconicState) + if (getstate(win->id) == XCB_ICCCM_WM_STATE_ICONIC) return; - set_win_state(win, IconicState); + set_win_state(win, XCB_ICCCM_WM_STATE_ICONIC); - XUnmapWindow(display, win->id); - XSetWindowBorder(display, win->id, - win->s->c[SWM_S_COLOR_UNFOCUS].color); + 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); } void unmap_all(void) { struct ws_win *win; - int i, j; + int i, j, num_screens; - for (i = 0; i < ScreenCount(display); i++) - for (j = 0; j < SWM_WS_MAX; j++) + 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) unmap_window(win); } void -fake_keypress(struct ws_win *win, int keysym, int modifiers) +fake_keypress(struct ws_win *win, xcb_keysym_t keysym, uint16_t modifiers) { - XKeyEvent event; + xcb_key_press_event_t event; + xcb_keycode_t *keycode; if (win == NULL) return; - event.display = display; /* Ignored, but what the hell */ - event.window = win->id; + keycode = xcb_key_symbols_get_keycode(syms, keysym); + + DNPRINTF(SWM_D_MISC, "fake_keypress: win 0x%x keycode %u\n", + win->id, *keycode); + + bzero(&event, sizeof(event)); + event.event = win->id; event.root = win->s->root; - event.subwindow = None; - event.time = CurrentTime; - event.x = X(win); - event.y = Y(win); - event.x_root = 1; - event.y_root = 1; + event.child = XCB_WINDOW_NONE; + event.time = XCB_CURRENT_TIME; + event.event_x = X(win); + event.event_y = Y(win); + event.root_x = 1; + event.root_y = 1; event.same_screen = True; - event.keycode = XKeysymToKeycode(display, keysym); + event.detail = *keycode; event.state = modifiers; - event.type = KeyPress; - XSendEvent(event.display, event.window, True, - KeyPressMask, (XEvent *)&event); - - event.type = KeyRelease; - XSendEvent(event.display, event.window, True, - KeyPressMask, (XEvent *)&event); + event.response_type = XCB_KEY_PRESS; + xcb_send_event(conn, True, win->id, + XCB_EVENT_MASK_KEY_PRESS, (const char *)&event); + event.response_type = XCB_KEY_RELEASE; + xcb_send_event(conn, True, win->id, + XCB_EVENT_MASK_KEY_RELEASE, (const char *)&event); } void @@ -1896,31 +2187,42 @@ restart(struct swm_region *r, union arg *args) bar_extra_stop(); bar_extra = 1; unmap_all(); - XCloseDisplay(display); + + xcb_key_symbols_free(syms); + xcb_flush(conn); + xcb_disconnect(conn); + execvp(start_argv[0], start_argv); warn("execvp failed"); quit(NULL, NULL); } struct swm_region * -root_to_region(Window root) +root_to_region(xcb_window_t root) { - struct swm_region *r = NULL; - Window rr, cr; - int i, x, y, wx, wy; - unsigned int mask; + struct swm_region *r = NULL; + int i, num_screens; + xcb_query_pointer_reply_t *qpr; + + DNPRINTF(SWM_D_MISC, "root_to_region: window: 0x%x\n", root); - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) if (screens[i].root == root) break; - if (XQueryPointer(display, screens[i].root, - &rr, &cr, &x, &y, &wx, &wy, &mask) != False) { + 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); /* choose a region based on pointer location */ TAILQ_FOREACH(r, &screens[i].rl, entry) - if (x >= X(r) && x <= X(r) + WIDTH(r) && - y >= Y(r) && y <= Y(r) + HEIGHT(r)) + 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) @@ -1930,13 +2232,14 @@ root_to_region(Window root) } struct ws_win * -find_unmanaged_window(Window id) +find_unmanaged_window(xcb_window_t id) { struct ws_win *win; - int i, j; + int i, j, num_screens; - for (i = 0; i < ScreenCount(display); i++) - for (j = 0; j < SWM_WS_MAX; j++) + 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].unmanagedlist, entry) if (id == win->id) @@ -1945,36 +2248,37 @@ find_unmanaged_window(Window id) } struct ws_win * -find_window(Window id) +find_window(xcb_window_t id) { struct ws_win *win; - Window wrr, wpr, *wcr = NULL; - int i, j; - unsigned int nc; + int i, j, num_screens; + xcb_query_tree_reply_t *r; - for (i = 0; i < ScreenCount(display); i++) - for (j = 0; j < SWM_WS_MAX; j++) + 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) if (id == win->id) return (win); - /* if we were looking for the parent return that window instead */ - if (XQueryTree(display, id, &wrr, &wpr, &wcr, &nc) == 0) + r = xcb_query_tree_reply(conn, xcb_query_tree(conn, id), NULL); + if (!r) return (NULL); - if (wcr) - XFree(wcr); - /* ignore not found and root */ - if (wpr == 0 || wrr == wpr) + /* if we were looking for the parent return that window instead */ + if (r->parent == 0 || r->root == r->parent) return (NULL); /* look for parent */ - for (i = 0; i < ScreenCount(display); i++) - for (j = 0; j < SWM_WS_MAX; j++) + for (i = 0; i < num_screens; i++) + for (j = 0; j < workspace_limit; j++) TAILQ_FOREACH(win, &screens[i].ws[j].winlist, entry) - if (wpr == win->id) + if (r->parent == win->id) { + free(r); return (win); + } + free(r); return (NULL); } @@ -1986,8 +2290,7 @@ spawn(int ws_idx, union arg *args, int close_fd) DNPRINTF(SWM_D_MISC, "spawn: %s\n", args->argv[0]); - if (display) - close(ConnectionNumber(display)); + close(xcb_get_file_descriptor(conn)); setenv("LD_PRELOAD", SWM_LIB, 1); @@ -2035,30 +2338,19 @@ spawn(int ws_idx, union arg *args, int close_fd) } void -spawnterm(struct swm_region *r, union arg *args) -{ - DNPRINTF(SWM_D_MISC, "spawnterm\n"); - - if (fork() == 0) { - if (term_width) - setenv("_SWM_XTERM_FONTADJ", "", 1); - spawn(r->ws->idx, args, 1); - } -} - -void kill_refs(struct ws_win *win) { - int i, x; + int i, x, num_screens; struct swm_region *r; struct workspace *ws; if (win == NULL) return; - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) - for (x = 0; x < SWM_WS_MAX; x++) { + for (x = 0; x < workspace_limit; x++) { ws = &r->s->ws[x]; if (win == ws->focus) ws->focus = NULL; @@ -2073,14 +2365,15 @@ validate_win(struct ws_win *testwin) struct ws_win *win; struct workspace *ws; struct swm_region *r; - int i, x; + int i, x, num_screens; if (testwin == NULL) return (0); - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) - for (x = 0; x < SWM_WS_MAX; x++) { + for (x = 0; x < workspace_limit; x++) { ws = &r->s->ws[x]; TAILQ_FOREACH(win, &ws->winlist, entry) if (win == testwin) @@ -2094,12 +2387,13 @@ validate_ws(struct workspace *testws) { struct swm_region *r; struct workspace *ws; - int i, x; + int i, x, num_screens; /* validate all ws */ - for (i = 0; i < ScreenCount(display); i++) + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) - for (x = 0; x < SWM_WS_MAX; x++) { + for (x = 0; x < workspace_limit; x++) { ws = &r->s->ws[x]; if (ws == testws) return (0); @@ -2110,10 +2404,9 @@ validate_ws(struct workspace *testws) void unfocus_win(struct ws_win *win) { - XEvent cne; - Window none = None; + xcb_window_t none = XCB_WINDOW_NONE; - DNPRINTF(SWM_D_FOCUS, "unfocus_win: window: 0x%lx\n", WINID(win)); + DNPRINTF(SWM_D_FOCUS, "unfocus_win: window: 0x%x\n", WINID(win)); if (win == NULL) return; @@ -2145,29 +2438,24 @@ unfocus_win(struct ws_win *win) win->ws->focus_prev = NULL; } - /* drain all previous unfocus events */ - while (XCheckTypedEvent(display, FocusOut, &cne) == True) - ; - grabbuttons(win, 0); - XSetWindowBorder(display, win->id, - win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); - - XChangeProperty(display, win->s->root, - ewmh[_NET_ACTIVE_WINDOW].atom, XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&none,1); + xcb_change_window_attributes(conn, win->id, XCB_CW_BORDER_PIXEL, + &win->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root, + ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, &none); } void unfocus_all(void) { struct ws_win *win; - int i, j; + int i, j, num_screens; DNPRINTF(SWM_D_FOCUS, "unfocus_all\n"); - for (i = 0; i < ScreenCount(display); i++) - for (j = 0; j < SWM_WS_MAX; j++) + 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); } @@ -2175,13 +2463,11 @@ unfocus_all(void) void focus_win(struct ws_win *win) { - XEvent cne; - Window cur_focus; - int rr; 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%lx\n", WINID(win)); + DNPRINTF(SWM_D_FOCUS, "focus_win: window: 0x%x\n", WINID(win)); if (win == NULL) return; @@ -2201,40 +2487,56 @@ focus_win(struct ws_win *win) return; } - XGetInputFocus(display, &cur_focus, &rr); + r = xcb_get_input_focus_reply(conn, xcb_get_input_focus(conn), NULL); + if (r) { + cur_focus = r->focus; + 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) + /* TAILQ_FOREACH(cfw, &win->ws->winlist, entry) if (cfw->ws && cfw->ws->r && cfw->ws->r->s) - XSetWindowBorder(display, cfw->id, - cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color); + xcb_change_window_attributes(conn, cfw->id, + XCB_CW_BORDER_PIXEL, + &cfw->ws->r->s->c[SWM_S_COLOR_UNFOCUS].color);*/ } win->ws->focus = win; if (win->ws->r != NULL) { - /* drain all previous focus events */ - while (XCheckTypedEvent(display, FocusIn, &cne) == True) - ; - if (win->java == 0) - XSetInputFocus(display, win->id, - RevertToParent, CurrentTime); + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_PARENT, + win->id, XCB_CURRENT_TIME); grabbuttons(win, 1); - XSetWindowBorder(display, win->id, - win->ws->r->s->c[SWM_S_COLOR_FOCUS].color); + 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) - XMapRaised(display, win->id); + map_window_raised(win->id); - XChangeProperty(display, win->s->root, - ewmh[_NET_ACTIVE_WINDOW].atom, XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&win->id,1); + xcb_change_property(conn, XCB_PROP_MODE_REPLACE, win->s->root, + ewmh[_NET_ACTIVE_WINDOW].atom, XCB_ATOM_WINDOW, 32, 1, + &win->id); } - bar_check_opts(); + bar_update(); +} + +void +event_drain(uint8_t rt) +{ + xcb_generic_event_t *evt; + + xcb_flush(conn); + while ((evt = xcb_poll_for_event(conn))) { + if (XCB_EVENT_RESPONSE_TYPE(evt) != rt) + event_handle(evt); + + free(evt); + } } void @@ -2249,6 +2551,9 @@ switchws(struct swm_region *r, union arg *args) if (!(r && r->s)) return; + if (wsid >= workspace_limit) + return; + this_r = r; old_ws = this_r->ws; new_ws = &this_r->s->ws[wsid]; @@ -2283,15 +2588,15 @@ switchws(struct swm_region *r, union arg *args) a.id = SWM_ARG_ID_FOCUSCUR; focus(new_ws->r, &a); - bar_update(); - /* unmap old windows */ if (unmap_old) TAILQ_FOREACH(win, &old_ws->winlist, entry) unmap_window(win); if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); + event_drain(XCB_ENTER_NOTIFY); + else + xcb_flush(conn); } void @@ -2311,7 +2616,7 @@ cyclews(struct swm_region *r, union arg *args) cycle_all = 1; /* FALLTHROUGH */ case SWM_ARG_ID_CYCLEWS_UP: - if (a.id < SWM_WS_MAX - 1) + if (a.id < workspace_limit - 1) a.id++; else a.id = 0; @@ -2323,7 +2628,7 @@ cyclews(struct swm_region *r, union arg *args) if (a.id > 0) a.id--; else - a.id = SWM_WS_MAX - 1; + a.id = workspace_limit - 1; break; default: return; @@ -2359,10 +2664,11 @@ cyclescr(struct swm_region *r, union arg *args) { struct swm_region *rr = NULL; union arg a; - int i, x, y; + int i, x, y, num_screens; + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); /* do nothing if we don't have more than one screen */ - if (!(ScreenCount(display) > 1 || outputs > 1)) + if (!(num_screens > 1 || outputs > 1)) return; i = r->s->idx; @@ -2386,7 +2692,8 @@ cyclescr(struct swm_region *r, union arg *args) /* move mouse to region */ x = X(rr) + 1; y = Y(rr) + 1 + (bar_enabled ? bar_height : 0); - XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y); + 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); @@ -2395,7 +2702,8 @@ cyclescr(struct swm_region *r, union arg *args) /* move to focus window */ x = X(rr->ws->focus) + 1; y = Y(rr->ws->focus) + 1; - XWarpPointer(display, None, rr->s[i].root, 0, 0, 0, 0, x, y); + xcb_warp_pointer(conn, XCB_WINDOW_NONE, rr->s[i].root, 0, 0, 0, + 0, x, y); } } @@ -2469,7 +2777,6 @@ swapwin(struct swm_region *r, union arg *args) if (target == source) { if (source->ws->focus_prev != NULL && source->ws->focus_prev != target) - source = source->ws->focus_prev; else return; @@ -2494,6 +2801,8 @@ swapwin(struct swm_region *r, union arg *args) sort_windows(wl); stack(); + + xcb_flush(conn); } void @@ -2504,8 +2813,6 @@ focus_prev(struct ws_win *win) struct ws_win_list *wl = NULL; struct workspace *ws = NULL; - DNPRINTF(SWM_D_FOCUS, "focus_prev: window: 0x%lx\n", WINID(win)); - if (!(win && win->ws)) return; @@ -2513,14 +2820,15 @@ focus_prev(struct ws_win *win) wl = &ws->winlist; cur_focus = ws->focus; + DNPRINTF(SWM_D_FOCUS, "focus_prev: window: 0x%x, cur_focus: 0x%x\n", + WINID(win), WINID(cur_focus)); + /* pickle, just focus on whatever */ if (cur_focus == NULL) { /* use prev_focus if valid */ if (ws->focus_prev && ws->focus_prev != cur_focus && find_window(WINID(ws->focus_prev))) winfocus = ws->focus_prev; - if (winfocus == NULL) - winfocus = TAILQ_FIRST(wl); goto done; } @@ -2541,14 +2849,45 @@ focus_prev(struct ws_win *win) goto done; } - if (cur_focus == win) - winfocus = TAILQ_PREV(win, ws_win_list, entry); - if (winfocus == NULL) - winfocus = TAILQ_LAST(wl, ws_win_list); - if (winfocus == NULL || winfocus == win) - winfocus = TAILQ_NEXT(cur_focus, entry); + DNPRINTF(SWM_D_FOCUS, "focus_prev: focus_close: %d\n", focus_close); + if (winfocus == NULL || winfocus == win) { + switch (focus_close) { + case SWM_STACK_BOTTOM: + winfocus = TAILQ_FIRST(wl); + break; + case SWM_STACK_TOP: + winfocus = TAILQ_LAST(wl, ws_win_list); + 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); + } + 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); + } + break; + } + } done: + if (winfocus == NULL) { + if (focus_default == SWM_STACK_TOP) + winfocus = TAILQ_LAST(wl, ws_win_list); + else + winfocus = TAILQ_FIRST(wl); + } + + kill_refs(win); focus_magic(winfocus); } @@ -2652,6 +2991,8 @@ focus(struct swm_region *r, union arg *args) } focus_magic(winfocus); + + xcb_flush(conn); } void @@ -2667,11 +3008,13 @@ cycle_layout(struct swm_region *r, union arg *args) ws->cur_layout = &layouts[0]; stack(); + bar_update(); + if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); + event_drain(XCB_ENTER_NOTIFY); + a.id = SWM_ARG_ID_FOCUSCUR; focus(r, &a); - bar_update(); } void @@ -2694,14 +3037,15 @@ void stack(void) { struct swm_geometry g; struct swm_region *r; - int i; + int i, num_screens; #ifdef SWM_DEBUG int j; #endif DNPRINTF(SWM_D_STACK, "stack: begin\n"); - for (i = 0; i < ScreenCount(display); i++) { + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { #ifdef SWM_DEBUG j = 0; #endif @@ -2728,7 +3072,7 @@ stack(void) { font_adjusted--; if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); + event_drain(XCB_ENTER_NOTIFY); DNPRINTF(SWM_D_STACK, "stack: end\n"); } @@ -2738,46 +3082,65 @@ store_float_geom(struct ws_win *win, struct swm_region *r) { /* retain window geom and region geom */ win->g_float = win->g; - win->rg_float = r->g; + win->g_float.x -= X(r); + win->g_float.y -= Y(r); win->g_floatvalid = 1; + DNPRINTF(SWM_D_MISC, "store_float_geom: window: 0x%x, g: (%d,%d)" + " %d x %d, g_float: (%d,%d) %d x %d\n", win->id, X(win), Y(win), + WIDTH(win), HEIGHT(win), win->g_float.x, win->g_float.y, + win->g_float.w, win->g_float.h); } void stack_floater(struct ws_win *win, struct swm_region *r) { - unsigned int mask; - XWindowChanges wc; - if (win == NULL) return; - bzero(&wc, sizeof wc); - mask = CWX | CWY | CWBorderWidth | CWWidth | CWHeight; + DNPRINTF(SWM_D_MISC, "stack_floater: window: 0x%x\n", win->id); /* * to allow windows to change their size (e.g. mplayer fs) only retrieve * geom on ws switches or return from max mode */ - if (win->floatmaxed || (r != r->ws->old_r && win->g_floatvalid - && !(win->ewmh_flags & EWMH_F_FULLSCREEN))) { - /* - * use stored g and rg to set relative position and size - * as in old region or before max stack mode - */ - X(win) = win->g_float.x - win->rg_float.x + X(r); - Y(win) = win->g_float.y - win->rg_float.y + Y(r); - WIDTH(win) = win->g_float.w; - HEIGHT(win) = win->g_float.h; - win->g_floatvalid = 0; + 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); + } + + win->floatmaxed = 0; + + /* + * if set to fullscreen mode, configure window to maximum size. + */ + if (win->ewmh_flags & EWMH_F_FULLSCREEN) { + if (!win->g_floatvalid) + store_float_geom(win, win->ws->r); + + win->g = win->ws->r->g; } - win->floatmaxed = 0; + /* + * remove border on fullscreen floater when in fullscreen mode or when + * the quirk is present. + */ + if ((win->ewmh_flags & EWMH_F_FULLSCREEN) || + ((win->quirks & SWM_Q_FULLSCREEN) && + (WIDTH(win) >= WIDTH(r)) && (HEIGHT(win) >= HEIGHT(r)))) { + if (win->bordered) { + win->bordered = 0; + X(win) += border_width; + Y(win) += border_width; + } + } else if (!win->bordered) { + win->bordered = 1; + X(win) -= border_width; + Y(win) -= border_width; + } - if ((win->quirks & SWM_Q_FULLSCREEN) && (WIDTH(win) >= WIDTH(r)) && - (HEIGHT(win) >= HEIGHT(r))) - wc.border_width = 0; - else - wc.border_width = border_width; if (win->transient && (win->quirks & SWM_Q_TRANSSZ)) { WIDTH(win) = (double)WIDTH(r) * dialog_ratio; HEIGHT(win) = (double)HEIGHT(r) * dialog_ratio; @@ -2788,39 +3151,14 @@ stack_floater(struct ws_win *win, struct swm_region *r) * floaters and transients are auto-centred unless moved * or resized */ - X(win) = X(r) + (WIDTH(r) - WIDTH(win)) / 2 - wc.border_width; - Y(win) = Y(r) + (HEIGHT(r) - HEIGHT(win)) / 2 - wc.border_width; - } - - /* win can be outside r if new r smaller than old r */ - /* Ensure top left corner inside r (move probs otherwise) */ - if (X(win) < X(r) - wc.border_width) - X(win) = X(r) - wc.border_width; - if (X(win) > X(r) + WIDTH(r) - 1) - X(win) = (WIDTH(win) > WIDTH(r)) ? X(r) : - (X(r) + WIDTH(r) - WIDTH(win) - 2 * wc.border_width); - if (Y(win) < Y(r) - wc.border_width) - Y(win) = Y(r) - wc.border_width; - if (Y(win) > Y(r) + HEIGHT(r) - 1) - Y(win) = (HEIGHT(win) > HEIGHT(r)) ? Y(r) : - (Y(r) + HEIGHT(r) - HEIGHT(win) - 2 * wc.border_width); - - wc.x = X(win); - wc.y = Y(win); - wc.width = WIDTH(win); - wc.height = HEIGHT(win); - - /* - * Retain floater and transient geometry for correct positioning - * when ws changes region - */ - if (!(win->ewmh_flags & EWMH_F_FULLSCREEN)) - store_float_geom(win, r); + X(win) = X(r) + (WIDTH(r) - WIDTH(win)) / 2 - BORDER(win); + Y(win) = Y(r) + (HEIGHT(r) - HEIGHT(win)) / 2 - BORDER(win); + } - DNPRINTF(SWM_D_MISC, "stack_floater: window: %lu, (x,y) w x h: (%d,%d) " - "%d x %d\n", win->id, wc.x, wc.y, wc.width, wc.height); + /* keep window within region bounds */ + constrain_window(win, r, 0); - XConfigureWindow(display, win->id, mask, &wc); + update_window(win); } /* @@ -2860,16 +3198,15 @@ adjust_font(struct ws_win *win) void stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) { - XWindowChanges wc; - XWindowAttributes wa; struct swm_geometry win_g, r_g = *g; - struct ws_win *win, *fs_win = 0; + struct ws_win *win, *fs_win = NULL; int i, j, s, stacks; 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; - unsigned int mask; + 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)); @@ -2995,42 +3332,51 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip) else win_g.y += last_h + 2 * border_width; - bzero(&wc, sizeof wc); if (disable_border && bar_enabled == 0 && winno == 1){ - wc.border_width = 0; + bordered = 0; win_g.w += 2 * border_width; win_g.h += 2 * border_width; - } else - wc.border_width = border_width; - reconfigure = 0; + } 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) { reconfigure = 1; - X(win) = wc.x = win_g.y; - Y(win) = wc.y = win_g.x; - WIDTH(win) = wc.width = win_g.h; - HEIGHT(win) = wc.height = win_g.w; + X(win) = win_g.y; + Y(win) = win_g.x; + WIDTH(win) = win_g.h; + HEIGHT(win) = win_g.w; } } else { if (X(win) != win_g.x || Y(win) != win_g.y || WIDTH(win) != win_g.w || HEIGHT(win) != win_g.h) { reconfigure = 1; - X(win) = wc.x = win_g.x; - Y(win) = wc.y = win_g.y; - WIDTH(win) = wc.width = win_g.w; - HEIGHT(win) = wc.height = win_g.h; + X(win) = win_g.x; + Y(win) = win_g.y; + WIDTH(win) = win_g.w; + HEIGHT(win) = win_g.h; } } + + if (bordered != win->bordered) { + reconfigure = 1; + win->bordered = bordered; + } + if (reconfigure) { adjust_font(win); - mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; - XConfigureWindow(display, win->id, mask, &wc); + update_window(win); } - if (XGetWindowAttributes(display, win->id, &wa)) - if (wa.map_state == IsUnmapped) - XMapRaised(display, win->id); + 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); + } last_h = win_g.h; i++; @@ -3050,12 +3396,12 @@ notiles: } stack_floater(win, ws->r); - XMapRaised(display, win->id); + map_window_raised(win->id); } if (fs_win) { stack_floater(fs_win, ws->r); - XMapRaised(display, fs_win->id); + map_window_raised(fs_win->id); } } @@ -3164,11 +3510,9 @@ horizontal_stack(struct workspace *ws, struct swm_geometry *g) void max_stack(struct workspace *ws, struct swm_geometry *g) { - XWindowChanges wc; struct swm_geometry gg = *g; struct ws_win *win, *wintrans = NULL, *parent = NULL; - unsigned int mask; - int winno; + int winno, num_screens; DNPRINTF(SWM_D_STACK, "max_stack: workspace: %d\n", ws->idx); @@ -3179,6 +3523,7 @@ 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; @@ -3198,32 +3543,27 @@ max_stack(struct workspace *ws, struct swm_geometry *g) /* only reconfigure if necessary */ if (X(win) != gg.x || Y(win) != gg.y || WIDTH(win) != gg.w || HEIGHT(win) != gg.h) { - bzero(&wc, sizeof wc); - X(win) = wc.x = gg.x; - Y(win) = wc.y = gg.y; + win->g = gg; if (bar_enabled){ - wc.border_width = border_width; - WIDTH(win) = wc.width = gg.w; - HEIGHT(win) = wc.height = gg.h; + win->bordered = 1; } else { - wc.border_width = 0; - WIDTH(win) = wc.width = gg.w + 2 * border_width; - HEIGHT(win) = wc.height = gg.h + - 2 * border_width; + win->bordered = 0; + WIDTH(win) += 2 * border_width; + HEIGHT(win) += 2 * border_width; } - mask = CWX | CWY | CWWidth | CWHeight | CWBorderWidth; - XConfigureWindow(display, win->id, mask, &wc); + + update_window(win); } /* unmap only if we don't have multi screen */ if (win != ws->focus) - if (!(ScreenCount(display) > 1 || outputs > 1)) + if (!(num_screens > 1 || outputs > 1)) unmap_window(win); } /* put the last transient on top */ if (wintrans) { if (parent) - XMapRaised(display, parent->id); + map_window_raised(parent->id); stack_floater(wintrans, ws->r); focus_magic(wintrans); } @@ -3235,10 +3575,13 @@ send_to_ws(struct swm_region *r, union arg *args) int wsid = args->id; struct ws_win *win = NULL, *parent; struct workspace *ws, *nws; - Atom ws_idx_atom = 0; - unsigned char ws_idx_str[SWM_PROPLEN]; + xcb_atom_t ws_idx_atom = XCB_ATOM_NONE; + char ws_idx_str[SWM_PROPLEN]; union arg a; + if (wsid >= workspace_limit) + return; + if (r && r->ws && r->ws->focus) win = r->ws->focus; else @@ -3248,7 +3591,7 @@ send_to_ws(struct swm_region *r, union arg *args) if (win->ws->idx == wsid) return; - DNPRINTF(SWM_D_MOVE, "send_to_ws: window: 0x%lx\n", win->id); + DNPRINTF(SWM_D_MOVE, "send_to_ws: window: 0x%x\n", win->id); ws = win->ws; nws = &win->s->ws[wsid]; @@ -3272,24 +3615,30 @@ send_to_ws(struct swm_region *r, union arg *args) win->ws = nws; /* Try to update the window's workspace property */ - ws_idx_atom = XInternAtom(display, "_SWM_WS", False); + ws_idx_atom = get_atom_from_string("_SWM_WS"); if (ws_idx_atom && - snprintf((char *)ws_idx_str, SWM_PROPLEN, "%d", nws->idx) < + 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); - XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8, - PropModeReplace, ws_idx_str, strlen((char *)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(); + + xcb_flush(conn); } void pressbutton(struct swm_region *r, union arg *args) { - XTestFakeButtonEvent(display, args->id, True, CurrentTime); - XTestFakeButtonEvent(display, args->id, False, CurrentTime); + 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, + XCB_CURRENT_TIME, XCB_WINDOW_NONE, 0, 0, 0); } void @@ -3303,6 +3652,8 @@ raise_toggle(struct swm_region *r, union arg *args) /* bring floaters back to top */ if (r->ws->always_raise == 0) stack(); + + xcb_flush(conn); } void @@ -3315,36 +3666,36 @@ iconify(struct swm_region *r, union arg *args) unmap_window(r->ws->focus); update_iconic(r->ws->focus, 1); stack(); - if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); + r->ws->focus = NULL; a.id = SWM_ARG_ID_FOCUSCUR; focus(r, &a); -} -unsigned char * -get_win_name(Window win) -{ - unsigned char *prop = NULL; - unsigned long nbytes, nitems; + xcb_flush(conn); +} - /* try _NET_WM_NAME first */ - if (get_property(win, a_netwmname, 0L, a_utf8_string, NULL, &nbytes, - &prop)) { - XFree(prop); - if (get_property(win, a_netwmname, nbytes, a_utf8_string, - &nitems, NULL, &prop)) - return (prop); +char * +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); + return (NULL); + } + memcpy(name, r.name, r.name_len); + name[r.name_len] = '\0'; + } + xcb_icccm_get_text_property_reply_wipe(&r); } - /* fallback to WM_NAME */ - if (!get_property(win, a_wmname, 0L, a_string, NULL, &nbytes, &prop)) - return (NULL); - XFree(prop); - if (get_property(win, a_wmname, nbytes, a_string, &nitems, NULL, &prop)) - return (prop); - - return (NULL); + return (name); } void @@ -3352,7 +3703,7 @@ uniconify(struct swm_region *r, union arg *args) { struct ws_win *win; FILE *lfile; - unsigned char *name; + char *name; int count = 0; DNPRINTF(SWM_D_MISC, "uniconify\n"); @@ -3388,11 +3739,13 @@ uniconify(struct swm_region *r, union arg *args) name = get_win_name(win->id); if (name == NULL) continue; - fprintf(lfile, "%s.%lu\n", name, win->id); - XFree(name); + fprintf(lfile, "%s.%u\n", name, win->id); + free(name); } fclose(lfile); + + xcb_flush(conn); } void @@ -3437,7 +3790,7 @@ search_workspace(struct swm_region *r, union arg *args) if ((lfile = fdopen(select_list_pipe[1], "w")) == NULL) return; - for (i = 0; i < SWM_WS_MAX; i++) { + for (i = 0; i < workspace_limit; i++) { ws = &r->s->ws[i]; if (ws == NULL) continue; @@ -3454,8 +3807,8 @@ search_win_cleanup(void) struct search_window *sw = NULL; while ((sw = TAILQ_FIRST(&search_wl)) != NULL) { - XDestroyWindow(display, sw->indicator); - XFreeGC(display, sw->gc); + xcb_destroy_window(conn, sw->indicator); + xcb_free_gc(conn, sw->gc); TAILQ_REMOVE(&search_wl, sw, entry); free(sw); } @@ -3466,8 +3819,8 @@ search_win(struct swm_region *r, union arg *args) { struct ws_win *win = NULL; struct search_window *sw = NULL; - Window w; - XGCValues gcv; + xcb_window_t w; + uint32_t gcv[3], wa[2]; int i; char s[8]; FILE *lfile; @@ -3504,36 +3857,62 @@ 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 = XCreateSimpleWindow(display, - win->id, 0, 0,lbox.width + 4, - bar_fs_extents->max_logical_extent.height, 1, - r->s->c[SWM_S_COLOR_UNFOCUS].color, - r->s->c[SWM_S_COLOR_FOCUS].color); + 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 */ + xcb_create_window(conn, XCB_COPY_FROM_PARENT, w, win->id, 0, 0, + 22, 20, 1, XCB_WINDOW_CLASS_INPUT_OUTPUT, + XCB_COPY_FROM_PARENT, XCB_CW_BACK_PIXEL | + XCB_CW_BORDER_PIXEL, wa); +#endif sw->indicator = w; TAILQ_INSERT_TAIL(&search_wl, sw, entry); - sw->gc = XCreateGC(display, w, 0, &gcv); - XMapRaised(display, w); - XSetForeground(display, sw->gc, r->s->c[SWM_S_COLOR_BAR].color); + 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); - DRAWSTRING(display, w, bar_fs, sw->gc, 2, +#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, len); + lbox.height) / 2 - lbox.y, s); +#else + /* workaround */ + xcb_image_text_8(conn, len, w, sw->gc, 6, 14, s); +#endif + + DNPRINTF(SWM_D_MISC, "search_win: mapped window: 0x%x\n", w); fprintf(lfile, "%d\n", i); i++; } fclose(lfile); + + xcb_flush(conn); } void search_resp_uniconify(char *resp, unsigned long len) { - unsigned char *name; + char *name; struct ws_win *win; char *s; @@ -3545,11 +3924,11 @@ search_resp_uniconify(char *resp, unsigned long len) name = get_win_name(win->id); if (name == NULL) continue; - if (asprintf(&s, "%s.%lu", name, win->id) == -1) { - XFree(name); + if (asprintf(&s, "%s.%u", name, win->id) == -1) { + free(name); continue; } - XFree(name); + free(name); if (strncmp(s, resp, len) == 0) { /* XXX this should be a callback to generalize */ update_iconic(win, 0); @@ -3605,7 +3984,7 @@ search_resp_search_workspace(char *resp, unsigned long len) p = strchr(q, ':'); if (p != NULL) *p = '\0'; - ws_idx = strtonum(q, 1, SWM_WS_MAX, &errstr); + ws_idx = strtonum(q, 1, workspace_limit, &errstr); if (errstr) { DNPRINTF(SWM_D_MISC, "workspace idx is %s: %s", errstr, q); @@ -3716,10 +4095,12 @@ wkill(struct swm_region *r, union arg *args) return; if (args->id == SWM_ARG_ID_KILLWINDOW) - XKillClient(display, r->ws->focus->id); + xcb_kill_client(conn, r->ws->focus->id); else if (r->ws->focus->can_delete) - client_msg(r->ws->focus, adelete); + client_msg(r->ws->focus, a_delete); + + xcb_flush(conn); } @@ -3729,16 +4110,16 @@ floating_toggle_win(struct ws_win *win) struct swm_region *r; if (win == NULL) - return 0; + return (0); if (!win->ws->r) - return 0; + return (0); r = win->ws->r; /* reject floating toggles in max stack mode */ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK]) - return 0; + return (0); if (win->floating) { if (!win->floatmaxed) { @@ -3749,8 +4130,8 @@ floating_toggle_win(struct ws_win *win) } else { if (win->g_floatvalid) { /* refloat at last floating relative position */ - X(win) = win->g_float.x - win->rg_float.x + X(r); - Y(win) = win->g_float.y - win->rg_float.y + Y(r); + 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; } @@ -3759,7 +4140,7 @@ floating_toggle_win(struct ws_win *win) ewmh_update_actions(win); - return 1; + return (1); } void @@ -3775,70 +4156,75 @@ floating_toggle(struct swm_region *r, union arg *args) _NET_WM_STATE_TOGGLE); stack(); - if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); if (win == win->ws->focus) { a.id = SWM_ARG_ID_FOCUSCUR; focus(win->ws->r, &a); } + + xcb_flush(conn); + event_drain(XCB_ENTER_NOTIFY); } void constrain_window(struct ws_win *win, struct swm_region *r, int resizable) { - if (X(win) + WIDTH(win) > X(r) + WIDTH(r) - border_width) { + if (MAX_X(win) + BORDER(win) > MAX_X(r)) { if (resizable) - WIDTH(win) = X(r) + WIDTH(r) - X(win) - border_width; + WIDTH(win) = MAX_X(r) - X(win) - BORDER(win); else - X(win) = X(r) + WIDTH(r) - WIDTH(win) - border_width; + X(win) = MAX_X(r)- WIDTH(win) - BORDER(win); } - if (X(win) < X(r) - border_width) { + if (X(win) + BORDER(win) < X(r)) { if (resizable) - WIDTH(win) -= X(r) - X(win) - border_width; + WIDTH(win) -= X(r) - X(win) - BORDER(win); - X(win) = X(r) - border_width; + X(win) = X(r) - BORDER(win); } - if (Y(win) + HEIGHT(win) > Y(r) + HEIGHT(r) - border_width) { + if (MAX_Y(win) + BORDER(win) > MAX_Y(r)) { if (resizable) - HEIGHT(win) = Y(r) + HEIGHT(r) - Y(win) - border_width; + HEIGHT(win) = MAX_Y(r) - Y(win) - BORDER(win); else - Y(win) = Y(r) + HEIGHT(r) - HEIGHT(win) - border_width; + Y(win) = MAX_Y(r) - HEIGHT(win) - BORDER(win); } - if (Y(win) < Y(r) - border_width) { + if (Y(win) + BORDER(win) < Y(r)) { if (resizable) - HEIGHT(win) -= Y(r) - Y(win) - border_width; + HEIGHT(win) -= Y(r) - Y(win) - BORDER(win); - Y(win) = Y(r) - border_width; + Y(win) = Y(r) - BORDER(win); } - if (WIDTH(win) < 1) - WIDTH(win) = 1; - if (HEIGHT(win) < 1) - HEIGHT(win) = 1; + if (resizable) { + if (WIDTH(win) < 1) + WIDTH(win) = 1; + if (HEIGHT(win) < 1) + HEIGHT(win) = 1; + } } void update_window(struct ws_win *win) { - unsigned int mask; - XWindowChanges wc; + uint16_t mask; + uint32_t wc[5]; - bzero(&wc, sizeof wc); - mask = CWBorderWidth | CWWidth | CWHeight | CWX | CWY; - wc.border_width = border_width; - wc.x = X(win); - wc.y = Y(win); - wc.width = WIDTH(win); - wc.height = HEIGHT(win); + mask = XCB_CONFIG_WINDOW_X | XCB_CONFIG_WINDOW_Y | + 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); + wc[3] = HEIGHT(win); + wc[4] = BORDER(win); - DNPRINTF(SWM_D_MISC, "update_window: window: 0x%lx, (x,y) w x h: " - "(%d,%d) %d x %d\n", win->id, wc.x, wc.y, wc.width, wc.height); + DNPRINTF(SWM_D_EVENT, "update_window: window: 0x%x, (x,y) w x h: " + "(%d,%d) %d x %d, bordered: %s\n", win->id, wc[0], wc[1], wc[2], + wc[3], YESNO(win->bordered)); - XConfigureWindow(display, win->id, mask, &wc); + xcb_configure_window(conn, win->id, mask, wc); } #define SWM_RESIZE_STEPS (50) @@ -3846,25 +4232,30 @@ update_window(struct ws_win *win) void resize(struct ws_win *win, union arg *args) { - XEvent ev; - Time time = 0; + xcb_timestamp_t timestamp = 0; struct swm_region *r = NULL; int resize_step = 0; - Window rr, cr; - int x, y, wx, wy; - unsigned int mask; struct swm_geometry g; - int top = 0, left = 0; + int top = 0, left = 0, resizing; int dx, dy; - Cursor cursor; 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_generic_event_t *evt; + xcb_motion_notify_event_t *mne; if (win == NULL) return; r = win->ws->r; - DNPRINTF(SWM_D_MOUSE, "resize: window: 0x%lx, floating: %s, " - "transient: 0x%lx\n", win->id, YESNO(win->floating), + if (win->ewmh_flags & EWMH_F_FULLSCREEN) + return; + + DNPRINTF(SWM_D_EVENT, "resize: window: 0x%x, floating: %s, " + "transient: 0x%x\n", win->id, YESNO(win->floating), win->transient); if (!(win->transient != 0 || win->floating != 0)) @@ -3907,19 +4298,18 @@ resize(struct ws_win *win, union arg *args) return; } - if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); - /* get cursor offset from window root */ - if (!XQueryPointer(display, win->id, &rr, &cr, &x, &y, &wx, &wy, &mask)) - return; + xpr = xcb_query_pointer_reply(conn, xcb_query_pointer(conn, win->id), + NULL); + if (!xpr) + return; g = win->g; - if (wx < WIDTH(win) / 2) + if (xpr->win_x < WIDTH(win) / 2) left = 1; - if (wy < HEIGHT(win) / 2) + if (xpr->win_y < HEIGHT(win) / 2) top = 1; if (args->id == SWM_ARG_ID_CENTER) @@ -3929,27 +4319,37 @@ resize(struct ws_win *win, union arg *args) else shape = (left) ? XC_bottom_left_corner : XC_bottom_right_corner; - cursor = XCreateFontCursor(display, shape); - - if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync, - GrabModeAsync, None, cursor, CurrentTime) != GrabSuccess) { - XFreeCursor(display, cursor); + cursor_font = xcb_generate_id(conn); + xcb_open_font(conn, cursor_font, strlen("cursor"), "cursor"); + + cursor = xcb_generate_id(conn); + xcb_create_glyph_cursor(conn, cursor, cursor_font, cursor_font, + shape, shape + 1, 0, 0, 0, 0xffff, 0xffff, 0xffff); + + gpc = xcb_grab_pointer(conn, False, 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; } - do { - XMaskEvent(display, MOUSEMASK | ExposureMask | - SubstructureRedirectMask, &ev); - switch (ev.type) { - case ConfigureRequest: - case Expose: - case MapRequest: - handler[ev.type](&ev); + xcb_flush(conn); + resizing = 1; + while ((evt = xcb_wait_for_event(conn)) && resizing) { + switch (XCB_EVENT_RESPONSE_TYPE(evt)) { + case XCB_BUTTON_RELEASE: + DNPRINTF(SWM_D_EVENT, "resize: BUTTON_RELEASE\n"); + resizing = 0; break; - case MotionNotify: + case XCB_MOTION_NOTIFY: + mne = (xcb_motion_notify_event_t *)evt; /* cursor offset/delta from start of the operation */ - dx = ev.xmotion.x_root - x; - dy = ev.xmotion.y_root - y; + dx = mne->root_x - xpr->root_x; + dy = mne->root_y - xpr->root_y; /* vertical */ if (top) @@ -3994,25 +4394,30 @@ resize(struct ws_win *win, union arg *args) constrain_window(win, r, 1); /* not free, don't sync more than 120 times / second */ - if ((ev.xmotion.time - time) > (1000 / 120) ) { - time = ev.xmotion.time; - XSync(display, False); + if ((mne->time - timestamp) > (1000 / 120) ) { + timestamp = mne->time; + do_sync(); update_window(win); } break; + default: + event_handle(evt); + break; } - } while (ev.type != ButtonRelease); - if (time) { - XSync(display, False); + free(evt); + } + if (timestamp) { + do_sync(); update_window(win); } store_float_geom(win,r); - XUngrabPointer(display, CurrentTime); - XFreeCursor(display, cursor); - - /* drain events */ - drain_enter_notify(); + 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"); } void @@ -4033,21 +4438,26 @@ resize_step(struct swm_region *r, union arg *args) void move(struct ws_win *win, union arg *args) { - XEvent ev; - Time time = 0; - int move_step = 0; + xcb_timestamp_t timestamp = 0; + int move_step = 0, moving; struct swm_region *r = NULL; - - Window rr, cr; - int x, y, wx, wy; - unsigned int mask; + 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_generic_event_t *evt; + xcb_motion_notify_event_t *mne; if (win == NULL) return; r = win->ws->r; - DNPRINTF(SWM_D_MOUSE, "move: window: 0x%lx, floating: %s, transient: " - "0x%lx\n", win->id, YESNO(win->floating), win->transient); + if (win->ewmh_flags & EWMH_F_FULLSCREEN) + return; + + DNPRINTF(SWM_D_EVENT, "move: window: 0x%x, floating: %s, transient: " + "0x%x\n", win->id, YESNO(win->floating), win->transient); /* in max_stack mode should only move transients */ if (win->ws->cur_layout == &layouts[SWM_MAX_STACK] && !win->transient) @@ -4055,7 +4465,7 @@ move(struct ws_win *win, union arg *args) win->manual = 1; if (win->floating == 0 && !win->transient) { - store_float_geom(win,r); + store_float_geom(win, r); ewmh_update_win_state(win, ewmh[_NET_WM_STATE_ABOVE].atom, _NET_WM_STATE_ADD); } @@ -4092,48 +4502,71 @@ move(struct ws_win *win, union arg *args) return; } - if (XGrabPointer(display, win->id, False, MOUSEMASK, GrabModeAsync, - GrabModeAsync, None, XCreateFontCursor(display, XC_fleur), - CurrentTime) != GrabSuccess) + 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_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; + } /* get cursor offset from window root */ - if (!XQueryPointer(display, win->id, &rr, &cr, &x, &y, &wx, &wy, &mask)) - return; + 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; + } - do { - XMaskEvent(display, MOUSEMASK | ExposureMask | - SubstructureRedirectMask, &ev); - switch (ev.type) { - case ConfigureRequest: - case Expose: - case MapRequest: - handler[ev.type](&ev); + xcb_flush(conn); + moving = 1; + while ((evt = xcb_wait_for_event(conn)) && moving) { + switch (XCB_EVENT_RESPONSE_TYPE(evt)) { + case XCB_BUTTON_RELEASE: + DNPRINTF(SWM_D_EVENT, "move: BUTTON_RELEASE\n"); + moving = 0; break; - case MotionNotify: - X(win) = ev.xmotion.x_root - wx - border_width; - Y(win) = ev.xmotion.y_root - wy - border_width; + case XCB_MOTION_NOTIFY: + mne = (xcb_motion_notify_event_t *)evt; + X(win) = mne->root_x - qpr->win_x - border_width; + Y(win) = mne->root_y - qpr->win_y - border_width; constrain_window(win, r, 0); /* not free, don't sync more than 120 times / second */ - if ((ev.xmotion.time - time) > (1000 / 120) ) { - time = ev.xmotion.time; - XSync(display, False); + if ((mne->time - timestamp) > (1000 / 120) ) { + timestamp = mne->time; + do_sync(); update_window(win); } break; + default: + event_handle(evt); + break; } - } while (ev.type != ButtonRelease); - if (time) { - XSync(display, False); + free(evt); + } + if (timestamp) { + do_sync(); update_window(win); } - store_float_geom(win,r); - XUngrabPointer(display, CurrentTime); - - /* drain events */ - drain_enter_notify(); + store_float_geom(win, r); + free(qpr); + xcb_free_cursor(conn, cursor); + xcb_close_font(conn, cursor_font); + xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); + DNPRINTF(SWM_D_EVENT, "move: done\n"); } void @@ -4155,117 +4588,168 @@ move_step(struct swm_region *r, union arg *args) /* user/key callable function IDs */ enum keyfuncid { - kf_cycle_layout, - kf_flip_layout, - kf_stack_reset, - kf_master_shrink, - kf_master_grow, - kf_master_add, - kf_master_del, - kf_stack_inc, - kf_stack_dec, - kf_swap_main, - kf_focus_next, - kf_focus_prev, - kf_swap_next, - kf_swap_prev, - kf_spawn_term, - kf_spawn_menu, - kf_quit, - kf_restart, - kf_focus_main, - 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_next, - kf_ws_prev, - kf_ws_next_all, - kf_ws_prev_all, - kf_ws_prior, - kf_screen_next, - kf_screen_prev, - 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_bar_toggle, - kf_wind_kill, - kf_wind_del, - kf_screenshot_all, - kf_screenshot_wind, - kf_float_toggle, - kf_version, - kf_spawn_lock, - kf_spawn_initscr, - kf_spawn_custom, - kf_iconify, - kf_uniconify, - kf_raise_toggle, - kf_button2, - kf_width_shrink, - kf_width_grow, - kf_height_shrink, - kf_height_grow, - kf_move_left, - kf_move_right, - kf_move_up, - kf_move_down, - kf_name_workspace, - kf_search_workspace, - kf_search_win, - kf_dumpwins, /* MUST BE LAST */ - kf_invalid + 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 */ -void -dummykeyfunc(struct swm_region *r, union arg *args) -{ -}; - -void -legacyfunc(struct swm_region *r, union arg *args) -{ -}; - struct keyfunc { char name[SWM_FUNCNAME_LEN]; void (*func)(struct swm_region *r, union arg *); union arg args; -} keyfuncs[kf_invalid + 1] = { +} keyfuncs[KF_INVALID + 1] = { /* name function argument */ + { "bar_toggle", bar_toggle, {0} }, + { "button2", pressbutton, {2} }, { "cycle_layout", cycle_layout, {0} }, { "flip_layout", stack_config, {.id = SWM_ARG_ID_FLIPLAYOUT} }, - { "stack_reset", stack_config, {.id = SWM_ARG_ID_STACKRESET} }, + { "float_toggle", floating_toggle,{0} }, + { "focus_main", focus, {.id = SWM_ARG_ID_FOCUSMAIN} }, + { "focus_next", focus, {.id = SWM_ARG_ID_FOCUSNEXT} }, + { "focus_prev", focus, {.id = SWM_ARG_ID_FOCUSPREV} }, + { "height_grow", resize_step, {.id = SWM_ARG_ID_HEIGHTGROW} }, + { "height_shrink", resize_step, {.id = SWM_ARG_ID_HEIGHTSHRINK} }, + { "iconify", iconify, {0} }, { "master_shrink", stack_config, {.id = SWM_ARG_ID_MASTERSHRINK} }, { "master_grow", stack_config, {.id = SWM_ARG_ID_MASTERGROW} }, { "master_add", stack_config, {.id = SWM_ARG_ID_MASTERADD} }, { "master_del", stack_config, {.id = SWM_ARG_ID_MASTERDEL} }, + { "move_down", move_step, {.id = SWM_ARG_ID_MOVEDOWN} }, + { "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} }, + { "mvws_1", send_to_ws, {.id = 0} }, + { "mvws_2", send_to_ws, {.id = 1} }, + { "mvws_3", send_to_ws, {.id = 2} }, + { "mvws_4", send_to_ws, {.id = 3} }, + { "mvws_5", send_to_ws, {.id = 4} }, + { "mvws_6", send_to_ws, {.id = 5} }, + { "mvws_7", send_to_ws, {.id = 6} }, + { "mvws_8", send_to_ws, {.id = 7} }, + { "mvws_9", send_to_ws, {.id = 8} }, + { "mvws_10", send_to_ws, {.id = 9} }, + { "mvws_11", send_to_ws, {.id = 10} }, + { "mvws_12", send_to_ws, {.id = 11} }, + { "mvws_13", send_to_ws, {.id = 12} }, + { "mvws_14", send_to_ws, {.id = 13} }, + { "mvws_15", send_to_ws, {.id = 14} }, + { "mvws_16", send_to_ws, {.id = 15} }, + { "mvws_17", send_to_ws, {.id = 16} }, + { "mvws_18", send_to_ws, {.id = 17} }, + { "mvws_19", send_to_ws, {.id = 18} }, + { "mvws_20", send_to_ws, {.id = 19} }, + { "mvws_21", send_to_ws, {.id = 20} }, + { "mvws_22", send_to_ws, {.id = 21} }, + { "name_workspace", name_workspace, {0} }, + { "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} }, + { "search_win", search_win, {0} }, + { "search_workspace", search_workspace, {0} }, + { "spawn_custom", NULL, {0} }, { "stack_inc", stack_config, {.id = SWM_ARG_ID_STACKINC} }, { "stack_dec", stack_config, {.id = SWM_ARG_ID_STACKDEC} }, + { "stack_reset", stack_config, {.id = SWM_ARG_ID_STACKRESET} }, { "swap_main", swapwin, {.id = SWM_ARG_ID_SWAPMAIN} }, - { "focus_next", focus, {.id = SWM_ARG_ID_FOCUSNEXT} }, - { "focus_prev", focus, {.id = SWM_ARG_ID_FOCUSPREV} }, { "swap_next", swapwin, {.id = SWM_ARG_ID_SWAPNEXT} }, { "swap_prev", swapwin, {.id = SWM_ARG_ID_SWAPPREV} }, - { "spawn_term", spawnterm, {.argv = spawn_term} }, - { "spawn_menu", legacyfunc, {0} }, - { "quit", quit, {0} }, - { "restart", restart, {0} }, - { "focus_main", focus, {.id = SWM_ARG_ID_FOCUSMAIN} }, + { "uniconify", uniconify, {0} }, + { "version", version, {0} }, + { "width_grow", resize_step, {.id = SWM_ARG_ID_WIDTHGROW} }, + { "width_shrink", resize_step, {.id = SWM_ARG_ID_WIDTHSHRINK} }, + { "wind_del", wkill, {.id = SWM_ARG_ID_DELETEWINDOW} }, + { "wind_kill", wkill, {.id = SWM_ARG_ID_KILLWINDOW} }, { "ws_1", switchws, {.id = 0} }, { "ws_2", switchws, {.id = 1} }, { "ws_3", switchws, {.id = 2} }, @@ -4276,48 +4760,23 @@ struct keyfunc { { "ws_8", switchws, {.id = 7} }, { "ws_9", switchws, {.id = 8} }, { "ws_10", switchws, {.id = 9} }, + { "ws_11", switchws, {.id = 10} }, + { "ws_12", switchws, {.id = 11} }, + { "ws_13", switchws, {.id = 12} }, + { "ws_14", switchws, {.id = 13} }, + { "ws_15", switchws, {.id = 14} }, + { "ws_16", switchws, {.id = 15} }, + { "ws_17", switchws, {.id = 16} }, + { "ws_18", switchws, {.id = 17} }, + { "ws_19", switchws, {.id = 18} }, + { "ws_20", switchws, {.id = 19} }, + { "ws_21", switchws, {.id = 20} }, + { "ws_22", switchws, {.id = 21} }, { "ws_next", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP} }, - { "ws_prev", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} }, { "ws_next_all", cyclews, {.id = SWM_ARG_ID_CYCLEWS_UP_ALL} }, + { "ws_prev", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN} }, { "ws_prev_all", cyclews, {.id = SWM_ARG_ID_CYCLEWS_DOWN_ALL} }, { "ws_prior", priorws, {0} }, - { "screen_next", cyclescr, {.id = SWM_ARG_ID_CYCLESC_UP} }, - { "screen_prev", cyclescr, {.id = SWM_ARG_ID_CYCLESC_DOWN} }, - { "mvws_1", send_to_ws, {.id = 0} }, - { "mvws_2", send_to_ws, {.id = 1} }, - { "mvws_3", send_to_ws, {.id = 2} }, - { "mvws_4", send_to_ws, {.id = 3} }, - { "mvws_5", send_to_ws, {.id = 4} }, - { "mvws_6", send_to_ws, {.id = 5} }, - { "mvws_7", send_to_ws, {.id = 6} }, - { "mvws_8", send_to_ws, {.id = 7} }, - { "mvws_9", send_to_ws, {.id = 8} }, - { "mvws_10", send_to_ws, {.id = 9} }, - { "bar_toggle", bar_toggle, {0} }, - { "wind_kill", wkill, {.id = SWM_ARG_ID_KILLWINDOW} }, - { "wind_del", wkill, {.id = SWM_ARG_ID_DELETEWINDOW} }, - { "screenshot_all", legacyfunc, {0} }, - { "screenshot_wind", legacyfunc, {0} }, - { "float_toggle", floating_toggle,{0} }, - { "version", version, {0} }, - { "spawn_lock", legacyfunc, {0} }, - { "spawn_initscr", legacyfunc, {0} }, - { "spawn_custom", dummykeyfunc, {0} }, - { "iconify", iconify, {0} }, - { "uniconify", uniconify, {0} }, - { "raise_toggle", raise_toggle, {0} }, - { "button2", pressbutton, {2} }, - { "width_shrink", resize_step, {.id = SWM_ARG_ID_WIDTHSHRINK} }, - { "width_grow", resize_step, {.id = SWM_ARG_ID_WIDTHGROW} }, - { "height_shrink", resize_step, {.id = SWM_ARG_ID_HEIGHTSHRINK} }, - { "height_grow", resize_step, {.id = SWM_ARG_ID_HEIGHTGROW} }, - { "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} }, - { "move_down", move_step, {.id = SWM_ARG_ID_MOVEDOWN} }, - { "name_workspace", name_workspace, {0} }, - { "search_workspace", search_workspace, {0} }, - { "search_win", search_win, {0} }, { "dumpwins", dumpwins, {0} }, /* MUST BE LAST */ { "invalid key func", NULL, {0} }, }; @@ -4328,7 +4787,7 @@ struct key { enum keyfuncid funcid; char *spawn_name; }; -RB_HEAD(key_list, key); +RB_HEAD(key_tree, key); int key_cmp(struct key *kp1, struct key *kp2) @@ -4346,8 +4805,8 @@ key_cmp(struct key *kp1, struct key *kp2) return (0); } -RB_GENERATE_STATIC(key_list, key, entry, key_cmp); -struct key_list keys; +RB_GENERATE(key_tree, key, entry, key_cmp); +struct key_tree keys; /* mouse */ enum { client_click, root_click }; @@ -4371,7 +4830,7 @@ update_modkey(unsigned int mod) struct key *kp; mod_key = mod; - RB_FOREACH(kp, key_list, &keys) + RB_FOREACH(kp, key_tree, &keys) if (kp->mod & ShiftMask) kp->mod = mod | ShiftMask; else @@ -4636,6 +5095,7 @@ void setup_spawn(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); @@ -4680,7 +5140,7 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) return (1); } cp = keystr; - *ks = NoSymbol; + *ks = XCB_NO_SYMBOL; *mod = 0; while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) { DNPRINTF(SWM_D_KEY, "parsekeys: key [%s]\n", name); @@ -4703,7 +5163,7 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks) else { *ks = XStringToKeysym(name); XConvertCase(*ks, ks, &uks); - if (ks == NoSymbol) { + if (ks == XCB_NO_SYMBOL) { DNPRINTF(SWM_D_KEY, "parsekeys: invalid key %s\n", name); @@ -4739,7 +5199,7 @@ key_insert(unsigned int mod, KeySym ks, enum keyfuncid kfid, char *spawn_name) kp->keysym = ks; kp->funcid = kfid; kp->spawn_name = strdupsafe(spawn_name); - RB_INSERT(key_list, &keys, kp); + RB_INSERT(key_tree, &keys, kp); DNPRINTF(SWM_D_KEY, "key_insert: leave\n"); } @@ -4752,7 +5212,7 @@ key_lookup(unsigned int mod, KeySym ks) kp.keysym = ks; kp.mod = mod; - return (RB_FIND(key_list, &keys, &kp)); + return (RB_FIND(key_tree, &keys, &kp)); } void @@ -4760,7 +5220,7 @@ key_remove(struct key *kp) { DNPRINTF(SWM_D_KEY, "key_remove: %s\n", keyfuncs[kp->funcid].name); - RB_REMOVE(key_list, &keys, kp); + RB_REMOVE(key_tree, &keys, kp); free(kp->spawn_name); free(kp); @@ -4790,14 +5250,14 @@ setkeybinding(unsigned int mod, KeySym ks, enum keyfuncid kfid, keyfuncs[kfid].name, spawn_name); if ((kp = key_lookup(mod, ks)) != NULL) { - if (kfid == kf_invalid) + if (kfid == KF_INVALID) key_remove(kp); else key_replace(kp, mod, ks, kfid, spawn_name); DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n"); return; } - if (kfid == kf_invalid) { + if (kfid == KF_INVALID) { warnx("error: setkeybinding: cannot find mod/key combination"); DNPRINTF(SWM_D_KEY, "setkeybinding: leave\n"); return; @@ -4818,14 +5278,14 @@ setconfbinding(char *selector, char *value, int flags) if (selector == NULL) { DNPRINTF(SWM_D_KEY, "setconfbinding: unbind %s\n", value); if (parsekeys(value, mod_key, &mod, &ks) == 0) { - kfid = kf_invalid; + kfid = KF_INVALID; setkeybinding(mod, ks, kfid, NULL); return (0); } else return (1); } /* search by key function name */ - for (kfid = 0; kfid < kf_invalid; (kfid)++) { + 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", @@ -4843,7 +5303,7 @@ setconfbinding(char *selector, char *value, int flags) DNPRINTF(SWM_D_KEY, "setconfbinding: %s: match\n", selector); if (parsekeys(value, mod_key, &mod, &ks) == 0) { - setkeybinding(mod, ks, kf_spawn_custom, + setkeybinding(mod, ks, KF_SPAWN_CUSTOM, sp->name); return (0); } else @@ -4857,80 +5317,104 @@ setconfbinding(char *selector, char *value, int flags) void setup_keys(void) { - 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, 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_term, NULL); - setkeybinding(MODKEY, XK_p, kf_spawn_custom,"menu"); - setkeybinding(MODKEY|ShiftMask, XK_q, kf_quit, NULL); - setkeybinding(MODKEY, XK_q, kf_restart, NULL); - setkeybinding(MODKEY, XK_m, kf_focus_main, 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); - setkeybinding(MODKEY, XK_4, kf_ws_4, NULL); - setkeybinding(MODKEY, XK_5, kf_ws_5, NULL); - setkeybinding(MODKEY, XK_6, kf_ws_6, NULL); - setkeybinding(MODKEY, XK_7, kf_ws_7, NULL); - setkeybinding(MODKEY, XK_8, kf_ws_8, NULL); - setkeybinding(MODKEY, XK_9, kf_ws_9, NULL); - setkeybinding(MODKEY, XK_0, kf_ws_10, NULL); - setkeybinding(MODKEY, XK_Right, kf_ws_next, NULL); - 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, 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, 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); + 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, 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, XK_q, KF_RESTART, NULL); + setkeybinding(MODKEY, XK_m, KF_FOCUS_MAIN, 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); + setkeybinding(MODKEY, XK_4, KF_WS_4, NULL); + setkeybinding(MODKEY, XK_5, KF_WS_5, NULL); + setkeybinding(MODKEY, XK_6, KF_WS_6, NULL); + setkeybinding(MODKEY, XK_7, KF_WS_7, NULL); + setkeybinding(MODKEY, XK_8, KF_WS_8, NULL); + setkeybinding(MODKEY, XK_9, KF_WS_9, NULL); + setkeybinding(MODKEY, XK_0, KF_WS_10, NULL); + setkeybinding(MODKEY, XK_F1, KF_WS_11, NULL); + setkeybinding(MODKEY, XK_F2, KF_WS_12, NULL); + setkeybinding(MODKEY, XK_F3, KF_WS_13, NULL); + setkeybinding(MODKEY, XK_F4, KF_WS_14, NULL); + setkeybinding(MODKEY, XK_F5, KF_WS_15, NULL); + setkeybinding(MODKEY, XK_F6, KF_WS_16, NULL); + setkeybinding(MODKEY, XK_F7, KF_WS_17, NULL); + setkeybinding(MODKEY, XK_F8, KF_WS_18, NULL); + setkeybinding(MODKEY, XK_F9, KF_WS_19, NULL); + setkeybinding(MODKEY, XK_F10, KF_WS_20, NULL); + setkeybinding(MODKEY, XK_F11, KF_WS_21, NULL); + setkeybinding(MODKEY, XK_F12, KF_WS_22, NULL); + setkeybinding(MODKEY, XK_Right, KF_WS_NEXT, NULL); + 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, 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|ShiftMask, XK_d, KF_DUMPWINS, NULL); #endif } @@ -4968,26 +5452,38 @@ setkeymapping(char *selector, char *value, int flags) void updatenumlockmask(void) { - unsigned int i, j; - XModifierKeymap *modmap; + unsigned int i, j; + xcb_get_modifier_mapping_reply_t *modmap_r; + xcb_keycode_t *modmap, kc; DNPRINTF(SWM_D_MISC, "updatenumlockmask\n"); numlockmask = 0; - modmap = XGetModifierMapping(display); - for (i = 0; i < 8; i++) - for (j = 0; j < modmap->max_keypermod; j++) - if (modmap->modifiermap[i * modmap->max_keypermod + j] - == XKeysymToKeycode(display, XK_Num_Lock)) - numlockmask = (1 << i); - XFreeModifiermap(modmap); + modmap_r = xcb_get_modifier_mapping_reply(conn, + xcb_get_modifier_mapping(conn), + NULL); + if (modmap_r) { + modmap = xcb_get_modifier_mapping_keycodes(modmap_r); + for (i = 0; i < 8; i++) { + 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))) + numlockmask = (1 << i); + } + } + free(modmap_r); + } } void grabkeys(void) { + int num_screens; unsigned int j, k; - KeyCode code; + xcb_keycode_t *code; unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask | LockMask }; struct key *kp; @@ -4995,17 +5491,21 @@ grabkeys(void) DNPRINTF(SWM_D_MISC, "grabkeys\n"); updatenumlockmask(); - for (k = 0; k < ScreenCount(display); k++) { + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (k = 0; k < num_screens; k++) { if (TAILQ_EMPTY(&screens[k].rl)) continue; - XUngrabKey(display, AnyKey, AnyModifier, screens[k].root); - RB_FOREACH(kp, key_list, &keys) { - if ((code = XKeysymToKeycode(display, kp->keysym))) + xcb_ungrab_key(conn, XCB_GRAB_ANY, screens[k].root, + XCB_MOD_MASK_ANY); + RB_FOREACH(kp, key_tree, &keys) { + if ((code = xcb_key_symbols_get_keycode(syms, + kp->keysym))) for (j = 0; j < LENGTH(modifiers); j++) - XGrabKey(display, code, + xcb_grab_key(conn, True, + screens[k].root, kp->mod | modifiers[j], - screens[k].root, True, - GrabModeAsync, GrabModeAsync); + *code, XCB_GRAB_MODE_ASYNC, + XCB_GRAB_MODE_ASYNC); } } } @@ -5018,19 +5518,24 @@ grabbuttons(struct ws_win *win, int focused) { 0, LockMask, numlockmask, numlockmask|LockMask }; updatenumlockmask(); - XUngrabButton(display, AnyButton, AnyModifier, win->id); + 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++) - XGrabButton(display, buttons[i].button, - buttons[i].mask | modifiers[j], - win->id, False, BUTTONMASK, - GrabModeAsync, GrabModeSync, None, - None); + 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 - XGrabButton(display, AnyButton, AnyModifier, win->id, False, - BUTTONMASK, GrabModeAsync, GrabModeSync, None, None); + 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); } const char *quirkname[] = { @@ -5195,16 +5700,39 @@ setup_quirks(void) #define SWM_CONF_FILE "spectrwm.conf" #define SWM_CONF_FILE_OLD "scrotwm.conf" -enum { SWM_S_BAR_DELAY, SWM_S_BAR_ENABLED, SWM_S_BAR_BORDER_WIDTH, - SWM_S_STACK_ENABLED, SWM_S_CLOCK_ENABLED, SWM_S_CLOCK_FORMAT, - SWM_S_CYCLE_EMPTY, SWM_S_CYCLE_VISIBLE, SWM_S_SS_ENABLED, - SWM_S_TERM_WIDTH, SWM_S_TITLE_CLASS_ENABLED, - SWM_S_TITLE_NAME_ENABLED, SWM_S_WINDOW_NAME_ENABLED, SWM_S_URGENT_ENABLED, - SWM_S_FOCUS_MODE, SWM_S_DISABLE_BORDER, SWM_S_BORDER_WIDTH, - SWM_S_BAR_FONT, SWM_S_BAR_ACTION, SWM_S_SPAWN_TERM, - SWM_S_SS_APP, SWM_S_DIALOG_RATIO, SWM_S_BAR_AT_BOTTOM, - SWM_S_VERBOSE_LAYOUT, SWM_S_BAR_JUSTIFY - }; +enum { + SWM_S_BAR_ACTION, + SWM_S_BAR_AT_BOTTOM, + SWM_S_BAR_BORDER_WIDTH, + SWM_S_BAR_DELAY, + SWM_S_BAR_ENABLED, + SWM_S_BAR_FONT, + SWM_S_BAR_FORMAT, + SWM_S_BAR_JUSTIFY, + SWM_S_BORDER_WIDTH, + SWM_S_CLOCK_ENABLED, + SWM_S_CLOCK_FORMAT, + SWM_S_CYCLE_EMPTY, + SWM_S_CYCLE_VISIBLE, + SWM_S_DIALOG_RATIO, + SWM_S_DISABLE_BORDER, + SWM_S_FOCUS_CLOSE, + SWM_S_FOCUS_CLOSE_WRAP, + SWM_S_FOCUS_DEFAULT, + SWM_S_FOCUS_MODE, + 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_TITLE_CLASS_ENABLED, + SWM_S_TITLE_NAME_ENABLED, + SWM_S_URGENT_ENABLED, + SWM_S_VERBOSE_LAYOUT, + SWM_S_WINDOW_NAME_ENABLED, + SWM_S_WORKSPACE_LIMIT +}; int setconfvalue(char *selector, char *value, int flags) @@ -5213,17 +5741,37 @@ setconfvalue(char *selector, char *value, int flags) char *b; switch (flags) { + case SWM_S_BAR_ACTION: + free(bar_argv[0]); + if ((bar_argv[0] = strdup(value)) == NULL) + err(1, "setconfvalue: bar_action"); + break; + case SWM_S_BAR_AT_BOTTOM: + bar_at_bottom = atoi(value); + break; + case SWM_S_BAR_BORDER_WIDTH: + bar_border_width = atoi(value); + if (bar_border_width < 0) + bar_border_width = 0; + break; case SWM_S_BAR_DELAY: bar_delay = atoi(value); break; case SWM_S_BAR_ENABLED: bar_enabled = atoi(value); break; - case SWM_S_BAR_BORDER_WIDTH: - bar_border_width = atoi(value); + 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); break; - case SWM_S_BAR_AT_BOTTOM: - bar_at_bottom = atoi(value); + case SWM_S_BAR_FORMAT: + free(bar_format); + if ((bar_format = strdup(value)) == NULL) + err(1, "setconfvalue: bar_format"); break; case SWM_S_BAR_JUSTIFY: if (!strcmp(value, "left")) @@ -5235,8 +5783,10 @@ setconfvalue(char *selector, char *value, int flags) else errx(1, "invalid bar_justify"); break; - case SWM_S_STACK_ENABLED: - stack_enabled = atoi(value); + case SWM_S_BORDER_WIDTH: + border_width = atoi(value); + if (border_width < 0) + border_width = 0; break; case SWM_S_CLOCK_ENABLED: clock_enabled = atoi(value); @@ -5254,23 +5804,36 @@ setconfvalue(char *selector, char *value, int flags) case SWM_S_CYCLE_VISIBLE: cycle_visible = atoi(value); break; - case SWM_S_SS_ENABLED: - ss_enabled = atoi(value); - break; - case SWM_S_TERM_WIDTH: - term_width = atoi(value); + case SWM_S_DIALOG_RATIO: + dialog_ratio = atof(value); + if (dialog_ratio > 1.0 || dialog_ratio <= .3) + dialog_ratio = .6; break; - case SWM_S_TITLE_CLASS_ENABLED: - title_class_enabled = atoi(value); + case SWM_S_DISABLE_BORDER: + disable_border = atoi(value); break; - case SWM_S_WINDOW_NAME_ENABLED: - window_name_enabled = atoi(value); + case SWM_S_FOCUS_CLOSE: + if (!strcmp(value, "first")) + focus_close = SWM_STACK_BOTTOM; + else if (!strcmp(value, "last")) + focus_close = SWM_STACK_TOP; + else if (!strcmp(value, "next")) + focus_close = SWM_STACK_ABOVE; + else if (!strcmp(value, "previous")) + focus_close = SWM_STACK_BELOW; + else + errx(1, "focus_close"); break; - case SWM_S_TITLE_NAME_ENABLED: - title_name_enabled = atoi(value); + case SWM_S_FOCUS_CLOSE_WRAP: + focus_close_wrap = atoi(value); break; - case SWM_S_URGENT_ENABLED: - urgent_enabled = atoi(value); + case SWM_S_FOCUS_DEFAULT: + if (!strcmp(value, "last")) + focus_default = SWM_STACK_TOP; + else if (!strcmp(value, "first")) + focus_default = SWM_STACK_BOTTOM; + else + errx(1, "focus_default"); break; case SWM_S_FOCUS_MODE: if (!strcmp(value, "default")) @@ -5282,36 +5845,43 @@ setconfvalue(char *selector, char *value, int flags) else errx(1, "focus_mode"); break; - case SWM_S_DISABLE_BORDER: - disable_border = atoi(value); + case SWM_S_SPAWN_ORDER: + if (!strcmp(value, "first")) + spawn_position = SWM_STACK_BOTTOM; + else if (!strcmp(value, "last")) + spawn_position = SWM_STACK_TOP; + else if (!strcmp(value, "next")) + spawn_position = SWM_STACK_ABOVE; + else if (!strcmp(value, "previous")) + spawn_position = SWM_STACK_BELOW; + else + errx(1, "spawn_position"); break; - case SWM_S_BORDER_WIDTH: - border_width = atoi(value); + case SWM_S_SPAWN_TERM: + setconfspawn("term", value, 0); + setconfspawn("spawn_term", value, 0); 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); + case SWM_S_SS_APP: break; - case SWM_S_BAR_ACTION: - free(bar_argv[0]); - if ((bar_argv[0] = strdup(value)) == NULL) - err(1, "setconfvalue: bar_action"); + case SWM_S_SS_ENABLED: + ss_enabled = atoi(value); + break; + case SWM_S_STACK_ENABLED: + stack_enabled = atoi(value); break; - case SWM_S_SPAWN_TERM: - free(spawn_term[0]); - if ((spawn_term[0] = strdup(value)) == NULL) - err(1, "setconfvalue: spawn_term"); + case SWM_S_TERM_WIDTH: + term_width = atoi(value); + if (term_width < 0) + term_width = 0; break; - case SWM_S_SS_APP: + case SWM_S_TITLE_CLASS_ENABLED: + title_class_enabled = atoi(value); break; - case SWM_S_DIALOG_RATIO: - dialog_ratio = atof(value); - if (dialog_ratio > 1.0 || dialog_ratio <= .3) - dialog_ratio = .6; + case SWM_S_TITLE_NAME_ENABLED: + title_name_enabled = atoi(value); + break; + case SWM_S_URGENT_ENABLED: + urgent_enabled = atoi(value); break; case SWM_S_VERBOSE_LAYOUT: verbose_layout = atoi(value); @@ -5322,6 +5892,16 @@ setconfvalue(char *selector, char *value, int flags) layouts[i].l_string = plain_stacker; } break; + case SWM_S_WINDOW_NAME_ENABLED: + window_name_enabled = atoi(value); + break; + case SWM_S_WORKSPACE_LIMIT: + workspace_limit = atoi(value); + if (workspace_limit > SWM_WS_MAX) + workspace_limit = SWM_WS_MAX; + else if (workspace_limit < 1) + workspace_limit = 1; + break; default: return (1); } @@ -5366,7 +5946,7 @@ setautorun(char *selector, char *value, int flags) char *ap, *sp = s; union arg a; int argc = 0; - long pid; + pid_t pid; struct pid_e *p; if (getenv("SWM_STARTED")) @@ -5376,7 +5956,7 @@ setautorun(char *selector, char *value, int flags) if (sscanf(value, "ws[%d]:%1023c", &ws_id, s) != 2) errx(1, "invalid autorun entry, should be 'ws[]:command'"); ws_id--; - if (ws_id < 0 || ws_id >= SWM_WS_MAX) + if (ws_id < 0 || ws_id >= workspace_limit) errx(1, "autorun: invalid workspace %d", ws_id + 1); /* @@ -5426,8 +6006,8 @@ setautorun(char *selector, char *value, int flags) int setlayout(char *selector, char *value, int flags) { - int ws_id, i, x, mg, ma, si, raise; - int st = SWM_V_STACK; + int ws_id, i, x, mg, ma, si, raise, f = 0; + int st = SWM_V_STACK, num_screens; char s[1024]; struct workspace *ws; @@ -5441,21 +6021,28 @@ setlayout(char *selector, char *value, int flags) "::::" "'"); ws_id--; - if (ws_id < 0 || ws_id >= SWM_WS_MAX) + if (ws_id < 0 || ws_id >= workspace_limit) errx(1, "layout: invalid workspace %d", ws_id + 1); if (!strcasecmp(s, "vertical")) st = SWM_V_STACK; - else if (!strcasecmp(s, "horizontal")) + else if (!strcasecmp(s, "vertical_flip")) { + st = SWM_V_STACK; + f = 1; + } else if (!strcasecmp(s, "horizontal")) st = SWM_H_STACK; - else if (!strcasecmp(s, "fullscreen")) + else if (!strcasecmp(s, "horizontal_flip")) { + st = SWM_H_STACK; + f = 1; + } else if (!strcasecmp(s, "fullscreen")) st = SWM_MAX_STACK; else errx(1, "invalid layout entry, should be 'ws[]:" "::::" "'"); - for (i = 0; i < ScreenCount(display); i++) { + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { ws = (struct workspace *)&screens[i].ws; ws[ws_id].cur_layout = &layouts[st]; @@ -5484,6 +6071,12 @@ setlayout(char *selector, char *value, int flags) SWM_ARG_ID_STACKDEC); stack(); } + /* Apply flip */ + if (f) { + ws[ws_id].cur_layout->l_config(&ws[ws_id], + SWM_ARG_ID_FLIPLAYOUT); + stack(); + } } return (0); @@ -5506,6 +6099,7 @@ struct config_option configopt[] = { { "bar_action", setconfvalue, SWM_S_BAR_ACTION }, { "bar_delay", setconfvalue, SWM_S_BAR_DELAY }, { "bar_justify", setconfvalue, SWM_S_BAR_JUSTIFY }, + { "bar_format", setconfvalue, SWM_S_BAR_FORMAT }, { "keyboard_mapping", setkeymapping, 0 }, { "bind", setconfbinding, 0 }, { "stack_enabled", setconfvalue, SWM_S_STACK_ENABLED }, @@ -5515,6 +6109,7 @@ struct config_option configopt[] = { { "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 }, { "modkey", setconfmodkey, 0 }, @@ -5530,6 +6125,10 @@ struct config_option configopt[] = { { "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 }, @@ -5650,116 +6249,107 @@ out: } void -set_child_transient(struct ws_win *win, Window *trans) +set_child_transient(struct ws_win *win, xcb_window_t *trans) { struct ws_win *parent, *w; - XWMHints *wmh = NULL; struct swm_region *r; struct workspace *ws; + xcb_icccm_wm_hints_t wmh; parent = find_window(win->transient); if (parent) parent->child_trans = win; else { DNPRINTF(SWM_D_MISC, "set_child_transient: parent doesn't exist" - " for 0x%lx trans 0x%lx\n", win->id, win->transient); - - if (win->hints == NULL) { - warnx("no hints for 0x%lx", win->id); - return; - } + " 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); ws = r->ws; /* parent doen't exist in our window list */ TAILQ_FOREACH(w, &ws->winlist, entry) { - if (wmh) - XFree(wmh); - - if ((wmh = XGetWMHints(display, w->id)) == NULL) { - warnx("can't get hints for 0x%lx", w->id); + if (xcb_icccm_get_wm_hints_reply(conn, + xcb_icccm_get_wm_hints(conn, w->id), + &wmh, NULL) != 1) { + warnx("can't get hints for 0x%x", w->id); continue; } - if (win->hints->window_group != wmh->window_group) + if (win->hints.window_group != wmh.window_group) continue; w->child_trans = win; win->transient = w->id; *trans = w->id; - DNPRINTF(SWM_D_MISC, "set_child_transient: asjusting " - "transient to 0x%lx\n", win->transient); + DNPRINTF(SWM_D_MISC, "set_child_transient: adjusting " + "transient to 0x%x\n", win->transient); break; } } - - if (wmh) - XFree(wmh); } -long -window_get_pid(Window win) +pid_t +window_get_pid(xcb_window_t win) { - Atom actual_type_return; - int actual_format_return = 0; - unsigned long nitems_return = 0; - unsigned long bytes_after_return = 0; - long *pid = NULL; - long ret = 0; - const char *errstr; - unsigned char *prop = NULL; + pid_t ret = 0; + const char *errstr; + xcb_atom_t apid; + xcb_get_property_cookie_t pc; + xcb_get_property_reply_t *pr; - if (XGetWindowProperty(display, win, - XInternAtom(display, "_NET_WM_PID", False), 0, 1, False, - XA_CARDINAL, &actual_type_return, &actual_format_return, - &nitems_return, &bytes_after_return, - (unsigned char**)(void*)&pid) != Success) + apid = get_atom_from_string("_NET_WM_PID"); + if (apid == XCB_ATOM_NONE) goto tryharder; - if (actual_type_return != XA_CARDINAL) + + pc = xcb_get_property(conn, False, win, apid, XCB_ATOM_CARDINAL, 0, 1); + pr = xcb_get_property_reply(conn, pc, NULL); + if (!pr) goto tryharder; - if (pid == NULL) + if (pr->type != XCB_ATOM_CARDINAL) { + free(pr); goto tryharder; + } - ret = *pid; - XFree(pid); + ret = *((pid_t *)xcb_get_property_value(pr)); + free(pr); return (ret); tryharder: - if (XGetWindowProperty(display, win, - XInternAtom(display, "_SWM_PID", False), 0, SWM_PROPLEN, False, - XA_STRING, &actual_type_return, &actual_format_return, - &nitems_return, &bytes_after_return, &prop) != Success) + apid = get_atom_from_string("_SWM_PID"); + pc = xcb_get_property(conn, False, win, apid, XCB_ATOM_STRING, + 0, SWM_PROPLEN); + pr = xcb_get_property_reply(conn, pc, NULL); + if (!pr) return (0); - if (actual_type_return != XA_STRING) - return (0); - if (prop == NULL) + if (pr->type != XCB_ATOM_STRING) { + free(pr); return (0); + } - ret = strtonum((const char *)prop, 0, UINT_MAX, &errstr); - /* ignore error because strtonum returns 0 anyway */ - XFree(prop); + ret = strtonum(xcb_get_property_value(pr), 0, INT_MAX, &errstr); + free(pr); return (ret); } struct ws_win * -manage_window(Window id) +manage_window(xcb_window_t id) { - Window trans = 0; + xcb_window_t trans = XCB_WINDOW_NONE; struct workspace *ws; struct ws_win *win, *ww; - int format, i, ws_idx, n, border_me = 0; - unsigned long nitems, bytes; - Atom ws_idx_atom = 0, type; - Atom *prot = NULL, *pp; - unsigned char ws_idx_str[SWM_PROPLEN], *prop = NULL; + int i, 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; struct swm_region *r; - long mask; const char *errstr; - XWindowChanges wc; struct pid_e *p; struct quirk *qp; + uint32_t event_mask; + xcb_atom_t prot; + xcb_get_property_reply_t *gpr; + xcb_icccm_get_wm_protocols_reply_t wpr; if ((win = find_window(id)) != NULL) return (win); /* already being managed */ @@ -5767,14 +6357,30 @@ manage_window(Window id) /* see if we are on the unmanaged list */ if ((win = find_unmanaged_window(id)) != NULL) { DNPRINTF(SWM_D_MISC, "manage_window: previously unmanaged " - "window: 0x%lx\n", win->id); + "window: 0x%x\n", win->id); TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); - if (win->transient) { + if (win->transient) set_child_transient(win, &trans); - } if (trans && (ww = find_window(trans))) + + if (trans && (ww = find_window(trans))) TAILQ_INSERT_AFTER(&win->ws->winlist, ww, win, entry); - else + 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); } @@ -5784,37 +6390,64 @@ manage_window(Window id) "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 = XInternAtom(display, "_SWM_WS", False); + ws_idx_atom = get_atom_from_string("_SWM_WS"); if (ws_idx_atom) { - XGetWindowProperty(display, id, ws_idx_atom, 0, SWM_PROPLEN, - False, XA_STRING, &type, &format, &nitems, &bytes, &prop); + 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); + } } - XGetWindowAttributes(display, id, &win->wa); - XGetWMNormalHints(display, id, &win->sh, &win->sh_mask); - win->hints = XGetWMHints(display, id); - XGetTransientForHint(display, id, &trans); + win->wa = xcb_get_geometry_reply(conn, + xcb_get_geometry(conn, id), + NULL); + xcb_icccm_get_wm_normal_hints_reply(conn, + xcb_icccm_get_wm_normal_hints(conn, id), + &win->sh, NULL); + xcb_icccm_get_wm_hints_reply(conn, + xcb_icccm_get_wm_hints(conn, id), + &win->hints, NULL); + xcb_icccm_get_wm_transient_for_reply(conn, + xcb_icccm_get_wm_transient_for(conn, id), + &trans, NULL); if (trans) { win->transient = trans; set_child_transient(win, &trans); - DNPRINTF(SWM_D_MISC, "manage_window: window: 0x%lx, " - "transient: 0x%lx\n", win->id, win->transient); + DNPRINTF(SWM_D_MISC, "manage_window: window: 0x%x, " + "transient: 0x%x\n", win->id, win->transient); } + prot = get_atom_from_string("WM_PROTOCOLS"); + /* get supported protocols */ - if (XGetWMProtocols(display, id, &prot, &n)) { - for (i = 0, pp = prot; i < n; i++, pp++) { - if (*pp == takefocus) + if (xcb_icccm_get_wm_protocols_reply(conn, + xcb_icccm_get_wm_protocols(conn, id, prot), + &wpr, NULL)) { + for (i = 0; i < wpr.atoms_len; i++) { + if (wpr.atoms[i] == a_takefocus) win->take_focus = 1; - if (*pp == adelete) + if (wpr.atoms[i] == a_delete) win->can_delete = 1; } - if (prot) - XFree(prot); + xcb_icccm_get_wm_protocols_reply_wipe(&wpr); } win->iconic = get_iconic(win); @@ -5824,7 +6457,7 @@ manage_window(Window id) * 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); + r = root_to_region(win->wa->root); if (p) { ws = &r->s->ws[p->ws]; TAILQ_REMOVE(&pidlist, p, entry); @@ -5832,7 +6465,8 @@ manage_window(Window id) p = NULL; } else if (prop && win->transient == 0) { DNPRINTF(SWM_D_PROP, "manage_window: get _SWM_WS: %s\n", prop); - ws_idx = strtonum((const char *)prop, 0, 9, &errstr); + ws_idx = strtonum(prop, 0, workspace_limit - 1, + &errstr); if (errstr) { DNPRINTF(SWM_D_EVENT, "manage_window: window: #%s: %s", errstr, prop); @@ -5860,47 +6494,71 @@ manage_window(Window id) win->s = r->s; /* this never changes */ if (trans && (ww = find_window(trans))) TAILQ_INSERT_AFTER(&ws->winlist, ww, win, entry); - else - TAILQ_INSERT_TAIL(&ws->winlist, 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); + } - WIDTH(win) = win->wa.width; - HEIGHT(win) = win->wa.height; - X(win) = win->wa.x; - Y(win) = win->wa.y; + /* 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((char *)ws_idx_str, SWM_PROPLEN, "%d", ws->idx) < + snprintf(ws_idx_str, SWM_PROPLEN, "%d", ws->idx) < SWM_PROPLEN) { DNPRINTF(SWM_D_PROP, "manage_window: set _SWM_WS: %s\n", ws_idx_str); - XChangeProperty(display, win->id, ws_idx_atom, XA_STRING, 8, - PropModeReplace, ws_idx_str, strlen((char *)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); } if (prop) - XFree(prop); + free(prop); ewmh_autoquirk(win); - if (XGetClassHint(display, win->id, &win->ch)) { + if (xcb_icccm_get_wm_class_reply(conn, + xcb_icccm_get_wm_class(conn, win->id), + &win->ch, NULL)) { DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n", - win->ch.res_class, win->ch.res_name); + win->ch.class_name, win->ch.instance_name); /* java is retarded so treat it special */ - if (strstr(win->ch.res_name, "sun-awt")) { + if (strstr(win->ch.instance_name, "sun-awt")) { win->java = 1; border_me = 1; } TAILQ_FOREACH(qp, &quirks, entry) { - if (!strcmp(win->ch.res_class, qp->class) && - !strcmp(win->ch.res_name, qp->name)) { + 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.res_class, - win->ch.res_name); + "class: %s, name: %s\n", win->ch.class_name, + win->ch.instance_name); if (qp->quirk & SWM_Q_FLOAT) { win->floating = 1; border_me = 1; @@ -5913,16 +6571,10 @@ manage_window(Window id) /* alter window position if quirky */ if (win->quirks & SWM_Q_ANYWHERE) { win->manual = 1; /* don't center the quirky windows */ - bzero(&wc, sizeof wc); - mask = 0; - if (bar_enabled && Y(win) < bar_height) { - Y(win) = wc.y = bar_height; - mask |= CWY; - } - if (WIDTH(win) + X(win) > WIDTH(r)) { - X(win) = wc.x = WIDTH(r) - WIDTH(win) - 2; - mask |= CWX; - } + 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; } @@ -5940,18 +6592,20 @@ manage_window(Window id) /* border me */ if (border_me) { - bzero(&wc, sizeof wc); - wc.border_width = border_width; - mask = CWBorderWidth; - XConfigureWindow(display, win->id, mask, &wc); + win->bordered = 1; + X(win) -= border_width; + Y(win) -= border_width; + update_window(win); } - XSelectInput(display, id, EnterWindowMask | FocusChangeMask | - PropertyChangeMask | StructureNotifyMask); + event_mask = XCB_EVENT_MASK_ENTER_WINDOW | XCB_EVENT_MASK_FOCUS_CHANGE | + XCB_EVENT_MASK_PROPERTY_CHANGE | XCB_EVENT_MASK_STRUCTURE_NOTIFY; + + xcb_change_window_attributes(conn, id, XCB_CW_EVENT_MASK, &event_mask); /* floaters need to be mapped if they are in the current workspace */ if ((win->floating || win->transient) && (ws->idx == r->ws->idx)) - XMapRaised(display, win->id); + map_window_raised(win->id); return (win); } @@ -5959,20 +6613,17 @@ manage_window(Window id) void free_window(struct ws_win *win) { - DNPRINTF(SWM_D_MISC, "free_window: window: 0x%lx\n", win->id); + DNPRINTF(SWM_D_MISC, "free_window: window: 0x%x\n", win->id); if (win == NULL) return; - /* needed for restart wm */ - set_win_state(win, WithdrawnState); - TAILQ_REMOVE(&win->ws->unmanagedlist, win, entry); - if (win->ch.res_class) - XFree(win->ch.res_class); - if (win->ch.res_name) - XFree(win->ch.res_name); + if (win->wa) + free(win->wa); + + xcb_icccm_get_wm_class_reply_wipe(&win->ch); kill_refs(win); @@ -5980,17 +6631,19 @@ free_window(struct ws_win *win) memset(win, 0xff, sizeof *win); /* XXX kill later */ free(win); + 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; - DNPRINTF(SWM_D_MISC, "unmanage_window: window: 0x%lx\n", win->id); + DNPRINTF(SWM_D_MISC, "unmanage_window: window: 0x%x\n", win->id); if (win->transient) { parent = find_window(win->transient); @@ -5999,29 +6652,24 @@ unmanage_window(struct ws_win *win) } /* focus on root just in case */ - XSetInputFocus(display, PointerRoot, PointerRoot, CurrentTime); + 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); - if (win->hints) { - XFree(win->hints); - win->hints = NULL; - } - TAILQ_REMOVE(&win->ws->winlist, win, entry); TAILQ_INSERT_TAIL(&win->ws->unmanagedlist, win, entry); - - kill_refs(win); } void focus_magic(struct ws_win *win) { - DNPRINTF(SWM_D_FOCUS, "focus_magic: window: 0x%lx\n", WINID(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_check_opts(); + bar_update(); return; } @@ -6030,63 +6678,77 @@ focus_magic(struct ws_win *win) if (win->java) { focus_win(win->child_trans); if (win->child_trans->take_focus) - client_msg(win, takefocus); + 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, takefocus); + client_msg(win->child_trans, + a_takefocus); } else { win->child_trans = NULL; focus_win(win); if (win->take_focus) - client_msg(win, takefocus); + client_msg(win, a_takefocus); } } } else { /* regular focus */ focus_win(win); if (win->take_focus) - client_msg(win, takefocus); + client_msg(win, a_takefocus); } } void -expose(XEvent *e) +expose(xcb_expose_event_t *e) { - DNPRINTF(SWM_D_EVENT, "expose: window: 0x%lx\n", e->xexpose.window); + int i, num_screens; + struct swm_region *r; + + DNPRINTF(SWM_D_EVENT, "expose: window: 0x%x\n", e->window); + + 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 (e->window == WINID(r->bar)) + bar_update(); + + xcb_flush(conn); } void -keypress(XEvent *e) +keypress(xcb_key_press_event_t *e) { - KeySym keysym; - XKeyEvent *ev = &e->xkey; + xcb_keysym_t keysym; struct key *kp; - struct swm_region *r; - keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0); - if ((kp = key_lookup(CLEANMASK(ev->state), keysym)) == NULL) - return; - if (keyfuncs[kp->funcid].func == NULL) + keysym = xcb_key_press_lookup_keysym(syms, e, 0); + + DNPRINTF(SWM_D_EVENT, "keypress: %u %u\n", e->detail, keysym); + + if ((kp = key_lookup(CLEANMASK(e->state), keysym)) == NULL) return; - r = root_to_region(ev->root); - if (kp->funcid == kf_spawn_custom) - spawn_custom(r, &(keyfuncs[kp->funcid].args), kp->spawn_name); - else - keyfuncs[kp->funcid].func(r, &(keyfuncs[kp->funcid].args)); + if (kp->funcid == KF_SPAWN_CUSTOM) + spawn_custom(root_to_region(e->root), + &(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].args)); } void -buttonpress(XEvent *e) +buttonpress(xcb_button_press_event_t *e) { struct ws_win *win; int i, action; - XButtonPressedEvent *ev = &e->xbutton; - if ((win = find_window(ev->window)) == NULL) + DNPRINTF(SWM_D_EVENT, "buttonpress: window 0x%x, detail: %u\n", + e->event, e->detail); + + if ((win = find_window(e->event)) == NULL) return; focus_magic(win); @@ -6094,70 +6756,111 @@ buttonpress(XEvent *e) for (i = 0; i < LENGTH(buttons); i++) if (action == buttons[i].action && buttons[i].func && - buttons[i].button == ev->button && - CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state)) + buttons[i].button == e->detail && + CLEANMASK(buttons[i].mask) == CLEANMASK(e->state)) buttons[i].func(win, &buttons[i].args); + + xcb_flush(conn); } void -configurerequest(XEvent *e) +configurerequest(xcb_configure_request_event_t *e) { - XConfigureRequestEvent *ev = &e->xconfigurerequest; struct ws_win *win; - int new = 0; - XWindowChanges wc; + int new = 0, i = 0; + uint16_t mask = 0; + uint32_t wc[7] = {0}; - if ((win = find_window(ev->window)) == NULL) - if ((win = find_unmanaged_window(ev->window)) == NULL) + if ((win = find_window(e->window)) == NULL) + if ((win = find_unmanaged_window(e->window)) == NULL) new = 1; - DNPRINTF(SWM_D_EVENT, "configurerequest: window: 0x%lx, new: %s\n", - ev->window, YESNO(new)); - if (new) { - bzero(&wc, sizeof wc); - wc.x = ev->x; - wc.y = ev->y; - wc.width = ev->width; - wc.height = ev->height; - wc.border_width = ev->border_width; - wc.sibling = ev->above; - wc.stack_mode = ev->detail; - XConfigureWindow(display, ev->window, ev->value_mask, &wc); + if (e->value_mask & XCB_CONFIG_WINDOW_X) { + mask |= XCB_CONFIG_WINDOW_X; + wc[i++] = e->x; + } + if (e->value_mask & XCB_CONFIG_WINDOW_Y) { + mask |= XCB_CONFIG_WINDOW_Y; + wc[i++] = e->y; + } + if (e->value_mask & XCB_CONFIG_WINDOW_WIDTH) { + mask |= XCB_CONFIG_WINDOW_WIDTH; + wc[i++] = e->width; + } + if (e->value_mask & XCB_CONFIG_WINDOW_HEIGHT) { + mask |= XCB_CONFIG_WINDOW_HEIGHT; + wc[i++] = e->height; + } + if (e->value_mask & XCB_CONFIG_WINDOW_BORDER_WIDTH) { + mask |= XCB_CONFIG_WINDOW_BORDER_WIDTH; + wc[i++] = e->border_width; + } + if (e->value_mask & XCB_CONFIG_WINDOW_SIBLING) { + mask |= XCB_CONFIG_WINDOW_SIBLING; + wc[i++] = e->sibling; + } + if (e->value_mask & XCB_CONFIG_WINDOW_STACK_MODE) { + mask |= XCB_CONFIG_WINDOW_STACK_MODE; + wc[i++] = e->stack_mode; + } + + DNPRINTF(SWM_D_EVENT, "configurerequest: new window: 0x%x, " + "new: %s, (x,y) w x h: (%d,%d) %d x %d\n", e->window, + YESNO(new), wc[0], wc[1], wc[2], wc[3]); + + xcb_configure_window(conn, e->window, mask, wc); + } 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; + 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); + } else { + config_win(win, e); + } } else { - config_win(win, ev); + config_win(win, e); } + + xcb_flush(conn); } void -configurenotify(XEvent *e) +configurenotify(xcb_configure_notify_event_t *e) { struct ws_win *win; - DNPRINTF(SWM_D_EVENT, "configurenotify: window: 0x%lx\n", - e->xconfigure.window); + DNPRINTF(SWM_D_EVENT, "configurenotify: window: 0x%x\n", + e->window); - win = find_window(e->xconfigure.window); + win = find_window(e->window); if (win) { - XGetWMNormalHints(display, win->id, &win->sh, &win->sh_mask); + xcb_icccm_get_wm_normal_hints_reply(conn, + xcb_icccm_get_wm_normal_hints(conn, win->id), + &win->sh, NULL); adjust_font(win); if (font_adjusted) stack(); - if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); } } void -destroynotify(XEvent *e) +destroynotify(xcb_destroy_notify_event_t *e) { struct ws_win *win; - XDestroyWindowEvent *ev = &e->xdestroywindow; - DNPRINTF(SWM_D_EVENT, "destroynotify: window: 0x%lx\n", ev->window); + DNPRINTF(SWM_D_EVENT, "destroynotify: window: 0x%x\n", e->window); - if ((win = find_window(ev->window)) == NULL) { - if ((win = find_unmanaged_window(ev->window)) == NULL) + if ((win = find_window(e->window)) == NULL) { + if ((win = find_unmanaged_window(e->window)) == NULL) return; free_window(win); return; @@ -6168,28 +6871,19 @@ destroynotify(XEvent *e) unmanage_window(win); stack(); - if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); free_window(win); } void -enternotify(XEvent *e) +enternotify(xcb_enter_notify_event_t *e) { - XCrossingEvent *ev = &e->xcrossing; - XEvent cne; struct ws_win *win; -#if 0 - struct ws_win *w; - Window focus_return; - int revert_to_return; -#endif - DNPRINTF(SWM_D_FOCUS, "enternotify: window: 0x%lx, mode: %d, detail: " - "%d, root: 0x%lx, subwindow: 0x%lx, same_screen: %s, focus: %s, " - "state: %d\n", ev->window, ev->mode, ev->detail, ev->root, - ev->subwindow, YESNO(ev->same_screen), YESNO(ev->focus), ev->state); + 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 (ev->mode != NotifyNormal) { + if (e->mode != XCB_NOTIFY_MODE_NORMAL) { DNPRINTF(SWM_D_EVENT, "skip enternotify: generated by " "cursor grab.\n"); return; @@ -6201,239 +6895,130 @@ enternotify(XEvent *e) case SWM_FOCUS_FOLLOW: break; case SWM_FOCUS_SYNERGY: -#if 0 - /* - * all these checks need to be in this order because the - * XCheckTypedWindowEvent relies on weeding out the previous events - * - * making this code an option would enable a follow mouse for focus - * feature - */ - - /* - * state is set when we are switching workspaces and focus is set when - * the window or a subwindow already has focus (occurs during restart). - * - * Only honor the focus flag if last_focus_event is not FocusOut, - * this allows spectrwm to continue to control focus when another - * program is also playing with it. - */ - if (ev->state || (ev->focus && last_focus_event != FocusOut)) { - DNPRINTF(SWM_D_EVENT, "ignoring enternotify: focus\n"); - return; - } - - /* - * happens when a window is created or destroyed and the border - * crosses the mouse pointer and when switching ws - * - * we need the subwindow test to see if we came from root in order - * to give focus to floaters - */ - if (ev->mode == NotifyNormal && ev->detail == NotifyVirtual && - ev->subwindow == 0) { - DNPRINTF(SWM_D_EVENT, "ignoring enternotify: NotifyVirtual\n"); - return; - } - - /* this window already has focus */ - if (ev->mode == NotifyNormal && ev->detail == NotifyInferior) { - DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win has focus\n"); - return; - } - - /* this window is being deleted or moved to another ws */ - if (XCheckTypedWindowEvent(display, ev->window, ConfigureNotify, - &cne) == True) { - DNPRINTF(SWM_D_EVENT, "ignoring enternotify: configurenotify\n"); - XPutBackEvent(display, &cne); - return; - } - - if ((win = find_window(ev->window)) == NULL) { - DNPRINTF(SWM_D_EVENT, "ignoring enternotify: win == NULL\n"); - return; - } - - /* - * In fullstack kill all enters unless they come from a different ws - * (i.e. another region) or focus has been grabbed externally. - */ - if (win->ws->cur_layout->flags & SWM_L_FOCUSPREV && - last_focus_event != FocusOut) { - XGetInputFocus(display, &focus_return, &revert_to_return); - if ((w = find_window(focus_return)) == NULL || - w->ws == win->ws) { - DNPRINTF(SWM_D_EVENT, "ignoring event: fullstack\n"); - return; - } - } -#endif break; } - if ((win = find_window(ev->window)) == NULL) { + if ((win = find_window(e->event)) == NULL) { DNPRINTF(SWM_D_EVENT, "skip enternotify: window is NULL\n"); return; } - /* - * if we have more enternotifies let them handle it in due time - */ - if (XCheckTypedEvent(display, EnterNotify, &cne) == True) { - DNPRINTF(SWM_D_EVENT, - "ignoring enternotify: got more enternotify\n"); - XPutBackEvent(display, &cne); - return; - } - 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)) void -focusevent(XEvent *e) -{ -#if 0 - struct ws_win *win; - u_int32_t mode_detail; - XFocusChangeEvent *ev = &e->xfocus; - - DNPRINTF(SWM_D_EVENT, "focusevent: %s window: 0x%lx mode: %d " - "detail: %d\n", ev->type == FocusIn ? "entering" : "leaving", - ev->window, ev->mode, ev->detail); - - if (last_focus_event == ev->type) { - DNPRINTF(SWM_D_FOCUS, "ignoring focusevent: bad ordering\n"); - return; - } - - last_focus_event = ev->type; - mode_detail = MERGE_MEMBERS(ev->mode, ev->detail); - - switch (mode_detail) { - /* synergy client focus operations */ - case MERGE_MEMBERS(NotifyNormal, NotifyNonlinear): - case MERGE_MEMBERS(NotifyNormal, NotifyNonlinearVirtual): - - /* synergy server focus operations */ - case MERGE_MEMBERS(NotifyWhileGrabbed, NotifyNonlinear): - - /* Entering applications like rdesktop that mangle the pointer */ - case MERGE_MEMBERS(NotifyNormal, NotifyPointer): - - if ((win = find_window(e->xfocus.window)) != NULL && win->ws->r) - XSetWindowBorder(display, win->id, - win->ws->r->s->c[ev->type == FocusIn ? - SWM_S_COLOR_FOCUS : SWM_S_COLOR_UNFOCUS].color); - break; - default: - warnx("ignoring focusevent"); - DNPRINTF(SWM_D_FOCUS, "ignoring focusevent\n"); - break; - } -#endif -} - -void -mapnotify(XEvent *e) +mapnotify(xcb_map_notify_event_t *e) { struct ws_win *win; - XMapEvent *ev = &e->xmap; - DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%lx\n", ev->window); + DNPRINTF(SWM_D_EVENT, "mapnotify: window: 0x%x\n", e->window); - win = manage_window(ev->window); + win = manage_window(e->window); if (win) - set_win_state(win, NormalState); + set_win_state(win, XCB_ICCCM_WM_STATE_NORMAL); + + /* + * 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); } void -mappingnotify(XEvent *e) +mappingnotify(xcb_mapping_notify_event_t *e) { - XMappingEvent *ev = &e->xmapping; + xcb_refresh_keyboard_mapping(syms, e); - XRefreshKeyboardMapping(ev); - if (ev->request == MappingKeyboard) + if (e->request == XCB_MAPPING_KEYBOARD) grabkeys(); } void -maprequest(XEvent *e) +maprequest(xcb_map_request_event_t *e) { struct ws_win *win; struct swm_region *r; - XWindowAttributes wa; - XMapRequestEvent *ev = &e->xmaprequest; + xcb_get_window_attributes_reply_t *war; - DNPRINTF(SWM_D_EVENT, "maprequest: window: 0x%lx\n", - e->xmaprequest.window); + DNPRINTF(SWM_D_EVENT, "maprequest: window: 0x%x\n", + e->window); - if (!XGetWindowAttributes(display, ev->window, &wa)) + war = xcb_get_window_attributes_reply(conn, + xcb_get_window_attributes(conn, e->window), + NULL); + if (!war) return; - if (wa.override_redirect) + if (war->override_redirect) { + free(war); return; + } + free(war); - win = manage_window(e->xmaprequest.window); - if (win == NULL) + win = manage_window(e->window); + if (win == NULL) { return; /* can't happen */ + } stack(); /* make new win focused */ - r = root_to_region(win->wa.root); + r = root_to_region(win->wa->root); if (win->ws == r->ws) focus_magic(win); } void -propertynotify(XEvent *e) +propertynotify(xcb_property_notify_event_t *e) { struct ws_win *win; - XPropertyEvent *ev = &e->xproperty; #ifdef SWM_DEBUG - char *name; - name = XGetAtomName(display, ev->atom); - DNPRINTF(SWM_D_EVENT, "propertynotify: window: 0x%lx, atom: %s\n", - ev->window, name); - XFree(name); + char *name; + size_t len; + xcb_get_atom_name_reply_t *r; + + r = xcb_get_atom_name_reply(conn, + xcb_get_atom_name(conn, e->atom), + NULL); + if (r) { + len = xcb_get_atom_name_name_length(r); + if (len > 0) { + name = malloc(len + 1); + if (name) { + memcpy(name, xcb_get_atom_name_name(r), len); + name[len] = '\0'; + + DNPRINTF(SWM_D_EVENT, + "propertynotify: window: 0x%x, atom: %s\n", + e->window, name); + free(name); + } + } + free(r); + } #endif - win = find_window(ev->window); + win = find_window(e->window); if (win == NULL) return; - if (ev->state == PropertyDelete && ev->atom == a_swm_iconic) { + if (e->state == XCB_PROPERTY_DELETE && e->atom == a_swm_iconic) { update_iconic(win, 0); - XMapRaised(display, win->id); + map_window_raised(win->id); stack(); focus_win(win); return; } - switch (ev->atom) { -#if 0 - case XA_WM_NORMAL_HINTS: - long mask; - XGetWMNormalHints(display, win->id, &win->sh, &mask); - warnx("normal hints: flag 0x%x", win->sh.flags); - if (win->sh.flags & PMinSize) { - WIDTH(win) = win->sh.min_width; - HEIGHT(win) = win->sh.min_height; - warnx("min %d %d", WIDTH(win), HEIGHT(win)); - } - XMoveResizeWindow(display, win->id, - X(win), Y(win), WIDTH(win), HEIGHT(win)); -#endif - case XA_WM_CLASS: - if (title_name_enabled || title_class_enabled) - bar_update(); - break; - case XA_WM_NAME: - if (window_name_enabled) - bar_update(); + switch (e->atom) { + case XCB_ATOM_WM_CLASS: + case XCB_ATOM_WM_NAME: + bar_update(); break; default: break; @@ -6441,94 +7026,70 @@ propertynotify(XEvent *e) } void -unmapnotify(XEvent *e) +unmapnotify(xcb_unmap_notify_event_t *e) { struct ws_win *win; - DNPRINTF(SWM_D_EVENT, "unmapnotify: window: 0x%lx\n", e->xunmap.window); + DNPRINTF(SWM_D_EVENT, "unmapnotify: window: 0x%x\n", e->window); /* determine if we need to help unmanage this window */ - win = find_window(e->xunmap.window); + win = find_window(e->window); if (win == NULL) return; - if (getstate(e->xunmap.window) == NormalState) { + if (getstate(e->window) == XCB_ICCCM_WM_STATE_NORMAL) { unmanage_window(win); stack(); - /* giant hack for apps that don't destroy transient windows */ - /* eat a bunch of events to prevent remanaging the window */ - XEvent cne; - while (XCheckWindowEvent(display, e->xunmap.window, - EnterWindowMask, &cne)) - ; - while (XCheckWindowEvent(display, e->xunmap.window, - StructureNotifyMask, &cne)) - ; - while (XCheckWindowEvent(display, e->xunmap.window, - SubstructureNotifyMask, &cne)) - ; /* resend unmap because we ated it */ - XUnmapWindow(display, e->xunmap.window); + xcb_unmap_window(conn, e->window); + xcb_flush(conn); } - - if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); } -void -visibilitynotify(XEvent *e) +/*void +visibilitynotify(xcb_visibility_notify_event_t *e) { - int i; - struct swm_region *r; - - DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%lx\n", - e->xvisibility.window); - if (e->xvisibility.state == VisibilityUnobscured) - for (i = 0; i < ScreenCount(display); i++) - TAILQ_FOREACH(r, &screens[i].rl, entry) - if (e->xvisibility.window == r->bar_window) - bar_update(); -} + DNPRINTF(SWM_D_EVENT, "visibilitynotify: window: 0x%x\n", + e->window); +}*/ void -clientmessage(XEvent *e) +clientmessage(xcb_client_message_event_t *e) { - XClientMessageEvent *ev; struct ws_win *win; - ev = &e->xclient; - - win = find_window(ev->window); + win = find_window(e->window); if (win == NULL) return; + } - DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%lx, type: %ld\n", - ev->window, ev->message_type); + DNPRINTF(SWM_D_EVENT, "clientmessage: window: 0x%x, type: %u\n", + e->window, e->type); - if (ev->message_type == ewmh[_NET_ACTIVE_WINDOW].atom) { + if (e->type == ewmh[_NET_ACTIVE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_ACTIVE_WINDOW\n"); focus_win(win); } - if (ev->message_type == ewmh[_NET_CLOSE_WINDOW].atom) { + if (e->type == ewmh[_NET_CLOSE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_CLOSE_WINDOW\n"); if (win->can_delete) - client_msg(win, adelete); + client_msg(win, a_delete); else - XKillClient(display, win->id); + xcb_kill_client(conn, win->id); } - if (ev->message_type == ewmh[_NET_MOVERESIZE_WINDOW].atom) { + if (e->type == ewmh[_NET_MOVERESIZE_WINDOW].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_MOVERESIZE_WINDOW\n"); if (win->floating) { - if (ev->data.l[0] & (1<<8)) /* x */ - X(win) = ev->data.l[1]; - if (ev->data.l[0] & (1<<9)) /* y */ - Y(win) = ev->data.l[2]; - if (ev->data.l[0] & (1<<10)) /* width */ - WIDTH(win) = ev->data.l[3]; - if (ev->data.l[0] & (1<<11)) /* height */ - HEIGHT(win) = ev->data.l[4]; + if (e->data.data32[0] & (1<<8)) /* x */ + X(win) = e->data.data32[1]; + if (e->data.data32[0] & (1<<9)) /* y */ + Y(win) = e->data.data32[2]; + if (e->data.data32[0] & (1<<10)) /* width */ + WIDTH(win) = e->data.data32[3]; + if (e->data.data32[0] & (1<<11)) /* height */ + HEIGHT(win) = e->data.data32[4]; update_window(win); } @@ -6538,47 +7099,33 @@ clientmessage(XEvent *e) config_win(win, NULL); } } - if (ev->message_type == ewmh[_NET_WM_STATE].atom) { + if (e->type == ewmh[_NET_WM_STATE].atom) { DNPRINTF(SWM_D_EVENT, "clientmessage: _NET_WM_STATE\n"); - ewmh_update_win_state(win, ev->data.l[1], ev->data.l[0]); - if (ev->data.l[2]) - ewmh_update_win_state(win, ev->data.l[2], - ev->data.l[0]); + ewmh_update_win_state(win, e->data.data32[1], e->data.data32[0]); + if (e->data.data32[2]) + ewmh_update_win_state(win, e->data.data32[2], + e->data.data32[0]); stack(); } -} - -int -xerror_start(Display *d, XErrorEvent *ee) -{ - other_wm = 1; - return (-1); -} -int -xerror(Display *d, XErrorEvent *ee) -{ - /* warnx("error: %p %p", display, ee); */ - return (-1); + xcb_flush(conn); } -int +void active_wm(void) { - other_wm = 0; - xerrorxlib = XSetErrorHandler(xerror_start); + int num_screens, i; + const uint32_t val = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT; + xcb_screen_t *sc; /* this causes an error if some other window manager is running */ - XSelectInput(display, DefaultRootWindow(display), - SubstructureRedirectMask); - XSync(display, False); - if (other_wm) - return (1); - - XSetErrorHandler(xerror); - XSync(display, False); - return (0); + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { + sc = get_screen(i); + xcb_change_window_attributes(conn, sc->root, + XCB_CW_EVENT_MASK, &val); + } } void @@ -6603,7 +7150,7 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) if (r->ws->r != NULL) r->ws->old_r = r->ws->r; r->ws->r = NULL; - XDestroyWindow(display, r->bar_window); + bar_cleanup(r); TAILQ_REMOVE(&s->rl, r, entry); TAILQ_INSERT_TAIL(&s->orl, r, entry); } @@ -6634,7 +7181,7 @@ new_region(struct swm_screen *s, int x, int y, int w, int h) /* if we don't have a workspace already, find one */ if (ws == NULL) { - for (i = 0; i < SWM_WS_MAX; i++) + for (i = 0; i < workspace_limit; i++) if (s->ws[i].r == NULL) { ws = &s->ws[i]; break; @@ -6660,21 +7207,26 @@ void scan_xrandr(int i) { #ifdef SWM_XRR_HAS_CRTC - XRRCrtcInfo *ci; - XRRScreenResources *sr; - int c; - int ncrtc = 0; + int c; + int ncrtc = 0; #endif /* SWM_XRR_HAS_CRTC */ - struct swm_region *r; - - - if (i >= ScreenCount(display)) + struct swm_region *r; + 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); + + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + if (i >= num_screens) errx(1, "scan_xrandr: invalid screen"); /* remove any old regions */ while ((r = TAILQ_FIRST(&screens[i].rl)) != NULL) { r->ws->old_r = r->ws->r = NULL; - XDestroyWindow(display, r->bar_window); + bar_cleanup(r); TAILQ_REMOVE(&screens[i].rl, r, entry); TAILQ_INSERT_TAIL(&screens[i].orl, r, entry); } @@ -6683,140 +7235,196 @@ scan_xrandr(int i) /* map virtual screens onto physical screens */ #ifdef SWM_XRR_HAS_CRTC if (xrandr_support) { - sr = XRRGetScreenResources(display, screens[i].root); - if (sr == NULL) + src = xcb_randr_get_screen_resources_current(conn, + screens[i].root); + srr = xcb_randr_get_screen_resources_current_reply(conn, src, + NULL); + if (srr == NULL) { new_region(&screens[i], 0, 0, - DisplayWidth(display, i), - DisplayHeight(display, i)); - else - ncrtc = sr->ncrtc; - - for (c = 0, ci = NULL; c < ncrtc; c++) { - ci = XRRGetCrtcInfo(display, sr, sr->crtcs[c]); - if (ci->noutput == 0) + screen->width_in_pixels, + screen->height_in_pixels); + return; + } else + ncrtc = srr->num_crtcs; + 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); + if (cir == NULL) continue; + if (cir->num_outputs == 0) { + free(cir); + continue; + } - if (ci != NULL && ci->mode == None) + if (cir->mode == 0) new_region(&screens[i], 0, 0, - DisplayWidth(display, i), - DisplayHeight(display, i)); + screen->width_in_pixels, + screen->height_in_pixels); else new_region(&screens[i], - ci->x, ci->y, ci->width, ci->height); + cir->x, cir->y, cir->width, cir->height); + free(cir); } - if (ci) - XRRFreeCrtcInfo(ci); - XRRFreeScreenResources(sr); + free(srr); } else #endif /* SWM_XRR_HAS_CRTC */ { - new_region(&screens[i], 0, 0, DisplayWidth(display, i), - DisplayHeight(display, i)); + new_region(&screens[i], 0, 0, screen->width_in_pixels, + screen->height_in_pixels); } } void -screenchange(XEvent *e) { - XRRScreenChangeNotifyEvent *xe = (XRRScreenChangeNotifyEvent *)e; +screenchange(xcb_randr_screen_change_notify_event_t *e) +{ struct swm_region *r; - int i; + int i, num_screens; - DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%lx\n", xe->root); + DNPRINTF(SWM_D_EVENT, "screenchange: root: 0x%x\n", e->root); - if (!XRRUpdateConfiguration(e)) - return; + if (e->rotation & (XCB_RANDR_ROTATION_ROTATE_90 + | XCB_RANDR_ROTATION_ROTATE_270)) + xcb_randr_set_screen_size(conn, e->root, e->height, + e->width, e->mheight, e->mwidth); + else + xcb_randr_set_screen_size(conn, e->root, e->width, + e->height, e->mwidth, e->mheight); + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); /* silly event doesn't include the screen index */ - for (i = 0; i < ScreenCount(display); i++) - if (screens[i].root == xe->root) + for (i = 0; i < num_screens; i++) + if (screens[i].root == e->root) break; - if (i >= ScreenCount(display)) + if (i >= num_screens) errx(1, "screenchange: screen not found"); /* brute force for now, just re-enumerate the regions */ scan_xrandr(i); /* add bars to all regions */ - for (i = 0; i < ScreenCount(display); i++) + for (i = 0; i < num_screens; i++) TAILQ_FOREACH(r, &screens[i].rl, entry) bar_setup(r); stack(); - if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); } void grab_windows(void) { - Window d1, d2, *wins = NULL; - XWindowAttributes wa; - unsigned int no; - int i, j; - long state, manage; - - for (i = 0; i < ScreenCount(display); i++) { - if (!XQueryTree(display, screens[i].root, &d1, &d2, &wins, &no)) + xcb_window_t *wins = NULL; + int no; + int i, j, num_screens; + uint16_t state, manage; + + 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_property_cookie_t pc; + + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + for (i = 0; i < num_screens; i++) { + qtc = xcb_query_tree(conn, screens[i].root); + qtr = xcb_query_tree_reply(conn, qtc, NULL); + if (!qtr) continue; - + wins = xcb_query_tree_children(qtr); + no = xcb_query_tree_children_length(qtr); /* attach windows to a region */ /* normal windows */ for (j = 0; j < no; j++) { - if (!XGetWindowAttributes(display, wins[j], &wa) || - wa.override_redirect || - XGetTransientForHint(display, wins[j], &d1)) + c = xcb_get_window_attributes(conn, wins[j]); + r = xcb_get_window_attributes_reply(conn, c, NULL); + if (!r) + continue; + if (r->override_redirect) { + free(r); + continue; + } + + pc = xcb_icccm_get_wm_transient_for(conn, wins[j]); + if (xcb_icccm_get_wm_transient_for_reply(conn, pc, + &wins[j], NULL)) { + free(r); continue; + } state = getstate(wins[j]); - manage = state == IconicState; - if (wa.map_state == IsViewable || manage) + manage = state == XCB_ICCCM_WM_STATE_ICONIC; + if (r->map_state == XCB_MAP_STATE_VIEWABLE || manage) manage_window(wins[j]); + free(r); } /* transient windows */ for (j = 0; j < no; j++) { - if (!XGetWindowAttributes(display, wins[j], &wa) || - wa.override_redirect) + c = xcb_get_window_attributes(conn, wins[j]); + r = xcb_get_window_attributes_reply(conn, c, NULL); + if (!r) + continue; + if (r->override_redirect) { + free(r); continue; + } + free(r); state = getstate(wins[j]); - manage = state == IconicState; - if (XGetTransientForHint(display, wins[j], &d1) && - manage) + manage = state == XCB_ICCCM_WM_STATE_ICONIC; + 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]); } - if (wins) { - XFree(wins); - wins = NULL; - } + free(qtr); } } void setup_screens(void) { - int i, j, k; - int errorbase, major, minor; + int i, j, k, num_screens; struct workspace *ws; - XGCValues gcv; - - if ((screens = calloc(ScreenCount(display), + uint32_t gcv[1], wa[1]; + const xcb_query_extension_reply_t *qep; + xcb_cursor_t cursor; + xcb_font_t cursor_font; + xcb_randr_query_version_cookie_t c; + xcb_randr_query_version_reply_t *r; + + num_screens = xcb_setup_roots_length(xcb_get_setup(conn)); + 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 = XRRQueryExtension(display, - &xrandr_eventbase, &errorbase); - if (xrandr_support) - if (XRRQueryVersion(display, &major, &minor) && major < 1) - xrandr_support = 0; + 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); + } + 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"); + + 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; /* map physical screens */ - for (i = 0; i < ScreenCount(display); i++) { + for (i = 0; i < num_screens; i++) { DNPRINTF(SWM_D_WS, "setup_screens: init screen: %d\n", i); screens[i].idx = i; TAILQ_INIT(&screens[i].rl); TAILQ_INIT(&screens[i].orl); - screens[i].root = RootWindow(display, i); + screens[i].root = get_screen(i)->root; /* set default colors */ setscreencolor("red", i + 1, SWM_S_COLOR_FOCUS); @@ -6825,16 +7433,15 @@ setup_screens(void) setscreencolor("black", i + 1, SWM_S_COLOR_BAR); setscreencolor("rgb:a0/a0/a0", i + 1, SWM_S_COLOR_BAR_FONT); - /* create graphics context on screen with default font color */ - screens[i].bar_gc = XCreateGC(display, screens[i].root, 0, - &gcv); - - XSetForeground(display, screens[i].bar_gc, - screens[i].c[SWM_S_COLOR_BAR_FONT].color); + /* create graphics context on screen */ + screens[i].bar_gc = xcb_generate_id(conn); + gcv[0] = 0; + xcb_create_gc(conn, screens[i].bar_gc, screens[i].root, + XCB_GC_GRAPHICS_EXPOSURES, gcv); /* set default cursor */ - XDefineCursor(display, screens[i].root, - XCreateFontCursor(display, XC_left_ptr)); + xcb_change_window_attributes(conn, screens[i].root, + XCB_CW_CURSOR, wa); /* init all workspaces */ /* XXX these should be dynamically allocated too */ @@ -6859,9 +7466,11 @@ setup_screens(void) scan_xrandr(i); if (xrandr_support) - XRRSelectInput(display, screens[i].root, - RRScreenChangeNotifyMask); + 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 @@ -6870,37 +7479,115 @@ setup_globals(void) if ((bar_fonts = strdup(SWM_BAR_FONTS)) == NULL) err(1, "setup_globals: strdup: failed to allocate memory."); - if ((spawn_term[0] = strdup("xterm")) == NULL) - err(1, "setup_globals: strdup: failed to allocate memory."); - if ((clock_format = strdup("%a %b %d %R %Z %Y")) == NULL) err(1, "setup_globals: strdup: failed to allocate memory."); + + if ((syms = xcb_key_symbols_alloc(conn)) == NULL) + errx(1, "unable to allocate key symbols"); + + a_state = get_atom_from_string("WM_STATE"); + a_prot = get_atom_from_string("WM_PROTOCOLS"); + a_delete = get_atom_from_string("WM_DELETE_WINDOW"); + a_takefocus = get_atom_from_string("WM_TAKE_FOCUS"); + a_wmname = get_atom_from_string("WM_NAME"); + a_netwmname = get_atom_from_string("_NET_WM_NAME"); + a_utf8_string = get_atom_from_string("UTF8_STRING"); + a_string = get_atom_from_string("STRING"); + a_swm_iconic = get_atom_from_string("_SWM_ICONIC"); } void workaround(void) { - int i; - Atom netwmcheck, netwmname, utf8_string; - Window root, win; + int i, num_screens; + xcb_atom_t netwmcheck, netwmname, utf8_string; + xcb_window_t root, win; + uint32_t wa[2]; /* work around sun jdk bugs, code from wmname */ - netwmcheck = XInternAtom(display, "_NET_SUPPORTING_WM_CHECK", False); - netwmname = XInternAtom(display, "_NET_WM_NAME", False); - utf8_string = XInternAtom(display, "UTF8_STRING", False); - for (i = 0; i < ScreenCount(display); i++) { + 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)); + for (i = 0; i < num_screens; i++) { root = screens[i].root; - win = XCreateSimpleWindow(display,root, 0, 0, 1, 1, 0, - screens[i].c[SWM_S_COLOR_UNFOCUS].color, - screens[i].c[SWM_S_COLOR_UNFOCUS].color); - XChangeProperty(display, root, netwmcheck, XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&win,1); - XChangeProperty(display, win, netwmcheck, XA_WINDOW, 32, - PropModeReplace, (unsigned char *)&win,1); - XChangeProperty(display, win, netwmname, utf8_string, 8, - PropModeReplace, (unsigned char*)"LG3D", strlen("LG3D")); - } + 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_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"); + } +} + +void +event_error(xcb_generic_error_t *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, + xcb_event_get_request_label(e->major_code), e->major_code, + e->sequence, e->resource_id, e->minor_code); +} + +void +event_handle(xcb_generic_event_t *evt) +{ + uint8_t type = XCB_EVENT_RESPONSE_TYPE(evt); + + DNPRINTF(SWM_D_EVENT, "XCB Event: %s(%d)\n", + xcb_event_get_label(XCB_EVENT_RESPONSE_TYPE(evt)), + XCB_EVENT_RESPONSE_TYPE(evt)); + + switch (type) { +#define EVENT(type, callback) case type: callback((void *)evt); return + EVENT(0, event_error); + EVENT(XCB_BUTTON_PRESS, buttonpress); + /*EVENT(XCB_BUTTON_RELEASE, buttonpress);*/ + /*EVENT(XCB_CIRCULATE_NOTIFY, );*/ + /*EVENT(XCB_CIRCULATE_REQUEST, );*/ + EVENT(XCB_CLIENT_MESSAGE, clientmessage); + /*EVENT(XCB_COLORMAP_NOTIFY, );*/ + EVENT(XCB_CONFIGURE_NOTIFY, configurenotify); + EVENT(XCB_CONFIGURE_REQUEST, configurerequest); + /*EVENT(XCB_CREATE_NOTIFY, );*/ + EVENT(XCB_DESTROY_NOTIFY, destroynotify); + EVENT(XCB_ENTER_NOTIFY, enternotify); + EVENT(XCB_EXPOSE, expose); + /*EVENT(XCB_FOCUS_IN, );*/ + /*EVENT(XCB_FOCUS_OUT, );*/ + /*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, );*/ + EVENT(XCB_MAP_NOTIFY, mapnotify); + EVENT(XCB_MAP_REQUEST, maprequest); + EVENT(XCB_MAPPING_NOTIFY, mappingnotify); + /*EVENT(XCB_MOTION_NOTIFY, );*/ + /*EVENT(XCB_NO_EXPOSURE, );*/ + EVENT(XCB_PROPERTY_NOTIFY, propertynotify); + /*EVENT(XCB_REPARENT_NOTIFY, );*/ + /*EVENT(XCB_RESIZE_REQUEST, );*/ + /*EVENT(XCB_SELECTION_CLEAR, );*/ + /*EVENT(XCB_SELECTION_NOTIFY, );*/ + /*EVENT(XCB_SELECTION_REQUEST, );*/ + EVENT(XCB_UNMAP_NOTIFY, unmapnotify); + /*EVENT(XCB_VISIBILITY_NOTIFY, visibilitynotify);*/ +#undef EVENT + } + if (type - xrandr_eventbase == XCB_RANDR_SCREEN_CHANGE_NOTIFY) + screenchange((void *)evt); } int @@ -6908,30 +7595,22 @@ main(int argc, char *argv[]) { struct swm_region *r, *rr; struct ws_win *winfocus = NULL; - struct timeval tv; union arg a; char conf[PATH_MAX], *cfile = NULL; struct stat sb; - XEvent e; - int xfd, i; - fd_set rd; + int xfd, i, num_screens; struct sigaction sact; + xcb_generic_event_t *evt; + struct timeval tv; + fd_set rd; + + 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, "") || - !XSupportsLocale()) + if (!setlocale(LC_CTYPE, "") || !setlocale(LC_TIME, "")) warnx("no locale support"); - if (!X_HAVE_UTF8_STRING) - warnx("no UTF-8 support"); - - if (!(display = XOpenDisplay(0))) - errx(1, "can not open display"); - - if (active_wm()) - errx(1, "other wm running"); - /* handle some signals */ bzero(&sact, sizeof(sact)); sigemptyset(&sact.sa_mask); @@ -6946,21 +7625,34 @@ main(int argc, char *argv[]) sact.sa_flags = SA_NOCLDSTOP; sigaction(SIGCHLD, &sact, NULL); - astate = XInternAtom(display, "WM_STATE", False); - aprot = XInternAtom(display, "WM_PROTOCOLS", False); - adelete = XInternAtom(display, "WM_DELETE_WINDOW", False); - takefocus = XInternAtom(display, "WM_TAKE_FOCUS", False); - a_wmname = XInternAtom(display, "WM_NAME", False); - a_netwmname = XInternAtom(display, "_NET_WM_NAME", False); - a_utf8_string = XInternAtom(display, "UTF8_STRING", False); - a_string = XInternAtom(display, "STRING", False); - a_swm_iconic = XInternAtom(display, "_SWM_ICONIC", False); + conn = xcb_connect(NULL, NULL); + if (xcb_connection_has_error(conn)) + errx(1, "can not get XCB connection"); + + xcb_prefetch_extension_data(conn, &xcb_randr_id); + xfd = xcb_get_file_descriptor(conn); /* look for local and global conf file */ pwd = getpwuid(getuid()); if (pwd == NULL) errx(1, "invalid user: %d", getuid()); + xcb_grab_server(conn); + xcb_aux_sync(conn); + + /* flush all events */ + while ((evt = xcb_poll_for_event(conn))) { + if (XCB_EVENT_RESPONSE_TYPE(evt) == 0) + event_handle(evt); + free(evt); + } + + active_wm(); + xcb_aux_sync(conn); + + if (xcb_poll_for_event(conn) != NULL) + errx(1, "another window manager is currently running"); + setup_globals(); setup_screens(); setup_keys(); @@ -7003,11 +7695,9 @@ main(int argc, char *argv[]) } noconfig: - /* load conf (if any) and refresh font color in bar graphics contexts */ - if (cfile && conf_load(cfile, SWM_CONF_DEFAULT) == 0) - for (i = 0; i < ScreenCount(display); ++i) - XSetForeground(display, screens[i].bar_gc, - screens[i].c[SWM_S_COLOR_BAR_FONT].color); + /* load conf (if any) */ + if (cfile) + conf_load(cfile, SWM_CONF_DEFAULT); setup_ewmh(); /* set some values to work around bad programs */ @@ -7019,48 +7709,28 @@ noconfig: setenv("SWM_STARTED", "YES", 1); /* setup all bars */ - for (i = 0; i < ScreenCount(display); i++) + 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 (winfocus == NULL) winfocus = TAILQ_FIRST(&r->ws->winlist); bar_setup(r); } - unfocus_all(); + //unfocus_all(); grabkeys(); stack(); - if (focus_mode == SWM_FOCUS_DEFAULT) - drain_enter_notify(); - xfd = ConnectionNumber(display); + xcb_ungrab_server(conn); + xcb_flush(conn); + while (running) { - while (XPending(display)) { - XNextEvent(display, &e); + while ((evt = xcb_poll_for_event(conn))) { if (running == 0) goto done; - if (e.type < LASTEvent) { - DNPRINTF(SWM_D_EVENTQ ,"XEvent: handled: %s, " - "window: 0x%lx, type: %s (%d), %d remaining" - "\n", YESNO(handler[e.type]), - e.xany.window, geteventname(&e), - e.type, QLength(display)); - - if (handler[e.type]) - handler[e.type](&e); - } else { - DNPRINTF(SWM_D_EVENTQ, "XRandr Event: window: " - "0x%lx, type: %s (%d)\n", e.xany.window, - xrandr_geteventname(&e), e.type); - - switch (e.type - xrandr_eventbase) { - case RRScreenChangeNotify: - screenchange(&e); - break; - default: - break; - } - } + event_handle(evt); + free(evt); } /* if we are being restarted go focus on first window */ @@ -7072,9 +7742,9 @@ noconfig: continue; } /* move pointer to first screen if multi screen */ - if (ScreenCount(display) > 1 || outputs > 1) - XWarpPointer(display, None, rr->s[0].root, - 0, 0, 0, 0, X(rr), + 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; @@ -7105,12 +7775,14 @@ done: teardown_ewmh(); bar_extra_stop(); - for (i = 0; i < ScreenCount(display); ++i) - if (screens[i].bar_gc != NULL) - XFreeGC(display, screens[i].bar_gc); - + 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); - XCloseDisplay(display); +#endif + xcb_key_symbols_free(syms); + xcb_disconnect(conn); return (0); }