]> git.sur5r.net Git - i3/i3/blobdiff - src/handlers.c
expose event handler: use x_deco_recurse
[i3/i3] / src / handlers.c
index 6e54b04b67ba3a928f1d172e2b2c1207be17a319..8e9bbb0448cddb7c598dd7232b8599f02adef02d 100644 (file)
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
- *
- * © 2009 Michael Stapelberg and contributors
- *
- * See file LICENSE for license information.
+ * © 2009-2010 Michael Stapelberg and contributors (see also: LICENSE)
  *
  */
-#include <stdio.h>
-#include <assert.h>
-#include <string.h>
-#include <stdlib.h>
 #include <time.h>
+#include <limits.h>
 
-#include <xcb/xcb.h>
-#include <xcb/xcb_atom.h>
-#include <xcb/xcb_icccm.h>
+#include <xcb/randr.h>
 
 #include <X11/XKBlib.h>
 
-#include "i3.h"
-#include "debug.h"
-#include "table.h"
-#include "layout.h"
-#include "commands.h"
-#include "data.h"
-#include "xcb.h"
-#include "util.h"
-#include "xinerama.h"
-#include "config.h"
-#include "queue.h"
-#include "resize.h"
-#include "client.h"
-#include "manage.h"
-#include "floating.h"
-#include "workspace.h"
-#include "log.h"
-#include "container.h"
+#include "all.h"
+
+int randr_base = -1;
 
 /* After mapping/unmapping windows, a notify event is generated. However, we don’t want it,
    since it’d trigger an infinite loop of switching between the different windows when
    changing workspaces */
 static SLIST_HEAD(ignore_head, Ignore_Event) ignore_events;
 
