#include <time.h>
#include <math.h>
-#include <xcb/xcb_atom.h>
#include <xcb/xcb_icccm.h>
#include <X11/XKBlib.h>
*/
static bool tiling_resize_for_border(Con *con, border_t border, xcb_button_press_event_t *event) {
DLOG("border = %d, con = %p\n", border, con);
- char way = (border == BORDER_TOP || border == BORDER_LEFT ? 'p' : 'n');
- orientation_t orientation = (border == BORDER_TOP || border == BORDER_BOTTOM ? VERT : HORIZ);
-
- /* look for a parent container with the right orientation */
- Con *first = NULL, *second = NULL;
- Con *resize_con = con;
- while (resize_con->type != CT_WORKSPACE &&
- resize_con->type != CT_FLOATING_CON &&
- con_orientation(resize_con->parent) != orientation)
- resize_con = resize_con->parent;
-
- DLOG("resize_con = %p\n", resize_con);
- if (resize_con->type != CT_WORKSPACE &&
- resize_con->type != CT_FLOATING_CON &&
- con_orientation(resize_con->parent) == orientation) {
- first = resize_con;
- second = (way == 'n') ? TAILQ_NEXT(first, nodes) : TAILQ_PREV(first, nodes_head, nodes);
- if (second == TAILQ_END(&(first->nodes_head))) {
- second = NULL;
- }
- else if (way == 'p') {
- Con *tmp = first;
- first = second;
- second = tmp;
- }
- DLOG("first = %p, second = %p, resize_con = %p\n",
- first, second, resize_con);
+ Con *second = NULL;
+ Con *first = con;
+ direction_t search_direction;
+ switch (border) {
+ case BORDER_LEFT:
+ search_direction = D_LEFT;
+ break;
+ case BORDER_RIGHT:
+ search_direction = D_RIGHT;
+ break;
+ case BORDER_TOP:
+ search_direction = D_UP;
+ break;
+ case BORDER_BOTTOM:
+ search_direction = D_DOWN;
+ break;
}
- if (first == NULL || second == NULL) {
- DLOG("Resize not possible\n");
+ bool res = resize_find_tiling_participants(&first, &second, search_direction);
+ if (!res) {
+ LOG("No second container in this direction found.\n");
return false;
}
assert(first != second);
assert(first->parent == second->parent);
- /* We modify the X/Y position in the event so that the divider line is at
- * the actual position of the border, not at the position of the click. */
- if (orientation == HORIZ)
- event->root_x = second->rect.x;
- else event->root_y = second->rect.y;
+ /* The first container should always be in front of the second container */
+ if (search_direction == D_UP || search_direction == D_LEFT) {
+ Con *tmp = first;
+ first = second;
+ second = tmp;
+ }
+
+ const orientation_t orientation = ((border == BORDER_LEFT || border == BORDER_RIGHT) ? HORIZ : VERT);
resize_graphical_handler(first, second, orientation, event);
return tiling_resize_for_border(con, BORDER_TOP, event);
}
- if (event->event_x >= 0 && event->event_x <= bsr.x &&
- event->event_y >= bsr.y && event->event_y <= con->rect.height + bsr.height)
+ if (event->event_x >= 0 && event->event_x <= (int32_t)bsr.x &&
+ event->event_y >= (int32_t)bsr.y && event->event_y <= (int32_t)(con->rect.height + bsr.height))
return tiling_resize_for_border(con, BORDER_LEFT, event);
- if (event->event_x >= (con->window_rect.x + con->window_rect.width) &&
- event->event_y >= bsr.y && event->event_y <= con->rect.height + bsr.height)
+ if (event->event_x >= (int32_t)(con->window_rect.x + con->window_rect.width) &&
+ event->event_y >= (int32_t)bsr.y && event->event_y <= (int32_t)(con->rect.height + bsr.height))
return tiling_resize_for_border(con, BORDER_RIGHT, event);
- if (event->event_y >= (con->window_rect.y + con->window_rect.height))
+ if (event->event_y >= (int32_t)(con->window_rect.y + con->window_rect.height))
return tiling_resize_for_border(con, BORDER_BOTTOM, event);
return false;
DLOG("--> OUTCOME = %p\n", con);
DLOG("type = %d, name = %s\n", con->type, con->name);
+ /* Any click in a workspace should focus that workspace. If the
+ * workspace is on another output we need to do a workspace_show in
+ * order for i3bar (and others) to notice the change in workspace. */
+ Con *ws = con_get_workspace(con);
+ Con *focused_workspace = con_get_workspace(focused);
+
+ if (!ws) {
+ ws = TAILQ_FIRST(&(output_get_content(con_get_output(con))->focus_head));
+ if (!ws)
+ goto done;
+ }
+
+ if (ws != focused_workspace)
+ workspace_show(ws);
+ focused_id = XCB_NONE;
+
/* don’t handle dockarea cons, they must not be focused */
if (con->parent->type == CT_DOCKAREA)
goto done;
event->detail == XCB_BUTTON_INDEX_5)) {
DLOG("Scrolling on a window decoration\n");
orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ);
+ /* Focus the currently focused container on the same level that the
+ * user scrolled on. e.g. the tabbed decoration contains
+ * "urxvt | i3: V[xterm geeqie] | firefox",
+ * focus is on the xterm, but the user scrolled on urxvt.
+ * The splitv container will be focused. */
+ Con *focused = con->parent;
+ focused = TAILQ_FIRST(&(focused->focus_head));
+ con_focus(focused);
/* To prevent scrolling from going outside the container (see ticket
* #557), we first check if scrolling is possible at all. */
- Con *focused = con_descend_focused(con->parent);
bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL);
bool scroll_next_possible = (TAILQ_NEXT(focused, nodes) != NULL);
if (event->detail == XCB_BUTTON_INDEX_4 && scroll_prev_possible)
goto done;
}
- /* 2: focus this con. If the workspace is on another output we need to
- * do a workspace_show in order for i3bar (and others) to notice the
- * change in workspace. */
- Con *ws = con_get_workspace(con);
- Con *focused_workspace = con_get_workspace(focused);
-
- if (ws != focused_workspace)
- workspace_show(ws);
- focused_id = XCB_NONE;
+ /* 2: focus this con. */
con_focus(con);
/* 3: For floating containers, we also want to raise them on click.
* We will skip handling events on floating cons in fullscreen mode */
Con *fs = (ws ? con_get_fullscreen_con(ws, CF_OUTPUT) : NULL);
- if (floatingcon != NULL && fs == NULL) {
+ if (floatingcon != NULL && fs != con) {
floating_raise_con(floatingcon);
/* 4: floating_modifier plus left mouse button drags */
projects / i3 / i3 / blobdiff