X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fclick.c;h=5c36aeb0e45193f4579bbc437ec7be6e9832ef83;hb=8870edc2ca9c187d0358f11c13eb2dc775302dce;hp=b6eb948c66cfb93593e16d331ea99945596f9ad6;hpb=10d7c1a993433ba7149704933f6d8b62cd4401f7;p=i3%2Fi3 diff --git a/src/click.c b/src/click.c index b6eb948c..5c36aeb0 100644 --- a/src/click.c +++ b/src/click.c @@ -18,7 +18,9 @@ #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 @@ -89,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 && @@ -122,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: @@ -171,6 +173,33 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod 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 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. */ @@ -185,11 +214,6 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod 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); @@ -237,10 +261,10 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod 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; @@ -253,6 +277,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); @@ -276,7 +306,7 @@ 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; } @@ -292,6 +322,7 @@ done: xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time); xcb_flush(conn); tree_render(); + return 0; } @@ -305,7 +336,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; @@ -341,6 +374,11 @@ int handle_button_press(xcb_button_press_event_t *event) { 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) {