X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fclick.c;h=2cf02178a0b160cace1058c751016dc6244c80cd;hb=92000942039fa99d7334ca5099b467b0d3d17792;hp=a046965030bfe1451337df68ed328d9e7039cab8;hpb=5a345db18bc92e23a54db16840412cd74b618d1d;p=i3%2Fi3 diff --git a/src/click.c b/src/click.c index a0469650..2cf02178 100644 --- a/src/click.c +++ b/src/click.c @@ -1,8 +1,10 @@ +#undef I3__FILE__ +#define I3__FILE__ "click.c" /* * vim:ts=4:sw=4:expandtab * * i3 - an improved dynamic tiling window manager - * © 2009-2011 Michael Stapelberg and contributors (see also: LICENSE) + * © 2009-2012 Michael Stapelberg and contributors (see also: LICENSE) * * click.c: Button press (mouse click) events. * @@ -12,12 +14,13 @@ #include #include -#include #include #include -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 @@ -27,48 +30,41 @@ 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, 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 && - resize_con->parent->orientation != 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 && - 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("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); @@ -95,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 && @@ -128,7 +124,7 @@ static bool tiling_resize(Con *con, xcb_button_press_event_t *event, const click /* 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: @@ -145,7 +141,7 @@ static bool tiling_resize(Con *con, xcb_button_press_event_t *event, const click if ((check_con->layout == L_STACKED || check_con->layout == L_TABBED || - check_con->orientation == HORIZ) && + con_orientation(check_con) == HORIZ) && con_num_children(check_con) > 1) { DLOG("Not handling this resize, this container has > 1 child.\n"); return false; @@ -153,15 +149,15 @@ static bool tiling_resize(Con *con, xcb_button_press_event_t *event, const click 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; @@ -181,6 +177,22 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod if (con->parent->type == CT_DOCKAREA) 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. */ + 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; + /* get the floating con */ Con *floatingcon = con_inside_floating(con); const bool proportional = (event->state & BIND_SHIFT); @@ -193,32 +205,44 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod 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; @@ -231,6 +255,12 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod 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); @@ -254,12 +284,14 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod } /* 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; } /* 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); } @@ -281,7 +313,9 @@ 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; @@ -292,15 +326,39 @@ int handle_button_press(xcb_button_press_event_t *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) { + TAILQ_FOREACH (child, &(con->nodes_head), nodes) { if (!rect_contains(child->deco_rect, event->event_x, event->event_y)) continue;