]> git.sur5r.net Git - i3/i3/blobdiff - src/handlers.c
Make i3 compatible with the very latest xcb
[i3/i3] / src / handlers.c
index b7b10a7427384180e627dbbc3292fc544ca5a544..263b303668c003403590b974a8e2360adfa9dcac 100644 (file)
 #include <string.h>
 #include <stdlib.h>
 #include <time.h>
+#include <limits.h>
+
+/* Contains compatibility definitions for old libxcb versions */
+#ifdef XCB_COMPAT
+#include "xcb_compat.h"
+#endif
 
 #include <xcb/xcb.h>
 #include <xcb/xcb_atom.h>
@@ -22,7 +28,7 @@
 #include <X11/XKBlib.h>
 
 #include "i3.h"
-#include "debug.h"
+#include "handlers.h"
 #include "table.h"
 #include "layout.h"
 #include "commands.h"
@@ -39,6 +45,9 @@
 #include "workspace.h"
 #include "log.h"
 #include "container.h"
+#include "ipc.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
@@ -81,17 +90,154 @@ static bool event_is_ignored(const int sequence) {
         return false;
 }
 
+ /*
+ * 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) {
+    /* XXX: remove the NULL and conn parameters as soon as this version of libxcb is required */
+
+    if (randr_base > -1 &&
+        type == randr_base + XCB_RANDR_SCREEN_CHANGE_NOTIFY) {
+        handle_screen_change(NULL, global_conn, event);
+        return;
+    }
+
+    switch (type) {
+        case XCB_KEY_PRESS:
+            handle_key_press(NULL, global_conn, (xcb_key_press_event_t*)event);
+            break;
+
+        case XCB_BUTTON_PRESS:
+            handle_button_press(NULL, global_conn, (xcb_button_press_event_t*)event);
+            break;
+
+        case XCB_MAP_REQUEST:
+            handle_map_request(NULL, global_conn, (xcb_map_request_event_t*)event);
+            break;
+
+        case XCB_UNMAP_NOTIFY:
+            handle_unmap_notify_event(NULL, global_conn, (xcb_unmap_notify_event_t*)event);
+            break;
+
+        case XCB_DESTROY_NOTIFY:
+            handle_destroy_notify_event(NULL, global_conn, (xcb_destroy_notify_event_t*)event);
+            break;
+
+        case XCB_EXPOSE:
+            handle_expose_event(NULL, global_conn, (xcb_expose_event_t*)event);
+            break;
+
+        case XCB_MOTION_NOTIFY:
+            handle_motion_notify(NULL, global_conn, (xcb_motion_notify_event_t*)event);
+            break;
+
+        /* Enter window = user moved his mouse over the window */
+        case XCB_ENTER_NOTIFY:
+            handle_enter_notify(NULL, global_conn, (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(NULL, global_conn, (xcb_client_message_event_t*)event);
+            break;
+
+        /* Configure request = window tried to change size on its own */
+        case XCB_CONFIGURE_REQUEST:
+            handle_configure_request(NULL, global_conn, (xcb_configure_request_event_t*)event);
+            break;
+
+        case XCB_CONFIGURE_NOTIFY:
+            handle_configure_event(NULL, global_conn, (xcb_configure_notify_event_t*)event);
+            break;
+
+        /* Mapping notify = keyboard mapping changed (Xmodmap), re-grab bindings */
+        case XCB_MAPPING_NOTIFY:
+            handle_mapping_notify(NULL, global_conn, (xcb_mapping_notify_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;
+    }
+}
+
+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 },
+    { 0, UINT_MAX, handle_windowclass_change }
+};
+#define NUM_HANDLERS (sizeof(property_handlers) / sizeof(struct property_handler_t))
+
 /*
- * 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.
+ * Sets the appropriate atoms for the property handlers after the atoms were
+ * received from X11
  *
  */
-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;
+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;
+    property_handlers[6].atom = A_WM_CLASS;
+}
+
+/*
+ * Requests the property and invokes the appropriate callback.
+ *
+ */
+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(global_conn, 0, window, atom, XCB_GET_PROPERTY_TYPE_ANY, 0, handler->long_len);
+        propr = xcb_get_property_reply(global_conn, cookie, 0);
+    }
+
+    ret = handler->cb(NULL, global_conn, state, window, atom, propr);
+    FREE(propr);
+    return ret;
 }
 