-static void add_ignore_event(const int sequence) {
-        struct Ignore_Event *event = smalloc(sizeof(struct Ignore_Event));
+void add_ignore_event(const int sequence, const int response_type) {
+    struct Ignore_Event *event = smalloc(sizeof(struct Ignore_Event));
 
-        event->sequence = sequence;
-        event->added = time(NULL);
+    event->sequence = sequence;
+    event->response_type = response_type;
+    event->added = time(NULL);
 
-        SLIST_INSERT_HEAD(&ignore_events, event, ignore_events);
+    SLIST_INSERT_HEAD(&ignore_events, event, ignore_events);
 }
 
 /*
  * Checks if the given sequence is ignored and returns true if so.
  *
  */
-static bool event_is_ignored(const int sequence) {
-        struct Ignore_Event *event;
-        time_t now = time(NULL);
-        for (event = SLIST_FIRST(&ignore_events); event != SLIST_END(&ignore_events);) {
-                if ((now - event->added) > 5) {
-                        struct Ignore_Event *save = event;
-                        event = SLIST_NEXT(event, ignore_events);
-                        SLIST_REMOVE(&ignore_events, save, Ignore_Event, ignore_events);
-                        free(save);
-                } else event = SLIST_NEXT(event, ignore_events);
-        }
-
-        SLIST_FOREACH(event, &ignore_events, ignore_events) {
-                if (event->sequence == sequence) {
-                        SLIST_REMOVE(&ignore_events, event, Ignore_Event, ignore_events);
-                        free(event);
-                        return true;
-                }
-        }
-
-        return false;
+static bool event_is_ignored(const int sequence, const int response_type) {
+    struct Ignore_Event *event;
+    time_t now = time(NULL);
+    for (event = SLIST_FIRST(&ignore_events); event != SLIST_END(&ignore_events);) {
+        if ((now - event->added) > 5) {
+            struct Ignore_Event *save = event;
+            event = SLIST_NEXT(event, ignore_events);
+            SLIST_REMOVE(&ignore_events, save, Ignore_Event, ignore_events);
+            free(save);
+        } else event = SLIST_NEXT(event, ignore_events);
+    }
+
+    SLIST_FOREACH(event, &ignore_events, ignore_events) {
+        if (event->sequence != sequence)
+            continue;
+
+        if (event->response_type != 0 &&
+            event->response_type != response_type)
+            continue;
+
+        /* instead of removing a sequence number we better wait until it gets
+         * garbage collected. it may generate multiple events (there are multiple
+         * enter_notifies for one configure_request, for example). */
+        //SLIST_REMOVE(&ignore_events, event, Ignore_Event, ignore_events);
+        //free(event);
+        return true;
+    }
+
+    return false;
 }
 
-/*
- * Due to bindings like Mode_switch + <a>, we need to bind some keys in XCB_GRAB_MODE_SYNC.
- * Therefore, we just replay all key presses.
- *
- */
-int handle_key_release(void *ignored, xcb_connection_t *conn, xcb_key_release_event_t *event) {
-        xcb_allow_events(conn, XCB_ALLOW_REPLAY_KEYBOARD, event->time);
-        xcb_flush(conn);
-        return 1;
-}
 
 /*
  * There was a key press. We compare this key code with our bindings table and pass
  * the bound action to parse_command().
  *
  */
-int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_t *event) {
-        DLOG("Keypress %d, state raw = %d\n", event->detail, event->state);
-
-        /* Remove the numlock bit, all other bits are modifiers we can bind to */
-        uint16_t state_filtered = event->state & ~(xcb_numlock_mask | XCB_MOD_MASK_LOCK);
-        DLOG("(removed numlock, state = %d)\n", state_filtered);
-        /* Only use the lower 8 bits of the state (modifier masks) so that mouse
-         * button masks are filtered out */
-        state_filtered &= 0xFF;
-        DLOG("(removed upper 8 bits, state = %d)\n", state_filtered);
-
-        if (xkb_supported) {
-                /* We need to get the keysym group (There are group 1 to group 4, each holding
-                   two keysyms (without shift and with shift) using Xkb because X fails to
-                   provide them reliably (it works in Xephyr, it does not in real X) */
-                XkbStateRec state;
-                if (XkbGetState(xkbdpy, XkbUseCoreKbd, &state) == Success && (state.group+1) == 2)
-                        state_filtered |= BIND_MODE_SWITCH;
-        }
-
-        DLOG("(checked mode_switch, state %d)\n", state_filtered);
-
-        /* Find the binding */
-        Binding *bind;
-        TAILQ_FOREACH(bind, bindings, bindings) {
-                /* First compare the modifiers */
-                if (bind->mods != state_filtered)
-                        continue;
-
-                /* If a symbol was specified by the user, we need to look in
-                 * the array of translated keycodes for the event’s keycode */
-                if (bind->symbol != NULL) {
-                        if (memmem(bind->translated_to,
-                                   bind->number_keycodes * sizeof(xcb_keycode_t),
-                                   &(event->detail), sizeof(xcb_keycode_t)) != NULL)
-                                break;
-                } else {
-                        /* This case is easier: The user specified a keycode */
-                        if (bind->keycode == event->detail)
-                                break;
-                }
-        }
-
-        /* No match? Then it was an actively grabbed key, that is with Mode_switch, and
-           the user did not press Mode_switch, so just pass it… */
-        if (bind == TAILQ_END(bindings)) {
-                xcb_allow_events(conn, ReplayKeyboard, event->time);
-                xcb_flush(conn);
-                return 1;
+static int handle_key_press(xcb_key_press_event_t *event) {
+    DLOG("Keypress %d, state raw = %d\n", event->detail, event->state);
+
+    /* Remove the numlock bit, all other bits are modifiers we can bind to */
+    uint16_t state_filtered = event->state & ~(xcb_numlock_mask | XCB_MOD_MASK_LOCK);
+    DLOG("(removed numlock, state = %d)\n", state_filtered);
+    /* Only use the lower 8 bits of the state (modifier masks) so that mouse
+     * button masks are filtered out */
+    state_filtered &= 0xFF;
+    DLOG("(removed upper 8 bits, state = %d)\n", state_filtered);
+
+    if (xkb_current_group == XkbGroup2Index)
+        state_filtered |= BIND_MODE_SWITCH;
+
+    DLOG("(checked mode_switch, state %d)\n", state_filtered);
+
+    /* Find the binding */
+    Binding *bind = get_binding(state_filtered, event->detail);
+
+    /* No match? Then the user has Mode_switch enabled but does not have a
+     * specific keybinding. Fall back to the default keybindings (without
+     * Mode_switch). Makes it much more convenient for users of a hybrid
+     * layout (like us, ru). */
+    if (bind == NULL) {
+        state_filtered &= ~(BIND_MODE_SWITCH);
+        DLOG("no match, new state_filtered = %d\n", state_filtered);
+        if ((bind = get_binding(state_filtered, event->detail)) == NULL) {
+            ELOG("Could not lookup key binding (modifiers %d, keycode %d)\n",
+                 state_filtered, event->detail);
+            return 1;
         }
+    }
 
-        parse_command(conn, bind->command);
-        if (state_filtered & BIND_MODE_SWITCH) {
-                DLOG("Mode_switch -> allow_events(SyncKeyboard)\n");
-                xcb_allow_events(conn, SyncKeyboard, event->time);
-                xcb_flush(conn);
-        }
-        return 1;
+    parse_cmd(bind->command);
+    return 1;
 }
 
 /*
@@ -163,83 +116,100 @@ int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_
  *
  */
 static void check_crossing_screen_boundary(uint32_t x, uint32_t y) {
-        i3Screen *screen;
+    Output *output;
 
-        if ((screen = get_screen_containing(x, y)) == NULL) {
-                ELOG("ERROR: No such screen\n");
-                return;
-        }
-        if (screen == c_ws->screen)
-                return;
-
-        c_ws->current_row = current_row;
-        c_ws->current_col = current_col;
-        c_ws = screen->current_workspace;
-        current_row = c_ws->current_row;
-        current_col = c_ws->current_col;
-        DLOG("We're now on virtual screen number %d\n", screen->num);
+    /* If the user disable focus follows mouse, we have nothing to do here */
+    if (config.disable_focus_follows_mouse)
+        return;
+
+    if ((output = get_output_containing(x, y)) == NULL) {
+        ELOG("ERROR: No such screen\n");
+        return;
+    }
+
+    if (output->con == NULL) {
+        ELOG("ERROR: The screen is not recognized by i3 (no container associated)\n");
+        return;
+    }
+
+    /* Focus the output on which the user moved his cursor */
+    Con *old_focused = focused;
+    con_focus(con_descend_focused(output_get_content(output->con)));
+
+    /* If the focus changed, we re-render to get updated decorations */
+    if (old_focused != focused)
+        tree_render();
 }
 
 /*
  * When the user moves the mouse pointer onto a window, this callback gets called.
  *
  */
-int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_event_t *event) {
-        DLOG("enter_notify for %08x, mode = %d, detail %d, serial %d\n", event->event, event->mode, event->detail, event->sequence);
-        if (event->mode != XCB_NOTIFY_MODE_NORMAL) {
-                DLOG("This was not a normal notify, ignoring\n");
-                return 1;
-        }
-        /* Some events are not interesting, because they were not generated actively by the
-           user, but by reconfiguration of windows */
-        if (event_is_ignored(event->sequence))
-                return 1;
-
-        /* This was either a focus for a client’s parent (= titlebar)… */
-        Client *client = table_get(&by_parent, event->event);
-        /* …or the client itself */
-        if (client == NULL)
-                client = table_get(&by_child, event->event);
-
-        /* Check for stack windows */
-        if (client == NULL) {
-                struct Stack_Window *stack_win;
-                SLIST_FOREACH(stack_win, &stack_wins, stack_windows)
-                        if (stack_win->window == event->event) {
-                                client = stack_win->container->currently_focused;
-                                break;
-                        }
-        }
-
-
-        /* If not, then the user moved his cursor to the root window. In that case, we adjust c_ws */
-        if (client == NULL) {
-                DLOG("Getting screen at %d x %d\n", event->root_x, event->root_y);
-                check_crossing_screen_boundary(event->root_x, event->root_y);
-                return 1;
-        }
-
-        /* Do plausibility checks: This event may be useless for us if it occurs on a window
-           which is in a stacked container but not the focused one */
-        if (client->container != NULL &&
-            client->container->mode == MODE_STACK &&
-            client->container->currently_focused != client) {
-                DLOG("Plausibility check says: no\n");
-                return 1;
-        }
+static int handle_enter_notify(xcb_enter_notify_event_t *event) {
+    Con *con;
+
+    DLOG("enter_notify for %08x, mode = %d, detail %d, serial %d\n",
+         event->event, event->mode, event->detail, event->sequence);
+    DLOG("coordinates %d, %d\n", event->event_x, event->event_y);
+    if (event->mode != XCB_NOTIFY_MODE_NORMAL) {
+        DLOG("This was not a normal notify, ignoring\n");
+        return 1;
+    }
+    /* Some events are not interesting, because they were not generated
+     * actively by the user, but by reconfiguration of windows */
+    if (event_is_ignored(event->sequence, XCB_ENTER_NOTIFY)) {
+        DLOG("Event ignored\n");
+        return 1;
+    }
+
+    bool enter_child = false;
+    /* Get container by frame or by child window */
+    if ((con = con_by_frame_id(event->event)) == NULL) {
+        con = con_by_window_id(event->event);
+        enter_child = true;
+    }
+
+    /* If not, then the user moved his cursor to the root window. In that case, we adjust c_ws */
+    if (con == NULL) {
+        DLOG("Getting screen at %d x %d\n", event->root_x, event->root_y);
+        check_crossing_screen_boundary(event->root_x, event->root_y);
+        return 1;
+    }
 
-        if (client->workspace != c_ws && client->workspace->screen == c_ws->screen) {
-                /* This can happen when a client gets assigned to a different workspace than
-                 * the current one (see src/mainx.c:reparent_window). Shortly after it was created,
-                 * an enter_notify will follow. */
-                DLOG("enter_notify for a client on a different workspace but the same screen, ignoring\n");
-                return 1;
-        }
+    if (con->parent->type == CT_DOCKAREA) {
+        DLOG("Ignoring, this is a dock client\n");
+        return 1;
+    }
+
+    /* see if the user entered the window on a certain window decoration */
+    int layout = (enter_child ? con->parent->layout : con->layout);
+    if (layout == L_DEFAULT) {
+        Con *child;
+        TAILQ_FOREACH(child, &(con->nodes_head), nodes)
+            if (rect_contains(child->deco_rect, event->event_x, event->event_y)) {
+                LOG("using child %p / %s instead!\n", child, child->name);
+                con = child;
+                break;
+            }
+    }
+
+#if 0
+    if (client->workspace != c_ws && client->workspace->output == c_ws->output) {
+            /* This can happen when a client gets assigned to a different workspace than
+             * the current one (see src/mainx.c:reparent_window). Shortly after it was created,
+             * an enter_notify will follow. */
+            DLOG("enter_notify for a client on a different workspace but the same screen, ignoring\n");
+            return 1;
+    }
+#endif
+
+    if (config.disable_focus_follows_mouse)
+        return 1;
 
-        if (!config.disable_focus_follows_mouse)
-                set_focus(conn, client, false);
+    con_focus(con_descend_focused(con));
+    tree_render();
 
-        return 1;
+    return 1;
 }
 
 /*
@@ -248,15 +218,40 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_
  * and crossing virtual screen boundaries), this callback gets called.
  *
  */
-int handle_motion_notify(void *ignored, xcb_connection_t *conn, xcb_motion_notify_event_t *event) {
-        /* Skip events where the pointer was over a child window, we are only
-         * interested in events on the root window. */
-        if (event->child != 0)
-                return 1;
+static int handle_motion_notify(xcb_motion_notify_event_t *event) {
+    /* Skip events where the pointer was over a child window, we are only
+     * interested in events on the root window. */
+    if (event->child != 0)
+        return 1;
 
+    Con *con;
+    if ((con = con_by_frame_id(event->event)) == NULL) {
         check_crossing_screen_boundary(event->root_x, event->root_y);
+        return 1;
+    }
 
+    if (config.disable_focus_follows_mouse)
         return 1;
+
+    if (con->layout != L_DEFAULT)
+        return 1;
+
+    /* see over which rect the user is */
+    Con *current;
+    TAILQ_FOREACH(current, &(con->nodes_head), nodes) {
+        if (!rect_contains(current->deco_rect, event->event_x, event->event_y))
+            continue;
+
+        /* We found the rect, let’s see if this window is focused */
+        if (TAILQ_FIRST(&(con->focus_head)) == current)
+            return 1;
+
+        con_focus(current);
+        x_push_changes(croot);
+        return 1;
+    }
+
+    return 1;
 }
 
 /*
@@ -264,36 +259,38 @@ int handle_motion_notify(void *ignored, xcb_connection_t *conn, xcb_motion_notif
  * we need to update our key bindings then (re-translate symbols).
  *
  */
-int handle_mapping_notify(void *ignored, xcb_connection_t *conn, xcb_mapping_notify_event_t *event) {
-        if (event->request != XCB_MAPPING_KEYBOARD &&
-            event->request != XCB_MAPPING_MODIFIER)
-                return 0;
+static int handle_mapping_notify(xcb_mapping_notify_event_t *event) {
+    if (event->request != XCB_MAPPING_KEYBOARD &&
+        event->request != XCB_MAPPING_MODIFIER)
+        return 0;
 
-        DLOG("Received mapping_notify for keyboard or modifier mapping, re-grabbing keys\n");
-        xcb_refresh_keyboard_mapping(keysyms, event);
+    DLOG("Received mapping_notify for keyboard or modifier mapping, re-grabbing keys\n");
+    xcb_refresh_keyboard_mapping(keysyms, event);
 
-        xcb_get_numlock_mask(conn);
+    xcb_get_numlock_mask(conn);
 
-        ungrab_all_keys(conn);
-        grab_all_keys(conn);
+    ungrab_all_keys(conn);
+    translate_keysyms();
+    grab_all_keys(conn, false);
 
-        return 0;
+    return 0;
 }
 
 /*
  * A new window appeared on the screen (=was mapped), so let’s manage it.
  *
  */
-int handle_map_request(void *prophs, xcb_connection_t *conn, xcb_map_request_event_t *event) {
-        xcb_get_window_attributes_cookie_t cookie;
+static int handle_map_request(xcb_map_request_event_t *event) {
+    xcb_get_window_attributes_cookie_t cookie;
 
-        cookie = xcb_get_window_attributes_unchecked(conn, event->window);
+    cookie = xcb_get_window_attributes_unchecked(conn, event->window);
 
-        DLOG("window = 0x%08x, serial is %d.\n", event->window, event->sequence);
-        add_ignore_event(event->sequence);
+    DLOG("window = 0x%08x, serial is %d.\n", event->window, event->sequence);
+    add_ignore_event(event->sequence, 0);
 
-        manage_window(prophs, conn, event->window, cookie, false);
-        return 1;
+    manage_window(event->window, cookie, false);
+    x_push_changes(croot);
+    return 1;
 }
 
 /*
@@ -302,89 +299,77 @@ int handle_map_request(void *prophs, xcb_connection_t *conn, xcb_map_request_eve
  * We generate a synthethic configure notify event to signalize the client its "new" position.
  *
  */
-int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure_request_event_t *event) {
-        DLOG("window 0x%08x wants to be at %dx%d with %dx%d\n",
-            event->window, event->x, event->y, event->width, event->height);
+static int handle_configure_request(xcb_configure_request_event_t *event) {
+    Con *con;
 
-        Client *client = table_get(&by_child, event->window);
-        if (client == NULL) {
-                uint32_t mask = 0;
-                uint32_t values[7];
-                int c = 0;
+    DLOG("window 0x%08x wants to be at %dx%d with %dx%d\n",
+        event->window, event->x, event->y, event->width, event->height);
+
+    /* For unmanaged windows, we just execute the configure request. As soon as
+     * it gets mapped, we will take over anyways. */
+    if ((con = con_by_window_id(event->window)) == NULL) {
+        DLOG("Configure request for unmanaged window, can do that.\n");
+
+        uint32_t mask = 0;
+        uint32_t values[7];
+        int c = 0;
 #define COPY_MASK_MEMBER(mask_member, event_member) do { \
-                if (event->value_mask & mask_member) { \
-                        mask |= mask_member; \
-                        values[c++] = event->event_member; \
-                } \
+        if (event->value_mask & mask_member) { \
+            mask |= mask_member; \
+            values[c++] = event->event_member; \
+        } \
 } while (0)
 
-                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_X, x);
-                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_Y, y);
-                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_WIDTH, width);
-                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_HEIGHT, height);
-                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_BORDER_WIDTH, border_width);
-                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_SIBLING, sibling);
-                COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_STACK_MODE, stack_mode);
+        COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_X, x);
+        COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_Y, y);
+        COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_WIDTH, width);
+        COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_HEIGHT, height);
+        COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_BORDER_WIDTH, border_width);
+        COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_SIBLING, sibling);
+        COPY_MASK_MEMBER(XCB_CONFIG_WINDOW_STACK_MODE, stack_mode);
 
