]> git.sur5r.net Git - i3/i3/blobdiff - src/floating.c
Bugfix: don’t kill parent when currently in tree_close() for a child of this parent
[i3/i3] / src / floating.c
index 310b6a395e774fbfc8907af19ce9558fa6503299..005f2092c48fffd420c5a523975bcb1f6cff4dc7 100644 (file)
 /*
- * vim:ts=8:expandtab
+ * vim:ts=4:sw=4:expandtab
  *
  * i3 - an improved dynamic tiling window manager
  *
- * © 2009 Michael Stapelberg and contributors
+ * © 2009-2010 Michael Stapelberg and contributors
  *
  * See file LICENSE for license information.
  *
  * src/floating.c: contains all functions for handling floating clients
  *
  */
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
-#include <xcb/xcb.h>
-#include <xcb/xcb_event.h>
-
-#include "i3.h"
-#include "config.h"
-#include "data.h"
-#include "util.h"
-#include "xcb.h"
-#include "debug.h"
-#include "layout.h"
-#include "client.h"
-
-/* On which border was the dragging initiated? */
-typedef enum { BORDER_LEFT, BORDER_RIGHT, BORDER_TOP, BORDER_BOTTOM} border_t;
-/* Callback for dragging */
-typedef void(*callback_t)(xcb_connection_t*, Client*, border_t, Rect*, xcb_button_press_event_t*, uint32_t, uint32_t);
-
-/* Forward definitions */
-static void drag_pointer(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event,
-                         border_t border, callback_t callback);
+
+
+#include "all.h"
+
+extern xcb_connection_t *conn;
+
+void floating_enable(Con *con, bool automatic) {
+    if (con_is_floating(con)) {
+        LOG("Container is already in floating mode, not doing anything.\n");
+        return;
+    }
+
+    /* 1: detach the container from its parent */
+    /* TODO: refactor this with tree_close() */
+    TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
+    TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
+
+    con_fix_percent(con->parent, WINDOW_REMOVE);
+
+    /* 2: create a new container to render the decoration on, add
+     * it as a floating window to the workspace */
+    Con *nc = con_new(NULL);
+    /* we need to set the parent afterwards instead of passing it as an
+     * argument to con_new() because nc would be inserted into the tiling layer
+     * otherwise. */
+    nc->parent = con_get_workspace(con);
+
+    char *name;
+    asprintf(&name, "[i3 con] floatingcon around %p", con);
+    x_set_name(nc, name);
+    free(name);
+
+    nc->rect = con->rect;
+    /* add pixels for the decoration */
+    /* TODO: don’t add them when the user automatically puts new windows into
+     * 1pixel/borderless mode */
+    nc->rect.height += 17 + 2;
+    nc->rect.width += 4;
+    nc->orientation = NO_ORIENTATION;
+    nc->type = CT_FLOATING_CON;
+    TAILQ_INSERT_TAIL(&(nc->parent->floating_head), nc, floating_windows);
+    TAILQ_INSERT_TAIL(&(nc->parent->focus_head), nc, focused);
+
+    /* 3: attach the child to the new parent container */
+    con->old_parent = con->parent;
+    con->parent = nc;
+    con->floating = FLOATING_USER_ON;
+
+    /* Some clients (like GIMP’s color picker window) get mapped
+     * to (0, 0), so we push them to a reasonable position
+     * (centered over their leader) */
+    if (nc->rect.x == 0 && nc->rect.y == 0) {
+        Con *leader;
+        if (con->window && con->window->leader != XCB_NONE &&
+            (leader = con_by_window_id(con->window->leader)) != NULL) {
+            DLOG("Centering above leader\n");
+            nc->rect.x = leader->rect.x + (leader->rect.width / 2) - (nc->rect.width / 2);
+            nc->rect.y = leader->rect.y + (leader->rect.height / 2) - (nc->rect.height / 2);
+        } else {
+            /* center the window on workspace as fallback */
+            Con *ws = nc->parent;
+            nc->rect.x = ws->rect.x + (ws->rect.width / 2) - (nc->rect.width / 2);
+            nc->rect.y = ws->rect.y + (ws->rect.height / 2) - (nc->rect.height / 2);
+        }
+    }
+
+    TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
+    TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
+}
+
+void floating_disable(Con *con, bool automatic) {
+    if (!con_is_floating(con)) {
+        LOG("Container isn't floating, not doing anything.\n");
+        return;
+    }
+
+    assert(con->old_parent != NULL);
+
+    /* 1: detach from parent container */
+    TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
+    TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
+
+    /* 2: kill parent container */
+    TAILQ_REMOVE(&(con->parent->parent->floating_head), con->parent, floating_windows);
+    TAILQ_REMOVE(&(con->parent->parent->focus_head), con->parent, focused);
+    tree_close(con->parent, false, false);
+
+    /* 3: re-attach to previous parent */
+    con->parent = con->old_parent;
+    TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes);
+    TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused);
+
+    con->floating = FLOATING_USER_OFF;
+
+    con_fix_percent(con->parent, WINDOW_ADD);
+}
+
 
 /*
- * Toggles floating mode for the given client.
- * Correctly takes care of the position/size (separately stored for tiling/floating mode)
- * and repositions/resizes/redecorates the client.
+ * Toggles floating mode for the given container.
  *
  * If the automatic flag is set to true, this was an automatic update by a change of the
  * window class from the application which can be overwritten by the user.
  *
  */
