X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ffloating.c;h=2ac4afda0d39bb5e32a14aa38ca3715a50ec8905;hb=4be3178d4d360c2996217d811e61161c84d25898;hp=f416160a4e4ba5400c13d9c058549fdc067e3e50;hpb=5c0496a3efe0afc7e1908cd2807d0561e7e1342c;p=i3%2Fi3 diff --git a/src/floating.c b/src/floating.c index f416160a..2ac4afda 100644 --- a/src/floating.c +++ b/src/floating.c @@ -1,233 +1,391 @@ /* - * 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 -#include -#include - -#include -#include - -#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)(Rect*, 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); -/* - * 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. - * - * 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); - - if (con == NULL) { - LOG("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) - 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]; - else con = next_tiling->container; - - /* Remove the client from the list of floating clients */ - TAILQ_REMOVE(&(client->workspace->floating_clients), client, floating_clients); - - LOG("destination container = %p\n", con); - Client *old_focused = con->currently_focused; - /* Preserve position/size */ - memcpy(&(client->floating_rect), &(client->rect), sizeof(Rect)); - - client->floating = FLOATING_USER_OFF; - client->container = con; - - if (old_focused != NULL && !old_focused->dock) - 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"); - con->currently_focused = client; - - /* Ensure that it is below all floating clients */ - Client *first_floating = TAILQ_FIRST(&(client->workspace->floating_clients)); - if (first_floating != TAILQ_END(&(client->workspace->floating_clients))) { - LOG("Setting below floating\n"); - uint32_t values[] = { first_floating->frame, XCB_STACK_MODE_BELOW }; - xcb_configure_window(conn, client->frame, XCB_CONFIG_WINDOW_SIBLING | XCB_CONFIG_WINDOW_STACK_MODE, values); - } - - render_container(conn, con); - xcb_flush(conn); - return; - } +#include "all.h" - LOG("Entering floating for client %08x\n", client->child); +extern xcb_connection_t *conn; - /* Remove the client of its container */ - client_remove_from_container(conn, client, con, false); - client->container = NULL; +void floating_enable(Con *con, bool automatic) { + bool set_focus = true; - /* Add the client to the list of floating clients for its workspace */ - TAILQ_INSERT_TAIL(&(client->workspace->floating_clients), client, floating_clients); + if (con_is_floating(con)) { + LOG("Container is already in floating mode, not doing anything.\n"); + return; + } - if (con->currently_focused == client) { - LOG("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); + /* 1: If the container is a workspace container, we need to create a new + * split-container with the same orientation and make that one floating. We + * cannot touch the workspace container itself because floating containers + * are children of the workspace. */ + if (con->type == CT_WORKSPACE) { + LOG("This is a workspace, creating new container around content\n"); + if (con_num_children(con) == 0) { + LOG("Workspace is empty, aborting\n"); + return; + } + /* TODO: refactor this with src/con.c:con_set_layout */ + Con *new = con_new(NULL); + new->parent = con; + new->orientation = con->orientation; + + /* since the new container will be set into floating mode directly + * afterwards, we need to copy the workspace rect. */ + memcpy(&(new->rect), &(con->rect), sizeof(Rect)); + + Con *old_focused = TAILQ_FIRST(&(con->focus_head)); + if (old_focused == TAILQ_END(&(con->focus_head))) + old_focused = NULL; + + /* 4: move the existing cons of this workspace below the new con */ + DLOG("Moving cons\n"); + Con *child; + while (!TAILQ_EMPTY(&(con->nodes_head))) { + child = TAILQ_FIRST(&(con->nodes_head)); + con_detach(child); + con_attach(child, new, true); } - if (automatic) - client->floating = FLOATING_AUTO_ON; - else client->floating = FLOATING_USER_ON; + /* 4: attach the new split container to the workspace */ + DLOG("Attaching new split to ws\n"); + con_attach(new, con, false); + + if (old_focused) + con_focus(old_focused); + + con = new; + set_focus = false; + } + + /* 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); + + /* 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); + + /* check if the parent container is empty and close it if so */ + if ((con->parent->type == CT_CON || con->parent->type == CT_FLOATING_CON) && con_num_children(con->parent) == 0) { + DLOG("Old container empty after setting this child to floating, closing\n"); + tree_close(con->parent, false, false); + } + + char *name; + asprintf(&name, "[i3 con] floatingcon around %p", con); + x_set_name(nc, name); + free(name); + + /* find the height for the decorations */ + int deco_height = config.font.height + 5; + + DLOG("Original rect: (%d, %d) with %d x %d\n", con->rect.x, con->rect.y, con->rect.width, con->rect.height); + Rect zero = { 0, 0, 0, 0 }; + nc->rect = con->geometry; + /* If the geometry was not set (split containers), we need to determine a + * sensible one by combining the geometry of all children */ + if (memcmp(&(nc->rect), &zero, sizeof(Rect)) == 0) { + DLOG("Geometry not set, combining children\n"); + Con *child; + TAILQ_FOREACH(child, &(con->nodes_head), nodes) { + DLOG("child geometry: %d x %d\n", child->geometry.width, child->geometry.height); + nc->rect.width += child->geometry.width; + nc->rect.height = max(nc->rect.height, child->geometry.height); + } + } + /* Raise the width/height to at least 75x50 (minimum size for windows) */ + nc->rect.width = max(nc->rect.width, 75); + nc->rect.height = max(nc->rect.height, 50); + /* add pixels for the decoration */ + /* TODO: don’t add them when the user automatically puts new windows into + * 1pixel/borderless mode */ + nc->rect.height += deco_height + 4; + nc->rect.width += 4; + DLOG("Floating rect: (%d, %d) with %d x %d\n", nc->rect.x, nc->rect.y, nc->rect.width, nc->rect.height); + 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->parent = nc; + con->percent = 1.0; + 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); + } + } - /* Initialize the floating position from the position in tiling mode, if this - * client never was floating (x == -1) */ - if (client->floating_rect.x == -1) { - /* Copy over the position */ - client->floating_rect.x = client->rect.x; - client->floating_rect.y = client->rect.y; + TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes); + TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused); - /* Copy size the other direction */ - client->child_rect.width = client->floating_rect.width; - client->child_rect.height = client->floating_rect.height; + /* render the cons to get initial window_rect correct */ + render_con(nc, false); + render_con(con, false); - client->rect.width = client->child_rect.width + 2 + 2; - client->rect.height = client->child_rect.height + (font->height + 2 + 2) + 2; + // TODO: don’t influence focus handling when Con was not focused before. + if (set_focus) + con_focus(con); - LOG("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, - client->floating_rect.width, client->floating_rect.height); - memcpy(&(client->rect), &(client->floating_rect), sizeof(Rect)); - } + /* Check if we need to re-assign it to a different workspace because of its + * coordinates and exit if that was done successfully. */ + if (floating_maybe_reassign_ws(nc)) + return; - /* Raise the client */ - xcb_raise_window(conn, client->frame); - reposition_client(conn, client); - resize_client(conn, client); - /* redecorate_window flushes */ - redecorate_window(conn, client); + /* Sanitize coordinates: Check if they are on any output */ + if (get_output_containing(nc->rect.x, nc->rect.y) != NULL) + return; - /* Re-render the tiling layout of this container */ - render_container(conn, con); - xcb_flush(conn); + ELOG("No output found at destination coordinates, centering floating window on current ws\n"); + 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); } +void floating_disable(Con *con, bool automatic) { + if (!con_is_floating(con)) { + LOG("Container isn't floating, not doing anything.\n"); + return; + } -/* - * 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 - * with the resize_callback. - * - */ -int floating_border_click(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event) { + /* 1: detach from parent container */ + TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes); + TAILQ_REMOVE(&(con->parent->focus_head), con, focused); - LOG("floating border click\n"); + /* 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); - border_t border; + /* 3: re-attach to the parent of the currently focused con on the workspace + * this floating con was on */ + Con *focused = con_descend_tiling_focused(con_get_workspace(con)); - void resize_callback(Rect *old_rect, uint32_t new_x, uint32_t new_y) { - switch (border) { - case BORDER_RIGHT: - client->rect.width = old_rect->width + (new_x - event->root_x); - break; + /* if there is no other container on this workspace, focused will be the + * workspace itself */ + if (focused->type == CT_WORKSPACE) + con->parent = focused; + else con->parent = focused->parent; - case BORDER_BOTTOM: - client->rect.height = old_rect->height + (new_y - event->root_y); - break; + /* con_fix_percent will adjust the percent value */ + con->percent = 0.0; - 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); - break; + TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes); + TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused); - case BORDER_LEFT: - client->rect.x = old_rect->x + (new_x - event->root_x); - client->rect.width = old_rect->width + (event->root_x - new_x); - break; - } + con->floating = FLOATING_USER_OFF; - /* Push the new position/size to X11 */ - reposition_client(conn, client); - resize_client(conn, client); - xcb_flush(conn); - } + con_fix_percent(con->parent); + // TODO: don’t influence focus handling when Con was not focused before. + con_focus(con); +} - 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) - border = BORDER_RIGHT; - else { - LOG("Not on any border, not doing anything.\n"); - return 1; - } +/* + * 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(Con *con, bool automatic) { + /* see if the client is already floating */ + if (con_is_floating(con)) { + LOG("already floating, re-setting to tiling\n"); - LOG("border = %d\n", border); + floating_disable(con, automatic); + return; + } - drag_pointer(conn, client, event, border, resize_callback); + floating_enable(con, automatic); +} - return 1; +/* + * Raises the given container in the list of floating containers + * + */ +void floating_raise_con(Con *con) { + DLOG("Raising floating con %p / %s\n", con, con->name); + TAILQ_REMOVE(&(con->parent->floating_head), con, floating_windows); + TAILQ_INSERT_TAIL(&(con->parent->floating_head), con, floating_windows); +} + +/* + * Checks if con’s coordinates are within its workspace and re-assigns it to + * the actual workspace if not. + * + */ +bool floating_maybe_reassign_ws(Con *con) { + Output *output = get_output_containing( + con->rect.x + (con->rect.width / 2), + con->rect.y + (con->rect.height / 2)); + + if (!output) { + ELOG("No output found at destination coordinates?\n"); + return false; + } + + if (con_get_output(con) == output->con) { + DLOG("still the same ws\n"); + return false; + } + + DLOG("Need to re-assign!\n"); + + Con *content = output_get_content(output->con); + Con *ws = TAILQ_FIRST(&(content->focus_head)); + DLOG("Moving con %p / %s to workspace %p / %s\n", con, con->name, ws, ws->name); + con_move_to_workspace(con, ws); + con_focus(con_descend_focused(con)); + return true; } +DRAGGING_CB(drag_window_callback) { + struct xcb_button_press_event_t *event = extra; + + /* Reposition the client correctly while moving */ + con->rect.x = old_rect->x + (new_x - event->root_x); + con->rect.y = old_rect->y + (new_y - event->root_y); + + render_con(con, false); + x_push_node(con); + xcb_flush(conn); + + /* Check if we cross workspace boundaries while moving */ + if (!floating_maybe_reassign_ws(con)) + return; + tree_render(); +} /* * Called when the user clicked on the titlebar of a floating window. * 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 drag_window_callback(Rect *old_rect, uint32_t new_x, uint32_t new_y) { - /* 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 */ - } +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); + + /* Obey minimum window size */ + Rect minimum = con_minimum_size(con); + dest_width = max(dest_width, minimum.width); + dest_height = max(dest_height, minimum.height); + + /* 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; + + 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_BOTTOM; - drag_pointer(conn, client, event, BORDER_TOP /* irrelevant */, drag_window_callback); + struct resize_window_callback_params params = { corner, proportional, event }; + + drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, resize_window_callback, ¶ms); } /* @@ -238,68 +396,82 @@ 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) { - 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)); - - /* Grab the pointer */ - /* TODO: returncode */ - xcb_grab_pointer(conn, - false, /* get all pointer events specified by the following mask */ - root, /* grab the root window */ - 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 */ - 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; - /* 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; +void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t + confine_to, border_t border, callback_t callback, void *extra) +{ + uint32_t new_x, new_y; + Rect old_rect; + if (con != NULL) + memcpy(&old_rect, &(con->rect), sizeof(Rect)); + + /* Grab the pointer */ + /* TODO: returncode */ + xcb_grab_pointer(conn, + false, /* get all pointer events specified by the following mask */ + root, /* grab the root window */ + 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 */ + 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, *last_motion_notify = NULL; + /* I’ve always wanted to have my own eventhandler… */ + while ((inside_event = xcb_wait_for_event(conn))) { + /* We now handle all events we can get using xcb_poll_for_event */ + do { + /* skip x11 errors */ + if (inside_event->response_type == 0) { + free(inside_event); + continue; + } + /* Strip off the highest bit (set if the event is generated) */ + int type = (inside_event->response_type & 0x7F); + + switch (type) { + 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"); + handle_event(type, inside_event); + goto done; - 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; + default: + DLOG("Passing to original handler\n"); + /* Use original handler */ + handle_event(type, inside_event); + break; + } + if (last_motion_notify != inside_event) + free(inside_event); + } while ((inside_event = xcb_poll_for_event(conn)) != NULL); - callback(&old_rect, new_x, new_y); + if (last_motion_notify == NULL) + continue; - break; - default: - LOG("Passing to original handler\n"); - /* Use original handler */ - xcb_event_handle(&evenths, inside_event); - break; - } - free(inside_event); - } + new_x = ((xcb_motion_notify_event_t*)last_motion_notify)->root_x; + new_y = ((xcb_motion_notify_event_t*)last_motion_notify)->root_y; - xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); - xcb_flush(conn); + 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. * @@ -308,7 +480,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 */ @@ -330,30 +502,39 @@ void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused, * */ void floating_move(xcb_connection_t *conn, Client *currently_focused, direction_t direction) { - LOG("floating move\n"); + DLOG("floating move\n"); + + Rect destination = currently_focused->rect; + Rect *screen = &(currently_focused->workspace->output->rect); switch (direction) { case D_LEFT: - if (currently_focused->rect.x < 10) - return; - currently_focused->rect.x -= 10; + destination.x -= 10; break; case D_RIGHT: - currently_focused->rect.x += 10; + destination.x += 10; break; case D_UP: - if (currently_focused->rect.y < 10) - return; - currently_focused->rect.y -= 10; + destination.y -= 10; break; case D_DOWN: - currently_focused->rect.y += 10; + 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), @@ -371,21 +552,23 @@ void floating_toggle_hide(xcb_connection_t *conn, Workspace *workspace) { Client *client; workspace->floating_hidden = !workspace->floating_hidden; - LOG("floating_hidden is now: %d\n", 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) - xcb_unmap_window(conn, client->frame); - else xcb_map_window(conn, client->frame); + 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->floating <= FLOATING_USER_OFF) { - set_focus(conn, client, true); - return; - } + SLIST_FOREACH(client, &(workspace->focus_stack), focus_clients) { + if (client_is_floating(client)) + continue; + set_focus(conn, client, true); + return; + } xcb_flush(conn); } +#endif