]> Pileus Git - wmpus/blobdiff - sys-xcb.c
Add focus and enter events
[wmpus] / sys-xcb.c
index fb3135554b9c2b969dea91359a8bce5be465ccaf..f876511134e8eb9dd083943af6ad9d50221c2cfc 100644 (file)
--- a/sys-xcb.c
+++ b/sys-xcb.c
 #include <stdio.h>
 #include <stdlib.h>
 #include <search.h>
+#include <string.h>
 
 #include <xcb/xcb.h>
+#include <xcb/xcb_event.h>
+#include <xcb/xcb_keysyms.h>
 #include <xcb/xinerama.h>
 
 #include "util.h"
@@ -34,41 +37,129 @@ static int no_capture = 0;
 
 /* Internal structures */
 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
+       int override;            // normal vs override redirect
+       int mapped;              // window is currently mapped
 };
 
+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_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;
+
+/************************
+ * Conversion functions *
+ ************************/
+
+/* 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 },
 };
 
+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 *
  ********************/
@@ -142,7 +233,7 @@ static int do_get_geometry(xcb_window_t win,
 }
 
 static int do_get_window_attributes(xcb_window_t win,
-               int *override)
+               int *override, int *mapped)
 {
        xcb_get_window_attributes_cookie_t cookie =
                xcb_get_window_attributes(conn, win);
@@ -157,6 +248,7 @@ static int do_get_window_attributes(xcb_window_t win,
        printf("do_get_window_attributes: %d - %d\n",
                        win, reply->override_redirect);
        *override = reply->override_redirect;
+       *mapped   = reply->map_state != XCB_MAP_STATE_UNMAPPED;
        return 1;
 }
 
@@ -199,17 +291,174 @@ static int do_query_screens(xcb_xinerama_screen_info_t **info)
        return ninfo;
 }
 
+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);
+}
+
+/**************************
+ * 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 int send_state(void)
+{
+       return 0;
+}
+
+
 /**********************
  * X11 Event Handlers *
  **********************/
 
 /* Specific events */
+static void on_key_event(xcb_key_press_event_t *event, int up)
+{
+       printf("on_key_event:         xcb=%-8u\n", event->event);
+       event_t ev = keycode_to_event(event->detail);
+       send_event_info(ev, event->state, up, &event->root_x,
+               event->root, event->event, 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;
@@ -226,7 +475,7 @@ static void on_create_notify(xcb_create_notify_event_t *event)
 
 static void on_destroy_notify(win_t *win, xcb_destroy_notify_event_t *event)
 {
-       printf("on_destroy_notify:    xcb=%u -> win=%p\n",
+       printf("on_destroy_notify:    xcb=%-8u -> win=%p\n",
                        event->window, win);
 
        tdelete(win, &cache, win_cmp);
@@ -237,13 +486,12 @@ static void on_destroy_notify(win_t *win, xcb_destroy_notify_event_t *event)
 
 static void on_map_request(win_t *win, xcb_map_request_event_t *event)
 {
-       printf("on_map_request:       xcb=%u -> win=%p\n",
+       printf("on_map_request:       xcb=%-8u -> win=%p\n",
                        event->window, win);
 
-       if (!win->sys->managed) {
+       if (!win->sys->override && !win->sys->mapped)
                wm_insert(win);
-               win->sys->managed = 1;
-       }
+       win->sys->mapped = 1;
 
        xcb_map_window(conn, win->sys->xcb);
        sys_move(win, win->x, win->y, win->w, win->h);
@@ -251,7 +499,7 @@ static void on_map_request(win_t *win, xcb_map_request_event_t *event)
 
 static void on_configure_request(win_t *win, xcb_configure_request_event_t *event)
 {
-       printf("on_configure_request: xcb=%u -> win=%p -- %dx%d @ %d,%d\n",
+       printf("on_configure_request: xcb=%-8u -> win=%p -- %dx%d @ %d,%d\n",
                        event->window, win,
                        event->width, event->height,
                        event->x, event->y);
@@ -280,8 +528,43 @@ 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) {
+       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 */
+               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;
@@ -297,8 +580,12 @@ static void on_event(xcb_generic_event_t *event)
                        if ((win = win_get(((xcb_configure_request_event_t *)event)->window)))
                                on_configure_request(win, (xcb_configure_request_event_t *)event);
                        break;
+
+               /* Unknown events */
                default:
-                       printf("on_%s\n", event_names[event->response_type] ?: "unknown_event");
+                       name = xcb_event_get_label(type);
+                       printf("on_event: %d:%02X -> %s\n",
+                               !!sent, type, name?:"unknown_event");
                        break;
        }
 }
@@ -309,19 +596,24 @@ 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;
+       win->w = MAX(w,1+b);
+       win->h = MAX(h,1+b);
+       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;
-       uint32_t list[] = {x, y, w, h};
+                       | 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);
 }
@@ -329,21 +621,70 @@ void sys_move(win_t *win, int x, int y, int w, int h)
 void sys_raise(win_t *win)
 {
        printf("sys_raise: %p\n", win);
+       xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, win->sys->xcb);
 }
 
 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 - %d\n", win, 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)
@@ -412,18 +753,27 @@ 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;
+
+       /* 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)
@@ -439,12 +789,11 @@ void sys_run(void)
                        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);
+                       do_get_window_attributes(kids[i],
+                               &win->sys->override, &win->sys->mapped);
                        tsearch(win, &cache, win_cmp);
-                       if (!win->sys->override) {
+                       if (!win->sys->override && win->sys->mapped)
                                wm_insert(win);
-                               win->sys->managed = 1;
-                       }
                }
                xcb_flush(conn);
        }