]> git.sur5r.net Git - i3/i3/blobdiff - src/handlers.c
Bugfix: Store width_factor/height_factor per workspace, not per container
[i3/i3] / src / handlers.c
index 88a03e3d48345d197c2a6f6e851ccabeada2d545..0ce1724c0c8f9aa1edb82cf6b284d2af0939ff29 100644 (file)
@@ -15,7 +15,7 @@
 #include <time.h>
 
 #include <xcb/xcb.h>
-#include <xcb/xcb_wm.h>
+#include <xcb/xcb_atom.h>
 #include <xcb/xcb_icccm.h>
 
 #include <X11/XKBlib.h>
 #include "xinerama.h"
 #include "config.h"
 #include "queue.h"
+#include "resize.h"
 
 /* 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 */
-SLIST_HEAD(ignore_head, Ignore_Event) ignore_events;
+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));
@@ -54,11 +55,21 @@ static void add_ignore_event(const int sequence) {
  */
 static bool event_is_ignored(const int sequence) {
         struct Ignore_Event *event;
-        /* TODO: cleanup this list */
+        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) {
                         LOG("Ignoring event (sequence %d)\n", sequence);
                         SLIST_REMOVE(&ignore_events, event, Ignore_Event, ignore_events);
+                        free(event);
                         return true;
                 }
         }
@@ -96,7 +107,7 @@ int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_
         LOG("state %d\n", event->state);
 
         /* Remove the numlock bit, all other bits are modifiers we can bind to */
-        uint16_t state_filtered = event->state & ~XCB_MOD_MASK_LOCK;
+        uint16_t state_filtered = event->state & ~(xcb_numlock_mask | XCB_MOD_MASK_LOCK);
 
         /* Find the binding */
         Binding *bind;
