diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-01-13 20:40:00 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-01-13 20:40:00 -0500 |
commit | db1631b67dd463f6516275ac4387712e39f9a384 (patch) | |
tree | 4dfb666777353f2d6bc77ec24d1a1b2b808925e0 /sway/input/cursor.c | |
parent | Merge pull request #3402 from RyanDwyer/refactor-seatops (diff) | |
parent | input_cmd_scroll_button: utilize mouse btn helpers (diff) | |
download | sway-db1631b67dd463f6516275ac4387712e39f9a384.tar.gz sway-db1631b67dd463f6516275ac4387712e39f9a384.tar.zst sway-db1631b67dd463f6516275ac4387712e39f9a384.zip |
Merge pull request #3342 from RedSoxFan/scroll-buttons-improved
Improve mouse button parsing: input scroll_button
Diffstat (limited to 'sway/input/cursor.c')
-rw-r--r-- | sway/input/cursor.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 06294b8b..c65548c3 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -1227,7 +1227,7 @@ uint32_t get_mouse_bindcode(const char *name, char **error) { | |||
1227 | 1227 | ||
1228 | uint32_t get_mouse_button(const char *name, char **error) { | 1228 | uint32_t get_mouse_button(const char *name, char **error) { |
1229 | uint32_t button = get_mouse_bindsym(name, error); | 1229 | uint32_t button = get_mouse_bindsym(name, error); |
1230 | if (!button && !error) { | 1230 | if (!button && !*error) { |
1231 | button = get_mouse_bindcode(name, error); | 1231 | button = get_mouse_bindcode(name, error); |
1232 | } | 1232 | } |
1233 | return button; | 1233 | return button; |