#include <time.h>
#include <math.h>
-#include <xcb/xcb_atom.h>
#include <xcb/xcb_icccm.h>
#include <X11/XKBlib.h>
-typedef enum { CLICK_BORDER = 0, CLICK_DECORATION = 1, CLICK_INSIDE = 2 } click_destination_t;
+typedef enum { CLICK_BORDER = 0,
+ CLICK_DECORATION = 1,
+ CLICK_INSIDE = 2 } click_destination_t;
/*
* Finds the correct pair of first/second cons between the resize will take
*/
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;
+ default:
+ assert(false);
+ 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);
to_bottom = con->rect.height - event->event_y;
DLOG("click was %d px to the right, %d px to the left, %d px to top, %d px to bottom\n",
- to_right, to_left, to_top, to_bottom);
+ to_right, to_left, to_top, to_bottom);
if (to_right < to_left &&
to_right < to_top &&
/* check if this was a click on the window border (and on which one) */
Rect bsr = con_border_style_rect(con);
DLOG("BORDER x = %d, y = %d for con %p, window 0x%08x\n",
- event->event_x, event->event_y, con, event->event);
+ event->event_x, event->event_y, con, event->event);
DLOG("checks for right >= %d\n", con->window_rect.x + con->window_rect.width);
if (dest == CLICK_DECORATION) {
/* The user clicked on a window decoration. We ignore the following case:
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);
+ /* don’t handle dockarea cons, they must not be focused */
+ if (con->parent->type == CT_DOCKAREA)
+ goto done;
+
+ /* if the user has bound an action to this click, it should override the
+ * default behavior. */
+ if (dest == CLICK_DECORATION || dest == CLICK_INSIDE) {
+ Binding *bind = get_binding_from_xcb_event((xcb_generic_event_t *)event);
+ /* clicks over a window decoration will always trigger the binding and
+ * clicks on the inside of the window will only trigger a binding if
+ * the --whole-window flag was given for the binding. */
+ if (bind && (dest == CLICK_DECORATION || bind->whole_window)) {
+ CommandResult *result = run_binding(bind, con);
+
+ /* ASYNC_POINTER eats the event */
+ xcb_allow_events(conn, XCB_ALLOW_ASYNC_POINTER, event->time);
+ xcb_flush(conn);
+
+ if (result->needs_tree_render)
+ tree_render();
+
+ command_result_free(result);
+
+ return 0;
+ }
+ }
+
+ /* There is no default behavior for button release events so we are done. */
+ if (event->response_type == XCB_BUTTON_RELEASE) {
+ goto done;
+ }
+
/* 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. */
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;
/* get the floating con */
Con *floatingcon = con_inside_floating(con);
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)
return 1;
}
- /* 5: resize (floating) if this was a click on the left/right/bottom
- * border. also try resizing (tiling) if it was a click on the top
- * border, but continue if that does not work */
- if (mod_pressed && event->detail == 3) {
+ /* 5: resize (floating) if this was a (left or right) click on the
+ * left/right/bottom border, or a right click on the decoration.
+ * also try resizing (tiling) if it was a click on the top */
+ if (mod_pressed && event->detail == XCB_BUTTON_INDEX_3) {
DLOG("floating resize due to floatingmodifier\n");
floating_resize_window(floatingcon, proportional, event);
return 1;
goto done;
}
+ if (dest == CLICK_DECORATION && event->detail == XCB_BUTTON_INDEX_3) {
+ DLOG("floating resize due to decoration right click\n");
+ floating_resize_window(floatingcon, proportional, event);
+ return 1;
+ }
+
if (dest == CLICK_BORDER) {
DLOG("floating resize due to border click\n");
floating_resize_window(floatingcon, proportional, event);
}
/* 7: floating modifier pressed, initiate a resize */
- if (dest == CLICK_INSIDE && mod_pressed && event->detail == 3) {
+ if (dest == CLICK_INSIDE && mod_pressed && event->detail == XCB_BUTTON_INDEX_3) {
if (floating_mod_on_tiled_client(con, event))
return 1;
}
xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
xcb_flush(conn);
tree_render();
+
return 0;
}
*/
int handle_button_press(xcb_button_press_event_t *event) {
Con *con;
- DLOG("Button %d pressed on window 0x%08x\n", event->state, event->event);
+ DLOG("Button %d %s on window 0x%08x (child 0x%08x) at (%d, %d) (root %d, %d)\n",
+ event->state, (event->response_type == XCB_BUTTON_PRESS ? "press" : "release"),
+ event->event, event->child, event->event_x, event->event_y, event->root_x,
+ event->root_y);
last_timestamp = event->time;
if (!(con = con_by_frame_id(event->event))) {
/* If the root window is clicked, find the relevant output from the
* click coordinates and focus the output's active workspace. */
- if (event->event == root) {
+ if (event->event == root && event->response_type == XCB_BUTTON_PRESS) {
Con *output, *ws;
TAILQ_FOREACH(output, &(croot->nodes_head), nodes) {
if (con_is_internal(output) ||
return route_click(child, event, mod_pressed, CLICK_DECORATION);
}
+ if (event->child != XCB_NONE) {
+ DLOG("event->child not XCB_NONE, so this is an event which originated from a click into the application, but the application did not handle it.\n");
+ return route_click(con, event, mod_pressed, CLICK_INSIDE);
+ }
+
return route_click(con, event, mod_pressed, CLICK_BORDER);
}
projects / i3 / i3 / blobdiff