+
 /*
  * There was a key press. We compare this key code with our bindings table and pass
  * the bound action to parse_command().
@@ -108,52 +254,29 @@ int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_
         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;
-        }
+        if (xkb_current_group == XkbGroup2Index)
+                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;
+        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;
                 }
         }
 
-        /* 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;
-        }
-
         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;
 }
 
@@ -166,7 +289,7 @@ 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) {
         Output *output;
 
-        if ((output = get_screen_containing(x, y)) == NULL) {
+        if ((output = get_output_containing(x, y)) == NULL) {
                 ELOG("ERROR: No such screen\n");
                 return;
         }
@@ -179,6 +302,24 @@ static void check_crossing_screen_boundary(uint32_t x, uint32_t y) {
         current_row = c_ws->current_row;
         current_col = c_ws->current_col;
         DLOG("We're now on output %p\n", output);
+
+        /* While usually this function is only called when the user switches
+         * to a different output using his mouse (and thus the output is
+         * empty), it may be that the following race condition occurs:
+         * 1) the user actives a new output (say VGA1).
+         * 2) the cursor is sent to the first pixel of the new VGA1, thus
+         *    generating an enter_notify for the screen (the enter_notify
+         *    is not yet received by i3).
+         * 3) i3 requeries screen configuration and maps a workspace onto the
+         *    new output.
+         * 4) the enter_notify event arrives and c_ws is set to the new
+         *    workspace but the existing windows on the new workspace are not
+         *    focused.
+         *
+         * Therefore, we re-set the focus here to be sure it’s correct. */
+        Client *first_client = SLIST_FIRST(&(c_ws->focus_stack));
+        if (first_client != NULL)
+                set_focus(global_conn, first_client, true);
 }
 
 /*
@@ -276,7 +417,8 @@ int handle_mapping_notify(void *ignored, xcb_connection_t *conn, xcb_mapping_not
         xcb_get_numlock_mask(conn);
 
         ungrab_all_keys(conn);
-        grab_all_keys(conn);
+        translate_keysyms();
+        grab_all_keys(conn, false);
 
         return 0;
 }
@@ -285,7 +427,7 @@ int handle_mapping_notify(void *ignored, xcb_connection_t *conn, xcb_mapping_not
  * 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) {
+int handle_map_request(void *invalid, xcb_connection_t *conn, xcb_map_request_event_t *event) {
         xcb_get_window_attributes_cookie_t cookie;
 
         cookie = xcb_get_window_attributes_unchecked(conn, event->window);
@@ -293,7 +435,7 @@ int handle_map_request(void *prophs, xcb_connection_t *conn, xcb_map_request_eve
         DLOG("window = 0x%08x, serial is %d.\n", event->window, event->sequence);
         add_ignore_event(event->sequence);
 
-        manage_window(prophs, conn, event->window, cookie, false);
+        manage_window(conn, event->window, cookie, false);
         return 1;
 }
 
@@ -347,11 +489,31 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
         if (client_is_floating(client)) {
                 i3Font *font = load_font(conn, config.font);
                 int mode = (client->container != NULL ? client->container->mode : MODE_DEFAULT);
+                /* TODO: refactor this code. we need a function to translate
+                 * coordinates of child_rect/rect. */
 
