+#undef I3__FILE__
+#define I3__FILE__ "floating.c"
/*
* vim:ts=4:sw=4:expandtab
*
return outputs_dimensions;
}
+/**
+ * Called when a floating window is created or resized.
+ * This function resizes the window if its size is higher or lower than the
+ * configured maximum/minimum size, respectively.
+ *
+ */
+void floating_check_size(Con *floating_con) {
+ /* Define reasonable minimal and maximal sizes for floating windows */
+ const int floating_sane_min_height = 50;
+ const int floating_sane_min_width = 75;
+ Rect floating_sane_max_dimensions;
+
+ /* Unless user requests otherwise (-1), ensure width/height do not exceed
+ * configured maxima or, if unconfigured, limit to combined width of all
+ * outputs */
+ if (config.floating_minimum_height != -1) {
+ if (config.floating_minimum_height == 0)
+ floating_con->rect.height = max(floating_con->rect.height, floating_sane_min_height);
+ else
+ floating_con->rect.height = max(floating_con->rect.height, config.floating_minimum_height);
+ }
+ if (config.floating_minimum_width != -1) {
+ if (config.floating_minimum_width == 0)
+ floating_con->rect.width = max(floating_con->rect.width, floating_sane_min_width);
+ else
+ floating_con->rect.width = max(floating_con->rect.width, config.floating_minimum_width);
+ }
+
+ /* Unless user requests otherwise (-1), raise the width/height to
+ * reasonable minimum dimensions */
+ floating_sane_max_dimensions = total_outputs_dimensions();
+ if (config.floating_maximum_height != -1) {
+ if (config.floating_maximum_height == 0)
+ floating_con->rect.height = min(floating_con->rect.height, floating_sane_max_dimensions.height);
+ else
+ floating_con->rect.height = min(floating_con->rect.height, config.floating_maximum_height);
+ }
+ if (config.floating_maximum_width != -1) {
+ if (config.floating_maximum_width == 0)
+ floating_con->rect.width = min(floating_con->rect.width, floating_sane_max_dimensions.width);
+ else
+ floating_con->rect.width = min(floating_con->rect.width, config.floating_maximum_width);
+ }
+}
+
void floating_enable(Con *con, bool automatic) {
bool set_focus = (con == focused);
* otherwise. */
Con *ws = con_get_workspace(con);
nc->parent = ws;
- nc->split = true;
nc->type = CT_FLOATING_CON;
nc->layout = L_SPLITH;
/* We insert nc already, even though its rect is not yet calculated. This
}
}
- /* Define reasonable minimal and maximal sizes for floating windows */
- const int floating_sane_min_height = 50;
- const int floating_sane_min_width = 75;
+ floating_check_size(nc);
- Rect floating_sane_max_dimensions;
- floating_sane_max_dimensions = total_outputs_dimensions();
+ /* 3: attach the child to the new parent container. We need to do this
+ * because con_border_style_rect() needs to access con->parent. */
+ con->parent = nc;
+ con->percent = 1.0;
+ con->floating = FLOATING_USER_ON;
- /* Unless user requests otherwise (-1), ensure width/height do not exceed
- * configured maxima or, if unconfigured, limit to combined width of all
- * outputs */
- if (config.floating_maximum_height != -1) {
- if (config.floating_maximum_height == 0)
- nc->rect.height = min(nc->rect.height, floating_sane_max_dimensions.height);
- else
- nc->rect.height = min(nc->rect.height, config.floating_maximum_height);
- }
- if (config.floating_maximum_width != -1) {
- if (config.floating_maximum_width == 0)
- nc->rect.width = min(nc->rect.width, floating_sane_max_dimensions.width);
- else
- nc->rect.width = min(nc->rect.width, config.floating_maximum_width);
- }
+ /* 4: set the border style as specified with new_float */
+ if (automatic)
+ con->border_style = config.default_floating_border;
- /* Unless user requests otherwise (-1), raise the width/height to
- * reasonable minimum dimensions */
- if (config.floating_minimum_height != -1) {
- if (config.floating_minimum_height == 0)
- nc->rect.height = max(nc->rect.height, floating_sane_min_height);
- else
- nc->rect.height = max(nc->rect.height, config.floating_minimum_height);
- }
- if (config.floating_minimum_width != -1) {
- if (config.floating_minimum_width == 0)
- nc->rect.width = max(nc->rect.width, floating_sane_min_width);
- else
- nc->rect.width = max(nc->rect.width, config.floating_minimum_width);
- }
+ /* Add pixels for the decoration. */
+ Rect border_style_rect = con_border_style_rect(con);
+
+ nc->rect.height -= border_style_rect.height;
+ nc->rect.width -= border_style_rect.width;
- /* 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 + 2;
- nc->rect.width += 4;
+ /* Add some more pixels for the title bar */
+ if(con_border_style(con) == BS_NORMAL)
+ nc->rect.height += deco_height;
/* Honor the X11 border */
nc->rect.height += con->border_width * 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);
+ Output *current_output = get_output_containing(nc->rect.x +
+ (nc->rect.width / 2), nc->rect.y + (nc->rect.height / 2));
+
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;
+
+ /* If moving from one output to another, keep the relative position
+ * consistent (e.g. a centered dialog will remain centered). */
+ if (current_output)
+ floating_fix_coordinates(nc, ¤t_output->con->rect, &correct_output->rect);
+ else {
+ nc->rect.x = correct_output->rect.x;
+ nc->rect.y = correct_output->rect.y;
+ }
}
DLOG("Floating rect: (%d, %d) with %d x %d\n", nc->rect.x, nc->rect.y, nc->rect.width, nc->rect.height);
- /* 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;
-
/* 5: Subtract the deco_height in order to make the floating window appear
* at precisely the position it specified in its original geometry (which
* is what applications might remember). */
tree_render();
/* Drag the window */
- drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, drag_window_callback, event);
+ drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, XCURSOR_CURSOR_MOVE, drag_window_callback, event);
tree_render();
}
corner |= BORDER_LEFT;
else corner |= BORDER_RIGHT;
- if (event->event_y <= (con->rect.height / 2))
+ int cursor = 0;
+ if (event->event_y <= (con->rect.height / 2)) {
corner |= BORDER_TOP;
- else corner |= BORDER_BOTTOM;
+ cursor = (corner & BORDER_LEFT) ?
+ XCURSOR_CURSOR_TOP_LEFT_CORNER : XCURSOR_CURSOR_TOP_RIGHT_CORNER;
+ }
+ else {
+ corner |= BORDER_BOTTOM;
+ cursor = (corner & BORDER_LEFT) ?
+ XCURSOR_CURSOR_BOTTOM_LEFT_CORNER : XCURSOR_CURSOR_BOTTOM_RIGHT_CORNER;
+ }
struct resize_window_callback_params params = { corner, proportional, event };
- drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, resize_window_callback, ¶ms);
+ drag_pointer(con, event, XCB_NONE, BORDER_TOP /* irrelevant */, cursor, resize_window_callback, ¶ms);
}
/*
*
*/
void drag_pointer(Con *con, const xcb_button_press_event_t *event, xcb_window_t
- confine_to, border_t border, callback_t callback, const void *extra)
+ confine_to, border_t border, int cursor, callback_t callback, const void *extra)
{
uint32_t new_x, new_y;
- Rect old_rect;
+ Rect old_rect = { 0, 0, 0, 0 };
if (con != NULL)
memcpy(&old_rect, &(con->rect), sizeof(Rect));
+ Cursor xcursor = (cursor && xcursor_supported) ?
+ xcursor_get_cursor(cursor) : XCB_NONE;
+
/* Grab the pointer */
xcb_grab_pointer_cookie_t cookie;
xcb_grab_pointer_reply_t *reply;
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 */
+ xcursor, /* possibly display a special cursor */
XCB_CURRENT_TIME);
if ((reply = xcb_grab_pointer_reply(conn, cookie, NULL)) == NULL) {
free(inside_event);
} while ((inside_event = xcb_poll_for_event(conn)) != NULL);
- if (last_motion_notify == NULL)
+ if (last_motion_notify == NULL || loop_done)
continue;
new_x = ((xcb_motion_notify_event_t*)last_motion_notify)->root_x;
*
*/
void floating_fix_coordinates(Con *con, Rect *old_rect, Rect *new_rect) {
- DLOG("Fixing coordinates of floating window %p\n", con);
+ DLOG("Fixing coordinates of floating window %p (rect (%d, %d), %d x %d)\n",
+ con, con->rect.x, con->rect.y, con->rect.width, con->rect.height);
+ DLOG("old_rect = (%d, %d), %d x %d\n",
+ old_rect->x, old_rect->y, old_rect->width, old_rect->height);
+ DLOG("new_rect = (%d, %d), %d x %d\n",
+ new_rect->x, new_rect->y, new_rect->width, new_rect->height);
/* First we get the x/y coordinates relative to the x/y coordinates
* of the output on which the window is on */
- uint32_t rel_x = (con->rect.x - old_rect->x);
- uint32_t rel_y = (con->rect.y - old_rect->y);
+ int32_t rel_x = con->rect.x - old_rect->x + (int32_t)(con->rect.width / 2);
+ int32_t rel_y = con->rect.y - old_rect->y + (int32_t)(con->rect.height / 2);
/* Then we calculate a fraction, for example 0.63 for a window
* which is at y = 1212 of a 1920 px high output */
DLOG("rel_x = %d, rel_y = %d, fraction_x = %f, fraction_y = %f, output->w = %d, output->h = %d\n",
rel_x, rel_y, (double)rel_x / old_rect->width, (double)rel_y / old_rect->height,
old_rect->width, old_rect->height);
/* Here we have to multiply at first. Or we will lose precision when not compiled with -msse2 */
- con->rect.x = new_rect->x + (double)(rel_x * new_rect->width) / old_rect->width;
- con->rect.y = new_rect->y + (double)(rel_y * new_rect->height) / old_rect->height;
+ con->rect.x = (int32_t)new_rect->x + (double)(rel_x * (int32_t)new_rect->width)
+ / (int32_t)old_rect->width - (int32_t)(con->rect.width / 2);
+ con->rect.y = (int32_t)new_rect->y + (double)(rel_y * (int32_t)new_rect->height)
+ / (int32_t)old_rect->height - (int32_t)(con->rect.height / 2);
DLOG("Resulting coordinates: x = %d, y = %d\n", con->rect.x, con->rect.y);
}