diff options
author | Robert Kubosz <kubosz.robert@gmail.com> | 2018-07-11 22:03:06 +0200 |
---|---|---|
committer | Robert Kubosz <kubosz.robert@gmail.com> | 2018-07-11 22:03:06 +0200 |
commit | 41b80c28dfafb9bc13b68e4d5d2811d311b59863 (patch) | |
tree | bbc7fe4664da4e25e9d66b87a216e64024856b31 | |
parent | Merge pull request #2245 from RyanDwyer/floating-minmax-size (diff) | |
download | sway-41b80c28dfafb9bc13b68e4d5d2811d311b59863.tar.gz sway-41b80c28dfafb9bc13b68e4d5d2811d311b59863.tar.zst sway-41b80c28dfafb9bc13b68e4d5d2811d311b59863.zip |
add scroll button option
This commit introduces a scroll_button option, which is intended to be
used with scroll_method. Now user can edit his sway config and add an
scroll_button option to device section.
-rw-r--r-- | include/sway/commands.h | 1 | ||||
-rw-r--r-- | include/sway/config.h | 1 | ||||
-rw-r--r-- | sway/commands/input.c | 1 | ||||
-rw-r--r-- | sway/commands/input/scroll_button.c | 31 | ||||
-rw-r--r-- | sway/config/input.c | 4 | ||||
-rw-r--r-- | sway/input/input-manager.c | 6 | ||||
-rw-r--r-- | sway/meson.build | 1 |
7 files changed, 45 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; |
diff --git a/sway/commands/input.c b/sway/commands/input.c index 574e1f8c..e7906b0e 100644 --- a/sway/commands/input.c +++ b/sway/commands/input.c | |||
@@ -20,6 +20,7 @@ static struct cmd_handler input_handlers[] = { | |||
20 | { "pointer_accel", input_cmd_pointer_accel }, | 20 | { "pointer_accel", input_cmd_pointer_accel }, |
21 | { "repeat_delay", input_cmd_repeat_delay }, | 21 | { "repeat_delay", input_cmd_repeat_delay }, |
22 | { "repeat_rate", input_cmd_repeat_rate }, | 22 | { "repeat_rate", input_cmd_repeat_rate }, |
23 | { "scroll_button", input_cmd_scroll_button }, | ||
23 | { "scroll_method", input_cmd_scroll_method }, | 24 | { "scroll_method", input_cmd_scroll_method }, |
24 | { "tap", input_cmd_tap }, | 25 | { "tap", input_cmd_tap }, |
25 | { "xkb_layout", input_cmd_xkb_layout }, | 26 | { "xkb_layout", input_cmd_xkb_layout }, |
diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c new file mode 100644 index 00000000..a9d697cf --- /dev/null +++ b/sway/commands/input/scroll_button.c | |||
@@ -0,0 +1,31 @@ | |||
1 | #include <string.h> | ||
2 | #include <strings.h> | ||
3 | #include "sway/config.h" | ||
4 | #include "sway/commands.h" | ||
5 | #include "sway/input/input-manager.h" | ||
6 | |||
7 | struct cmd_results *input_cmd_scroll_button(int argc, char **argv) { | ||
8 | struct cmd_results *error = NULL; | ||
9 | if ((error = checkarg(argc, "scroll_button", EXPECTED_AT_LEAST, 1))) { | ||
10 | return error; | ||
11 | } | ||
12 | struct input_config *current_input_config = | ||
13 | config->handler_context.input_config; | ||
14 | if (!current_input_config) { | ||
15 | return cmd_results_new(CMD_FAILURE, "scroll_button", | ||
16 | "No input device defined."); | ||
17 | } | ||
18 | struct input_config *new_config = | ||
19 | new_input_config(current_input_config->identifier); | ||
20 | |||
21 | int scroll_button = atoi(argv[0]); | ||
22 | if (scroll_button < 1 || scroll_button > 10) { | ||
23 | free_input_config(new_config); | ||
24 | return cmd_results_new(CMD_INVALID, "scroll_button", | ||
25 | "Input out of range [1, 10]"); | ||
26 | } | ||
27 | new_config->scroll_button = scroll_button; | ||
28 | |||
29 | apply_input_config(new_config); | ||
30 | return cmd_results_new(CMD_SUCCESS, NULL, NULL); | ||
31 | } | ||
diff --git a/sway/config/input.c b/sway/config/input.c index 9840df18..62d77cf7 100644 --- a/sway/config/input.c +++ b/sway/config/input.c | |||
@@ -28,6 +28,7 @@ struct input_config *new_input_config(const char* identifier) { | |||
28 | input->accel_profile = INT_MIN; | 28 | input->accel_profile = INT_MIN; |
29 | input->pointer_accel = FLT_MIN; | 29 | input->pointer_accel = FLT_MIN; |
30 | input->scroll_method = INT_MIN; | 30 | input->scroll_method = INT_MIN; |
31 | input->scroll_button = INT_MIN; | ||
31 | input->left_handed = INT_MIN; | 32 | input->left_handed = INT_MIN; |
32 | input->repeat_delay = INT_MIN; | 33 | input->repeat_delay = INT_MIN; |
33 | input->repeat_rate = INT_MIN; | 34 | input->repeat_rate = INT_MIN; |
@@ -70,6 +71,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { | |||
70 | if (src->scroll_method != INT_MIN) { | 71 | if (src->scroll_method != INT_MIN) { |
71 | dst->scroll_method = src->scroll_method; | 72 | dst->scroll_method = src->scroll_method; |
72 | } | 73 | } |
74 | if (src->scroll_button != INT_MIN) { | ||
75 | dst->scroll_button= src->scroll_button; | ||
76 | } | ||
73 | if (src->send_events != INT_MIN) { | 77 | if (src->send_events != INT_MIN) { |
74 | dst->send_events = src->send_events; | 78 | dst->send_events = src->send_events; |
75 | } | 79 | } |
diff --git a/sway/input/input-manager.c b/sway/input/input-manager.c index daaf1fb6..b18989d0 100644 --- a/sway/input/input-manager.c +++ b/sway/input/input-manager.c | |||
@@ -158,6 +158,12 @@ static void input_manager_libinput_config_pointer( | |||
158 | libinput_device_config_accel_set_speed(libinput_device, | 158 | libinput_device_config_accel_set_speed(libinput_device, |
159 | ic->pointer_accel); | 159 | ic->pointer_accel); |
160 | } | 160 | } |
161 | if (ic->scroll_button != INT_MIN) { | ||
162 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_button(%d)", | ||
163 | ic->identifier, ic->scroll_button); | ||
164 | libinput_device_config_scroll_set_button(libinput_device, | ||
165 | ic->scroll_button); | ||
166 | } | ||
161 | if (ic->scroll_method != INT_MIN) { | 167 | if (ic->scroll_method != INT_MIN) { |
162 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)", | 168 | wlr_log(WLR_DEBUG, "libinput_config_pointer(%s) scroll_set_method(%d)", |
163 | ic->identifier, ic->scroll_method); | 169 | ic->identifier, ic->scroll_method); |
diff --git a/sway/meson.build b/sway/meson.build index 72192917..6fc78db3 100644 --- a/sway/meson.build +++ b/sway/meson.build | |||
@@ -118,6 +118,7 @@ sway_sources = files( | |||
118 | 'commands/input/pointer_accel.c', | 118 | 'commands/input/pointer_accel.c', |
119 | 'commands/input/repeat_delay.c', | 119 | 'commands/input/repeat_delay.c', |
120 | 'commands/input/repeat_rate.c', | 120 | 'commands/input/repeat_rate.c', |
121 | 'commands/input/scroll_button.c', | ||
121 | 'commands/input/scroll_method.c', | 122 | 'commands/input/scroll_method.c', |
122 | 'commands/input/tap.c', | 123 | 'commands/input/tap.c', |
123 | 'commands/input/xkb_layout.c', | 124 | 'commands/input/xkb_layout.c', |