#include <xcb/xcb.h>
#include <xcb/xcb_event.h>
#include <xcb/xcb_keysyms.h>
+#include <xcb/xcb_icccm.h>
+#include <xcb/xcb_ewmh.h>
#include <xcb/xinerama.h>
#include "util.h"
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 {
} 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 *
************************/
+/* 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;
{ EV_F12, 0xFFC9 },
};
+/************************
+ * Conversion functions *
+ ************************/
+
static xcb_keycode_t *event_to_keycodes(event_t ev)
{
xcb_keycode_t *codes = NULL;
return *win;
}
+static win_t *win_new(xcb_window_t xcb)
+{
+ win_t *win = new0(win_t);
+ win->sys = new0(win_sys_t);
+ win->sys->xcb = xcb;
+
+ win_t **old = tfind(win, &cache, win_cmp);
+ if (old) {
+ warn("duplicate window for %u\n", xcb);
+ free(win->sys);
+ free(win);
+ return *old;
+ }
+
+ tsearch(win, &cache, win_cmp);
+ printf("win_new: xcb=%-8u -> win=%p\n",
+ win->sys->xcb, win);
+ return win;
+}
+
+static void win_free(win_t *win)
+{
+ printf("win_free: xcb=%-8u -> win=%p\n",
+ win->sys->xcb, win);
+ free(win->sys);
+ free(win);
+}
+
/****************
* XCB Wrappers *
****************/
-static int do_query_tree(xcb_window_t win, xcb_window_t **kids)
+static void *do_query_tree(xcb_window_t win, xcb_window_t **kids, int *nkids)
{
xcb_query_tree_cookie_t cookie =
xcb_query_tree(conn, win);
if (!cookie.sequence)
- return warn("do_query_tree: %d - bad cookie", win);
+ return warn("do_query_tree: %d - bad cookie", win), NULL;
xcb_query_tree_reply_t *reply =
xcb_query_tree_reply(conn, cookie, NULL);
if (!reply)
- return warn("do_query_tree: %d - no reply", win);
+ return warn("do_query_tree: %d - no reply", win), NULL;
- 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;
+ *nkids = xcb_query_tree_children_length(reply);
+ *kids = xcb_query_tree_children(reply);
+ printf("do_query_tree: %d - n=%d\n", win, *nkids);
+ return reply;
}
static int do_get_geometry(xcb_window_t win,
*y = reply->y;
*w = reply->width;
*h = reply->height;
+ free(reply);
return 1;
}
win, reply->override_redirect);
*override = reply->override_redirect;
*mapped = reply->map_state != XCB_MAP_STATE_UNMAPPED;
+ free(reply);
return 1;
}
xcb_xinerama_is_active_reply_t *reply =
xcb_xinerama_is_active_reply(conn, cookie, NULL);
if (!reply)
- warn("do_xinerama_check: no reply");
+ return warn("do_xinerama_check: no reply");
printf("do_xinerama_check: %d\n", reply->state);
- return reply && reply->state;
+ int state = reply->state;
+ free(reply);
+ return state;
}
-static int do_query_screens(xcb_xinerama_screen_info_t **info)
+static void *do_query_screens(xcb_xinerama_screen_info_t **info, int *ninfo)
{
xcb_xinerama_query_screens_cookie_t cookie =
xcb_xinerama_query_screens(conn);
if (!cookie.sequence)
- return warn("do_query_screens: bad cookie");
+ return warn("do_query_screens: bad cookie"), NULL;
xcb_xinerama_query_screens_reply_t *reply =
xcb_xinerama_query_screens_reply(conn, cookie, NULL);
if (!reply)
- return warn("do_query_screens: no reply");
+ return warn("do_query_screens: no reply"), NULL;
- 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;
+ *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 reply;
+}
+
+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");
+
+ int focus = reply->focus;
+ free(reply);
+ return 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)
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)
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;
+ xcb_icccm_get_wm_protocols_reply_wipe(&protos);
+ 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 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 *
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, event->event, event->child);
+ event->root, focus, event->child);
}
static void on_button_event(xcb_button_press_event_t *event, int up)
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=%-8u\n", event->window);
- printf("on_create_notify: xcb=%-8u -> win=%p\n",
- event->window, win);
+ win_t *win = win_new(event->window);
- win->x = event->x;
- win->y = event->y;
- win->w = event->width;
- win->h = event->height;
- win->sys = sys;
-
- sys->xcb = event->window;
- sys->override = event->override_redirect;
+ win->x = event->x;
+ win->y = event->y;
+ win->w = event->width;
+ win->h = event->height;
- tsearch(win, &cache, win_cmp);
+ if (!event->override_redirect)
+ send_manage(win, 1);
}
-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);
+ win_free(win);
+}
- free(win->sys);
- free(win);
+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(win_t *win, xcb_map_request_event_t *event)
+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;
(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 */
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;
}
}
w = MAX(w-b,1);
h = MAX(h-b,1);
- uint16_t mask = XCB_CONFIG_WINDOW_X
- | XCB_CONFIG_WINDOW_Y
- | XCB_CONFIG_WINDOW_WIDTH
- | XCB_CONFIG_WINDOW_HEIGHT
- | XCB_CONFIG_WINDOW_BORDER_WIDTH;
- uint32_t list[] = {x, y, w, h, border};
-
- 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);
- xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, win->sys->xcb);
+
+ 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)
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)
xcb_grab_key(conn, 1, xcb, mods, code[i],
XCB_GRAB_MODE_ASYNC,
XCB_GRAB_MODE_ASYNC);
-
+ free(code);
break;
}
}
if (screens == NULL && do_xinerama_check()) {
/* Add Xinerama screens */
+ int ninfo = 0;
xcb_xinerama_screen_info_t *info = NULL;
- int ninfo = do_query_screens(&info);
+ void *reply = do_query_screens(&info, &ninfo);
for (int i = 0; i < ninfo; i++) {
win_t *screen = new0(win_t);
screen->w, screen->h,
screen->x, screen->y);
}
+ free(reply);
}
if (screens == NULL) {
{
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);
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 */
+ uint32_t override = 1;
+ control = xcb_generate_id(conn);
+ printf("control window: %d\n", control);
+ cookie = xcb_create_window_checked(conn, 0, control, root,
+ 0, 0, 1, 1, 0, 0, 0,
+ XCB_CW_OVERRIDE_REDIRECT, &override);
+ 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");
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)
/* Add each initial window */
if (!no_capture) {
+ int nkids = 0;
xcb_window_t *kids = NULL;
- int nkids = do_query_tree(root, &kids);
+ void *reply = do_query_tree(root, &kids, &nkids);
for(int i = 0; i < nkids; i++) {
- win_t *win = new0(win_t);
- win->sys = new0(win_sys_t);
- win->sys->xcb = kids[i];
+ int override=0, mapped=0;
+ if (kids[i] == control)
+ continue;
+ win_t *win = win_new(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_window_attributes(kids[i], &override, &mapped);
+ printf(" found %-8u %dx%d @ %d,%d --%s%s\n", kids[i],
+ win->w, win->h, win->x, win->y,
+ override ? " override" : "",
+ mapped ? " mapped" : "");
+ if (!override)
+ send_manage(win, 1);
+ if (mapped)
+ send_state(win, ST_SHOW);
}
+ free(reply);
xcb_flush(conn);
}
/* Main loop */
- while (1)
+ running = 1;
+ while (running)
{
int status;
xcb_generic_event_t *event;
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;
+
+ /* unregister wm */
+ 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");
+
+ /* close connection */
+ xcb_ewmh_connection_wipe(&ewmh);
+ xcb_key_symbols_free(keysyms);
+ xcb_disconnect(conn);
+
+ /* free local data */
+ while (screens)
+ screens = list_remove(screens, screens, 1);
+ tdestroy(cache, (void(*)(void*))win_free);
}
projects / wmpus / blobdiff