X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=sys-xcb.c;h=1da2f6674f5df2d2162c7495c64ec340a0846eb4;hb=53915f4a7090d26345c9a0db99ed0e49b19fdb5b;hp=44d3c51182f9789a5fd1c6aa7cd63d09912df670;hpb=461d41b1bd3d68ac44d3a288ce41613a4ee398ce;p=wmpus diff --git a/sys-xcb.c b/sys-xcb.c index 44d3c51..1da2f66 100644 --- a/sys-xcb.c +++ b/sys-xcb.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include #include #include "util.h" @@ -36,11 +38,18 @@ 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; // xcb window id xcb_event_mask_t events; // currently watch events - int override; // normal vs override redirect - int mapped; // window is currently mapped + strut_t strut; // toolbar struts + int managed; // window is managed by wm }; typedef enum { @@ -51,15 +60,20 @@ typedef enum { } color_t; /* Global data */ -static xcb_connection_t *conn; -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_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 int running; +static xcb_window_t control; +static xcb_atom_t wm_protos; +static xcb_atom_t wm_delete; /************************ * Conversion functions * @@ -321,6 +335,58 @@ static int do_get_input_focus(void) 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"); + + xcb_atom_t atom = reply->atom; + free(reply); + return 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; @@ -337,7 +403,9 @@ static xcb_pixmap_t do_alloc_color(uint32_t rgb) return warn("do_alloc_color: no reply"); printf("do_alloc_color: %06x -> %06x\n", rgb, reply->pixel); - return reply->pixel; + xcb_pixmap_t pixel = reply->pixel; + free(reply); + return pixel; } static void do_grab_pointer(xcb_event_mask_t mask) @@ -383,6 +451,40 @@ static void do_configure_window(xcb_window_t win, 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 * **************************/ @@ -425,11 +527,28 @@ static int send_pointer(int16_t *pos, } /* Send window state info */ -static int send_state(void) +static void send_manage(win_t *win, int managed) { - return 0; + if (win->sys->managed == managed) + return; + if (managed) + wm_insert(win); + else + 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); +} /********************** * X11 Event Handlers * @@ -525,15 +644,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) { + 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); @@ -541,25 +666,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) { + win_t *win = win_get(event->window); + printf("on_unmap_notify: xcb=%-8u -> win=%p\n", + event->window, win); + if (!win) return; + + 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 (!win->sys->override && !win->sys->mapped) - wm_insert(win); - win->sys->mapped = 1; + 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) { + 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; @@ -582,14 +733,19 @@ static void on_configure_request(win_t *win, xcb_configure_request_event_t *even (const char *)&resp); } +static void on_client_message(xcb_client_message_event_t *event) +{ + printf("on_client_message: xcb=%-8u\n", event->window); + if (event->window == control && + event->type == wm_protos && + event->data.data32[0] == wm_delete) + running = 0; +} + /* Generic Event */ static void on_event(xcb_generic_event_t *event) { - win_t *win = NULL; - int type = XCB_EVENT_RESPONSE_TYPE(event); - int sent = XCB_EVENT_SENT(event); - const char *name = NULL; switch (type) { /* Input handling */ @@ -626,23 +782,30 @@ static void on_event(xcb_generic_event_t *event) 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; + case XCB_CLIENT_MESSAGE: + on_client_message((xcb_client_message_event_t *)event); break; /* Unknown events */ default: - name = xcb_event_get_label(type); printf("on_event: %d:%02X -> %s\n", - !!sent, type, name?:"unknown_event"); + XCB_EVENT_SENT(event) != 0, + XCB_EVENT_RESPONSE_TYPE(event), + xcb_event_get_label(type) ?: "unknown_event"); break; } } @@ -746,16 +909,8 @@ void sys_show(win_t *win, state_t state) break; case ST_CLOSE: - // TODO - // if (!win_msg(win, WM_DELETE)) { - // XGrabServer(win->sys->dpy); - // XSetErrorHandler(xnoerror); - // XSetCloseDownMode(win->sys->dpy, DestroyAll); - // XKillClient(win->sys->dpy, win->sys->xid); - // XSync(win->sys->dpy, False); - // XSetErrorHandler(xerror); - // XUngrabServer(win->sys->dpy); - // } + if (!do_client_message(xcb, wm_delete)) + xcb_kill_client(conn, xcb); break; } @@ -864,6 +1019,9 @@ void sys_init(void) { printf("sys_init\n"); + xcb_void_cookie_t cookie; + xcb_generic_error_t *err; + /* Load configuration */ stack = conf_get_int("main.stack", stack); border = conf_get_int("main.border", border); @@ -881,6 +1039,40 @@ void sys_init(void) root = iter.data->root; colormap = iter.data->default_colormap; + /* Request 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, &events); + if ((err = xcb_request_check(conn, cookie))) + error("another window manager is already running"); + + /* 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"); + + /* Set EWMH wm window */ + control = xcb_generate_id(conn); + cookie = xcb_create_window_checked(conn, 0, control, root, + 0, 0, 1, 1, 0, 0, 0, 0, NULL); + if ((err = xcb_request_check(conn, cookie))) + error("can't create control window"); + cookie = xcb_ewmh_set_wm_name_checked(&ewmh, control, 5, "wmpus"); + if ((err = xcb_request_check(conn, cookie))) + error("can't set wm name"); + cookie = xcb_ewmh_set_supporting_wm_check_checked(&ewmh, root, control); + if ((err = xcb_request_check(conn, cookie))) + error("can't set control window"); + + /* 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"); @@ -889,16 +1081,6 @@ void sys_init(void) 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_void_cookie_t cookie; - xcb_generic_error_t *err; - events = XCB_EVENT_MASK_SUBSTRUCTURE_REDIRECT | - XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY; - cookie = xcb_change_window_attributes_checked(conn, root, - XCB_CW_EVENT_MASK, &events); - if ((err = xcb_request_check(conn, cookie))) - error("another window manager is already running"); } void sys_run(void) @@ -910,21 +1092,24 @@ void sys_run(void) xcb_window_t *kids = NULL; int nkids = do_query_tree(root, &kids); for(int i = 0; i < nkids; i++) { + int override=0, mapped=0; win_t *win = new0(win_t); win->sys = new0(win_sys_t); win->sys->xcb = kids[i]; - do_get_geometry(kids[i], &win->x, &win->y, &win->w, &win->h); - do_get_window_attributes(kids[i], - &win->sys->override, &win->sys->mapped); tsearch(win, &cache, win_cmp); - if (!win->sys->override && win->sys->mapped) - wm_insert(win); + 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); } /* Main loop */ - while (1) + running = 1; + while (running) { int status; xcb_generic_event_t *event; @@ -940,15 +1125,36 @@ void sys_run(void) void sys_exit(void) { printf("sys_exit\n"); - if (conn) - xcb_disconnect(conn); - conn = NULL; + + xcb_client_message_event_t msg = { + .response_type = XCB_CLIENT_MESSAGE, + .format = 32, + .window = control, + .type = wm_protos, + .data.data32[0] = wm_delete, + .data.data32[1] = XCB_CURRENT_TIME, + }; + xcb_send_event(conn, 0, control, XCB_EVENT_MASK_NO_EVENT, + (const char *)&msg); + xcb_flush(conn); } void sys_free(void) { printf("sys_free\n"); - if (conn) - xcb_disconnect(conn); - conn = NULL; + + xcb_void_cookie_t cookie; + xcb_generic_error_t *err; + + cookie = xcb_delete_property_checked(conn, root, + ewmh._NET_SUPPORTING_WM_CHECK); + if ((err = xcb_request_check(conn, cookie))) + warn("can't remove control window"); + + cookie = xcb_destroy_window_checked(conn, control); + if ((err = xcb_request_check(conn, cookie))) + warn("can't destroy control window"); + + xcb_ewmh_connection_wipe(&ewmh); + xcb_disconnect(conn); }