-                xcb_configure_window(conn, event->window, mask, values);
-                xcb_flush(conn);
+        xcb_configure_window(conn, event->window, mask, values);
+        xcb_flush(conn);
 
-                return 1;
+        return 1;
+    }
+
+    DLOG("Configure request!\n");
+    if (con_is_floating(con) && con_is_leaf(con)) {
+        /* find the height for the decorations */
+        int deco_height = config.font.height + 5;
+        /* we actually need to apply the size/position changes to the *parent*
+         * container */
+        Rect bsr = con_border_style_rect(con);
+        if (con->border_style == BS_NORMAL) {
+            bsr.y += deco_height;
+            bsr.height -= deco_height;
         }
-
-        if (client->fullscreen) {
-                DLOG("Client is in fullscreen mode\n");
-
-                Rect child_rect = client->workspace->rect;
-                child_rect.x = child_rect.y = 0;
-                fake_configure_notify(conn, child_rect, client->child);
-
-                return 1;
+        con = con->parent;
+        DLOG("Container is a floating leaf node, will do that.\n");
+        if (event->value_mask & XCB_CONFIG_WINDOW_X) {
+            con->rect.x = event->x + (-1) * bsr.x;
+            DLOG("proposed x = %d, new x is %d\n", event->x, con->rect.x);
         }
-
-        /* Floating clients can be reconfigured */
-        if (client_is_floating(client)) {
-                i3Font *font = load_font(conn, config.font);
-                int mode = (client->container != NULL ? client->container->mode : MODE_DEFAULT);
-
-                if (event->value_mask & XCB_CONFIG_WINDOW_X)
-                        client->rect.x = event->x;
-                if (event->value_mask & XCB_CONFIG_WINDOW_Y)
-                        client->rect.y = event->y;
-                if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
-                        if (mode == MODE_STACK || mode == MODE_TABBED) {
-                                client->rect.width = event->width + 2 + 2;
-                        } else {
-                                if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
-                                        client->rect.width = event->width;
-                                else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
-                                        client->rect.width = event->width + (1 + 1);
-                                else client->rect.width = event->width + (2 + 2);
-                        }
-                }
-                if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
-                        if (mode == MODE_STACK || mode == MODE_TABBED) {
-                                client->rect.height = event->height + 2;
-                        } else {
-                                if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
-                                        client->rect.height = event->height;
-                                else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
-                                        client->rect.height = event->height + (1 + 1);
-                                else client->rect.height = event->height + (font->height + 2 + 2) + 2;
-                        }
-                }
-
-                DLOG("Accepted new position/size for floating client: (%d, %d) size %d x %d\n",
-                    client->rect.x, client->rect.y, client->rect.width, client->rect.height);
-
-                /* Push the new position/size to X11 */
-                reposition_client(conn, client);
-                resize_client(conn, client);
-                xcb_flush(conn);
-
-                return 1;
+        if (event->value_mask & XCB_CONFIG_WINDOW_Y) {
+            con->rect.y = event->y + (-1) * bsr.y;
+            DLOG("proposed y = %d, new y is %d\n", event->y, con->rect.y);
+        }
+        if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
+            con->rect.width = event->width + (-1) * bsr.width;
+            DLOG("proposed width = %d, new width is %d\n", event->width, con->rect.width);
         }
+        if (event->value_mask & XCB_CONFIG_WINDOW_HEIGHT) {
+            con->rect.height = event->height + (-1) * bsr.height;
+            DLOG("proposed height = %d, new height is %d\n", event->height, con->rect.height);
+        }
+        tree_render();
+    }
+
+    fake_absolute_configure_notify(con);
 
+    return 1;
+#if 0
         /* Dock clients can be reconfigured in their height */
         if (client->dock) {
                 DLOG("Reconfiguring height of this dock client\n");
@@ -395,7 +380,7 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
                 }
 
                 client->desired_height = event->height;
-                render_workspace(conn, c_ws->screen, c_ws);
+                render_workspace(conn, c_ws->output, c_ws);
                 xcb_flush(conn);
 
                 return 1;
