From: Michael Stapelberg <michael@stapelberg.de>
Date: Sun, 8 Apr 2012 16:33:45 +0000 (+0200)
Subject: Prevent changing focus outside a container when scrolling on the decorations
X-Git-Tag: 4.2~29
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=42bbdbdfc1386009f14e514c55365dfc50cdbf7c;p=i3%2Fi3

Prevent changing focus outside a container when scrolling on the decorations

Fixes: #557
---

diff --git a/src/click.c b/src/click.c
index 04f8d2ed..bc66ab07 100644
--- a/src/click.c
+++ b/src/click.c
@@ -2,7 +2,7 @@
  * 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.
  *
@@ -193,9 +193,15 @@ 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)
+        /* 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)
             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;
     }