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");
return;
}
/* TODO: refactor this with src/con.c:con_set_layout */
- Con *new = con_new(NULL);
+ Con *new = con_new(NULL, NULL);
new->parent = con;
new->orientation = con->orientation;
/* 2: create a new container to render the decoration on, add
* it as a floating window to the workspace */
- Con *nc = con_new(NULL);
+ Con *nc = con_new(NULL, NULL);
/* we need to set the parent afterwards instead of passing it as an
* argument to con_new() because nc would be inserted into the tiling layer
* otherwise. */
- nc->parent = con_get_workspace(con);
+ Con *ws = con_get_workspace(con);
+ nc->parent = ws;
/* 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;
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;
- 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->parent = nc;
- con->percent = 1.0;
- con->floating = FLOATING_USER_ON;
+ /* 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
nc->rect.y = leader->rect.y + (leader->rect.height / 2) - (nc->rect.height / 2);
} else {
/* center the window on workspace as fallback */
- 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);
}
}
+ /* 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);
+ 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;
+ }
+
+ 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;
+
+ /* 4: set the border style as specified with new_float */
+ if (automatic)
+ con->border_style = config.default_floating_border;
+
+ 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);
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);
}
return;
}
+ Con *ws = con_get_workspace(con);
+
/* 1: detach from parent container */
TAILQ_REMOVE(&(con->parent->nodes_head), con, nodes);
TAILQ_REMOVE(&(con->parent->focus_head), con, focused);
/* 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 */
- Con *focused = con_descend_tiling_focused(con_get_workspace(con));
+ Con *focused = con_descend_tiling_focused(ws);
/* if there is no other container on this workspace, focused will be the
* workspace itself */
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_move_to_workspace(con, ws, false, true);
con_focus(con_descend_focused(con));
return true;
}
void floating_drag_window(Con *con, xcb_button_press_event_t *event) {
DLOG("floating_drag_window\n");
+ /* Push changes before dragging, so that the window gets raised now and not
+ * after the user releases the mouse button */
+ tree_render();
+
+ /* Drag the window */
drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback, event);
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 };
memcpy(&old_rect, &(con->rect), sizeof(Rect));
/* Grab the pointer */
- /* TODO: returncode */
- xcb_grab_pointer(conn,
- false, /* get all pointer events specified by the following mask */
- root, /* grab the root window */
- XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION, /* which events to let through */
- 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 */
- XCB_CURRENT_TIME);
+ xcb_grab_pointer_cookie_t cookie;
+ xcb_grab_pointer_reply_t *reply;
+ cookie = xcb_grab_pointer(conn,
+ false, /* get all pointer events specified by the following mask */
+ root, /* grab the root window */
+ XCB_EVENT_MASK_BUTTON_RELEASE | XCB_EVENT_MASK_POINTER_MOTION, /* which events to let through */
+ 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 */
+ XCB_CURRENT_TIME);
+
+ if ((reply = xcb_grab_pointer_reply(conn, cookie, NULL)) == NULL) {
+ ELOG("Could not grab pointer\n");
+ return;
+ }
+
+ free(reply);
/* Go into our own event loop */
xcb_flush(conn);
xcb_generic_event_t *inside_event, *last_motion_notify = NULL;
+ bool loop_done = false;
/* I’ve always wanted to have my own eventhandler… */
- while ((inside_event = xcb_wait_for_event(conn))) {
+ while (!loop_done && (inside_event = xcb_wait_for_event(conn))) {
/* We now handle all events we can get using xcb_poll_for_event */
do {
/* skip x11 errors */
switch (type) {
case XCB_BUTTON_RELEASE:
- goto done;
+ loop_done = true;
+ break;
case XCB_MOTION_NOTIFY:
/* motion_notify events are saved for later */
break;
case XCB_UNMAP_NOTIFY:
+ case XCB_KEY_PRESS:
+ case XCB_KEY_RELEASE:
DLOG("Unmap-notify, aborting\n");
handle_event(type, inside_event);
- goto done;
+ loop_done = true;
+ break;
default:
DLOG("Passing to original handler\n");
callback(con, &old_rect, new_x, new_y, extra);
FREE(last_motion_notify);
}
-done:
+
xcb_ungrab_pointer(conn, XCB_CURRENT_TIME);
xcb_flush(conn);
}
projects / i3 / i3 / blobdiff