@@ -414,53 +399,79 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
         fake_absolute_configure_notify(conn, client);
 
         return 1;
+#endif
 }
+#if 0
 
 /*
- * Configuration notifies are only handled because we need to set up ignore for the following
- * enter notify events
+ * Configuration notifies are only handled because we need to set up ignore for
+ * the following enter notify events.
  *
  */
 int handle_configure_event(void *prophs, xcb_connection_t *conn, xcb_configure_notify_event_t *event) {
-        xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
-
+    DLOG("configure_event, sequence %d\n", event->sequence);
         /* We ignore this sequence twice because events for child and frame should be ignored */
         add_ignore_event(event->sequence);
         add_ignore_event(event->sequence);
 
-        if (event->event == root) {
-                DLOG("event->x = %d, ->y = %d, ->width = %d, ->height = %d\n", event->x, event->y, event->width, event->height);
-                DLOG("reconfigure of the root window, need to xinerama\n");
-                /* FIXME: Somehow, this is occuring too often. Therefore, we check for 0/0,
-                   but is there a better way? */
-                if (event->x == 0 && event->y == 0)
-                        xinerama_requery_screens(conn);
-                return 1;
-        }
-
         return 1;
 }
+#endif
 
 /*
- * Our window decorations were unmapped. That means, the window will be killed now,
- * so we better clean up before.
+ * Gets triggered upon a RandR screen change event, that is when the user
+ * changes the screen configuration in any way (mode, position, …)
  *
  */
-int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_notify_event_t *event) {
-        xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
+static int handle_screen_change(xcb_generic_event_t *e) {
+    DLOG("RandR screen change\n");
 
-        add_ignore_event(event->sequence);
+    randr_query_outputs();
 
-        Client *client = table_get(&by_child, event->window);
-        /* First, we need to check if the client is awaiting an unmap-request which
-           was generated by us reparenting the window. In that case, we just ignore it. */
-        if (client != NULL && client->awaiting_useless_unmap) {
-                client->awaiting_useless_unmap = false;
-                return 1;
+    ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}");
+
+    return 1;
+}
+
+/*
+ * Our window decorations were unmapped. That means, the window will be killed
+ * now, so we better clean up before.
+ *
+ */
+static int handle_unmap_notify_event(xcb_unmap_notify_event_t *event) {
+    // XXX: this is commented out because in src/x.c we disable EnterNotify events
+    /* we need to ignore EnterNotify events which will be generated because a
+     * different window is visible now */
+    //add_ignore_event(event->sequence, XCB_ENTER_NOTIFY);
+
+    DLOG("UnmapNotify for 0x%08x (received from 0x%08x), serial %d\n", event->window, event->event, event->sequence);
+    Con *con = con_by_window_id(event->window);
+    if (con == NULL) {
+        /* This could also be an UnmapNotify for the frame. We need to
+         * decrement the ignore_unmap counter. */
+        con = con_by_frame_id(event->window);
+        if (con == NULL) {
+            LOG("Not a managed window, ignoring UnmapNotify event\n");
+            return 1;
         }
+        if (con->ignore_unmap > 0)
+            con->ignore_unmap--;
+        DLOG("ignore_unmap = %d for frame of container %p\n", con->ignore_unmap, con);
+        return 1;
+    }
 
-        DLOG("event->window = %08x, event->event = %08x\n", event->window, event->event);
-        DLOG("UnmapNotify for 0x%08x (received from 0x%08x)\n", event->window, event->event);
+    if (con->ignore_unmap > 0) {
+        DLOG("ignore_unmap = %d, dec\n", con->ignore_unmap);
+        con->ignore_unmap--;
+        return 1;
+    }
+
+    tree_close(con, DONT_KILL_WINDOW, false);
+    tree_render();
+    x_push_changes(croot);
+    return 1;
+
+#if 0
         if (client == NULL) {
                 DLOG("not a managed window. Ignoring.\n");
 
@@ -472,353 +483,172 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
 
                 return 0;
         }
+#endif
 
-        client = table_remove(&by_child, event->window);
-
-        /* If this was the fullscreen client, we need to unset it */
-        if (client->fullscreen)
-                client->workspace->fullscreen_client = NULL;
-
-        /* Clients without a container are either floating or dock windows */
-        if (client->container != NULL) {
-                Container *con = client->container;
-
-                /* Remove the client from the list of clients */
-                client_remove_from_container(conn, client, con, true);
-
-                /* Set focus to the last focused client in this container */
-                con->currently_focused = get_last_focused_client(conn, con, NULL);
-
-                /* Only if this is the active container, we need to really change focus */
-                if ((con->currently_focused != NULL) && ((con == CUR_CELL) || client->fullscreen))
-                        set_focus(conn, con->currently_focused, true);
-        } else if (client_is_floating(client)) {
-                DLOG("Removing from floating clients\n");
-                TAILQ_REMOVE(&(client->workspace->floating_clients), client, floating_clients);
-                SLIST_REMOVE(&(client->workspace->focus_stack), client, Client, focus_clients);
-        }
-
-        if (client->dock) {
-                DLOG("Removing from dock clients\n");
-                SLIST_REMOVE(&(client->workspace->screen->dock_clients), client, Client, dock_clients);
-        }
-
-        DLOG("child of 0x%08x.\n", client->frame);
-        xcb_reparent_window(conn, client->child, root, 0, 0);
-
-        client_unmap(conn, client);
-
-        xcb_destroy_window(conn, client->frame);
-        xcb_flush(conn);
-        table_remove(&by_parent, client->frame);
-
-        if (client->container != NULL) {
-                Workspace *workspace = client->container->workspace;
-                cleanup_table(conn, workspace);
-                fix_colrowspan(conn, workspace);
-        }
 
+#if 0
         /* Let’s see how many clients there are left on the workspace to delete it if it’s empty */
         bool workspace_empty = SLIST_EMPTY(&(client->workspace->focus_stack));
-        bool workspace_active = false;
+        bool workspace_focused = (c_ws == client->workspace);
         Client *to_focus = (!workspace_empty ? SLIST_FIRST(&(client->workspace->focus_stack)) : NULL);
 
-        /* If this workspace is currently active, we don’t delete it */
-        i3Screen *screen;
-        TAILQ_FOREACH(screen, virtual_screens, screens)
-                if (screen->current_workspace == client->workspace) {
-                        workspace_active = true;
-                        workspace_empty = false;
-                        break;
-                }
+        /* If this workspace is currently visible, we don’t delete it */
+        if (workspace_is_visible(client->workspace))
+                workspace_empty = false;
 
-        if (workspace_empty)
-                client->workspace->screen = NULL;
+        if (workspace_empty) {
+                client->workspace->output = NULL;
+                ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"empty\"}");
+        }
 
         /* Remove the urgency flag if set */
         client->urgent = false;
         workspace_update_urgent_flag(client->workspace);
 
-        FREE(client->window_class);
-        FREE(client->name);
-        free(client);
-
         render_layout(conn);
-
-        /* Ensure the focus is set to the next client in the focus stack or to
-         * the screen itself (if we do not focus the screen, it can happen that
-         * the focus is "nowhere" and thus keypress events will not be received
-         * by i3, thus the user cannot use any hotkeys). */
-        if (workspace_active) {
-                if (to_focus != NULL)
-                        set_focus(conn, to_focus, true);
-                else {
-                        DLOG("Restoring focus to root screen\n");
-                        xcb_set_input_focus(conn, XCB_INPUT_FOCUS_POINTER_ROOT, root, XCB_CURRENT_TIME);
-                        xcb_flush(conn);
-                }
-        }
+#endif
 
         return 1;
 }
 
 /*
- * Called when a window changes its title
+ * A destroy notify event is sent when the window is not unmapped, but
+ * immediately destroyed (for example when starting a window and immediately
+ * killing the program which started it).
+ *
+ * We just pass on the event to the unmap notify handler (by copying the
+ * important fields in the event data structure).
  *
  */
