Do not resend focus on click

[i3/i3] / src / click.c

diff --git a/src/click.c b/src/click.c
index 69cb7d22b2cb057bdb9e2b002e6ecc3c0741a63a..5c36aeb0e45193f4579bbc437ec7be6e9832ef83 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -18,7 +18,9 @@
 
 #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
@@ -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,13 +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);
 
-    /* if focus changes, we must rerender */
-    Con *initially_focused = focused;
-
     /* 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. */
@@ -192,7 +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;
 
     /* get the floating con */
     Con *floatingcon = con_inside_floating(con);
@@ -300,9 +321,7 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
 done:
     xcb_allow_events(conn, XCB_ALLOW_REPLAY_POINTER, event->time);
     xcb_flush(conn);
-
-    if (initially_focused != focused)
-        tree_render();
+    tree_render();
 
     return 0;
 }