X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Ffloating.c;h=2ac4afda0d39bb5e32a14aa38ca3715a50ec8905;hb=4be3178d4d360c2996217d811e61161c84d25898;hp=c50cf49444792ad47f78c2e4090b657c907f6255;hpb=2d05c3a37d56d7de8d75fc4f79e07428d82956f4;p=i3%2Fi3 diff --git a/src/floating.c b/src/floating.c index c50cf494..2ac4afda 100644 --- a/src/floating.c +++ b/src/floating.c @@ -17,6 +17,8 @@ extern xcb_connection_t *conn; void floating_enable(Con *con, bool automatic) { + bool set_focus = true; + if (con_is_floating(con)) { LOG("Container is already in floating mode, not doing anything.\n"); return; @@ -28,6 +30,10 @@ void floating_enable(Con *con, bool automatic) { * 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; @@ -58,6 +64,7 @@ void floating_enable(Con *con, bool automatic) { con_focus(old_focused); con = new; + set_focus = false; } /* 1: detach the container from its parent */ @@ -65,7 +72,7 @@ void floating_enable(Con *con, bool automatic) { TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes); TAILQ_REMOVE(&(con->parent->focus_head), con, focused); - con_fix_percent(con->parent, WINDOW_REMOVE); + con_fix_percent(con->parent); /* 2: create a new container to render the decoration on, add * it as a floating window to the workspace */ @@ -75,29 +82,51 @@ void floating_enable(Con *con, bool automatic) { * 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 */ - i3Font *font = load_font(conn, config.font); - int deco_height = font->height + 5; - - nc->rect = con->rect; + 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->old_parent = con->parent; con->parent = nc; + con->percent = 1.0; con->floating = FLOATING_USER_ON; /* Some clients (like GIMP’s color picker window) get mapped @@ -120,8 +149,28 @@ void floating_enable(Con *con, bool automatic) { TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes); TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused); + + /* render the cons to get initial window_rect correct */ + render_con(nc, false); + render_con(con, false); + // TODO: don’t influence focus handling when Con was not focused before. - con_focus(con); + if (set_focus) + con_focus(con); + + /* 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; + + /* Sanitize coordinates: Check if they are on any output */ + if (get_output_containing(nc->rect.x, nc->rect.y) != NULL) + return; + + 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) { @@ -130,8 +179,6 @@ void floating_disable(Con *con, bool automatic) { 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); @@ -141,14 +188,25 @@ void floating_disable(Con *con, bool automatic) { 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; + /* 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)); + + /* 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; + + /* 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_fix_percent(con->parent, WINDOW_ADD); + con_fix_percent(con->parent); // TODO: don’t influence focus handling when Con was not focused before. con_focus(con); } @@ -182,16 +240,51 @@ void floating_raise_con(Con *con) { 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); - /* TODO: don’t re-render the whole tree just because we change - * coordinates of a floating window */ + + 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(); - x_push_changes(croot); } /* @@ -241,12 +334,10 @@ DRAGGING_CB(resize_window_callback) { 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 + 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) { @@ -290,7 +381,7 @@ void floating_resize_window(Con *con, bool proportional, if (event->event_y <= (con->rect.height / 2)) corner |= BORDER_TOP; - else corner |= BORDER_RIGHT; + else corner |= BORDER_BOTTOM; struct resize_window_callback_params params = { corner, proportional, event }; @@ -308,7 +399,6 @@ void floating_resize_window(Con *con, bool proportional, 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; if (con != NULL) @@ -334,19 +424,15 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t while ((inside_event = xcb_wait_for_event(conn))) { /* 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); + /* skip x11 errors */ + if (inside_event->response_type == 0) { free(inside_event); continue; } - assert(nr < 256); - nr &= XCB_EVENT_RESPONSE_TYPE_MASK; - assert(nr >= 2); + /* Strip off the highest bit (set if the event is generated) */ + int type = (inside_event->response_type & 0x7F); - switch (nr) { + switch (type) { case XCB_BUTTON_RELEASE: goto done; @@ -358,13 +444,13 @@ void drag_pointer(Con *con, xcb_button_press_event_t *event, xcb_window_t case XCB_UNMAP_NOTIFY: DLOG("Unmap-notify, aborting\n"); - xcb_event_handle(&evenths, inside_event); + handle_event(type, inside_event); goto done; default: DLOG("Passing to original handler\n"); /* Use original handler */ - xcb_event_handle(&evenths, inside_event); + handle_event(type, inside_event); break; } if (last_motion_notify != inside_event)