@@ -128,16 +139,31 @@ int handle_key_press(void *ignored, xcb_connection_t *conn, xcb_key_press_event_
  */
 int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_event_t *event) {
         LOG("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) {
+                LOG("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 be 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(byParent, event->event);
+        Client *client = table_get(&by_parent, event->event);
         /* …or the client itself */
         if (client == NULL)
-                client = table_get(byChild, event->event);
+                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) {
@@ -147,73 +173,140 @@ int handle_enter_notify(void *ignored, xcb_connection_t *conn, xcb_enter_notify_
                         LOG("ERROR: No such screen\n");
                         return 0;
                 }
+                c_ws->current_row = current_row;
+                c_ws->current_col = current_col;
                 c_ws = &workspaces[screen->current_workspace];
+                current_row = c_ws->current_row;
+                current_col = c_ws->current_col;
                 LOG("We're now on virtual screen number %d\n", screen->num);
                 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->mode == MODE_STACK && client->container->currently_focused != client) {
+        if (client->container != NULL &&
+            client->container->mode == MODE_STACK &&
+            client->container->currently_focused != client) {
                 LOG("Plausibility check says: no\n");
                 return 1;
         }
 
-        set_focus(conn, client);
+        set_focus(conn, client, false);
 
         return 1;
 }
 
+/*
+ * Checks if the button press was on a stack window, handles focus setting and returns true
+ * if so, or false otherwise.
+ *
+ */
+static bool button_press_stackwin(xcb_connection_t *conn, xcb_button_press_event_t *event) {
+        struct Stack_Window *stack_win;
+        SLIST_FOREACH(stack_win, &stack_wins, stack_windows) {
+                if (stack_win->window != event->event)
+                        continue;
+
+                /* A stack window was clicked, we check if it was button4 or button5
+                   which are scroll up / scroll down. */
+                if (event->detail == XCB_BUTTON_INDEX_4 || event->detail == XCB_BUTTON_INDEX_5) {
+                        direction_t direction = (event->detail == XCB_BUTTON_INDEX_4 ? D_UP : D_DOWN);
+                        focus_window_in_container(conn, CUR_CELL, direction);
+                        return true;
+                }
+
+                /* It was no scrolling, so we calculate the destination client by
+                   dividing the Y position of the event through the height of a window
+                   decoration and then set the focus to this client. */
+                i3Font *font = load_font(conn, config.font);
+                int decoration_height = (font->height + 2 + 2);
+                int destination = (event->event_y / decoration_height),
+                    c = 0;
+                Client *client;
+
+                LOG("Click on stack_win for client %d\n", destination);
+                CIRCLEQ_FOREACH(client, &(stack_win->container->clients), clients)
+                        if (c++ == destination) {
+                                set_focus(conn, client, true);
+                                return true;
+                        }
+
+                return true;
+        }
+
+        return false;
+}
+
+/*
+ * Checks if the button press was on a bar, switches to the workspace and returns true
+ * if so, or false otherwise.
+ *
+ */
+static bool button_press_bar(xcb_connection_t *conn, xcb_button_press_event_t *event) {
+        i3Screen *screen;
+        TAILQ_FOREACH(screen, virtual_screens, screens) {
+                if (screen->bar != event->event)
+                        continue;
+
+                LOG("Click on a bar\n");
+
+                /* Check if the button was one of button4 or button5 (scroll up / scroll down) */
+                if (event->detail == XCB_BUTTON_INDEX_4 || event->detail == XCB_BUTTON_INDEX_5) {
+                        int add = (event->detail == XCB_BUTTON_INDEX_4 ? -1 : 1);
+                        for (int i = c_ws->num + add; (i >= 0) && (i < 10); i += add)
+                                if (workspaces[i].screen == screen) {
+                                        show_workspace(conn, i+1);
+                                        return true;
+                                }
+                        return true;
+                }
+                i3Font *font = load_font(conn, config.font);
+                int workspace = event->event_x / (font->height + 6),
+                    c = 0;
+                /* Because workspaces can be on different screens, we need to loop
+                   through all of them and decide to count it based on its ->screen */
+                for (int i = 0; i < 10; i++)
+                        if ((workspaces[i].screen == screen) && (c++ == workspace)) {
+                                show_workspace(conn, i+1);
+                                return true;
+                        }
+                return true;
+        }
+
+        return false;
+}
+
 int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_event_t *event) {
         LOG("button press!\n");
         /* This was either a focus for a client’s parent (= titlebar)… */
-        Client *client = table_get(byChild, event->event);
+        Client *client = table_get(&by_child, event->event);
         bool border_click = false;
         if (client == NULL) {
-                client = table_get(byParent, event->event);
+                client = table_get(&by_parent, event->event);
                 border_click = true;
         }
         if (client == NULL) {
                 /* The client was neither on a client’s titlebar nor on a client itself, maybe on a stack_window? */
-                struct Stack_Window *stack_win;
-                SLIST_FOREACH(stack_win, &stack_wins, stack_windows)
-                        if (stack_win->window == event->event) {
-                                /* A stack window was clicked. We calculate the destination client by
-                                   dividing the Y position of the event through the height of a window
-                                   decoration and then set the focus to this client. */
-                                i3Font *font = load_font(conn, config.font);
-                                int decoration_height = (font->height + 2 + 2);
-                                int destination = (event->event_y / decoration_height),
-                                    c = 0;
-                                Client *client;
-
-                                LOG("Click on stack_win for client %d\n", destination);
-                                CIRCLEQ_FOREACH(client, &(stack_win->container->clients), clients)
-                                        if (c++ == destination) {
-                                                set_focus(conn, client);
-                                                return 1;
-                                        }
+                if (button_press_stackwin(conn, event))
+                        return 1;
 
-                                return 1;
-                        }
+                /* Or on a bar? */
+                if (button_press_bar(conn, event))
+                        return 1;
 
+                LOG("Could not handle this button press\n");
                 return 1;
         }
 
-        xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
-        xcb_screen_t *root_screen = xcb_setup_roots_iterator(xcb_get_setup(conn)).data;
-
         /* Set focus in any case */
-        set_focus(conn, client);
+        set_focus(conn, client, true);
 
         /* Let’s see if this was on the borders (= resize). If not, we’re done */
         LOG("press button on x=%d, y=%d\n", event->event_x, event->event_y);
-
+        resize_orientation_t orientation = O_VERTICAL;
         Container *con = client->container,
                   *first = NULL,
                   *second = NULL;
-        enum { O_HORIZONTAL, O_VERTICAL } orientation = O_VERTICAL;
-        int new_position;
 
         if (con == NULL) {
                 LOG("dock. done.\n");
@@ -231,6 +324,13 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
                 return 1;
         }
 
+        /* Don’t handle events inside the titlebar, only borders are interesting */
+        i3Font *font = load_font(conn, config.font);
+        if (event->event_y >= 2 && event->event_y <= (font->height + 2 + 2)) {
+                LOG("click on titlebar\n");
+                return 1;
+        }
+
         if (event->event_y < 2) {
                 /* This was a press on the top border */
                 if (con->row == 0)
@@ -259,131 +359,7 @@ int handle_button_press(void *ignored, xcb_connection_t *conn, xcb_button_press_
                 second = con->workspace->table[con->col+1][con->row];
         }
 
-        uint32_t mask = 0;
-        uint32_t values[2];
-
-        mask = XCB_CW_OVERRIDE_REDIRECT;
-        values[0] = 1;
-
-        /* Open a new window, the resizebar. Grab the pointer and move the window around
-           as the user moves the pointer. */
-        Rect grabrect = {0, 0, root_screen->width_in_pixels, root_screen->height_in_pixels};
-        xcb_window_t grabwin = create_window(conn, grabrect, XCB_WINDOW_CLASS_INPUT_ONLY, -1, mask, values);
-
-        Rect helprect;
-        if (orientation == O_VERTICAL) {
-                helprect.x = event->root_x;
-                helprect.y = 0;
-                helprect.width = 2;
-                helprect.height = root_screen->height_in_pixels; /* this has to be the cell’s height */
-                new_position = event->root_x;
-        } else {
-                helprect.x = 0;
-                helprect.y = event->root_y;
-                helprect.width = root_screen->width_in_pixels; /* this has to be the cell’s width */
-                helprect.height = 2;
-                new_position = event->root_y;
-        }
-
-        mask = XCB_CW_BACK_PIXEL;
-        values[0] = get_colorpixel(conn, "#4c7899");
-
-        mask |= XCB_CW_OVERRIDE_REDIRECT;
-        values[1] = 1;
-
-        xcb_window_t helpwin = create_window(conn, helprect, XCB_WINDOW_CLASS_INPUT_OUTPUT,
-                                             (orientation == O_VERTICAL ?
-                                              XCB_CURSOR_SB_V_DOUBLE_ARROW :
-                                              XCB_CURSOR_SB_H_DOUBLE_ARROW), mask, values);
-
-        xcb_circulate_window(conn, XCB_CIRCULATE_RAISE_LOWEST, helpwin);
-
-        xcb_grab_pointer(conn, false, root, XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION,
-                        XCB_GRAB_MODE_ASYNC, XCB_GRAB_MODE_ASYNC, grabwin, XCB_NONE, XCB_CURRENT_TIME);
-
-        xcb_flush(conn);
-
-        xcb_generic_event_t *inside_event;
-        /* I’ve always wanted to have my own eventhandler… */
-        while ((inside_event = xcb_wait_for_event(conn))) {
-                /* Same as get_event_handler in xcb */
-                int nr = inside_event->response_type;
-                if (nr == 0) {
-                        /* An error occured */
-                        handle_event(NULL, conn, inside_event);
-                        free(inside_event);
-                        continue;
-                }
-                assert(nr < 256);
-                nr &= XCB_EVENT_RESPONSE_TYPE_MASK;
-                assert(nr >= 2);
-
-                /* Check if we need to escape this loop */
-                if (nr == XCB_BUTTON_RELEASE)
-                        break;
-
-                switch (nr) {
-                        case XCB_MOTION_NOTIFY:
-                                if (orientation == O_VERTICAL) {
-                                        values[0] = new_position = ((xcb_motion_notify_event_t*)inside_event)->root_x;
-                                        xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_X, values);
-                                } else {
-                                        values[0] = new_position = ((xcb_motion_notify_event_t*)inside_event)->root_y;
-                                        xcb_configure_window(conn, helpwin, XCB_CONFIG_WINDOW_Y, values);
-                                }
-
-                                xcb_flush(conn);
-                                break;
-                        default:
-                                LOG("Passing to original handler\n");
-                                /* Use original handler */
-                                xcb_event_handle(&evenths, inside_event);
-                                break;
-                }
-                free(inside_event);
-        }
-
-        xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
-        xcb_destroy_window(conn, helpwin);
-        xcb_destroy_window(conn, grabwin);
-        xcb_flush(conn);
-
-        Workspace *ws = con->workspace;
-        if (orientation == O_VERTICAL) {
-                LOG("Resize was from X = %d to X = %d\n", event->root_x, new_position);
-                if (event->root_x == new_position) {
-                        LOG("Nothing changed, not updating anything\n");
-                        return 1;
-                }
-
-                /* Convert 0 (for default width_factor) to actual numbers */
-                if (first->width_factor == 0)
-                        first->width_factor = ((float)ws->rect.width / ws->cols) / ws->rect.width;
-                if (second->width_factor == 0)
-                        second->width_factor = ((float)ws->rect.width / ws->cols) / ws->rect.width;
-
-                first->width_factor *= (float)(first->width + (new_position - event->root_x)) / first->width;
-                second->width_factor *= (float)(second->width - (new_position - event->root_x)) / second->width;
-        } else {
-                LOG("Resize was from Y = %d to Y = %d\n", event->root_y, new_position);
-                if (event->root_y == new_position) {
-                        LOG("Nothing changed, not updating anything\n");
-                        return 1;
-                }
-
-                /* Convert 0 (for default height_factor) to actual numbers */
-                if (first->height_factor == 0)
-                        first->height_factor = ((float)ws->rect.height / ws->rows) / ws->rect.height;
-                if (second->height_factor == 0)
-                        second->height_factor = ((float)ws->rect.height / ws->rows) / ws->rect.height;
-
-                first->height_factor *= (float)(first->height + (new_position - event->root_y)) / first->height;
-                second->height_factor *= (float)(second->height - (new_position - event->root_y)) / second->height;
-        }
-
-        render_layout(conn);
-
-        return 1;
+        return resize_graphical_handler(conn, first, second, orientation, event);
 }
 
 /*
@@ -406,6 +382,7 @@ int handle_map_request(void *prophs, xcb_connection_t *conn, xcb_map_request_eve
         wa.u.override_redirect = reply->override_redirect;
         LOG("window = 0x%08x, serial is %d.\n", event->window, event->sequence);
         add_ignore_event(event->sequence);
+
         manage_window(prophs, conn, event->window, wa);
         return 1;
 }
@@ -421,32 +398,25 @@ int handle_configure_request(void *prophs, xcb_connection_t *conn, xcb_configure
         LOG("event->window = %08x\n", event->window);
         LOG("application wants to be at %dx%d with %dx%d\n", event->x, event->y, event->width, event->height);
 
-        Client *client = table_get(byChild, event->window);
+        Client *client = table_get(&by_child, event->window);
         if (client == NULL) {
-                LOG("No such client\n");
+                LOG("This client is not mapped, so we don't care and just tell the client that he will get its size\n");
+                Rect rect = {event->x, event->y, event->width, event->height};
+                fake_configure_notify(conn, rect, event->window);
                 return 1;
         }
 
-        xcb_configure_notify_event_t generated_event;
+        if (client->fullscreen) {
+                LOG("Client is in fullscreen mode\n");
 
-        generated_event.event = client->child;
-        generated_event.window = client->child;
-        generated_event.response_type = XCB_CONFIGURE_NOTIFY;
+                Rect child_rect = client->container->workspace->rect;
+                child_rect.x = child_rect.y = 0;
+                fake_configure_notify(conn, child_rect, client->child);
 
-        generated_event.x = client->child_rect.x;
-        generated_event.y = client->child_rect.y;
-        generated_event.width = client->child_rect.width;
-        generated_event.height = client->child_rect.height;
-
-        generated_event.border_width = 0;
-        generated_event.above_sibling = XCB_NONE;
-        generated_event.override_redirect = false;
-
-        xcb_send_event(conn, false, client->child, XCB_EVENT_MASK_STRUCTURE_NOTIFY, (char*)&generated_event);
-        xcb_flush(conn);
+                return 1;
+        }
 
-        LOG("Told the client to stay at %dx%d with size %dx%d\n",
-            client->child_rect.x, client->child_rect.y, client->child_rect.width, client->child_rect.height);
+        fake_absolute_configure_notify(conn, client);
 
         return 1;
 }
@@ -462,6 +432,9 @@ int handle_configure_event(void *prophs, xcb_connection_t *conn, xcb_configure_n
         LOG("handle_configure_event for window %08x\n", event->window);
         LOG("event->type = %d, \n", event->response_type);
         LOG("event->x = %d, ->y = %d, ->width = %d, ->height = %d\n", event->x, event->y, event->width, event->height);
+
+        /* 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) {
@@ -486,7 +459,7 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
 
         add_ignore_event(event->sequence);
 
-        Client *client = table_get(byChild, event->window);
+        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) {
@@ -499,10 +472,17 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
         LOG("UnmapNotify for 0x%08x (received from 0x%08x)\n", event->window, event->event);
         if (client == NULL) {
                 LOG("not a managed window. Ignoring.\n");
+
+                /* This was most likely the destroyed frame of a client which is
+                 * currently being unmapped, so we add this sequence (again!) to
+                 * the ignore list (enter_notify events will get sent for both,
+                 * the child and its frame). */
+                add_ignore_event(event->sequence);
+
                 return 0;
         }
 
