diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-04-19 08:56:03 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-19 08:56:03 -0400 |
commit | 21eb63cc9ebff4e843595c64e40b5707a158c925 (patch) | |
tree | 8be54bda3c472f31666e0d2fad5b5647d67c62e6 /include | |
parent | render_output(): When fullscreen, clear to black and don't render background (diff) | |
parent | Merge pull request #1823 from RyanDwyer/key-repeat (diff) | |
download | sway-21eb63cc9ebff4e843595c64e40b5707a158c925.tar.gz sway-21eb63cc9ebff4e843595c64e40b5707a158c925.tar.zst sway-21eb63cc9ebff4e843595c64e40b5707a158c925.zip |
Merge branch 'master' into fullscreen
Diffstat (limited to 'include')
-rw-r--r-- | include/sway/commands.h | 2 | ||||
-rw-r--r-- | include/sway/config.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/sway/commands.h b/include/sway/commands.h index dbebaa49..7b8c949b 100644 --- a/include/sway/commands.h +++ b/include/sway/commands.h | |||
@@ -196,6 +196,8 @@ sway_cmd input_cmd_map_to_output; | |||
196 | sway_cmd input_cmd_middle_emulation; | 196 | sway_cmd input_cmd_middle_emulation; |
197 | sway_cmd input_cmd_natural_scroll; | 197 | sway_cmd input_cmd_natural_scroll; |
198 | sway_cmd input_cmd_pointer_accel; | 198 | sway_cmd input_cmd_pointer_accel; |
199 | sway_cmd input_cmd_repeat_delay; | ||
200 | sway_cmd input_cmd_repeat_rate; | ||
199 | sway_cmd input_cmd_scroll_method; | 201 | sway_cmd input_cmd_scroll_method; |
200 | sway_cmd input_cmd_tap; | 202 | sway_cmd input_cmd_tap; |
201 | sway_cmd input_cmd_xkb_layout; | 203 | sway_cmd input_cmd_xkb_layout; |
diff --git a/include/sway/config.h b/include/sway/config.h index ed49fbbd..085f7b92 100644 --- a/include/sway/config.h +++ b/include/sway/config.h | |||
@@ -65,6 +65,8 @@ struct input_config { | |||
65 | int middle_emulation; | 65 | int middle_emulation; |
66 | int natural_scroll; | 66 | int natural_scroll; |
67 | float pointer_accel; | 67 | float pointer_accel; |
68 | int repeat_delay; | ||
69 | int repeat_rate; | ||
68 | int scroll_method; | 70 | int scroll_method; |
69 | int send_events; | 71 | int send_events; |
70 | int tap; | 72 | int tap; |