nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow using left/right scrolling like up/down scrolling. 

This commit makes left/right scrolling synonyms for up/down scrolling for
* scrolling on window decoration
* scrolling on i3bar workspaces

fixes #2677
This commit is contained in:
Ingo Bürk 2017-02-12 20:48:44 +01:00
parent 7732971ad8
commit 432c4211ea
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i3bar/src/xcb.c
View File

@ -532,6 +532,7 @@ void handle_button(xcb_button_press_event_t *event) {
} }
switch (event->detail) { switch (event->detail) {
case XCB_BUTTON_SCROLL_UP: case XCB_BUTTON_SCROLL_UP:
case XCB_BUTTON_SCROLL_LEFT:
/* Mouse wheel up. We select the previous ws, if any. /* Mouse wheel up. We select the previous ws, if any.
* If there is no more workspace, don’t even send the workspace * If there is no more workspace, don’t even send the workspace
* command, otherwise (with workspace auto_back_and_forth) we’d end * command, otherwise (with workspace auto_back_and_forth) we’d end
@ -542,6 +543,7 @@ void handle_button(xcb_button_press_event_t *event) {
cur_ws = TAILQ_PREV(cur_ws, ws_head, tailq); cur_ws = TAILQ_PREV(cur_ws, ws_head, tailq);
break; break;
case XCB_BUTTON_SCROLL_DOWN: case XCB_BUTTON_SCROLL_DOWN:
case XCB_BUTTON_SCROLL_RIGHT:
/* Mouse wheel down. We select the next ws, if any. /* Mouse wheel down. We select the next ws, if any.
* If there is no more workspace, don’t even send the workspace * If there is no more workspace, don’t even send the workspace
* command, otherwise (with workspace auto_back_and_forth) we’d end * command, otherwise (with workspace auto_back_and_forth) we’d end

1
include/libi3.h
View File

@ -34,7 +34,6 @@
#define XCB_BUTTON_SCROLL_LEFT 6 #define XCB_BUTTON_SCROLL_LEFT 6
#define XCB_BUTTON_SCROLL_RIGHT 7 #define XCB_BUTTON_SCROLL_RIGHT 7
/** /**
* XCB connection and root screen * XCB connection and root screen
* *

10
src/click.c
View File

@ -229,7 +229,9 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
if (in_stacked && if (in_stacked &&
dest == CLICK_DECORATION && dest == CLICK_DECORATION &&
(event->detail == XCB_BUTTON_SCROLL_UP || (event->detail == XCB_BUTTON_SCROLL_UP ||
event->detail == XCB_BUTTON_SCROLL_DOWN)) { event->detail == XCB_BUTTON_SCROLL_DOWN ||
event->detail == XCB_BUTTON_SCROLL_LEFT ||
event->detail == XCB_BUTTON_SCROLL_RIGHT)) {
DLOG("Scrolling on a window decoration\n"); DLOG("Scrolling on a window decoration\n");
orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ); orientation_t orientation = (con->parent->layout == L_STACKED ? VERT : HORIZ);
/* Focus the currently focused container on the same level that the /* Focus the currently focused container on the same level that the
@ -244,10 +246,12 @@ static int route_click(Con *con, xcb_button_press_event_t *event, const bool mod
* #557), we first check if scrolling is possible at all. */ * #557), we first check if scrolling is possible at all. */
bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL); bool scroll_prev_possible = (TAILQ_PREV(focused, nodes_head, nodes) != NULL);
bool scroll_next_possible = (TAILQ_NEXT(focused, nodes) != NULL); bool scroll_next_possible = (TAILQ_NEXT(focused, nodes) != NULL);
if (event->detail == XCB_BUTTON_SCROLL_UP && scroll_prev_possible) if ((event->detail == XCB_BUTTON_SCROLL_UP || event->detail == XCB_BUTTON_SCROLL_LEFT) && scroll_prev_possible) {
tree_next('p', orientation); tree_next('p', orientation);
else if (event->detail == XCB_BUTTON_SCROLL_DOWN && scroll_next_possible) } else if ((event->detail == XCB_BUTTON_SCROLL_DOWN || event->detail == XCB_BUTTON_SCROLL_RIGHT) && scroll_next_possible) {
tree_next('n', orientation); tree_next('n', orientation);
}
goto done; goto done;
} }