X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fclick.c;h=5c36aeb0e45193f4579bbc437ec7be6e9832ef83;hb=8870edc2ca9c187d0358f11c13eb2dc775302dce;hp=c270bdecdef3affe71ea3eb28f211ff8333f6549;hpb=30dea1fda6798a0a1dcfad4b2fdd36c18f2108e5;p=i3%2Fi3 diff --git a/src/click.c b/src/click.c index c270bdec..5c36aeb0 100644 --- a/src/click.c +++ b/src/click.c @@ -1,28 +1,26 @@ +#undef I3__FILE__ +#define I3__FILE__ "click.c" /* * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager + * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) * - * © 2009-2011 Michael Stapelberg and contributors - * - * See file LICENSE for license information. - * - * src/click.c: Contains the handlers for button press (mouse click) events - * because they are quite large. + * click.c: Button press (mouse click) events. * */ +#include "all.h" + #include #include -#include #include #include -#include "all.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 @@ -31,43 +29,45 @@ typedef enum { CLICK_BORDER = 0, CLICK_DECORATION = 1, CLICK_INSIDE = 2 } click_ * */ static bool tiling_resize_for_border(Con *con, border_t border, xcb_button_press_event_t *event) { - DLOG("border = %d\n", border); - 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 && - resize_con->parent->orientation != orientation) - resize_con = resize_con->parent; - - if (resize_con->type != CT_WORKSPACE && - resize_con->type != CT_FLOATING_CON && - resize_con->parent->orientation == 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("border = %d, con = %p\n", border, 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; } - else { - assert(first != second); - assert(first->parent == second->parent); - resize_graphical_handler(first, second, orientation, event); + + assert(first != second); + assert(first->parent == second->parent); + + /* 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); + DLOG("After resize handler, rendering\n"); tree_render(); return true; @@ -91,7 +91,7 @@ static bool floating_mod_on_tiled_client(Con *con, xcb_button_press_event_t *eve 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 && @@ -120,24 +120,44 @@ static bool floating_mod_on_tiled_client(Con *con, xcb_button_press_event_t *eve * Finds out which border was clicked on and calls tiling_resize_for_border(). * */ -static bool tiling_resize(Con *con, xcb_button_press_event_t *event, click_destination_t dest) { +static bool tiling_resize(Con *con, xcb_button_press_event_t *event, const click_destination_t dest) { /* 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) + if (dest == CLICK_DECORATION) { + /* The user clicked on a window decoration. We ignore the following case: + * The container is a h-split, tabbed or stacked container with > 1 + * window. Decorations will end up next to each other and the user + * expects to switch to a window by clicking on its decoration. */ + + /* Since the container might either be the child *or* already a split + * container (in the case of a nested split container), we need to make + * sure that we are dealing with the split container here. */ + Con *check_con = con; + if (con_is_leaf(check_con) && check_con->parent->type == CT_CON) + check_con = check_con->parent; + + if ((check_con->layout == L_STACKED || + check_con->layout == L_TABBED || + con_orientation(check_con) == HORIZ) && + con_num_children(check_con) > 1) { + DLOG("Not handling this resize, this container has > 1 child.\n"); + return false; + } 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; @@ -148,7 +168,7 @@ static bool tiling_resize(Con *con, xcb_button_press_event_t *event, click_desti * functions for resizing/dragging. * */ -static int route_click(Con *con, xcb_button_press_event_t *event, bool mod_pressed, click_destination_t dest) { +static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod_pressed, const click_destination_t dest) { DLOG("--> click properties: mod = %d, destination = %d\n", mod_pressed, dest); DLOG("--> OUTCOME = %p\n", con); DLOG("type = %d, name = %s\n", con->type, con->name); @@ -157,6 +177,44 @@ static int route_click(Con *con, xcb_button_press_event_t *event, bool mod_press 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 it + * has modifiers. */ + if (bind && (dest == CLICK_DECORATION || (bind->mods && dest == CLICK_INSIDE))) { + 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; + } + } + + /* 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); + /* get the floating con */ Con *floatingcon = con_inside_floating(con); const bool proportional = (event->state & BIND_SHIFT); @@ -169,32 +227,44 @@ static int route_click(Con *con, xcb_button_press_event_t *event, bool mod_press event->detail == XCB_BUTTON_INDEX_5)) { DLOG("Scrolling on a window decoration\n"); orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ); - if (event->detail == XCB_BUTTON_INDEX_4) + /* 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. */ + 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) tree_next('p', orientation); - else tree_next('n', orientation); + else if (event->detail == XCB_BUTTON_INDEX_5 && scroll_next_possible) + tree_next('n', orientation); goto done; } - /* 2: focus this con */ + /* 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 *ws = con_get_workspace(con); 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 */ - if (mod_pressed && event->detail == 1) { + if (mod_pressed && event->detail == XCB_BUTTON_INDEX_1) { floating_drag_window(floatingcon, event); 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; @@ -207,6 +277,12 @@ static int route_click(Con *con, xcb_button_press_event_t *event, bool mod_press 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); @@ -230,12 +306,14 @@ static int route_click(Con *con, xcb_button_press_event_t *event, bool mod_press } /* 7: floating modifier pressed, initiate a resize */ - if (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; } /* 8: otherwise, check for border/decoration clicks and resize */ - else if (dest == CLICK_BORDER || dest == CLICK_DECORATION) { + else if ((dest == CLICK_BORDER || dest == CLICK_DECORATION) && + (event->detail == XCB_BUTTON_INDEX_1 || + event->detail == XCB_BUTTON_INDEX_3)) { DLOG("Trying to resize (tiling)\n"); tiling_resize(con, event, dest); } @@ -244,6 +322,7 @@ done: xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time); xcb_flush(conn); tree_render(); + return 0; } @@ -257,21 +336,49 @@ done: */ 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 pressed on window 0x%08x (child 0x%08x) at (%d, %d) (root %d, %d)\n", + event->state, event->event, event->child, event->event_x, event->event_y, + event->root_x, event->root_y); + + last_timestamp = event->time; const uint32_t mod = config.floating_modifier; - bool mod_pressed = (mod != 0 && (event->state & mod) == mod); + const bool mod_pressed = (mod != 0 && (event->state & mod) == mod); DLOG("floating_mod = %d, detail = %d\n", mod_pressed, event->detail); if ((con = con_by_window_id(event->event))) return route_click(con, event, mod_pressed, CLICK_INSIDE); 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) { + Con *output, *ws; + TAILQ_FOREACH(output, &(croot->nodes_head), nodes) { + if (con_is_internal(output) || + !rect_contains(output->rect, event->event_x, event->event_y)) + continue; + + ws = TAILQ_FIRST(&(output_get_content(output)->focus_head)); + if (ws != con_get_workspace(focused)) { + workspace_show(ws); + tree_render(); + } + return 1; + } + return 0; + } + ELOG("Clicked into unknown window?!\n"); xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time); xcb_flush(conn); return 0; } + 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); + } + /* Check if the click was on the decoration of a child */ Con *child; TAILQ_FOREACH(child, &(con->nodes_head), nodes) {