-int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
-                                xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
-        if (prop == NULL || xcb_get_property_value_length(prop) == 0) {
-                DLOG("_NET_WM_NAME not specified, not changing\n");
-                return 1;
-        }
-        Client *client = table_get(&by_child, window);
-        if (client == NULL)
-                return 1;
-
-        /* Save the old pointer to make the update atomic */
-        char *new_name;
-        int new_len;
-        asprintf(&new_name, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop));
-        /* Convert it to UCS-2 here for not having to convert it later every time we want to pass it to X */
-        char *ucs2_name = convert_utf8_to_ucs2(new_name, &new_len);
-        LOG("_NET_WM_NAME changed to \"%s\"\n", new_name);
-        free(new_name);
-
-        /* Check if they are the same and don’t update if so.
-           Note the use of new_len * 2 to check all bytes as each glyph takes 2 bytes.
-           Also note the use of memcmp() instead of strncmp() because the latter stops on nullbytes,
-           but UCS-2 uses nullbytes to fill up glyphs which only use one byte. */
-        if ((new_len == client->name_len) &&
-            (client->name != NULL) &&
-            (memcmp(client->name, ucs2_name, new_len * 2) == 0)) {
-                free(ucs2_name);
-                return 1;
-        }
+static int handle_destroy_notify_event(xcb_destroy_notify_event_t *event) {
+    DLOG("destroy notify for 0x%08x, 0x%08x\n", event->event, event->window);
 
-        char *old_name = client->name;
-        client->name = ucs2_name;
-        client->name_len = new_len;
-        client->uses_net_wm_name = true;
+    xcb_unmap_notify_event_t unmap;
+    unmap.sequence = event->sequence;
+    unmap.event = event->event;
+    unmap.window = event->window;
 
-        FREE(old_name);
-
-        /* If the client is a dock window, we don’t need to render anything */
-        if (client->dock)
-                return 1;
-
-        int mode = container_mode(client->container, true);
-        if (mode == MODE_STACK || mode == MODE_TABBED)
-                render_container(conn, client->container);
-        else decorate_window(conn, client, client->frame, client->titlegc, 0, 0);
-        xcb_flush(conn);
-
-        return 1;
+    return handle_unmap_notify_event(&unmap);
 }
 
 /*
- * We handle legacy window names (titles) which are in COMPOUND_TEXT encoding. However, we
- * just pass them along, so when containing non-ASCII characters, those will be rendering
- * incorrectly. In order to correctly render unicode window titles in i3, an application
- * has to set _NET_WM_NAME, which is in UTF-8 encoding.
- *
- * On every update, a message is put out to the user, so he may improve the situation and
- * update applications which display filenames in their title to correctly use
- * _NET_WM_NAME and therefore support unicode.
+ * Called when a window changes its title
  *
  */
-int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t state,
+static int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
                                 xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
-        if (prop == NULL || xcb_get_property_value_length(prop) == 0) {
-                DLOG("prop == NULL\n");
-                return 1;
-        }
-        Client *client = table_get(&by_child, window);
-        if (client == NULL)
-                return 1;
+    Con *con;
+    if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
+        return 1;
 
-        /* Client capable of _NET_WM_NAME, ignore legacy name changes */
-        if (client->uses_net_wm_name)
-                return 1;
+    window_update_name(con->window, prop, false);
 
-        /* Save the old pointer to make the update atomic */
-        char *new_name;
-        if (asprintf(&new_name, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop)) == -1) {
-                perror("Could not get old name");
-                DLOG("Could not get old name\n");
-                return 1;
-        }
-        /* Convert it to UCS-2 here for not having to convert it later every time we want to pass it to X */
-        LOG("WM_NAME changed to \"%s\"\n", new_name);
-
-        /* Check if they are the same and don’t update if so. */
-        if (client->name != NULL &&
-            strlen(new_name) == strlen(client->name) &&
-            strcmp(client->name, new_name) == 0) {
-                free(new_name);
-                return 1;
-        }
-
-        LOG("Using legacy window title. Note that in order to get Unicode window titles in i3, "
-            "the application has to set _NET_WM_NAME which is in UTF-8 encoding.\n");
+    x_push_changes(croot);
 
-        char *old_name = client->name;
-        client->name = new_name;
-        client->name_len = -1;
+    return 1;
+}
 
-        if (old_name != NULL)
-                free(old_name);
+/*
+ * Handles legacy window name updates (WM_NAME), see also src/window.c,
+ * window_update_name_legacy().
+ *
+ */
+static int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t state,
+                                xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
+    Con *con;
+    if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
+        return 1;
 
-        /* If the client is a dock window, we don’t need to render anything */
-        if (client->dock)
-                return 1;
+    window_update_name_legacy(con->window, prop, false);
 
-        if (client->container != NULL &&
-            (client->container->mode == MODE_STACK ||
-             client->container->mode == MODE_TABBED))
-                render_container(conn, client->container);
-        else decorate_window(conn, client, client->frame, client->titlegc, 0, 0);
-        xcb_flush(conn);
+    x_push_changes(croot);
 
-        return 1;
+    return 1;
 }
 
 /*
  * Updates the client’s WM_CLASS property
  *
  */
-int handle_windowclass_change(void *data, xcb_connection_t *conn, uint8_t state,
+static int handle_windowclass_change(void *data, xcb_connection_t *conn, uint8_t state,
                              xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *prop) {
-        if (prop == NULL || xcb_get_property_value_length(prop) == 0) {
-                DLOG("prop == NULL\n");
-                return 1;
-        }
-        Client *client = table_get(&by_child, window);
-        if (client == NULL)
-                return 1;
-        char *new_class;
-        if (asprintf(&new_class, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop)) == -1) {
-                perror("Could not get window class");
-                DLOG("Could not get window class\n");
-                return 1;
-        }
-
-        LOG("WM_CLASS changed to %s\n", new_class);
-        char *old_class = client->window_class;
-        client->window_class = new_class;
-        FREE(old_class);
-
-        if (!client->initialized)
-                return 1;
+    Con *con;
+    if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
+        return 1;
 
-        if (strcmp(new_class, "tools") == 0 || strcmp(new_class, "Dialog") == 0) {
-                DLOG("tool/dialog window, should we put it floating?\n");
-                if (client->floating == FLOATING_AUTO_OFF)
-                        toggle_floating_mode(conn, client, true);
-        }
+    window_update_class(con->window, prop, false);
 
-        return 1;
+    return 0;
 }
 
 /*
  * Expose event means we should redraw our windows (= title bar)
  *
  */
-int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t *event) {
-        /* event->count is the number of minimum remaining expose events for this window, so we
-           skip all events but the last one */
-        if (event->count != 0)
-                return 1;
-        DLOG("window = %08x\n", event->window);
+static int handle_expose_event(xcb_expose_event_t *event) {
+    Con *parent;
 
-        Client *client = table_get(&by_parent, event->window);
-        if (client == NULL) {
-                /* There was no client in the table, so this is probably an expose event for
-                   one of our stack_windows. */
-                struct Stack_Window *stack_win;
-                SLIST_FOREACH(stack_win, &stack_wins, stack_windows)
-                        if (stack_win->window == event->window) {
-                                render_container(conn, stack_win->container);
-                                return 1;
-                        }
-
-                /* …or one of the bars? */
-                i3Screen *screen;
-                TAILQ_FOREACH(screen, virtual_screens, screens)
-                        if (screen->bar == event->window)
-                                render_layout(conn);
-                return 1;
-        }
+    /* event->count is the number of minimum remaining expose events for this
+     * window, so we skip all events but the last one */
+    if (event->count != 0)
+        return 1;
 
-        if (client->dock)
-                return 1;
+    DLOG("window = %08x\n", event->window);
 
-        if (container_mode(client->container, true) == MODE_DEFAULT)
-                decorate_window(conn, client, client->frame, client->titlegc, 0, 0);
-        else {
-                uint32_t background_color;
-                if (client->urgent)
-                        background_color = config.client.urgent.background;
-                /* Distinguish if the window is currently focused… */
-                else if (CUR_CELL != NULL && CUR_CELL->currently_focused == client)
-                        background_color = config.client.focused.background;
-                /* …or if it is the focused window in a not focused container */
-                else background_color = config.client.focused_inactive.background;
-
-                /* Set foreground color to current focused color, line width to 2 */
-                uint32_t values[] = {background_color, 2};
-                xcb_change_gc(conn, client->titlegc, XCB_GC_FOREGROUND | XCB_GC_LINE_WIDTH, values);
-
-                /* Draw the border, the ±1 is for line width = 2 */
-                xcb_point_t points[] = {{1, 0},                                           /* left upper edge */
-                                        {1, client->rect.height-1},                       /* left bottom edge */
-                                        {client->rect.width-1, client->rect.height-1},    /* right bottom edge */
-                                        {client->rect.width-1, 0}};                       /* right upper edge */
-                xcb_poly_line(conn, XCB_COORD_MODE_ORIGIN, client->frame, client->titlegc, 4, points);
-
-                /* Draw a black background */
-                xcb_change_gc_single(conn, client->titlegc, XCB_GC_FOREGROUND, get_colorpixel(conn, "#000000"));
-                if (client->titlebar_position == TITLEBAR_OFF && !client->borderless) {
-                        xcb_rectangle_t crect = {1, 0, client->rect.width - (1 + 1), client->rect.height - 1};
-                        xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect);
-                } else {
-                        xcb_rectangle_t crect = {2, 0, client->rect.width - (2 + 2), client->rect.height - 2};
-                        xcb_poly_fill_rectangle(conn, client->frame, client->titlegc, 1, &crect);
-                }
-        }
-        xcb_flush(conn);
+    if ((parent = con_by_frame_id(event->window)) == NULL) {
+        LOG("expose event for unknown window, ignoring\n");
         return 1;
+    }
+
+    /* re-render the parent (recursively, if it’s a split con) */
+    x_deco_recurse(parent);
+    xcb_flush(conn);
+
+    return 1;
 }
 
 /*
  * Handle client messages (EWMH)
  *
  */
