Merge branch 'master' into fullscreen

This commit is contained in:
Drew DeVault 2018-04-19 08:56:03 -04:00 committed by GitHub
commit 21eb63cc9e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 94 additions and 1 deletions

View file

@ -196,6 +196,8 @@ sway_cmd input_cmd_map_to_output;
sway_cmd input_cmd_middle_emulation;
sway_cmd input_cmd_natural_scroll;
sway_cmd input_cmd_pointer_accel;
sway_cmd input_cmd_repeat_delay;
sway_cmd input_cmd_repeat_rate;
sway_cmd input_cmd_scroll_method;
sway_cmd input_cmd_tap;
sway_cmd input_cmd_xkb_layout;

View file

@ -65,6 +65,8 @@ struct input_config {
int middle_emulation;
int natural_scroll;
float pointer_accel;
int repeat_delay;
int repeat_rate;
int scroll_method;
int send_events;
int tap;