diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-07-13 04:07:11 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-13 04:07:11 -0700 |
commit | bcdf04d79c28866d971dc968a2497f7d95ec1aae (patch) | |
tree | 874386abb337c953b60ee2efe0a799d9dfb010ee /include | |
parent | Merge pull request #2255 from emersion/xwayland-floating-borders (diff) | |
parent | add error handling for scroll button out of range (diff) | |
download | sway-bcdf04d79c28866d971dc968a2497f7d95ec1aae.tar.gz sway-bcdf04d79c28866d971dc968a2497f7d95ec1aae.tar.zst sway-bcdf04d79c28866d971dc968a2497f7d95ec1aae.zip |
Merge pull request #2252 from rkubosz/scroll-button-option
feature: scroll button option for input devices
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 1 | ||||
-rw-r--r-- | include/sway/config.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index dda0606a..32d6cefd 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -207,6 +207,7 @@ sway_cmd input_cmd_natural_scroll; | |||
207 | sway_cmd input_cmd_pointer_accel; | 207 | sway_cmd input_cmd_pointer_accel; |
208 | sway_cmd input_cmd_repeat_delay; | 208 | sway_cmd input_cmd_repeat_delay; |
209 | sway_cmd input_cmd_repeat_rate; | 209 | sway_cmd input_cmd_repeat_rate; |
210 | sway_cmd input_cmd_scroll_button; | ||
210 | sway_cmd input_cmd_scroll_method; | 211 | sway_cmd input_cmd_scroll_method; |
211 | sway_cmd input_cmd_tap; | 212 | sway_cmd input_cmd_tap; |
212 | sway_cmd input_cmd_xkb_layout; | 213 | sway_cmd input_cmd_xkb_layout; |
diff --git a/include/sway/config.h b/include/sway/config.h index 99575274..75acd4f2 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -75,6 +75,7 @@ struct input_config { | |||
75 | float pointer_accel; | 75 | float pointer_accel; |
76 | int repeat_delay; | 76 | int repeat_delay; |
77 | int repeat_rate; | 77 | int repeat_rate; |
78 | int scroll_button; | ||
78 | int scroll_method; | 79 | int scroll_method; |
79 | int send_events; | 80 | int send_events; |
80 | int tap; | 81 | int tap; |