-int handle_client_message(void *data, xcb_connection_t *conn, xcb_client_message_event_t *event) {
-        if (event->type == atoms[_NET_WM_STATE]) {
-                if (event->format != 32 || event->data.data32[1] != atoms[_NET_WM_STATE_FULLSCREEN])
-                        return 0;
-
-                Client *client = table_get(&by_child, event->window);
-                if (client == NULL)
-                        return 0;
-
-                /* Check if the fullscreen state should be toggled */
-                if ((client->fullscreen &&
-                     (event->data.data32[0] == _NET_WM_STATE_REMOVE ||
-                      event->data.data32[0] == _NET_WM_STATE_TOGGLE)) ||
-                    (!client->fullscreen &&
-                     (event->data.data32[0] == _NET_WM_STATE_ADD ||
-                      event->data.data32[0] == _NET_WM_STATE_TOGGLE)))
-                        client_toggle_fullscreen(conn, client);
-        } else {
-                ELOG("unhandled clientmessage\n");
-                return 0;
+static int handle_client_message(xcb_client_message_event_t *event) {
+    LOG("ClientMessage for window 0x%08x\n", event->window);
+    if (event->type == A__NET_WM_STATE) {
+        if (event->format != 32 || event->data.data32[1] != A__NET_WM_STATE_FULLSCREEN) {
+            DLOG("atom in clientmessage is %d, fullscreen is %d\n",
+                    event->data.data32[1], A__NET_WM_STATE_FULLSCREEN);
+            DLOG("not about fullscreen atom\n");
+            return 0;
         }
 
-        return 1;
+        Con *con = con_by_window_id(event->window);
+        if (con == NULL) {
+            DLOG("Could not get window for client message\n");
+            return 0;
+        }
+
+        /* Check if the fullscreen state should be toggled */
+        if ((con->fullscreen_mode != CF_NONE &&
+             (event->data.data32[0] == _NET_WM_STATE_REMOVE ||
+              event->data.data32[0] == _NET_WM_STATE_TOGGLE)) ||
+            (con->fullscreen_mode == CF_NONE &&
+             (event->data.data32[0] == _NET_WM_STATE_ADD ||
+              event->data.data32[0] == _NET_WM_STATE_TOGGLE))) {
+            DLOG("toggling fullscreen\n");
+            con_toggle_fullscreen(con, CF_OUTPUT);
+        }
+
+        tree_render();
+        x_push_changes(croot);
+    } else {
+        ELOG("unhandled clientmessage\n");
+        return 0;
+    }
+
+    return 1;
 }
 
+#if 0
 int handle_window_type(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
                         xcb_atom_t atom, xcb_get_property_reply_t *property) {
         /* TODO: Implement this one. To do this, implement a little test program which sleep(1)s
@@ -826,6 +656,7 @@ int handle_window_type(void *data, xcb_connection_t *conn, uint8_t state, xcb_wi
         ELOG("_NET_WM_WINDOW_TYPE changed, this is not yet implemented.\n");
         return 0;
 }
+#endif
 
 /*
  * Handles the size hints set by a window, but currently only the part necessary for displaying
@@ -834,155 +665,164 @@ int handle_window_type(void *data, xcb_connection_t *conn, uint8_t state, xcb_wi
  * See ICCCM 4.1.2.3 for more details
  *
  */
-int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+static int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
                         xcb_atom_t name, xcb_get_property_reply_t *reply) {
-        Client *client = table_get(&by_child, window);
-        if (client == NULL) {
-                DLOG("Received WM_SIZE_HINTS for unknown client\n");
-                return 1;
-        }
-        xcb_size_hints_t size_hints;
-
-        CLIENT_LOG(client);
-
-        /* If the hints were already in this event, use them, if not, request them */
-        if (reply != NULL)
-                xcb_get_wm_size_hints_from_reply(&size_hints, reply);
-        else
-                xcb_get_wm_normal_hints_reply(conn, xcb_get_wm_normal_hints_unchecked(conn, client->child), &size_hints, NULL);
-
-        if ((size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)) {
-                // TODO: Minimum size is not yet implemented
-                //LOG("Minimum size: %d (width) x %d (height)\n", size_hints.min_width, size_hints.min_height);
-        }
-
-        if ((size_hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)) {
-                bool changed = false;
-
-                if (size_hints.width_inc > 0)
-                        if (client->width_increment != size_hints.width_inc) {
-                                client->width_increment = size_hints.width_inc;
-                                changed = true;
-                        }
-                if (size_hints.height_inc > 0)
-                        if (client->height_increment != size_hints.height_inc) {
-                                client->height_increment = size_hints.height_inc;
-                                changed = true;
-                        }
-
-                if (changed) {
-                        resize_client(conn, client);
-                        xcb_flush(conn);
-                }
-        }
-
-        int base_width = 0, base_height = 0;
-
-        /* base_width/height are the desired size of the window.
-           We check if either the program-specified size or the program-specified
-           min-size is available */
-        if (size_hints.flags & XCB_SIZE_HINT_P_SIZE) {
-                base_width = size_hints.base_width;
-                base_height = size_hints.base_height;
-        } else if (size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE) {
-                base_width = size_hints.min_width;
-                base_height = size_hints.min_height;
-        }
-
-        if (base_width != client->base_width ||
-            base_height != client->base_height) {
-                client->base_width = base_width;
-                client->base_height = base_height;
-                DLOG("client's base_height changed to %d\n", base_height);
-                if (client->fullscreen)
-                        DLOG("Not resizing client, it is in fullscreen mode\n");
-                else
-                        resize_client(conn, client);
-        }
-
-        /* If no aspect ratio was set or if it was invalid, we ignore the hints */
-        if (!(size_hints.flags & XCB_SIZE_HINT_P_ASPECT) ||
-            (size_hints.min_aspect_num <= 0) ||
-            (size_hints.min_aspect_den <= 0)) {
-                return 1;
+    Con *con = con_by_window_id(window);
+    if (con == NULL) {
+        DLOG("Received WM_NORMAL_HINTS for unknown client\n");
+        return 1;
+    }
+
+    xcb_size_hints_t size_hints;
+
+        //CLIENT_LOG(client);
+
+    /* If the hints were already in this event, use them, if not, request them */
+    if (reply != NULL)
+        xcb_icccm_get_wm_size_hints_from_reply(&size_hints, reply);
+    else
+        xcb_icccm_get_wm_normal_hints_reply(conn, xcb_icccm_get_wm_normal_hints_unchecked(conn, con->window->id), &size_hints, NULL);
+
+    if ((size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)) {
+        // TODO: Minimum size is not yet implemented
+        DLOG("Minimum size: %d (width) x %d (height)\n", size_hints.min_width, size_hints.min_height);
+    }
+
+    bool changed = false;
+    if ((size_hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)) {
+        if (size_hints.width_inc > 0 && size_hints.width_inc < 0xFFFF)
+            if (con->width_increment != size_hints.width_inc) {
+                con->width_increment = size_hints.width_inc;
+                changed = true;
+            }
+        if (size_hints.height_inc > 0 && size_hints.height_inc < 0xFFFF)
+            if (con->height_increment != size_hints.height_inc) {
+                con->height_increment = size_hints.height_inc;
+                changed = true;
+            }
+
+        if (changed)
+            DLOG("resize increments changed\n");
+    }
+
+    int base_width = 0, base_height = 0;
+
+    /* base_width/height are the desired size of the window.
+       We check if either the program-specified size or the program-specified
+       min-size is available */
+    if (size_hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE) {
+        base_width = size_hints.base_width;
+        base_height = size_hints.base_height;
+    } else if (size_hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE) {
+        /* TODO: is this right? icccm says not */
+        base_width = size_hints.min_width;
+        base_height = size_hints.min_height;
+    }
+
+    if (base_width != con->base_width ||
+        base_height != con->base_height) {
+        con->base_width = base_width;
+        con->base_height = base_height;
+        DLOG("client's base_height changed to %d\n", base_height);
+        DLOG("client's base_width changed to %d\n", base_width);
+        changed = true;
+    }
+
+    /* If no aspect ratio was set or if it was invalid, we ignore the hints */
+    if (!(size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT) ||
+        (size_hints.min_aspect_num <= 0) ||
+        (size_hints.min_aspect_den <= 0)) {
+        goto render_and_return;
+    }
+
+    /* XXX: do we really use rect here, not window_rect? */
+    double width = con->rect.width - base_width;
+    double height = con->rect.height - base_height;
+    /* Convert numerator/denominator to a double */
+    double min_aspect = (double)size_hints.min_aspect_num / size_hints.min_aspect_den;
+    double max_aspect = (double)size_hints.max_aspect_num / size_hints.min_aspect_den;
+
+    DLOG("Aspect ratio set: minimum %f, maximum %f\n", min_aspect, max_aspect);
+    DLOG("width = %f, height = %f\n", width, height);
+
+    /* Sanity checks, this is user-input, in a way */
+    if (max_aspect <= 0 || min_aspect <= 0 || height == 0 || (width / height) <= 0)
+        goto render_and_return;
+
+    /* Check if we need to set proportional_* variables using the correct ratio */
+    if ((width / height) < min_aspect) {
+        if (con->proportional_width != width ||
+            con->proportional_height != (width / min_aspect)) {
+            con->proportional_width = width;
+            con->proportional_height = width / min_aspect;
+            changed = true;
         }
-
-        double width = client->rect.width - base_width;
-        double height = client->rect.height - base_height;
-        /* Convert numerator/denominator to a double */
-        double min_aspect = (double)size_hints.min_aspect_num / size_hints.min_aspect_den;
-        double max_aspect = (double)size_hints.max_aspect_num / size_hints.min_aspect_den;
-
-        DLOG("Aspect ratio set: minimum %f, maximum %f\n", min_aspect, max_aspect);
-        DLOG("width = %f, height = %f\n", width, height);
-
-        /* Sanity checks, this is user-input, in a way */
-        if (max_aspect <= 0 || min_aspect <= 0 || height == 0 || (width / height) <= 0)
-                return 1;
-
-        /* Check if we need to set proportional_* variables using the correct ratio */
-        if ((width / height) < min_aspect) {
-                client->proportional_width = width;
-                client->proportional_height = width / min_aspect;
-        } else if ((width / height) > max_aspect) {
-                client->proportional_width = width;
-                client->proportional_height = width / max_aspect;
-        } else return 1;
-
-        client->force_reconfigure = true;
-
-        if (client->container != NULL) {
-                render_container(conn, client->container);
-                xcb_flush(conn);
+    } else if ((width / height) > max_aspect) {
+        if (con->proportional_width != width ||
+            con->proportional_height != (width / max_aspect)) {
+            con->proportional_width = width;
+            con->proportional_height = width / max_aspect;
+            changed = true;
         }
+    } else goto render_and_return;
 
-        return 1;
+render_and_return:
+    if (changed)
+        tree_render();
+    return 1;
 }
 
 /*
  * Handles the WM_HINTS property for extracting the urgency state of the window.
  *
  */
-int handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+static int handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
                   xcb_atom_t name, xcb_get_property_reply_t *reply) {
-        Client *client = table_get(&by_child, window);
-        if (client == NULL) {
-                DLOG("Received WM_HINTS for unknown client\n");
-                return 1;
-        }
-        xcb_wm_hints_t hints;
-
-        if (reply != NULL) {
-                if (!xcb_get_wm_hints_from_reply(&hints, reply))
-                        return 1;
-        } else {
-                if (!xcb_get_wm_hints_reply(conn, xcb_get_wm_hints_unchecked(conn, client->child), &hints, NULL))
-                        return 1;
-        }
-
-        Client *last_focused = SLIST_FIRST(&(c_ws->focus_stack));
-        if (!client->urgent && client == last_focused) {
-                DLOG("Ignoring urgency flag for current client\n");
-                return 1;
-        }
+    Con *con = con_by_window_id(window);
+    if (con == NULL) {
+        DLOG("Received WM_HINTS for unknown client\n");
+        return 1;
+    }
 
-        /* Update the flag on the client directly */
-        client->urgent = (xcb_wm_hints_get_urgency(&hints) != 0);
-        CLIENT_LOG(client);
-        LOG("Urgency flag changed to %d\n", client->urgent);
+    xcb_icccm_wm_hints_t hints;
 
-        workspace_update_urgent_flag(client->workspace);
-        redecorate_window(conn, client);
-
-        /* If the workspace this client is on is not visible, we need to redraw
-         * the workspace bar */
-        if (!workspace_is_visible(client->workspace)) {
-                i3Screen *screen = client->workspace->screen;
-                render_workspace(conn, screen, screen->current_workspace);
-                xcb_flush(conn);
-        }
+    if (reply != NULL) {
+        if (!xcb_icccm_get_wm_hints_from_reply(&hints, reply))
+            return 1;
+    } else {
+        if (!xcb_icccm_get_wm_hints_reply(conn, xcb_icccm_get_wm_hints_unchecked(conn, con->window->id), &hints, NULL))
+            return 1;
+    }
 
+    if (!con->urgent && focused == con) {
+        DLOG("Ignoring urgency flag for current client\n");
         return 1;
+    }
+
+    /* Update the flag on the client directly */
+    con->urgent = (xcb_icccm_wm_hints_get_urgency(&hints) != 0);
+    //CLIENT_LOG(con);
+    LOG("Urgency flag changed to %d\n", con->urgent);
+
+    Con *ws;
+    /* Set the urgency flag on the workspace, if a workspace could be found
+     * (for dock clients, that is not the case). */
+    if ((ws = con_get_workspace(con)) != NULL)
+        workspace_update_urgent_flag(ws);
+
+    tree_render();
+
+#if 0
+    /* If the workspace this client is on is not visible, we need to redraw
+     * the workspace bar */
+    if (!workspace_is_visible(client->workspace)) {
+            Output *output = client->workspace->output;
+            render_workspace(conn, output, output->current_workspace);
+            xcb_flush(conn);
+    }
+#endif
+
+    return 1;
 }
 
 /*
@@ -992,31 +832,33 @@ int handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t
  * See ICCCM 4.1.2.6 for more details
  *
  */
-int handle_transient_for(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
-                         xcb_atom_t name, xcb_get_property_reply_t *reply) {
-        Client *client = table_get(&by_child, window);
-        if (client == NULL) {
-                DLOG("No such client\n");
-                return 1;
-        }
-
-        xcb_window_t transient_for;
-
-        if (reply != NULL) {
-                if (!xcb_get_wm_transient_for_from_reply(&transient_for, reply))
-                        return 1;
-        } else {
-                if (!xcb_get_wm_transient_for_reply(conn, xcb_get_wm_transient_for_unchecked(conn, window),
-                                                    &transient_for, NULL))
-                        return 1;
-        }
-
-        if (client->floating == FLOATING_AUTO_OFF) {
-                DLOG("This is a popup window, putting into floating\n");
-                toggle_floating_mode(conn, client, true);
-        }
+static int handle_transient_for(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+                         xcb_atom_t name, xcb_get_property_reply_t *prop) {
+    Con *con;
 
+    if ((con = con_by_window_id(window)) == NULL || con->window == NULL) {
+        DLOG("No such window\n");
         return 1;
+    }
+
+    if (prop == NULL) {
+        prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn,
+                                false, window, A_WM_TRANSIENT_FOR, A_WINDOW, 0, 32), NULL);
+        if (prop == NULL)
+            return 1;
+    }
+
+    window_update_transient_for(con->window, prop);
+
+    // TODO: put window in floating mode if con->window->transient_for != XCB_NONE:
+#if 0
+    if (client->floating == FLOATING_AUTO_OFF) {
+        DLOG("This is a popup window, putting into floating\n");
+        toggle_floating_mode(conn, client, true);
+    }
+#endif
+
+    return 1;
 }
 
 /*
@@ -1024,26 +866,196 @@ int handle_transient_for(void *data, xcb_connection_t *conn, uint8_t state, xcb_
  * toolwindow (or similar) and to which window it belongs (logical parent).
  *
  */
-int handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+static int handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
                         xcb_atom_t name, xcb_get_property_reply_t *prop) {
-        if (prop == NULL) {
-                prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn,
-                                        false, window, WM_CLIENT_LEADER, WINDOW, 0, 32), NULL);
-                if (prop == NULL)
-                        return 1;
-        }
+    Con *con;
+    if ((con = con_by_window_id(window)) == NULL || con->window == NULL)
+        return 1;
 
