$OpenBSD: patch-src_click_c,v 1.8 2012/12/27 19:58:05 dcoppa Exp $ Fix scrolling on a tabbed titlebar which contains split cons (upstream git commit 721fa7bdadac6d7f0c78f8c1eac0e66252ba2dc6) --- src/click.c.orig Wed Dec 12 00:08:17 2012 +++ src/click.c Thu Dec 27 15:26:45 2012 @@ -211,9 +211,16 @@ static int route_click(Con *con, xcb_button_press_even 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)