Fix scrolling on a tabbed titlebar which contains split cons (Thanks f8l)

[i3/i3] / src / click.c

diff --git a/src/click.c b/src/click.c
index a1da00ac90296758e4deafa32ca8be1bc0467da5..3022c2480b3eaaddde03c210ad5bcc9dea38d319 100644 (file)
--- a/src/click.c
+++ b/src/click.c
@@ -14,7 +14,6 @@
 #include <time.h>
 #include <math.h>
 
-#include <xcb/xcb_atom.h>
 #include <xcb/xcb_icccm.h>
 
 #include <X11/XKBlib.h>
@@ -179,6 +178,22 @@ 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);
 
+    /* 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;
+
     /* don’t handle dockarea cons, they must not be focused */
     if (con->parent->type == CT_DOCKAREA)
         goto done;
@@ -195,9 +210,16 @@ 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);
+        /* 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)
@@ -207,21 +229,13 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
         goto done;
     }
 
-    /* 2: focus this con. 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 != focused_workspace)
-        workspace_show(ws);
-    focused_id = XCB_NONE;
+    /* 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 *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 */