X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-xcb.c;h=c9259c3ef3cfe0366ca838714d74f7db2e28b755;hb=e1cb276d972748a3044f1f7b694034170033e780;hp=7c73a4d67588d25ba3a2fca718e5fe7eb1750f8f;hpb=d79a7e5f74824d1e4b430953a30e71f43dfccf47;p=wmpus diff --git a/sys-xcb.c b/sys-xcb.c index 7c73a4d..c9259c3 100644 --- a/sys-xcb.c +++ b/sys-xcb.c @@ -17,8 +17,13 @@ #include #include #include +#include #include +#include +#include +#include +#include #include #include "util.h" @@ -33,42 +38,155 @@ static int stack = 25; static int no_capture = 0; /* Internal structures */ +typedef struct { + int left; + int right; + int top; + int bottom; +} strut_t; + struct win_sys { - xcb_window_t xcb; - int override; // normal vs override redirect - int managed; // window is currently managed by wm + xcb_window_t xcb; // xcb window id + xcb_event_mask_t events; // currently watch events + strut_t strut; // toolbar struts + int managed; // window is managed by wm }; +typedef enum { + CLR_FOCUS, + CLR_UNFOCUS, + CLR_URGENT, + NCOLORS +} color_t; + /* Global data */ -static xcb_connection_t *conn; -static xcb_window_t root; -static list_t *screens; -static void *cache; - -/***************** - * Constant data * - *****************/ - -const char *event_names[] = { - [XCB_KEY_PRESS ] "key_press", [XCB_KEY_RELEASE ] "key_release", - [XCB_BUTTON_PRESS ] "button_press", [XCB_BUTTON_RELEASE ] "button_release", - [XCB_MOTION_NOTIFY ] "motion_notify", [XCB_ENTER_NOTIFY ] "enter_notify", - [XCB_LEAVE_NOTIFY ] "leave_notify", [XCB_FOCUS_IN ] "focus_in", - [XCB_FOCUS_OUT ] "focus_out", [XCB_KEYMAP_NOTIFY ] "keymap_notify", - [XCB_EXPOSE ] "expose", [XCB_GRAPHICS_EXPOSURE] "graphics_exposure", - [XCB_NO_EXPOSURE ] "no_exposure", [XCB_VISIBILITY_NOTIFY] "visibility_notify", - [XCB_CREATE_NOTIFY ] "create_notify", [XCB_DESTROY_NOTIFY ] "destroy_notify", - [XCB_UNMAP_NOTIFY ] "unmap_notify", [XCB_MAP_NOTIFY ] "map_notify", - [XCB_MAP_REQUEST ] "map_request", [XCB_REPARENT_NOTIFY ] "reparent_notify", - [XCB_CONFIGURE_NOTIFY ] "configure_notify", [XCB_CONFIGURE_REQUEST] "configure_request", - [XCB_GRAVITY_NOTIFY ] "gravity_notify", [XCB_RESIZE_REQUEST ] "resize_request", - [XCB_CIRCULATE_NOTIFY ] "circulate_notify", [XCB_CIRCULATE_REQUEST] "circulate_request", - [XCB_PROPERTY_NOTIFY ] "property_notify", [XCB_SELECTION_CLEAR ] "selection_clear", - [XCB_SELECTION_REQUEST] "selection_request", [XCB_SELECTION_NOTIFY ] "selection_notify", - [XCB_COLORMAP_NOTIFY ] "colormap_notify", [XCB_CLIENT_MESSAGE ] "client_message", - [XCB_MAPPING_NOTIFY ] "mapping_notify", [XCB_GE_GENERIC ] "ge_generic", +static xcb_connection_t *conn; +static xcb_ewmh_connection_t ewmh; +static xcb_key_symbols_t *keysyms; +static xcb_colormap_t colormap; +static xcb_window_t root; +static xcb_event_mask_t events; +static list_t *screens; +static void *cache; +static xcb_pixmap_t colors[NCOLORS]; +static unsigned int grabbed; +static xcb_atom_t wm_protos; +static xcb_atom_t wm_delete; + +/************************ + * Conversion functions * + ************************/ + +/* State names */ +static char *state_map[] = { + [ST_HIDE ] "hide ", + [ST_SHOW ] "show ", + [ST_FULL ] "full ", + [ST_MAX ] "max ", + [ST_SHADE] "shade", + [ST_ICON ] "icon ", + [ST_CLOSE] "close", +}; + +/* Key presses */ +static struct { + event_t ev; + xcb_keysym_t sym; +} keysym_map[] = { + { EV_LEFT, 0xFF51 }, + { EV_RIGHT, 0xFF53 }, + { EV_UP, 0xFF52 }, + { EV_DOWN, 0xFF54 }, + { EV_HOME, 0xFF50 }, + { EV_END, 0xFF57 }, + { EV_PAGEUP, 0xFF55 }, + { EV_PAGEDOWN, 0xFF56 }, + { EV_F1, 0xFFBE }, + { EV_F2, 0xFFBF }, + { EV_F3, 0xFFC0 }, + { EV_F4, 0xFFC1 }, + { EV_F5, 0xFFC2 }, + { EV_F6, 0xFFC3 }, + { EV_F7, 0xFFC4 }, + { EV_F8, 0xFFC5 }, + { EV_F9, 0xFFC6 }, + { EV_F10, 0xFFC7 }, + { EV_F11, 0xFFC8 }, + { EV_F12, 0xFFC9 }, }; +/************************ + * Conversion functions * + ************************/ + +static xcb_keycode_t *event_to_keycodes(event_t ev) +{ + xcb_keycode_t *codes = NULL; + + /* Get keysym */ + xcb_keysym_t keysym = map_get(keysym_map, ev, ev, sym, ev); + + /* Get keycodes */ + if (!(codes = xcb_key_symbols_get_keycode(keysyms, keysym))) + warn("no keycode found for %d->%d", ev, keysym); + + return codes; +} + +static event_t keycode_to_event(xcb_keycode_t code) +{ + /* Get keysym */ + xcb_keysym_t keysym = xcb_key_symbols_get_keysym(keysyms, code, 0); + + /* Get event */ + return map_get(keysym_map, sym,keysym, ev,keysym); +} + +/* Button presses */ +static event_t button_to_event(xcb_button_t btn) +{ + return EV_MOUSE0 + btn; +} + +static xcb_button_t event_to_button(event_t ev) +{ + return ev - EV_MOUSE0; +} + +/* Modifier masks */ +static xcb_mod_mask_t mod_to_mask(mod_t mod) +{ + xcb_mod_mask_t mask = 0; + if (mod.alt) mask |= XCB_MOD_MASK_1; + if (mod.ctrl) mask |= XCB_MOD_MASK_CONTROL; + if (mod.shift) mask |= XCB_MOD_MASK_SHIFT; + if (mod.win) mask |= XCB_MOD_MASK_4; + return mask; +} + +static mod_t mask_to_mod(xcb_mod_mask_t mask, int up) +{ + mod_t mod = { .up = up }; + if (mask & XCB_MOD_MASK_1) mod.alt = 1; + if (mask & XCB_MOD_MASK_CONTROL) mod.ctrl = 1; + if (mask & XCB_MOD_MASK_SHIFT) mod.shift = 1; + if (mask & XCB_MOD_MASK_4) mod.win = 1; + return mod; +} + +/* Mouse pointers */ +static ptr_t list_to_ptr(int16_t *list) +{ + ptr_t ptr = {}; + if (list) { + ptr.rx = list[0]; // root_x + ptr.ry = list[1]; // root_y + ptr.x = list[2]; // event_x + ptr.y = list[3]; // event_y + } + return ptr; +} + /******************** * Window functions * ********************/ @@ -90,7 +208,7 @@ static win_t *win_get(xcb_window_t xcb) win_t **win = tfind(&key, &cache, win_cmp); if (!win) { - printf("Warning: no window for %u\n", xcb); + warn("no window for %u", xcb); return NULL; } @@ -101,42 +219,64 @@ static win_t *win_get(xcb_window_t xcb) * XCB Wrappers * ****************/ -static xcb_query_tree_reply_t *do_query_tree(xcb_window_t win) +static int do_query_tree(xcb_window_t win, xcb_window_t **kids) { xcb_query_tree_cookie_t cookie = xcb_query_tree(conn, win); + if (!cookie.sequence) + return warn("do_query_tree: %d - bad cookie", win); + xcb_query_tree_reply_t *reply = xcb_query_tree_reply(conn, cookie, NULL); if (!reply) - error("do_query_tree: %d - no reply", win); - printf("do_query_tree: %d\n", win); - return reply; + return warn("do_query_tree: %d - no reply", win); + + int nkids = xcb_query_tree_children_length(reply); + *kids = xcb_query_tree_children(reply); + printf("do_query_tree: %d - n=%d\n", win, nkids); + return nkids; } -static xcb_get_geometry_reply_t *do_get_geometry(xcb_window_t win) +static int do_get_geometry(xcb_window_t win, + int *x, int *y, int *w, int *h) { xcb_get_geometry_cookie_t cookie = xcb_get_geometry(conn, win); + if (!cookie.sequence) + return warn("do_get_geometry: %d - bad cookie", win); + xcb_get_geometry_reply_t *reply = xcb_get_geometry_reply(conn, cookie, NULL); if (!reply) - error("do_get_geometry: %d - no reply", win); + return warn("do_get_geometry: %d - no reply", win); + printf("do_get_geometry: %d - %dx%d @ %d,%d\n", win, reply->width, reply->height, reply->x, reply->y); - return reply; + *x = reply->x; + *y = reply->y; + *w = reply->width; + *h = reply->height; + return 1; } -static xcb_get_window_attributes_reply_t *do_get_window_attributes(xcb_window_t win) +static int do_get_window_attributes(xcb_window_t win, + int *override, int *mapped) { xcb_get_window_attributes_cookie_t cookie = xcb_get_window_attributes(conn, win); + if (!cookie.sequence) + return warn("do_get_window_attributes: %d - bad cookie", win); + xcb_get_window_attributes_reply_t *reply = xcb_get_window_attributes_reply(conn, cookie, NULL); if (!reply) - error("do_get_window_attributes: %d - no reply ", win); + return warn("do_get_window_attributes: %d - no reply ", win); + printf("do_get_window_attributes: %d - %d\n", win, reply->override_redirect); - return reply; + *override = reply->override_redirect; + *mapped = reply->map_state != XCB_MAP_STATE_UNMAPPED; + return 1; } static int do_xinerama_check(void) @@ -144,34 +284,264 @@ static int do_xinerama_check(void) const xcb_query_extension_reply_t *data = xcb_get_extension_data(conn, &xcb_xinerama_id); if (!data || !data->present) - return printf("do_xinerama_check: no ext\n"), 0; + return warn("do_xinerama_check: no ext"); xcb_xinerama_is_active_cookie_t cookie = xcb_xinerama_is_active(conn); if (!cookie.sequence) - return printf("do_xinerama_check: no cookie\n"), 0; + return warn("do_xinerama_check: no cookie"); xcb_xinerama_is_active_reply_t *reply = xcb_xinerama_is_active_reply(conn, cookie, NULL); if (!reply) - printf("do_xinerama_check: no reply\n"), 0; - else - printf("do_xinerama_check: %d\n", reply->state); + warn("do_xinerama_check: no reply"); + + printf("do_xinerama_check: %d\n", reply->state); return reply && reply->state; } -static xcb_xinerama_query_screens_reply_t *do_query_screens(void) +static int do_query_screens(xcb_xinerama_screen_info_t **info) { xcb_xinerama_query_screens_cookie_t cookie = xcb_xinerama_query_screens(conn); + if (!cookie.sequence) + return warn("do_query_screens: bad cookie"); + xcb_xinerama_query_screens_reply_t *reply = xcb_xinerama_query_screens_reply(conn, cookie, NULL); if (!reply) - printf("do_query_screens: no reply\n"); + return warn("do_query_screens: no reply"); + + int ninfo = xcb_xinerama_query_screens_screen_info_length(reply); + *info = xcb_xinerama_query_screens_screen_info(reply); + printf("do_query_screens: %d screens\n", ninfo); + return ninfo; +} + +static int do_get_input_focus(void) +{ + xcb_get_input_focus_cookie_t cookie = + xcb_get_input_focus(conn); + if (!cookie.sequence) + return warn("do_get_input_focus: bad cookie"); + + xcb_get_input_focus_reply_t *reply = + xcb_get_input_focus_reply(conn, cookie, NULL); + if (!reply) + return warn("do_get_input_focus: no reply"); + + return reply->focus; +} + +static xcb_atom_t do_intern_atom(const char *name) +{ + xcb_intern_atom_cookie_t cookie = + xcb_intern_atom(conn, 0, strlen(name), name); + if (!cookie.sequence) + return warn("do_intern_atom: bad cookie"); + + xcb_intern_atom_reply_t *reply = + xcb_intern_atom_reply(conn, cookie, NULL); + if (!reply) + return warn("do_intern_atom: no reply"); + + return reply->atom; +} + +static int do_ewmh_init_atoms(void) +{ + xcb_intern_atom_cookie_t *cookies = + xcb_ewmh_init_atoms(conn, &ewmh); + if (!cookies) + return warn("do_ewmh_init_atoms: no cookies"); + + int status = + xcb_ewmh_init_atoms_replies(&ewmh, cookies, NULL); + if (!status) + return warn("do_ewmh_init_atoms: no status"); + return status; +} + +static int do_get_strut(xcb_window_t win, strut_t *strut) +{ + xcb_get_property_cookie_t cookie = + xcb_ewmh_get_wm_strut(&ewmh, win); + if (!cookie.sequence) + return warn("do_get_strut: bad cookie"); + + xcb_ewmh_get_extents_reply_t ext = {}; + int status = + xcb_ewmh_get_wm_strut_reply(&ewmh, cookie, &ext, NULL); + if (!status) + return warn("do_get_strut: no status"); + + strut->left = ext.left; + strut->right = ext.right; + strut->top = ext.top; + strut->bottom = ext.bottom; + + return ext.left || ext.right || ext.top || ext.bottom; +} + +static xcb_pixmap_t do_alloc_color(uint32_t rgb) +{ + uint16_t r = (rgb & 0xFF0000) >> 8; + uint16_t g = (rgb & 0x00FF00); + uint16_t b = (rgb & 0x0000FF) << 8; + xcb_alloc_color_cookie_t cookie = + xcb_alloc_color(conn, colormap, r, g, b); + if (!cookie.sequence) + return warn("do_alloc_color: bad cookie"); + + xcb_alloc_color_reply_t *reply = + xcb_alloc_color_reply(conn, cookie, NULL); + if (!reply) + return warn("do_alloc_color: no reply"); + + printf("do_alloc_color: %06x -> %06x\n", rgb, reply->pixel); + return reply->pixel; +} + +static void do_grab_pointer(xcb_event_mask_t mask) +{ + if (!grabbed) + xcb_grab_pointer(conn, 0, root, mask, + XCB_GRAB_MODE_ASYNC, + XCB_GRAB_MODE_ASYNC, + 0, 0, XCB_CURRENT_TIME); + grabbed++; +} + +static void do_ungrab_pointer(void) +{ + grabbed--; + if (!grabbed) + xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); +} + +static void do_configure_window(xcb_window_t win, + int x, int y, int w, int h, + int b, int s, int r) +{ + int table[][2] = { + { x, XCB_CONFIG_WINDOW_X }, + { y, XCB_CONFIG_WINDOW_Y }, + { w, XCB_CONFIG_WINDOW_WIDTH }, + { h, XCB_CONFIG_WINDOW_HEIGHT }, + { b, XCB_CONFIG_WINDOW_BORDER_WIDTH }, + { s, XCB_CONFIG_WINDOW_SIBLING }, + { r, XCB_CONFIG_WINDOW_STACK_MODE }, + }; + + uint16_t mask = 0; + uint32_t list[7] = {}; + for (int i = 0; i < 7; i++) { + if (table[i][0] >= 0) { + list[i] = table[i][0]; + mask |= table[i][1]; + } + } + + xcb_configure_window(conn, win, mask, list); +} + +static int do_client_message(xcb_window_t win, xcb_atom_t atom) +{ + /* Get protocols */ + xcb_get_property_cookie_t cookie = + xcb_icccm_get_wm_protocols(conn, win, wm_protos); + if (!cookie.sequence) + return warn("do_client_message: %d - bad cookie", win); + + xcb_icccm_get_wm_protocols_reply_t protos = {}; + if (!xcb_icccm_get_wm_protocols_reply(conn, cookie, &protos, NULL)) + return warn("do_client_message: %d - no reply", win); + + /* Search for the atom */ + int found = 0; + for (int i = 0; i < protos.atoms_len; i++) + if (protos.atoms[i] == atom) + found = 1; + if (!found) + return warn("do_client_message: %d - no atom", win); + + /* Send the message */ + xcb_client_message_event_t msg = { + .response_type = XCB_CLIENT_MESSAGE, + .format = 32, + .window = win, + .type = wm_protos, + .data.data32[0] = atom, + .data.data32[1] = XCB_CURRENT_TIME, + }; + xcb_send_event(conn, 0, win, XCB_EVENT_MASK_NO_EVENT, + (const char *)&msg); + return 1; +} + +/************************** + * Window Manager Helpers * + **************************/ + +/* Send event info */ +static int send_event(event_t ev, xcb_window_t ewin) +{ + win_t *win = win_get(ewin); + do_grab_pointer(0); + int status = wm_handle_event(win, ev, MOD(), PTR()); + do_ungrab_pointer(); + return status; +} + +/* Send event info */ +static int send_event_info(event_t ev, xcb_mod_mask_t mask, int up, int16_t *pos, + xcb_window_t rwin, xcb_window_t ewin, xcb_window_t cwin) +{ + xcb_window_t xcb = ewin == rwin ? cwin : ewin; + win_t *win = win_get(xcb); + mod_t mod = mask_to_mod(mask, up); + ptr_t ptr = list_to_ptr(pos); + do_grab_pointer(0); + int status = wm_handle_event(win, ev, mod, ptr); + do_ungrab_pointer(); + return status; +} + +/* Send pointer motion info */ +static int send_pointer(int16_t *pos, + xcb_window_t rwin, xcb_window_t ewin, xcb_window_t cwin) +{ + xcb_window_t xcb = ewin == rwin ? cwin : ewin; + win_t *win = win_get(xcb); + ptr_t ptr = list_to_ptr(pos); + do_grab_pointer(0); + int status = wm_handle_ptr(win, ptr); + do_ungrab_pointer(); + return status; +} + +/* Send window state info */ +static void send_manage(win_t *win, int managed) +{ + if (win->sys->managed == managed) + return; + if (managed) + wm_insert(win); else - printf("do_query_screens: %d screens\n", - xcb_xinerama_query_screens_screen_info_length(reply)); - return reply; + wm_remove(win); + win->sys->managed = managed; +} + +/* Send window state info */ +static void send_state(win_t *win, state_t next) +{ + if (!win->sys->managed) + return; + if (win->state == next) + return; + state_t prev = win->state; + win->state = next; + wm_handle_state(win, prev, next); } /********************** @@ -179,12 +549,86 @@ static xcb_xinerama_query_screens_reply_t *do_query_screens(void) **********************/ /* Specific events */ +static void on_key_event(xcb_key_press_event_t *event, int up) +{ + printf("on_key_event: xcb=%-8u\n", event->event); + xcb_window_t focus = do_get_input_focus(); + event_t ev = keycode_to_event(event->detail); + send_event_info(ev, event->state, up, &event->root_x, + event->root, focus, event->child); +} + +static void on_button_event(xcb_button_press_event_t *event, int up) +{ + printf("on_button_event: xcb=%-8u\n", event->event); + event_t ev = button_to_event(event->detail); + if (!send_event_info(ev, event->state, up, &event->root_x, + event->root, event->event, event->child)) + xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time); + else if (!up) + do_grab_pointer(XCB_EVENT_MASK_POINTER_MOTION | + XCB_EVENT_MASK_BUTTON_RELEASE); + else + do_ungrab_pointer(); + +} + +static void on_motion_notify(xcb_motion_notify_event_t *event) +{ + printf("on_motion_notify: xcb=%-8u - %d,%d / %d.%d\n", event->event, + event->event_x, event->event_y, + event->root_x, event->root_y); + send_pointer(&event->root_x, event->root, event->event, event->child); +} + +static void on_enter_notify(xcb_enter_notify_event_t *event) +{ + if (event->mode != XCB_NOTIFY_MODE_NORMAL) + return; + printf("on_enter_notify: xcb=%-8u\n", event->event); + send_event_info(EV_ENTER, event->state, 0, &event->root_x, + event->root, event->event, event->child); +} + +static void on_leave_notify(xcb_leave_notify_event_t *event) +{ + if (event->mode != XCB_NOTIFY_MODE_NORMAL) + return; + printf("on_leave_notify: xcb=%-8u\n", event->event); + send_event_info(EV_LEAVE, event->state, 0, &event->root_x, + event->root, event->event, event->child); +} + +static void on_focus_in(xcb_focus_in_event_t *event) +{ + if (event->mode != XCB_NOTIFY_MODE_NORMAL && + event->mode != XCB_NOTIFY_MODE_WHILE_GRABBED) + return; + printf("on_focus_in: xcb=%-8u mode=%d\n", event->event, event->mode); + xcb_change_window_attributes(conn, event->event, + XCB_CW_BORDER_PIXEL, &colors[CLR_FOCUS]); + if (event->mode == XCB_NOTIFY_MODE_NORMAL) + send_event(EV_FOCUS, event->event); +} + +static void on_focus_out(xcb_focus_out_event_t *event) +{ + if (event->mode != XCB_NOTIFY_MODE_NORMAL && + event->mode != XCB_NOTIFY_MODE_WHILE_GRABBED) + return; + printf("on_focus_out: xcb=%-8u mode=%d\n", event->event, event->mode); + xcb_change_window_attributes(conn, event->event, + XCB_CW_BORDER_PIXEL, &colors[CLR_UNFOCUS]); + if (event->mode == XCB_NOTIFY_MODE_NORMAL) + send_event(EV_UNFOCUS, event->event); +} + static void on_create_notify(xcb_create_notify_event_t *event) { win_t *win = new0(win_t); win_sys_t *sys = new0(win_sys_t); - printf("on_create_notify: xcb=%u -> win=%p\n", + printf("on_create_notify: xcb=%-8u -> win=%p\n", event->window, win); win->x = event->x; @@ -194,15 +638,21 @@ static void on_create_notify(xcb_create_notify_event_t *event) win->sys = sys; sys->xcb = event->window; - sys->override = event->override_redirect; + + if (!event->override_redirect) + send_manage(win, 1); tsearch(win, &cache, win_cmp); } -static void on_destroy_notify(win_t *win, xcb_destroy_notify_event_t *event) +static void on_destroy_notify(xcb_destroy_notify_event_t *event) { - printf("on_destroy_notify: xcb=%u -> win=%p\n", + win_t *win = win_get(event->window); + printf("on_destroy_notify: xcb=%-8u -> win=%p\n", event->window, win); + if (!win) return; + + send_manage(win, 0); tdelete(win, &cache, win_cmp); @@ -210,26 +660,51 @@ static void on_destroy_notify(win_t *win, xcb_destroy_notify_event_t *event) free(win); } -static void on_map_request(win_t *win, xcb_map_request_event_t *event) +static void on_unmap_notify(xcb_unmap_notify_event_t *event) { - printf("on_map_request: xcb=%u -> win=%p\n", + win_t *win = win_get(event->window); + printf("on_unmap_notify: xcb=%-8u -> win=%p\n", event->window, win); + if (!win) return; - if (!win->sys->managed) { - wm_insert(win); - win->sys->managed = 1; - } + send_state(win, ST_HIDE); +} + +static void on_map_notify(xcb_map_notify_event_t *event) +{ + win_t *win = win_get(event->window); + printf("on_map_notify: xcb=%-8u -> win=%p\n", + event->window, win); + if (!win) return; + + send_state(win, ST_SHOW); +} +static void on_map_request(xcb_map_request_event_t *event) +{ + win_t *win = win_get(event->window); + printf("on_map_request: xcb=%-8u -> win=%p\n", + event->window, win); + if (!win) return; + + if (do_get_strut(win->sys->xcb, &win->sys->strut)) + printf("Map: Got a strut!\n"); + else + printf("Map: No struts here!\n"); + + send_state(win, ST_SHOW); xcb_map_window(conn, win->sys->xcb); sys_move(win, win->x, win->y, win->w, win->h); } -static void on_configure_request(win_t *win, xcb_configure_request_event_t *event) +static void on_configure_request(xcb_configure_request_event_t *event) { - printf("on_configure_request: xcb=%u -> win=%p -- %dx%d @ %d,%d\n", + win_t *win = win_get(event->window); + printf("on_configure_request: xcb=%-8u -> win=%p -- %dx%d @ %d,%d\n", event->window, win, event->width, event->height, event->x, event->y); + if (!win) return; win->x = event->x; win->y = event->y; @@ -255,25 +730,64 @@ static void on_configure_request(win_t *win, xcb_configure_request_event_t *even /* Generic Event */ static void on_event(xcb_generic_event_t *event) { - win_t *win = NULL; - switch (event->response_type) { + int type = XCB_EVENT_RESPONSE_TYPE(event); + + switch (type) { + /* Input handling */ + case XCB_KEY_PRESS: + on_key_event((xcb_key_press_event_t *)event, 0); + break; + case XCB_KEY_RELEASE: + on_key_event((xcb_key_release_event_t *)event, 1); + break; + case XCB_BUTTON_PRESS: + on_button_event((xcb_button_press_event_t *)event, 0); + break; + case XCB_BUTTON_RELEASE: + on_button_event((xcb_button_release_event_t *)event, 1); + break; + case XCB_MOTION_NOTIFY: + on_motion_notify((xcb_motion_notify_event_t *)event); + break; + case XCB_ENTER_NOTIFY: + on_enter_notify((xcb_enter_notify_event_t *)event); + break; + case XCB_LEAVE_NOTIFY: + on_leave_notify((xcb_leave_notify_event_t *)event); + break; + case XCB_FOCUS_IN: + on_focus_in((xcb_focus_in_event_t *)event); + break; + case XCB_FOCUS_OUT: + on_focus_out((xcb_focus_out_event_t *)event); + break; + + /* Window management */ case XCB_CREATE_NOTIFY: on_create_notify((xcb_create_notify_event_t *)event); break; case XCB_DESTROY_NOTIFY: - if ((win = win_get(((xcb_destroy_notify_event_t *)event)->window))) - on_destroy_notify(win, (xcb_destroy_notify_event_t *)event); + on_destroy_notify((xcb_destroy_notify_event_t *)event); + break; + case XCB_UNMAP_NOTIFY: + on_unmap_notify((xcb_unmap_notify_event_t *)event); + break; + case XCB_MAP_NOTIFY: + on_map_notify((xcb_map_notify_event_t *)event); break; case XCB_MAP_REQUEST: - if ((win = win_get(((xcb_map_request_event_t *)event)->window))) - on_map_request(win, (xcb_map_request_event_t *)event); + on_map_request((xcb_map_request_event_t *)event); break; case XCB_CONFIGURE_REQUEST: - if ((win = win_get(((xcb_configure_request_event_t *)event)->window))) - on_configure_request(win, (xcb_configure_request_event_t *)event); + on_configure_request((xcb_configure_request_event_t *)event); break; + + /* Unknown events */ default: - printf("on_%s\n", event_names[event->response_type] ?: "unknown_event"); + printf("on_event: %d:%02X -> %s\n", + XCB_EVENT_SENT(event) != 0, + XCB_EVENT_RESPONSE_TYPE(event), + xcb_event_get_label(type) ?: "unknown_event"); break; } } @@ -284,41 +798,155 @@ static void on_event(xcb_generic_event_t *event) void sys_move(win_t *win, int x, int y, int w, int h) { - printf("sys_move: %p - %dx%d @ %d,%d\n", + printf("sys_move: %p - %dx%d @ %d,%d\n", win, w, h, x, y); + int b = 2*border; + win->x = x; win->y = y; - win->w = w; - win->h = h; - - uint16_t mask = XCB_CONFIG_WINDOW_X - | XCB_CONFIG_WINDOW_Y - | XCB_CONFIG_WINDOW_WIDTH - | XCB_CONFIG_WINDOW_HEIGHT; - uint32_t list[] = {x, y, w, h}; + win->w = MAX(w,1+b); + win->h = MAX(h,1+b); + w = MAX(w-b,1); + h = MAX(h-b,1); - xcb_configure_window(conn, win->sys->xcb, mask, list); + do_configure_window(win->sys->xcb, x, y, w, h, -1, -1, -1); } void sys_raise(win_t *win) { printf("sys_raise: %p\n", win); + + uint16_t mask = XCB_CONFIG_WINDOW_STACK_MODE; + uint32_t list = XCB_STACK_MODE_ABOVE; + + xcb_configure_window(conn, win->sys->xcb, mask, &list); } void sys_focus(win_t *win) { printf("sys_focus: %p\n", win); + xcb_window_t xcb = win ? win->sys->xcb : root; + + xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, + xcb, XCB_CURRENT_TIME); } void sys_show(win_t *win, state_t state) { - printf("sys_show: %p - %d\n", win, state); + printf("sys_show: %p - %s -> %s\n", win, + state_map[win->state], state_map[state]); + xcb_window_t xcb = win ? win->sys->xcb : root; + + /* Find screen */ + win_t *screen = NULL; + if (state == ST_FULL || state == ST_MAX) { + for (list_t *cur = screens; cur; cur = cur->next) { + screen = cur->data; + if (win->x >= screen->x && win->x <= screen->x+screen->w && + win->y >= screen->y && win->y <= screen->y+screen->h) + break; + } + } + + /* Change window state */ + switch (state) { + case ST_HIDE: + xcb_unmap_window(conn, xcb); + break; + + case ST_SHOW: + xcb_map_window(conn, xcb); + do_configure_window(xcb, win->x, win->y, + MAX(win->w - 2*border, 1), + MAX(win->h - 2*border, 1), + border, -1, -1); + break; + + case ST_FULL: + xcb_map_window(conn, xcb); + do_configure_window(xcb, screen->x, screen->y, screen->w, screen->h, + 0, -1, XCB_STACK_MODE_ABOVE); + xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, xcb); + break; + + case ST_MAX: + xcb_map_window(conn, xcb); + do_configure_window(xcb, screen->x, screen->y, + MAX(screen->w - 2*border, 1), + MAX(screen->h - 2*border, 1), + border, -1, XCB_STACK_MODE_ABOVE); + break; + + case ST_SHADE: + xcb_map_window(conn, xcb); + do_configure_window(xcb, -1, -1, -1, stack, + border, -1, -1); + break; + + case ST_ICON: + xcb_map_window(conn, xcb); + do_configure_window(xcb, -1, -1, 100, 100, + border, -1, -1); + break; + + case ST_CLOSE: + if (!do_client_message(xcb, wm_delete)) + xcb_kill_client(conn, xcb); + break; + } + + /* Update state */ + win->state = state; } void sys_watch(win_t *win, event_t ev, mod_t mod) { printf("sys_watch: %p - 0x%X,0x%X\n", win, ev, mod2int(mod)); + xcb_window_t xcb = win ? win->sys->xcb : root; + xcb_event_mask_t *mask = win ? &win->sys->events : &events; + xcb_mod_mask_t mods = 0; + xcb_button_t btn = 0; + xcb_keycode_t *code = 0; + + switch (ev) { + case EV_ENTER: + *mask |= XCB_EVENT_MASK_ENTER_WINDOW; + xcb_change_window_attributes(conn, xcb, XCB_CW_EVENT_MASK, mask); + break; + + case EV_LEAVE: + *mask |= XCB_EVENT_MASK_LEAVE_WINDOW; + xcb_change_window_attributes(conn, xcb, XCB_CW_EVENT_MASK, mask); + break; + + case EV_FOCUS: + case EV_UNFOCUS: + *mask |= XCB_EVENT_MASK_FOCUS_CHANGE; + xcb_change_window_attributes(conn, xcb, XCB_CW_EVENT_MASK, mask); + break; + + case EV_MOUSE0...EV_MOUSE7: + btn = event_to_button(ev); + mods = mod_to_mask(mod); + *mask |= mod.up ? XCB_EVENT_MASK_BUTTON_RELEASE + : XCB_EVENT_MASK_BUTTON_PRESS; + xcb_grab_button(conn, 0, xcb, *mask, + XCB_GRAB_MODE_ASYNC, + XCB_GRAB_MODE_ASYNC, + 0, 0, btn, mods); + break; + + default: + code = event_to_keycodes(ev); + mods = mod_to_mask(mod); + for (int i = 0; code && code[i] != XCB_NO_SYMBOL; i++) + xcb_grab_key(conn, 1, xcb, mods, code[i], + XCB_GRAB_MODE_ASYNC, + XCB_GRAB_MODE_ASYNC); + + break; + } } void sys_unwatch(win_t *win, event_t ev, mod_t mod) @@ -332,14 +960,8 @@ list_t *sys_info(void) if (screens == NULL && do_xinerama_check()) { /* Add Xinerama screens */ - xcb_xinerama_query_screens_reply_t *query; - unsigned int ninfo; - xcb_xinerama_screen_info_t *info; - - query = do_query_screens(); - ninfo = xcb_xinerama_query_screens_screen_info_length(query); - info = xcb_xinerama_query_screens_screen_info(query); - + xcb_xinerama_screen_info_t *info = NULL; + int ninfo = do_query_screens(&info); for (int i = 0; i < ninfo; i++) { win_t *screen = new0(win_t); @@ -393,18 +1015,40 @@ void sys_init(void) /* Get root window */ const xcb_setup_t *setup = xcb_get_setup(conn); xcb_screen_iterator_t iter = xcb_setup_roots_iterator(setup); - root = iter.data->root; + root = iter.data->root; + colormap = iter.data->default_colormap; + + /* Setup X Atoms */ + wm_protos = do_intern_atom("WM_PROTOCOLS"); + wm_delete = do_intern_atom("WM_DELETE_WINDOW"); + if (!wm_protos || !wm_delete) + error("unable to setup atoms"); + + /* Setup EWMH connection */ + if (!do_ewmh_init_atoms()) + error("ewmh setup failed"); + + /* Setup for for ST_CLOSE */ + xcb_set_close_down_mode(conn, XCB_CLOSE_DOWN_DESTROY_ALL); + + /* Allocate key symbols */ + if (!(keysyms = xcb_key_symbols_alloc(conn))) + error("cannot allocate key symbols"); + + /* Read color information */ + colors[CLR_FOCUS] = do_alloc_color(0xFF6060); + colors[CLR_UNFOCUS] = do_alloc_color(0xD8D8FF); + colors[CLR_URGENT] = do_alloc_color(0xFF0000); /* Request substructure redirect */ - xcb_event_mask_t mask; - xcb_void_cookie_t cookie; + xcb_void_cookie_t cookie; xcb_generic_error_t *err; - mask = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | + events = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY; cookie = xcb_change_window_attributes_checked(conn, root, - XCB_CW_EVENT_MASK, &mask); + XCB_CW_EVENT_MASK, &events); if ((err = xcb_request_check(conn, cookie))) - error("Another window manager is already running"); + error("another window manager is already running"); } void sys_run(void) @@ -413,41 +1057,21 @@ void sys_run(void) /* Add each initial window */ if (!no_capture) { - xcb_query_tree_reply_t *tree; - unsigned int nkids; - xcb_window_t *kids; - - tree = do_query_tree(root); - nkids = xcb_query_tree_children_length(tree); - kids = xcb_query_tree_children(tree); - + xcb_window_t *kids = NULL; + int nkids = do_query_tree(root, &kids); for(int i = 0; i < nkids; i++) { - xcb_get_geometry_reply_t *geom; - xcb_get_window_attributes_reply_t *attr; - - geom = do_get_geometry(kids[i]); - attr = do_get_window_attributes(kids[i]); - - win_t *win = new0(win_t); - win_sys_t *sys = new0(win_sys_t); - - win->x = geom->x; - win->y = geom->y; - win->w = geom->width; - win->h = geom->height; - win->sys = sys; - - sys->xcb = kids[i]; - sys->override = attr->override_redirect; - + int override=0, mapped=0; + win_t *win = new0(win_t); + win->sys = new0(win_sys_t); + win->sys->xcb = kids[i]; tsearch(win, &cache, win_cmp); - - if (!attr->override_redirect) { - wm_insert(win); - sys->managed = 1; - } + do_get_geometry(kids[i], &win->x, &win->y, &win->w, &win->h); + do_get_window_attributes(kids[i], &override, &mapped); + if (!override) + send_manage(win, 1); + if (mapped) + send_state(win, ST_SHOW); } - xcb_flush(conn); }