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;
}
+ /* 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");
+ /* 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);
+ }
+
+ /* 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, 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 */
i3Font *font = load_font(conn, config.font);
int deco_height = 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);
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 += 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
}
}
+ /* render the cons to get initial window_rect correct */
+ render_con(nc, false);
+ render_con(con, false);
+
TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
// TODO: don’t influence focus handling when Con was not focused before.
- con_focus(con);
+ if (set_focus)
+ con_focus(con);
}
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);
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_focused(con_get_workspace(con));
+ con->parent = focused->parent;
+
+ /* XXX: We adjust the percentage value to start with a fair value. Floating
+ * cons always have 1.0 as percent which doesn’t work so well when
+ * re-inserting (the formerly floating con would get 50% of the target
+ * con). */
+ con->percent = (1.0 / con_num_children(con->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);
+ con_fix_percent(con->parent);
// TODO: don’t influence focus handling when Con was not focused before.
con_focus(con);
}
floating_enable(con, automatic);
}
+/*
+ * 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);
+}
+
DRAGGING_CB(drag_window_callback) {
struct xcb_button_press_event_t *event = extra;
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)
projects / i3 / i3 / blobdiff