summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-07-13 04:07:11 -0700
committerLibravatar GitHub <noreply@github.com>2018-07-13 04:07:11 -0700
commitbcdf04d79c28866d971dc968a2497f7d95ec1aae (patch)
tree874386abb337c953b60ee2efe0a799d9dfb010ee /include
parentMerge pull request #2255 from emersion/xwayland-floating-borders (diff)
parentadd error handling for scroll button out of range (diff)
downloadsway-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.h1
-rw-r--r--include/sway/config.h1
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;
207sway_cmd input_cmd_pointer_accel; 207sway_cmd input_cmd_pointer_accel;
208sway_cmd input_cmd_repeat_delay; 208sway_cmd input_cmd_repeat_delay;
209sway_cmd input_cmd_repeat_rate; 209sway_cmd input_cmd_repeat_rate;
210sway_cmd input_cmd_scroll_button;
210sway_cmd input_cmd_scroll_method; 211sway_cmd input_cmd_scroll_method;
211sway_cmd input_cmd_tap; 212sway_cmd input_cmd_tap;
212sway_cmd input_cmd_xkb_layout; 213sway_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;