-                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_X) {
+                        if (mode == MODE_STACK || mode == MODE_TABBED) {
+                                client->rect.x = event->x - 2;
+                        } else {
+                                if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
+                                        client->rect.x = event->x;
+                                else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
+                                        client->rect.x = event->x - 1;
+                                else client->rect.x = event->x - 2;
+                        }
+                }
+                if (event->value_mask & XCB_CONFIG_WINDOW_Y) {
+                        if (mode == MODE_STACK || mode == MODE_TABBED) {
+                                client->rect.y = event->y - 2;
+                        } else {
+                                if (client->titlebar_position == TITLEBAR_OFF && client->borderless)
+                                        client->rect.y = event->y;
+                                else if (client->titlebar_position == TITLEBAR_OFF && !client->borderless)
+                                        client->rect.y = event->y - 1;
+                                else client->rect.y = event->y - font->height - 2 - 2;
+                        }
+                }
                 if (event->value_mask & XCB_CONFIG_WINDOW_WIDTH) {
                         if (mode == MODE_STACK || mode == MODE_TABBED) {
                                 client->rect.width = event->width + 2 + 2;
@@ -439,7 +601,9 @@ int handle_screen_change(void *prophs, xcb_connection_t *conn,
                          xcb_generic_event_t *e) {
         DLOG("RandR screen change\n");
 
-        randr_query_screens(conn);
+        randr_query_outputs(conn);
+
+        ipc_send_event("output", I3_IPC_EVENT_OUTPUT, "{\"change\":\"unspecified\"}");
 
         return 1;
 }
@@ -450,8 +614,6 @@ int handle_screen_change(void *prophs, xcb_connection_t *conn,
  *
  */
 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;
-
         add_ignore_event(event->sequence);
 
         Client *client = table_get(&by_child, event->window);
@@ -478,9 +640,14 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
 
         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;
+        /* If this was the fullscreen client, we need to unset it from all
+         * workspaces it was on (global fullscreen) */
+        if (client->fullscreen) {
+                Workspace *ws;
+                TAILQ_FOREACH(ws, workspaces, workspaces)
+                        if (ws->fullscreen_client == client)
+                                ws->fullscreen_client = NULL;
+        }
 
         /* Clients without a container are either floating or dock windows */
         if (client->container != NULL) {
@@ -523,20 +690,17 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
 
         /* 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 */
-        Output *screen;
-        TAILQ_FOREACH(screen, &outputs, outputs)
-                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)
+        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;
@@ -553,7 +717,7 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
          * 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 (workspace_focused) {
                 if (to_focus != NULL)
                         set_focus(conn, to_focus, true);
                 else {
@@ -566,6 +730,26 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
         return 1;
 }
 
+/*
+ * 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_destroy_notify_event(void *data, xcb_connection_t *conn, xcb_destroy_notify_event_t *event) {
+        DLOG("destroy notify for 0x%08x, 0x%08x\n", event->event, event->window);
+
+        xcb_unmap_notify_event_t unmap;
+        unmap.sequence = event->sequence;
+        unmap.event = event->event;
+        unmap.window = event->window;
+
+        return handle_unmap_notify_event(NULL, conn, &unmap);
+}
+
 /*
  * Called when a window changes its title
  *
@@ -583,11 +767,19 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
         /* 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));
+        if (asprintf(&new_name, "%.*s", xcb_get_property_value_length(prop), (char*)xcb_get_property_value(prop)) == -1) {
+                perror("asprintf");
+                LOG("Could not format _NET_WM_NAME, ignoring new hint\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 */
         char *ucs2_name = convert_utf8_to_ucs2(new_name, &new_len);
         LOG("_NET_WM_NAME changed to \"%s\"\n", new_name);
         free(new_name);
+        if (ucs2_name == NULL) {
+                LOG("Could not convert _NET_WM_NAME to UCS-2, ignoring new hint\n");
+                return 1;
+        }
 
         /* 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.
@@ -611,6 +803,9 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
         if (client->dock)
                 return 1;
 
+        if (!workspace_is_visible(client->workspace))
+                return 1;
+
         int mode = container_mode(client->container, true);
         if (mode == MODE_STACK || mode == MODE_TABBED)
                 render_container(conn, client->container);
@@ -677,6 +872,9 @@ int handle_windowname_change_legacy(void *data, xcb_connection_t *conn, uint8_t
         if (client->dock)
                 return 1;
 
+        if (!workspace_is_visible(client->workspace))
+                return 1;
+
         if (client->container != NULL &&
             (client->container->mode == MODE_STACK ||
              client->container->mode == MODE_TABBED))
@@ -775,8 +973,8 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t *
                                         {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"));
+                /* Draw the background */
+                xcb_change_gc_single(conn, client->titlegc, XCB_GC_FOREGROUND, config.client.background);
                 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);
@@ -794,8 +992,8 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t *
  *
  */
 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])
+        if (event->type == A__NET_WM_STATE) {
+                if (event->format != 32 || event->data.data32[1] != A__NET_WM_STATE_FULLSCREEN)
                         return 0;
 
                 Client *client = table_get(&by_child, event->window);
@@ -846,18 +1044,17 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w
 
         /* 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);
+                xcb_icccm_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);
+                xcb_icccm_get_wm_normal_hints_reply(conn, xcb_icccm_get_wm_normal_hints_unchecked(conn, client->child), &size_hints, NULL);
 
-        if ((size_hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)) {
+        if ((size_hints.flags & XCB_ICCCM_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);
+                DLOG("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;
-
+        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 (client->width_increment != size_hints.width_inc) {
                                 client->width_increment = size_hints.width_inc;
@@ -869,10 +1066,8 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w
                                 changed = true;
                         }
 
-                if (changed) {
-                        resize_client(conn, client);
-                        xcb_flush(conn);
-                }
+                if (changed)
+                        DLOG("resize increments changed\n");
         }
 
         int base_width = 0, base_height = 0;
@@ -880,10 +1075,11 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w
         /* 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_BASE_SIZE) {
+        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_SIZE_HINT_P_MIN_SIZE) {
+        } 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;
         }
@@ -893,14 +1089,21 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w
                 client->base_width = base_width;
                 client->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 (changed) {
                 if (client->fullscreen)
                         DLOG("Not resizing client, it is in fullscreen mode\n");
-                else
+                else {
                         resize_client(conn, client);
+                        xcb_flush(conn);
+                }
         }
 
         /* If no aspect ratio was set or if it was invalid, we ignore the hints */
-        if (!(size_hints.flags & XCB_SIZE_HINT_P_ASPECT) ||
+        if (!(size_hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT) ||
             (size_hints.min_aspect_num <= 0) ||
             (size_hints.min_aspect_den <= 0)) {
                 return 1;
@@ -930,7 +1133,7 @@ int handle_normal_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_w
 
         client->force_reconfigure = true;
 
-        if (client->container != NULL) {
+        if (client->container != NULL && workspace_is_visible(client->workspace)) {
                 render_container(conn, client->container);
                 xcb_flush(conn);
         }
@@ -949,13 +1152,13 @@ int handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t
                 DLOG("Received WM_HINTS for unknown client\n");
                 return 1;
         }
-        xcb_wm_hints_t hints;
+        xcb_icccm_wm_hints_t hints;
 
         if (reply != NULL) {
-                if (!xcb_get_wm_hints_from_reply(&hints, reply))
+                if (!xcb_icccm_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))
+                if (!xcb_icccm_get_wm_hints_reply(conn, xcb_icccm_get_wm_hints_unchecked(conn, client->child), &hints, NULL))
                         return 1;
         }
 
@@ -966,12 +1169,11 @@ int handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t
         }
 
         /* Update the flag on the client directly */
-        client->urgent = (xcb_wm_hints_get_urgency(&hints) != 0);
+        client->urgent = (xcb_icccm_wm_hints_get_urgency(&hints) != 0);
         CLIENT_LOG(client);
         LOG("Urgency flag changed to %d\n", client->urgent);
 
         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 */
@@ -979,6 +1181,8 @@ int handle_hints(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t
                 Output *output = client->workspace->output;
                 render_workspace(conn, output, output->current_workspace);
                 xcb_flush(conn);
+        } else {
+                redecorate_window(conn, client);
         }
 
         return 1;
@@ -1002,10 +1206,10 @@ int handle_transient_for(void *data, xcb_connection_t *conn, uint8_t state, xcb_
         xcb_window_t transient_for;
 
         if (reply != NULL) {
-                if (!xcb_get_wm_transient_for_from_reply(&transient_for, reply))
+                if (!xcb_icccm_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),
+                if (!xcb_icccm_get_wm_transient_for_reply(conn, xcb_icccm_get_wm_transient_for_unchecked(conn, window),
                                                     &transient_for, NULL))
                         return 1;
         }
@@ -1027,7 +1231,7 @@ int handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state
                         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);
+                                        false, window, A_WM_CLIENT_LEADER, A_WINDOW, 0, 32), NULL);
                 if (prop == NULL)
                         return 1;
         }
@@ -1037,7 +1241,7 @@ int handle_clientleader_change(void *data, xcb_connection_t *conn, uint8_t state
                 return 1;
 
         xcb_window_t *leader = xcb_get_property_value(prop);
-        if (leader == NULL || *leader == 0)
+        if (leader == NULL)
                 return 1;
 
         DLOG("Client leader changed to %08x\n", *leader);