extern xcb_connection_t *conn;
void floating_enable(Con *con, bool automatic) {
- bool set_focus = true;
+ bool set_focus = (con == focused);
+
+ if (con->parent && con->parent->type == CT_DOCKAREA) {
+ LOG("Container is a dock window, not enabling floating mode.\n");
+ return;
+ }
if (con_is_floating(con)) {
LOG("Container is already in floating mode, not doing anything.\n");
/* 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, DONT_KILL_WINDOW, false);
+ tree_close(con->parent, DONT_KILL_WINDOW, false, false);
}
char *name;
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);
+ DLOG("Geometry = (%d, %d) with %d x %d\n", con->geometry.x, con->geometry.y, con->geometry.width, con->geometry.height);
Rect zero = { 0, 0, 0, 0 };
nc->rect = con->geometry;
/* If the geometry was not set (split containers), we need to determine a
/* 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.height += deco_height + 2;
nc->rect.width += 4;
+ /* Honor the X11 border */
+ nc->rect.height += con->border_width * 2;
+ nc->rect.width += con->border_width * 2;
+
+ /* Some clients (like GIMP’s color picker window) get mapped
+ * to (0, 0), so we push them to a reasonable position
+ * (centered over their leader) */
+ if (nc->rect.x == 0 && nc->rect.y == 0) {
+ Con *leader;
+ if (con->window && con->window->leader != XCB_NONE &&
+ (leader = con_by_window_id(con->window->leader)) != NULL) {
+ DLOG("Centering above leader\n");
+ nc->rect.x = leader->rect.x + (leader->rect.width / 2) - (nc->rect.width / 2);
+ nc->rect.y = leader->rect.y + (leader->rect.height / 2) - (nc->rect.height / 2);
+ } else {
+ /* center the window on workspace as fallback */
+ 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);
+ }
+ }
+
/* 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);
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->con->rect.x);
- uint32_t rel_y = (nc->rect.y - current_output->con->rect.y);
+ 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 (automatic)
con->border_style = config.default_floating_border;
- /* Some clients (like GIMP’s color picker window) get mapped
- * to (0, 0), so we push them to a reasonable position
- * (centered over their leader) */
- if (nc->rect.x == 0 && nc->rect.y == 0) {
- Con *leader;
- if (con->window && con->window->leader != XCB_NONE &&
- (leader = con_by_window_id(con->window->leader)) != NULL) {
- DLOG("Centering above leader\n");
- nc->rect.x = leader->rect.x + (leader->rect.width / 2) - (nc->rect.width / 2);
- nc->rect.y = leader->rect.y + (leader->rect.height / 2) - (nc->rect.height / 2);
- } else {
- /* center the window on workspace as fallback */
- 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);
- }
- }
-
TAILQ_INSERT_TAIL(&(nc->nodes_head), con, nodes);
TAILQ_INSERT_TAIL(&(nc->focus_head), con, focused);
render_con(nc, false);
render_con(con, false);
- // TODO: don’t influence focus handling when Con was not focused before.
if (set_focus)
con_focus(con);
/* 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);
+ tree_close(con->parent, DONT_KILL_WINDOW, false, false);
/* 3: re-attach to the parent of the currently focused con on the workspace
* this floating con was on */
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_move_to_workspace(con, ws, false, true);
con_focus(con_descend_focused(con));
return true;
}
}
#if 0
-/*
- * Changes focus in the given direction for floating clients.
- *
- * Changing to the left/right means going to the previous/next floating client,
- * changing to top/bottom means cycling through the Z-index.
- *
- */
-void floating_focus_direction(xcb_connection_t *conn, Client *currently_focused, direction_t direction) {
- DLOG("floating focus\n");
-
- if (direction == D_LEFT || direction == D_RIGHT) {
- /* Go to the next/previous floating client */
- Client *client;
-
- while ((client = (direction == D_LEFT ? TAILQ_PREV(currently_focused, floating_clients_head, floating_clients) :
- TAILQ_NEXT(currently_focused, floating_clients))) !=
- TAILQ_END(&(currently_focused->workspace->floating_clients))) {
- if (!client->floating)
- continue;
- set_focus(conn, client, true);
- return;
- }
- }
-}
-
/*
* Moves the client 10px to the specified direction.
*
projects / i3 / i3 / blobdiff