X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ffloating.c;h=761d207de39cfed6d1fed9e726082b828f4283ae;hb=7be5ece6636f7a4c800ab0c5dd6289b38db7b435;hp=d86ee2c0f6c8a176ced7cf86894e8c2e20f28b7a;hpb=4fba2d5f91b4c364cf4417a33986edeca0dd0e75;p=i3%2Fi3 diff --git a/src/floating.c b/src/floating.c index d86ee2c0..761d207d 100644 --- a/src/floating.c +++ b/src/floating.c @@ -1,3 +1,5 @@ +#undef I3__FILE__ +#define I3__FILE__ "floating.c" /* * vim:ts=4:sw=4:expandtab * @@ -11,6 +13,66 @@ extern xcb_connection_t *conn; +/* + * Calculates sum of heights and sum of widths of all currently active outputs + * + */ +static Rect total_outputs_dimensions(void) { + Output *output; + /* Use Rect to encapsulate dimensions, ignoring x/y */ + Rect outputs_dimensions = {0, 0, 0, 0}; + TAILQ_FOREACH(output, &outputs, outputs) { + outputs_dimensions.height += output->rect.height; + outputs_dimensions.width += output->rect.width; + } + return outputs_dimensions; +} + +/** + * Called when a floating window is created or resized. + * This function resizes the window if its size is higher or lower than the + * configured maximum/minimum size, respectively. + * + */ +void floating_check_size(Con *floating_con) { + /* Define reasonable minimal and maximal sizes for floating windows */ + const int floating_sane_min_height = 50; + const int floating_sane_min_width = 75; + Rect floating_sane_max_dimensions; + + /* Unless user requests otherwise (-1), ensure width/height do not exceed + * configured maxima or, if unconfigured, limit to combined width of all + * outputs */ + if (config.floating_minimum_height != -1) { + if (config.floating_minimum_height == 0) + floating_con->rect.height = max(floating_con->rect.height, floating_sane_min_height); + else + floating_con->rect.height = max(floating_con->rect.height, config.floating_minimum_height); + } + if (config.floating_minimum_width != -1) { + if (config.floating_minimum_width == 0) + floating_con->rect.width = max(floating_con->rect.width, floating_sane_min_width); + else + floating_con->rect.width = max(floating_con->rect.width, config.floating_minimum_width); + } + + /* Unless user requests otherwise (-1), raise the width/height to + * reasonable minimum dimensions */ + floating_sane_max_dimensions = total_outputs_dimensions(); + if (config.floating_maximum_height != -1) { + if (config.floating_maximum_height == 0) + floating_con->rect.height = min(floating_con->rect.height, floating_sane_max_dimensions.height); + else + floating_con->rect.height = min(floating_con->rect.height, config.floating_maximum_height); + } + if (config.floating_maximum_width != -1) { + if (config.floating_maximum_width == 0) + floating_con->rect.width = min(floating_con->rect.width, floating_sane_max_dimensions.width); + else + floating_con->rect.width = min(floating_con->rect.width, config.floating_maximum_width); + } +} + void floating_enable(Con *con, bool automatic) { bool set_focus = (con == focused); @@ -25,7 +87,7 @@ void floating_enable(Con *con, bool automatic) { } /* 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 + * split-container with the same layout 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) { @@ -37,7 +99,7 @@ void floating_enable(Con *con, bool automatic) { /* TODO: refactor this with src/con.c:con_set_layout */ Con *new = con_new(NULL, NULL); new->parent = con; - new->orientation = con->orientation; + new->layout = con->layout; /* since the new container will be set into floating mode directly * afterwards, we need to copy the workspace rect. */ @@ -82,9 +144,17 @@ void floating_enable(Con *con, bool automatic) { * otherwise. */ Con *ws = con_get_workspace(con); nc->parent = ws; + nc->type = CT_FLOATING_CON; + nc->layout = L_SPLITH; + /* We insert nc already, even though its rect is not yet calculated. This + * is necessary because otherwise the workspace might be empty (and get + * closed in tree_close()) even though it’s not. */ + TAILQ_INSERT_TAIL(&(ws->floating_head), nc, floating_windows); + TAILQ_INSERT_TAIL(&(ws->focus_head), nc, focused); /* 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) { + 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, DONT_KILL_WINDOW, false, false); } @@ -112,14 +182,28 @@ void floating_enable(Con *con, bool automatic) { 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 + 2; - nc->rect.width += 4; + + floating_check_size(nc); + + /* 3: attach the child to the new parent container. We need to do this + * because con_border_style_rect() needs to access con->parent. */ + con->parent = nc; + con->percent = 1.0; + con->floating = FLOATING_USER_ON; + + /* 4: set the border style as specified with new_float */ + if (automatic) + con->border_style = config.default_floating_border; + + /* Add pixels for the decoration. */ + Rect border_style_rect = con_border_style_rect(con); + + nc->rect.height -= border_style_rect.height; + nc->rect.width -= border_style_rect.width; + + /* Add some more pixels for the title bar */ + if(con_border_style(con) == BS_NORMAL) + nc->rect.height += deco_height; /* Honor the X11 border */ nc->rect.height += con->border_width * 2; @@ -144,33 +228,33 @@ void floating_enable(Con *con, bool automatic) { /* Sanity check: Are the coordinates on the appropriate output? If not, we * need to change them */ - Output *current_output = get_output_containing(nc->rect.x, nc->rect.y); + Output *current_output = get_output_containing(nc->rect.x + + (nc->rect.width / 2), nc->rect.y + (nc->rect.height / 2)); + Con *correct_output = con_get_output(ws); if (!current_output || current_output->con != correct_output) { DLOG("This floating window is on the wrong output, fixing coordinates (currently (%d, %d))\n", nc->rect.x, nc->rect.y); - /* Take the relative coordinates of the current output, then add them - * to the coordinate space of the correct output */ - uint32_t rel_x = (nc->rect.x - (current_output ? current_output->con->rect.x : 0)); - uint32_t rel_y = (nc->rect.y - (current_output ? current_output->con->rect.y : 0)); - nc->rect.x = correct_output->rect.x + rel_x; - nc->rect.y = correct_output->rect.y + rel_y; + + /* If moving from one output to another, keep the relative position + * consistent (e.g. a centered dialog will remain centered). */ + if (current_output) + floating_fix_coordinates(nc, ¤t_output->con->rect, &correct_output->rect); + else { + nc->rect.x = correct_output->rect.x; + nc->rect.y = correct_output->rect.y; + } } 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(&(ws->floating_head), nc, floating_windows); - TAILQ_INSERT_TAIL(&(ws->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; + /* 5: Subtract the deco_height in order to make the floating window appear + * at precisely the position it specified in its original geometry (which + * is what applications might remember). */ + deco_height = (con->border_style == BS_NORMAL ? config.font.height + 5 : 0); + nc->rect.y -= deco_height; - /* 4: set the border style as specified with new_float */ - if (automatic) - con->border_style = config.default_floating_border; + DLOG("Corrected y = %d (deco_height = %d)\n", nc->rect.y, deco_height); TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes); TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused); @@ -211,7 +295,7 @@ void floating_disable(Con *con, bool automatic) { /* 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, DONT_KILL_WINDOW, false, false); + tree_close(con->parent, DONT_KILL_WINDOW, true, false); /* 3: re-attach to the parent of the currently focused con on the workspace * this floating con was on */ @@ -226,11 +310,10 @@ void floating_disable(Con *con, bool automatic) { /* con_fix_percent will adjust the percent value */ con->percent = 0.0; - TAILQ_INSERT_TAIL(&(con->parent->nodes_head), con, nodes); - TAILQ_INSERT_TAIL(&(con->parent->focus_head), con, focused); - con->floating = FLOATING_USER_OFF; + con_attach(con, con->parent, false); + con_fix_percent(con->parent); // TODO: don’t influence focus handling when Con was not focused before. con_focus(con); @@ -325,7 +408,7 @@ void floating_drag_window(Con *con, const xcb_button_press_event_t *event) { tree_render(); /* Drag the window */ - drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback, event); + drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, XCURSOR_CURSOR_MOVE, drag_window_callback, event); tree_render(); } @@ -409,13 +492,21 @@ void floating_resize_window(Con *con, const bool proportional, corner |= BORDER_LEFT; else corner |= BORDER_RIGHT; - if (event->event_y <= (con->rect.height / 2)) + int cursor = 0; + if (event->event_y <= (con->rect.height / 2)) { corner |= BORDER_TOP; - else corner |= BORDER_BOTTOM; + cursor = (corner & BORDER_LEFT) ? + XCURSOR_CURSOR_TOP_LEFT_CORNER : XCURSOR_CURSOR_TOP_RIGHT_CORNER; + } + else { + corner |= BORDER_BOTTOM; + cursor = (corner & BORDER_LEFT) ? + XCURSOR_CURSOR_BOTTOM_LEFT_CORNER : XCURSOR_CURSOR_BOTTOM_RIGHT_CORNER; + } struct resize_window_callback_params params = { corner, proportional, event }; - drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, resize_window_callback, ¶ms); + drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, cursor, resize_window_callback, ¶ms); } /* @@ -427,13 +518,16 @@ void floating_resize_window(Con *con, const bool proportional, * */ void drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t - confine_to, border_t border, callback_t callback, const void *extra) + confine_to, border_t border, int cursor, callback_t callback, const void *extra) { uint32_t new_x, new_y; - Rect old_rect; + Rect old_rect = { 0, 0, 0, 0 }; if (con != NULL) memcpy(&old_rect, &(con->rect), sizeof(Rect)); + Cursor xcursor = (cursor && xcursor_supported) ? + xcursor_get_cursor(cursor) : XCB_NONE; + /* Grab the pointer */ xcb_grab_pointer_cookie_t cookie; xcb_grab_pointer_reply_t *reply; @@ -444,7 +538,7 @@ void drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t 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 */ + xcursor, /* possibly display a special cursor */ XCB_CURRENT_TIME); if ((reply = xcb_grab_pointer_reply(conn, cookie, NULL)) == NULL) { @@ -500,7 +594,7 @@ void drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t free(inside_event); } while ((inside_event = xcb_poll_for_event(conn)) != NULL); - if (last_motion_notify == NULL) + if (last_motion_notify == NULL || loop_done) continue; new_x = ((xcb_motion_notify_event_t*)last_motion_notify)->root_x; @@ -539,6 +633,35 @@ void floating_reposition(Con *con, Rect newrect) { tree_render(); } +/* + * Fixes the coordinates of the floating window whenever the window gets + * reassigned to a different output (or when the output’s rect changes). + * + */ +void floating_fix_coordinates(Con *con, Rect *old_rect, Rect *new_rect) { + DLOG("Fixing coordinates of floating window %p (rect (%d, %d), %d x %d)\n", + con, con->rect.x, con->rect.y, con->rect.width, con->rect.height); + DLOG("old_rect = (%d, %d), %d x %d\n", + old_rect->x, old_rect->y, old_rect->width, old_rect->height); + DLOG("new_rect = (%d, %d), %d x %d\n", + new_rect->x, new_rect->y, new_rect->width, new_rect->height); + /* First we get the x/y coordinates relative to the x/y coordinates + * of the output on which the window is on */ + int32_t rel_x = con->rect.x - old_rect->x + (int32_t)(con->rect.width / 2); + int32_t rel_y = con->rect.y - old_rect->y + (int32_t)(con->rect.height / 2); + /* Then we calculate a fraction, for example 0.63 for a window + * which is at y = 1212 of a 1920 px high output */ + DLOG("rel_x = %d, rel_y = %d, fraction_x = %f, fraction_y = %f, output->w = %d, output->h = %d\n", + rel_x, rel_y, (double)rel_x / old_rect->width, (double)rel_y / old_rect->height, + old_rect->width, old_rect->height); + /* Here we have to multiply at first. Or we will lose precision when not compiled with -msse2 */ + con->rect.x = (int32_t)new_rect->x + (double)(rel_x * (int32_t)new_rect->width) + / (int32_t)old_rect->width - (int32_t)(con->rect.width / 2); + con->rect.y = (int32_t)new_rect->y + (double)(rel_y * (int32_t)new_rect->height) + / (int32_t)old_rect->height - (int32_t)(con->rect.height / 2); + DLOG("Resulting coordinates: x = %d, y = %d\n", con->rect.x, con->rect.y); +} + #if 0 /* * Moves the client 10px to the specified direction.