-        client = table_remove(byChild, event->window);
+        client = table_remove(&by_child, event->window);
 
         if (client->name != NULL)
                 free(client->name);
@@ -517,28 +497,47 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
                 /* Remove the client from the list of clients */
                 remove_client_from_container(conn, client, con);
 
-                /* Remove from the focus stack */
-                LOG("Removing from focus stack\n");
-                SLIST_REMOVE(&(con->workspace->focus_stack), client, Client, focus_clients);
-
                 /* Set focus to the last focused client in this container */
-                con->currently_focused = NULL;
-                Client *focus_client;
-                SLIST_FOREACH(focus_client, &(con->workspace->focus_stack), focus_clients)
-                        if (focus_client->container == con) {
-                                con->currently_focused = focus_client;
-                                set_focus(conn, focus_client);
-                                break;
-                        }
+                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);
+        }
+
+        if (client->dock) {
+                LOG("Removing from dock clients\n");
+                SLIST_REMOVE(&(client->workspace->screen->dock_clients), client, Client, dock_clients);
         }
 
         LOG("child of 0x%08x.\n", client->frame);
         xcb_reparent_window(conn, client->child, root, 0, 0);
         xcb_destroy_window(conn, client->frame);
         xcb_flush(conn);
-        table_remove(byParent, client->frame);
+        table_remove(&by_parent, client->frame);
+
+        if (client->container != NULL) {
+                cleanup_table(conn, client->container->workspace);
+                fix_colrowspan(conn, client->container->workspace);
+        }
+
+        /* Let’s see how many clients there are left on the workspace to delete it if it’s empty */
+        bool workspace_empty = true;
+        FOR_TABLE(client->workspace)
+                if (!CIRCLEQ_EMPTY(&(client->workspace->table[cols][rows]->clients))) {
+                        workspace_empty = false;
+                        break;
+                }
 