-void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic) {
-        Container *con = client->container;
-        i3Font *font = load_font(conn, config.font);
+void toggle_floating_mode(Con *con, bool automatic) {
+        //i3Font *font = load_font(conn, config.font);
+
+        /* see if the client is already floating */
+        if (con_is_floating(con)) {
+                LOG("already floating, re-setting to tiling\n");
+
+                floating_disable(con, automatic);
+                return;
+        }
+
+        floating_enable(con, automatic);
+
+
+#if 0
+        if (client->dock) {
+                DLOG("Not putting dock client into floating mode\n");
+                return;
+        }
 
         if (con == NULL) {
-                LOG("This client is already in floating (container == NULL), re-inserting\n");
+                DLOG("This client is already in floating (container == NULL), re-inserting\n");
                 Client *next_tiling;
-                SLIST_FOREACH(next_tiling, &(client->workspace->focus_stack), focus_clients)
-                        if (next_tiling->floating <= FLOATING_USER_OFF)
+                Workspace *ws = client->workspace;
+                SLIST_FOREACH(next_tiling, &(ws->focus_stack), focus_clients)
+                        if (!client_is_floating(next_tiling))
                                 break;
                 /* If there are no tiling clients on this workspace, there can only be one
                  * container: the first one */
-                if (next_tiling == TAILQ_END(&(client->workspace->focus_stack)))
-                        con = client->workspace->table[0][0];
+                if (next_tiling == TAILQ_END(&(ws->focus_stack)))
+                        con = ws->table[0][0];
                 else con = next_tiling->container;
 
                 /* Remove the client from the list of floating clients */
-                TAILQ_REMOVE(&(client->workspace->floating_clients), client, floating_clients);
+                TAILQ_REMOVE(&(ws->floating_clients), client, floating_clients);
 
-                LOG("destination container = %p\n", con);
+                DLOG("destination container = %p\n", con);
                 Client *old_focused = con->currently_focused;
                 /* Preserve position/size */
                 memcpy(&(client->floating_rect), &(client->rect), sizeof(Rect));
@@ -75,16 +163,18 @@ void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic
                         CIRCLEQ_INSERT_AFTER(&(con->clients), old_focused, client, clients);
                 else CIRCLEQ_INSERT_TAIL(&(con->clients), client, clients);
 
-                LOG("Re-inserted the client into the matrix.\n");
+                DLOG("Re-inserted the window.\n");
                 con->currently_focused = client;
 
+                client_set_below_floating(conn, client);
+
                 render_container(conn, con);
                 xcb_flush(conn);
 
                 return;
         }
 
-        LOG("Entering floating for client %08x\n", client->child);
+        DLOG("Entering floating for client %08x\n", client->child);
 
         /* Remove the client of its container */
         client_remove_from_container(conn, client, con, false);
@@ -94,7 +184,7 @@ void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic
         TAILQ_INSERT_TAIL(&(client->workspace->floating_clients), client, floating_clients);
 
         if (con->currently_focused == client) {
-                LOG("Need to re-adjust currently_focused\n");
+                DLOG("Need to re-adjust currently_focused\n");
                 /* Get the next client in the focus stack for this particular container */
                 con->currently_focused = get_last_focused_client(conn, con, NULL);
         }
@@ -110,18 +200,18 @@ void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic
                 client->floating_rect.x = client->rect.x;
                 client->floating_rect.y = client->rect.y;
 
-                /* Copy the size the other direction */
+                /* Copy size the other direction */
                 client->child_rect.width = client->floating_rect.width;
                 client->child_rect.height = client->floating_rect.height;
 
                 client->rect.width = client->child_rect.width + 2 + 2;
                 client->rect.height = client->child_rect.height + (font->height + 2 + 2) + 2;
 
-                LOG("copying size from tiling (%d, %d) size (%d, %d)\n", client->floating_rect.x, client->floating_rect.y,
+                DLOG("copying size from tiling (%d, %d) size (%d, %d)\n", client->floating_rect.x, client->floating_rect.y,
                                 client->floating_rect.width, client->floating_rect.height);
         } else {
                 /* If the client was already in floating before we restore the old position / size */
-                LOG("using: (%d, %d) size (%d, %d)\n", client->floating_rect.x, client->floating_rect.y,
+                DLOG("using: (%d, %d) size (%d, %d)\n", client->floating_rect.x, client->floating_rect.y,
                         client->floating_rect.width, client->floating_rect.height);
                 memcpy(&(client->rect), &(client->floating_rect), sizeof(Rect));
         }
@@ -136,32 +226,86 @@ void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic
         /* Re-render the tiling layout of this container */
         render_container(conn, con);
         xcb_flush(conn);
+#endif
 }
 
+#if 0
 /*
- * Callback for resizing windows
+ * Removes the floating client from its workspace and attaches it to the new workspace.
+ * This is centralized here because it may happen if you move it via keyboard and
+ * if you move it using your mouse.
  *
  */
-static void resize_callback(xcb_connection_t *conn, Client *client, border_t border, Rect *old_rect,
-                            xcb_button_press_event_t *event, uint32_t new_x, uint32_t new_y) {
-        switch (border) {
-                case BORDER_RIGHT:
-                        client->rect.width = old_rect->width + (new_x - event->root_x);
+void floating_assign_to_workspace(Client *client, Workspace *new_workspace) {
+        /* Remove from focus stack and list of floating clients */
+        SLIST_REMOVE(&(client->workspace->focus_stack), client, Client, focus_clients);
+        TAILQ_REMOVE(&(client->workspace->floating_clients), client, floating_clients);
+
+        if (client->workspace->fullscreen_client == client)
+                client->workspace->fullscreen_client = NULL;
+
+        /* Insert into destination focus stack and list of floating clients */
+        client->workspace = new_workspace;
+        SLIST_INSERT_HEAD(&(client->workspace->focus_stack), client, focus_clients);
+        TAILQ_INSERT_TAIL(&(client->workspace->floating_clients), client, floating_clients);
+        if (client->fullscreen)
+                client->workspace->fullscreen_client = client;
+}
+
+/*
+ * This is an ugly data structure which we need because there is no standard
+ * way of having nested functions (only available as a gcc extension at the
+ * moment, clang doesn’t support it) or blocks (only available as a clang
+ * extension and only on Mac OS X systems at the moment).
+ *
+ */
+struct resize_callback_params {
+        border_t border;
+        xcb_button_press_event_t *event;
+};
+
+DRAGGING_CB(resize_callback) {
+        struct resize_callback_params *params = extra;
+        xcb_button_press_event_t *event = params->event;
+        switch (params->border) {
+                case BORDER_RIGHT: {
+                        int new_width = old_rect->width + (new_x - event->root_x);
+                        if ((new_width < 0) ||
+                            (new_width < client_min_width(client) && client->rect.width >= new_width))
+                                return;
+                        client->rect.width = new_width;
                         break;
+                }
 
-                case BORDER_BOTTOM:
+                case BORDER_BOTTOM: {
+                        int new_height = old_rect->height + (new_y - event->root_y);
+                        if ((new_height < 0) ||
+                            (new_height < client_min_height(client) && client->rect.height >= new_height))
+                                return;
                         client->rect.height = old_rect->height + (new_y - event->root_y);
                         break;
+                }
+
+                case BORDER_TOP: {
+                        int new_height = old_rect->height + (event->root_y - new_y);
+                        if ((new_height < 0) ||
+                            (new_height < client_min_height(client) && client->rect.height >= new_height))
+                                return;
 
-                case BORDER_TOP:
                         client->rect.y = old_rect->y + (new_y - event->root_y);
-                        client->rect.height = old_rect->height + (event->root_y - new_y);
+                        client->rect.height = new_height;
                         break;
+                }
 
-                case BORDER_LEFT:
+                case BORDER_LEFT: {
+                        int new_width = old_rect->width + (event->root_x - new_x);
+                        if ((new_width < 0) ||
+                            (new_width < client_min_width(client) && client->rect.width >= new_width))
+                                return;
                         client->rect.x = old_rect->x + (new_x - event->root_x);
-                        client->rect.width = old_rect->width + (event->root_x - new_x);
+                        client->rect.width = new_width;
                         break;
+                }
         }
 
         /* Push the new position/size to X11 */
@@ -170,6 +314,7 @@ static void resize_callback(xcb_connection_t *conn, Client *client, border_t bor
         xcb_flush(conn);
 }
 
+
 /*
  * Called whenever the user clicks on a border (not the titlebar!) of a floating window.
  * Determines on which border the user clicked and launches the drag_pointer function
@@ -177,40 +322,43 @@ static void resize_callback(xcb_connection_t *conn, Client *client, border_t bor
  *
  */
 int floating_border_click(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event) {
-
-        LOG("floating border click\n");
+        DLOG("floating border click\n");
 
         border_t border;
+
         if (event->event_y < 2)
                 border = BORDER_TOP;
         else if (event->event_y >= (client->rect.height - 2))
                 border = BORDER_BOTTOM;
         else if (event->event_x <= 2)
                 border = BORDER_LEFT;
-        else if (event->event_x > 2)
+        else if (event->event_x >= (client->rect.width - 2))
                 border = BORDER_RIGHT;
         else {
-                LOG("Not on any border, not doing anything.\n");
+                DLOG("Not on any border, not doing anything.\n");
                 return 1;
         }
 
-        LOG("border = %d\n", border);
+        DLOG("border = %d\n", border);
 
-        drag_pointer(conn, client, event, border, resize_callback);
+        struct resize_callback_params params = { border, event };
+
+        drag_pointer(conn, client, event, XCB_NONE, border, resize_callback, &params);
 
         return 1;
 }
 
-static void drag_window_callback(xcb_connection_t *conn, Client *client, border_t border, Rect *old_rect,
-                            xcb_button_press_event_t *event, uint32_t new_x, uint32_t new_y) {
+#endif
+DRAGGING_CB(drag_window_callback) {
+        struct xcb_button_press_event_t *event = extra;
+
         /* Reposition the client correctly while moving */
-        client->rect.x = old_rect->x + (new_x - event->root_x);
-        client->rect.y = old_rect->y + (new_y - event->root_y);
-        reposition_client(conn, client);
-        /* Because reposition_client does not send a faked configure event (only resize does),
-         * we need to initiate that on our own */
-        fake_absolute_configure_notify(conn, client);
-        /* fake_absolute_configure_notify flushes */
+        con->rect.x = old_rect->x + (new_x - event->root_x);
+        con->rect.y = old_rect->y + (new_y - event->root_y);
+        /* TODO: don’t re-render the whole tree just because we change
+         * coordinates of a floating window */
+        tree_render();
+        x_push_changes(croot);
 }
 
 /*
@@ -218,10 +366,102 @@ static void drag_window_callback(xcb_connection_t *conn, Client *client, border_
  * Calls the drag_pointer function with the drag_window callback
  *
  */
-void floating_drag_window(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event) {
-        LOG("floating_drag_window\n");
+void floating_drag_window(Con *con, xcb_button_press_event_t *event) {
+        DLOG("floating_drag_window\n");
+
+        drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback, event);
+        tree_render();
+}
+
+/*
+ * This is an ugly data structure which we need because there is no standard
+ * way of having nested functions (only available as a gcc extension at the
+ * moment, clang doesn’t support it) or blocks (only available as a clang
+ * extension and only on Mac OS X systems at the moment).
+ *
+ */
+struct resize_window_callback_params {
+    border_t corner;
+    bool proportional;
+    xcb_button_press_event_t *event;
+};
+
+DRAGGING_CB(resize_window_callback) {
+    struct resize_window_callback_params *params = extra;
+    xcb_button_press_event_t *event = params->event;
+    border_t corner = params->corner;
+
+    int32_t dest_x = con->rect.x;
+    int32_t dest_y = con->rect.y;
+    uint32_t dest_width;
+    uint32_t dest_height;
+
+    double ratio = (double) old_rect->width / old_rect->height;
+
+    /* First guess: We resize by exactly the amount the mouse moved,
+     * taking into account in which corner the client was grabbed */
+    if (corner & BORDER_LEFT)
+            dest_width = old_rect->width - (new_x - event->root_x);
+    else dest_width = old_rect->width + (new_x - event->root_x);
+
+    if (corner & BORDER_TOP)
+            dest_height = old_rect->height - (new_y - event->root_y);
+    else dest_height = old_rect->height + (new_y - event->root_y);
+
+    /* TODO: minimum window size */
+#if 0
+    /* Obey minimum window size */
+    dest_width = max(dest_width, client_min_width(client));
+    dest_height = max(dest_height, client_min_height(client));
+#endif
+
+    /* User wants to keep proportions, so we may have to adjust our values */
+    if (params->proportional) {
+            dest_width = max(dest_width, (int) (dest_height * ratio));
+            dest_height = max(dest_height, (int) (dest_width / ratio));
+    }
+
+    /* If not the lower right corner is grabbed, we must also reposition
+     * the client by exactly the amount we resized it */
+    if (corner & BORDER_LEFT)
+            dest_x = old_rect->x + (old_rect->width - dest_width);
+
+    if (corner & BORDER_TOP)
+            dest_y = old_rect->y + (old_rect->height - dest_height);
+
+    con->rect = (Rect) { dest_x, dest_y, dest_width, dest_height };
+
+    /* TODO: don’t re-render the whole tree just because we change
+     * coordinates of a floating window */
+    tree_render();
+    x_push_changes(croot);
+}
+
+/*
+ * Called when the user clicked on a floating window while holding the
+ * floating_modifier and the right mouse button.
+ * Calls the drag_pointer function with the resize_window callback
+ *
+ */
+void floating_resize_window(Con *con, bool proportional,
+                            xcb_button_press_event_t *event) {
+    DLOG("floating_resize_window\n");
+
+    /* corner saves the nearest corner to the original click. It contains
+     * a bitmask of the nearest borders (BORDER_LEFT, BORDER_RIGHT, …) */
+    border_t corner = 0;
 
-        drag_pointer(conn, client, event, BORDER_TOP /* irrelevant */, drag_window_callback);
+    if (event->event_x <= (con->rect.width / 2))
+            corner |= BORDER_LEFT;
+    else corner |= BORDER_RIGHT;
+
+    if (event->event_y <= (con->rect.height / 2))
+            corner |= BORDER_TOP;
+    else corner |= BORDER_RIGHT;
+
+    struct resize_window_callback_params params = { corner, proportional, event };
+
+    drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, resize_window_callback, &params);
 }
 
 /*
@@ -232,12 +472,14 @@ void floating_drag_window(xcb_connection_t *conn, Client *client, xcb_button_pre
  * the event and the new coordinates (x, y).
  *
  */
-static void drag_pointer(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event,
-                         border_t border, callback_t callback) {
+void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t
+                confine_to, border_t border, callback_t callback, void *extra)
+{
         xcb_window_t root = xcb_setup_roots_iterator(xcb_get_setup(conn)).data->root;
         uint32_t new_x, new_y;
         Rect old_rect;
-        memcpy(&old_rect, &(client->rect), sizeof(Rect));
+        if (con != NULL)
+                memcpy(&old_rect, &(con->rect), sizeof(Rect));
 
         /* Grab the pointer */
         /* TODO: returncode */
@@ -247,53 +489,70 @@ static void drag_pointer(xcb_connection_t *conn, Client *client, xcb_button_pres
                         XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION, /* which events to let through */
                         XCB_GRAB_MODE_ASYNC, /* pointer events should continue as normal */
                         XCB_GRAB_MODE_ASYNC, /* keyboard mode */
-                        XCB_NONE,            /* confine_to = in which window should the cursor stay */
+                        confine_to,          /* confine_to = in which window should the cursor stay */
                         XCB_NONE,            /* don’t display a special cursor */
                         XCB_CURRENT_TIME);
 
         /* Go into our own event loop */
         xcb_flush(conn);
 
-        xcb_generic_event_t *inside_event;
+        xcb_generic_event_t *inside_event, *last_motion_notify = NULL;
         /* 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);
+                /* We now handle all events we can get using xcb_poll_for_event */
+                do {
+                        /* 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);
+
+                        switch (nr) {
+                                case XCB_BUTTON_RELEASE:
+                                        goto done;
+
+                                case XCB_MOTION_NOTIFY:
+                                        /* motion_notify events are saved for later */
+                                        FREE(last_motion_notify);
+                                        last_motion_notify = inside_event;
+                                        break;
+
+                                case XCB_UNMAP_NOTIFY:
+                                        DLOG("Unmap-notify, aborting\n");
+                                        xcb_event_handle(&evenths, inside_event);
+                                        goto done;
+
+                                default:
+                                        DLOG("Passing to original handler\n");
+                                        /* Use original handler */
+                                        xcb_event_handle(&evenths, inside_event);
+                                        break;
+                        }
+                        if (last_motion_notify != inside_event)
+                                free(inside_event);
+                } while ((inside_event = xcb_poll_for_event(conn)) != NULL);
+
+                if (last_motion_notify == NULL)
                         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:
-                                new_x = ((xcb_motion_notify_event_t*)inside_event)->root_x;
-                                new_y = ((xcb_motion_notify_event_t*)inside_event)->root_y;
+                new_x = ((xcb_motion_notify_event_t*)last_motion_notify)->root_x;
+                new_y = ((xcb_motion_notify_event_t*)last_motion_notify)->root_y;
 
-                                callback(conn, client, border, &old_rect, event, new_x, new_y);
-
-                                break;
-                        default:
-                                LOG("Passing to original handler\n");
-                                /* Use original handler */
-                                xcb_event_handle(&evenths, inside_event);
-                                break;
-                }
-                free(inside_event);
+                callback(con, &old_rect, new_x, new_y, extra);
+                FREE(last_motion_notify);
         }
-
+done:
         xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
         xcb_flush(conn);
 }
 
+#if 0
 /*
  * Changes focus in the given direction for floating clients.
  *
@@ -302,7 +561,7 @@ static void drag_pointer(xcb_connection_t *conn, Client *client, xcb_button_pres
  *
  */
 void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused, direction_t direction) {
-        LOG("floating focus\n");
+        DLOG("floating focus\n");
 
         if (direction == D_LEFT || direction == D_RIGHT) {
                 /* Go to the next/previous floating client */
@@ -318,3 +577,79 @@ void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused,
                 }
         }
 }