-        Client *client = table_get(&by_child, window);
-        if (client == NULL)
-                return 1;
+    if (prop == NULL) {
+        prop = xcb_get_property_reply(conn, xcb_get_property_unchecked(conn,
+                                false, window, A_WM_CLIENT_LEADER, A_WINDOW, 0, 32), NULL);
+        if (prop == NULL)
+            return 1;
+    }
 
-        xcb_window_t *leader = xcb_get_property_value(prop);
-        if (leader == NULL || *leader == 0)
-                return 1;
+    window_update_leader(con->window, prop);
+
+    return 1;
+}
+
+/*
+ * Handles FocusIn events which are generated by clients (i3’s focus changes
+ * don’t generate FocusIn events due to a different EventMask) and updates the
+ * decorations accordingly.
+ *
+ */
+static int handle_focus_in(xcb_focus_in_event_t *event) {
+    DLOG("focus change in, for window 0x%08x\n", event->event);
+    Con *con;
+    if ((con = con_by_window_id(event->event)) == NULL || con->window == NULL)
+        return 1;
+    DLOG("That is con %p / %s\n", con, con->name);
 
-        DLOG("Client leader changed to %08x\n", *leader);
+    if (event->mode == XCB_NOTIFY_MODE_GRAB ||
+        event->mode == XCB_NOTIFY_MODE_UNGRAB) {
+        DLOG("FocusIn event for grab/ungrab, ignoring\n");
+        return 1;
+    }
 
-        client->leader = *leader;
+    if (event->detail == XCB_NOTIFY_DETAIL_POINTER) {
+        DLOG("notify detail is pointer, ignoring this event\n");
+        return 1;
+    }
 
+    if (focused_id == event->event) {
+        DLOG("focus matches the currently focused window, not doing anything\n");
         return 1;
+    }
+
+    DLOG("focus is different, updating decorations\n");
+    con_focus(con);
+    /* We update focused_id because we don’t need to set focus again */
+    focused_id = event->event;
+    x_push_changes(croot);
+    return 1;
+}
+
+typedef int (*cb_property_handler_t)(void *data, xcb_connection_t *c, uint8_t state, xcb_window_t window, xcb_atom_t atom, xcb_get_property_reply_t *property);
+
+struct property_handler_t {
+    xcb_atom_t atom;
+    uint32_t long_len;
+    cb_property_handler_t cb;
+};
+
+static struct property_handler_t property_handlers[] = {
+    { 0, 128, handle_windowname_change },
+    { 0, UINT_MAX, handle_hints },
+    { 0, 128, handle_windowname_change_legacy },
+    { 0, UINT_MAX, handle_normal_hints },
+    { 0, UINT_MAX, handle_clientleader_change },
+    { 0, UINT_MAX, handle_transient_for }
+};
+#define NUM_HANDLERS (sizeof(property_handlers) / sizeof(struct property_handler_t))
+
+/*
+ * Sets the appropriate atoms for the property handlers after the atoms were
+ * received from X11
+ *
+ */
+void property_handlers_init() {
+    property_handlers[0].atom = A__NET_WM_NAME;
+    property_handlers[1].atom = A_WM_HINTS;
+    property_handlers[2].atom = A_WM_NAME;
+    property_handlers[3].atom = A_WM_NORMAL_HINTS;
+    property_handlers[4].atom = A_WM_CLIENT_LEADER;
+    property_handlers[5].atom = A_WM_TRANSIENT_FOR;
+}
+
+static int property_notify(uint8_t state, xcb_window_t window, xcb_atom_t atom) {
+    struct property_handler_t *handler = NULL;
+    xcb_get_property_reply_t *propr = NULL;
+    int ret;
+
+    for (int c = 0; c < sizeof(property_handlers) / sizeof(struct property_handler_t); c++) {
+        if (property_handlers[c].atom != atom)
+            continue;
+
+        handler = &property_handlers[c];
+        break;
+    }
+
+    if (handler == NULL) {
+        DLOG("Unhandled property notify for atom %d (0x%08x)\n", atom, atom);
+        return 0;
+    }
+
+    if (state != XCB_PROPERTY_DELETE) {
+        xcb_get_property_cookie_t cookie = xcb_get_property(conn, 0, window, atom, XCB_GET_PROPERTY_TYPE_ANY, 0, handler->long_len);
+        propr = xcb_get_property_reply(conn, cookie, 0);
+    }
+
+    ret = handler->cb(NULL, conn, state, window, atom, propr);
+    FREE(propr);
+    return ret;
+}
+
+/*
+ * Takes an xcb_generic_event_t and calls the appropriate handler, based on the
+ * event type.
+ *
+ */
+void handle_event(int type, xcb_generic_event_t *event) {
+    if (randr_base > -1 &&
+        type == randr_base + XCB_RANDR_SCREEN_CHANGE_NOTIFY) {
+        handle_screen_change(event);
+        return;
+    }
+
+    switch (type) {
+        case XCB_KEY_PRESS:
+            handle_key_press((xcb_key_press_event_t*)event);
+            break;
+
+        case XCB_BUTTON_PRESS:
+            handle_button_press((xcb_button_press_event_t*)event);
+            break;
+
+        case XCB_MAP_REQUEST:
+            handle_map_request((xcb_map_request_event_t*)event);
+            break;
+
+        case XCB_UNMAP_NOTIFY:
+            handle_unmap_notify_event((xcb_unmap_notify_event_t*)event);
+            break;
+
+        case XCB_DESTROY_NOTIFY:
+            handle_destroy_notify_event((xcb_destroy_notify_event_t*)event);
+            break;
+
+        case XCB_EXPOSE:
+            handle_expose_event((xcb_expose_event_t*)event);
+            break;
+
+        case XCB_MOTION_NOTIFY:
+            handle_motion_notify((xcb_motion_notify_event_t*)event);
+            break;
+
+        /* Enter window = user moved his mouse over the window */
+        case XCB_ENTER_NOTIFY:
+            handle_enter_notify((xcb_enter_notify_event_t*)event);
+            break;
+
+        /* Client message are sent to the root window. The only interesting
+         * client message for us is _NET_WM_STATE, we honour
+         * _NET_WM_STATE_FULLSCREEN */
+        case XCB_CLIENT_MESSAGE:
+            handle_client_message((xcb_client_message_event_t*)event);
+            break;
+
+        /* Configure request = window tried to change size on its own */
+        case XCB_CONFIGURE_REQUEST:
+            handle_configure_request((xcb_configure_request_event_t*)event);
+            break;
+
+        /* Mapping notify = keyboard mapping changed (Xmodmap), re-grab bindings */
+        case XCB_MAPPING_NOTIFY:
+            handle_mapping_notify((xcb_mapping_notify_event_t*)event);
+            break;
+
+        case XCB_FOCUS_IN:
+            handle_focus_in((xcb_focus_in_event_t*)event);
+            break;
+
+        case XCB_PROPERTY_NOTIFY:
+            DLOG("Property notify\n");
+            xcb_property_notify_event_t *e = (xcb_property_notify_event_t*)event;
+            property_notify(e->state, e->window, e->atom);
+            break;
+
+        default:
+            DLOG("Unhandled event of type %d\n", type);
+            break;
+    }
 }