-        cleanup_table(conn, client->container->workspace);
+        i3Screen *screen;
+        TAILQ_FOREACH(screen, virtual_screens, screens)
+                if (screen->current_workspace == client->workspace->num) {
+                        workspace_empty = false;
+                        break;
+                }
+
+        if (workspace_empty)
+                client->workspace->screen = NULL;
 
         free(client);
 
@@ -547,20 +546,6 @@ int handle_unmap_notify_event(void *data, xcb_connection_t *conn, xcb_unmap_noti
         return 1;
 }
 
-/*
- * This handler makes sure that windows are closed correctly as we drop the first unmap event we
- * get because they are sometimes generated by remapping.
- *
- * FIXME: Rather than providing this event, I’d rather know why some applications need to have
- * unmap events ignored (like VLC’s open dialog, just open it two times) while others don’t (GIMP).
- * For now, just make it work.
- *
- */
-int handle_destroy_notify_event(void *data, xcb_connection_t *conn, xcb_destroy_notify_event_t *event) {
-        LOG("Destroynotify, faking unmapnotify\n");
-        return handle_unmap_notify_event(data, conn, event);
-}
-
 /*
  * Called when a window changes its title
  *
@@ -568,11 +553,11 @@ int handle_destroy_notify_event(void *data, xcb_connection_t *conn, xcb_destroy_
 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) {
         LOG("window's name changed.\n");
-        if (prop == NULL) {
-                LOG("prop == NULL\n");
+        if (prop == NULL || xcb_get_property_value_length(prop) == 0) {
+                LOG("_NET_WM_NAME not specified, not changing\n");
                 return 1;
         }
-        Client *client = table_get(byChild, window);
+        Client *client = table_get(&by_child, window);
         if (client == NULL)
                 return 1;
 
@@ -600,10 +585,82 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
         char *old_name = client->name;
         client->name = ucs2_name;
         client->name_len = new_len;
+        client->uses_net_wm_name = true;
+
+        FREE(old_name);
+
+        /* If the client is a dock window, we don’t need to render anything */
+        if (client->dock)
+                return 1;
+
+        if (client->container->mode == MODE_STACK)
+                render_container(conn, client->container);
+        else decorate_window(conn, client, client->frame, client->titlegc, 0);
+        xcb_flush(conn);
+
+        return 1;
+}
+
+/*
+ * 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.
+ *
+ */
+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) {
+        LOG("window's name changed (legacy).\n");
+        if (prop == NULL || xcb_get_property_value_length(prop) == 0) {
+                LOG("prop == NULL\n");
+                return 1;
+        }
+        Client *client = table_get(&by_child, window);
+        if (client == NULL)
+                return 1;
+
+        if (client->uses_net_wm_name) {
+                LOG("This client is capable of _NET_WM_NAME, ignoring legacy name\n");
+                return 1;
+        }
+
+        /* 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");
+                LOG("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("Name should change 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) {
+                LOG("Name did not change, not updating\n");
+                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");
+
+        char *old_name = client->name;
+        client->name = new_name;
+        client->name_len = -1;
 
         if (old_name != NULL)
                 free(old_name);
 
+        /* If the client is a dock window, we don’t need to render anything */
+        if (client->dock)
+                return 1;
+
         if (client->container->mode == MODE_STACK)
                 render_container(conn, client->container);
         else decorate_window(conn, client, client->frame, client->titlegc, 0);
@@ -612,6 +669,35 @@ int handle_windowname_change(void *data, xcb_connection_t *conn, uint8_t state,
         return 1;
 }
 
+/*
+ * Updates the client’s WM_CLASS property
+ *
+ */
+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) {
+        LOG("window class changed\n");
+        if (prop == NULL || xcb_get_property_value_length(prop) == 0) {
+                LOG("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");
+                LOG("Could not get window class\n");
+                return 1;
+        }
+
+        LOG("changed to %s\n", new_class);
+        char *old_class = client->window_class;
+        client->window_class = new_class;
+        FREE(old_class);
+
+        return 1;
+}
+
 /*
  * Expose event means we should redraw our windows (= title bar)
  *
@@ -623,7 +709,7 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t *
                 return 1;
         LOG("window = %08x\n", event->window);
 
-        Client *client = table_get(byParent, event->window);
+        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. */
@@ -636,15 +722,18 @@ int handle_expose_event(void *data, xcb_connection_t *conn, xcb_expose_event_t *
 
                 /* …or one of the bars? */
                 i3Screen *screen;
-                TAILQ_FOREACH(screen, virtual_screens, screens) {
-                        if (screen->bar == event->window) {
+                TAILQ_FOREACH(screen, virtual_screens, screens)
+                        if (screen->bar == event->window)
                                 render_layout(conn);
-                        }
-                }
                 return 1;
         }
 
         LOG("got client %s\n", client->name);
+        if (client->dock) {
+                LOG("this is a dock\n");
+                return 1;
+        }
+
         if (client->container->mode != MODE_STACK)
                 decorate_window(conn, client, client->frame, client->titlegc, 0);
         else {
@@ -688,7 +777,7 @@ int handle_client_message(void *data, xcb_connection_t *conn, xcb_client_message
 
                 LOG("fullscreen\n");
 
-                Client *client = table_get(byChild, event->window);
+                Client *client = table_get(&by_child, event->window);
                 if (client == NULL)
                         return 0;
 
@@ -708,7 +797,7 @@ int handle_client_message(void *data, xcb_connection_t *conn, xcb_client_message
         return 1;
 }
 
-int window_type_handler(void *data, xcb_connection_t *conn, uint8_t state, xcb_window_t window,
+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
          before changing this property. */
@@ -726,7 +815,7 @@ int window_type_handler(void *data, xcb_connection_t *conn, uint8_t state, xcb_w
 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) {
         LOG("handle_normal_hints\n");
-        Client *client = table_get(byChild, window);
+        Client *client = table_get(&by_child, window);
         if (client == NULL) {
                 LOG("No such client\n");
                 return 1;