/* 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);
+ tree_close(con->parent, DONT_KILL_WINDOW, false);
}
char *name;
}
}
+ 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);
- 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.
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) {
/* 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);
+ tree_close(con->parent, DONT_KILL_WINDOW, false);
/* 3: re-attach to the parent of the currently focused con on the workspace
* this floating con was on */
TAILQ_INSERT_TAIL(&(con->parent->floating_head), con, floating_windows);
}
-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, true);
- xcb_flush(conn);
-
- /* Check if we cross workspace boundaries while moving */
+/*
+ * 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;
+ return false;
}
if (con_get_output(con) == output->con) {
DLOG("still the same ws\n");
- return;
+ return false;
}
DLOG("Need to re-assign!\n");
Con *content = output_get_content(output->con);
- Con *ws = TAILQ_FIRST(&(content->nodes_head));
+ 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();
}
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 };