+
+/*
+ * Moves the client 10px to the specified direction.
+ *
+ */
+void floating_move(xcb_connection_t *conn, Client *currently_focused, direction_t direction) {
+        DLOG("floating move\n");
+
+        Rect destination = currently_focused->rect;
+        Rect *screen = &(currently_focused->workspace->output->rect);
+
+        switch (direction) {
+                case D_LEFT:
+                        destination.x -= 10;
+                        break;
+                case D_RIGHT:
+                        destination.x += 10;
+                        break;
+                case D_UP:
+                        destination.y -= 10;
+                        break;
+                case D_DOWN:
+                        destination.y += 10;
+                        break;
+                /* to make static analyzers happy */
+                default:
+                        break;
+        }
+
+        /* Prevent windows from vanishing completely */
+        if ((int32_t)(destination.x + destination.width - 5) <= (int32_t)screen->x ||
+            (int32_t)(destination.x + 5) >= (int32_t)(screen->x + screen->width) ||
+            (int32_t)(destination.y + destination.height - 5) <= (int32_t)screen->y ||
+            (int32_t)(destination.y + 5) >= (int32_t)(screen->y + screen->height)) {
+                DLOG("boundary check failed, not moving\n");
+                return;
+        }
+
+        currently_focused->rect = destination;
+        reposition_client(conn, currently_focused);
+
+        /* Because reposition_client does not send a faked configure event (only resize does),
+         * we need to initiate that on our own */
+        fake_absolute_configure_notify(conn, currently_focused);
+        /* fake_absolute_configure_notify flushes */
+}
+
+/*
+ * Hides all floating clients (or show them if they are currently hidden) on
+ * the specified workspace.
+ *
+ */
+void floating_toggle_hide(xcb_connection_t *conn, Workspace *workspace) {
+        Client *client;
+
+        workspace->floating_hidden = !workspace->floating_hidden;
+        DLOG("floating_hidden is now: %d\n", workspace->floating_hidden);
+        TAILQ_FOREACH(client, &(workspace->floating_clients), floating_clients) {
+                if (workspace->floating_hidden)
+                        client_unmap(conn, client);
+                else client_map(conn, client);
+        }
+
+        /* If we just unmapped all floating windows we should ensure that the focus
+         * is set correctly, that ist, to the first non-floating client in stack */
+        if (workspace->floating_hidden)
+                SLIST_FOREACH(client, &(workspace->focus_stack), focus_clients) {
+                        if (client_is_floating(client))
+                                continue;
+                        set_focus(conn, client, true);
+                        return;
+                }
+
+        xcb_flush(conn);
+}
+#endif