X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ffloating.c;h=dd6c86e760f367b32cb04e002b26d374ab1ac448;hb=f20a446423615610eae0937a0353872699ec0521;hp=fb5c95118ff8ea28dc81a06cb1c6df0c717f0ea3;hpb=4135aaad7cefc6b5c29f04881a368c81f9c65013;p=i3%2Fi3 diff --git a/src/floating.c b/src/floating.c index fb5c9511..dd6c86e7 100644 --- a/src/floating.c +++ b/src/floating.c @@ -25,15 +25,8 @@ #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 "floating.h" +#include "workspace.h" /* * Toggles floating mode for the given client. @@ -48,20 +41,26 @@ void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic Container *con = client->container; i3Font *font = load_font(conn, config.font); + if (client->dock) { + LOG("Not putting dock client into floating mode\n"); + return; + } + 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) + 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); Client *old_focused = con->currently_focused; @@ -78,6 +77,8 @@ void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic LOG("Re-inserted the client into the matrix.\n"); con->currently_focused = client; + client_set_below_floating(conn, client); + render_container(conn, con); xcb_flush(conn); @@ -139,35 +140,25 @@ void toggle_floating_mode(xcb_connection_t *conn, Client *client, bool automatic } /* - * 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); - break; +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); - case BORDER_BOTTOM: - client->rect.height = old_rect->height + (new_y - event->root_y); - break; - - 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; + if (client->workspace->fullscreen_client == client) + client->workspace->fullscreen_client = NULL; - 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; - } - - /* Push the new position/size to X11 */ - reposition_client(conn, client); - resize_client(conn, client); - xcb_flush(conn); + /* 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; } /* @@ -181,13 +172,62 @@ int floating_border_click(xcb_connection_t *conn, Client *client, xcb_button_pre LOG("floating border click\n"); border_t border; + + void resize_callback(Rect *old_rect, uint32_t new_x, uint32_t new_y) { + switch (border) { + case BORDER_RIGHT: { + int new_width = old_rect->width + (new_x - event->root_x); + if ((new_width < 0) || + (new_width < 50 && client->rect.width >= new_width)) + return; + client->rect.width = new_width; + break; + } + + case BORDER_BOTTOM: { + int new_height = old_rect->height + (new_y - event->root_y); + if ((new_height < 0) || + (new_height < 20 && 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 < 20 && client->rect.height >= new_height)) + return; + + client->rect.y = old_rect->y + (new_y - event->root_y); + client->rect.height = new_height; + break; + } + + case BORDER_LEFT: { + int new_width = old_rect->width + (event->root_x - new_x); + if ((new_width < 0) || + (new_width < 50 && client->rect.width >= new_width)) + return; + client->rect.x = old_rect->x + (new_x - event->root_x); + client->rect.width = new_width; + break; + } + } + + /* Push the new position/size to X11 */ + reposition_client(conn, client); + resize_client(conn, client); + xcb_flush(conn); + } + 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"); @@ -196,22 +236,11 @@ int floating_border_click(xcb_connection_t *conn, Client *client, xcb_button_pre LOG("border = %d\n", border); - drag_pointer(conn, client, event, border, resize_callback); + drag_pointer(conn, client, event, XCB_NONE, border, resize_callback); 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) { - /* 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 */ -} /* * Called when the user clicked on the titlebar of a floating window. @@ -221,9 +250,48 @@ static void drag_window_callback(xcb_connection_t *conn, Client *client, border_ void floating_drag_window(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event) { LOG("floating_drag_window\n"); - drag_pointer(conn, client, event, BORDER_TOP /* irrelevant */, drag_window_callback); + 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 */ + } + + drag_pointer(conn, client, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback); +} + +/* + * Called when the user right-clicked on the titlebar of a floating window to + * resize it. + * Calls the drag_pointer function with the resize_window callback + * + */ +void floating_resize_window(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event) { + LOG("floating_resize_window\n"); + + void resize_window_callback(Rect *old_rect, uint32_t new_x, uint32_t new_y) { + int32_t new_width = old_rect->width + (new_x - event->root_x); + int32_t new_height = old_rect->height + (new_y - event->root_y); + + /* Obey minimum window size and reposition the client */ + if (new_width >= 50) + client->rect.width = new_width; + + if (new_height >= 20) + client->rect.height = new_height; + + /* resize_client flushes */ + resize_client(conn, client); + } + + drag_pointer(conn, client, event, XCB_NONE, BORDER_TOP /* irrelevant */, resize_window_callback); } + /* * This function grabs your pointer and lets you drag stuff around (borders). * Every time you move your mouse, an XCB_MOTION_NOTIFY event will be received @@ -232,12 +300,13 @@ 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(xcb_connection_t *conn, Client *client, xcb_button_press_event_t *event, + xcb_window_t confine_to, 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)); + if (client != NULL) + memcpy(&old_rect, &(client->rect), sizeof(Rect)); /* Grab the pointer */ /* TODO: returncode */ @@ -247,49 +316,65 @@ 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: + LOG("Unmap-notify, aborting\n"); + xcb_event_handle(&evenths, inside_event); + goto done; + + default: + LOG("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(&old_rect, new_x, new_y); + FREE(last_motion_notify); } - +done: xcb_ungrab_pointer(conn, XCB_CURRENT_TIME); xcb_flush(conn); } @@ -326,28 +411,37 @@ 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"); + Rect destination = currently_focused->rect; + Rect *screen = &(currently_focused->workspace->screen->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)) { + LOG("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), @@ -355,3 +449,32 @@ void floating_move(xcb_connection_t *conn, Client *currently_focused, direction_ 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; + LOG("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); +}