diff options
author | Brian Ashworth <bosrsf04@gmail.com> | 2018-07-14 01:01:47 -0400 |
---|---|---|
committer | Brian Ashworth <bosrsf04@gmail.com> | 2018-07-14 01:01:47 -0400 |
commit | 13c6627ddb7dbe235426e123ee6ff8e6794bda6d (patch) | |
tree | 078891937a369fae4a7399374c58c3352734f199 /sway/config/input.c | |
parent | Merge pull request #2244 from RyanDwyer/floating-resize (diff) | |
download | sway-13c6627ddb7dbe235426e123ee6ff8e6794bda6d.tar.gz sway-13c6627ddb7dbe235426e123ee6ff8e6794bda6d.tar.zst sway-13c6627ddb7dbe235426e123ee6ff8e6794bda6d.zip |
Implement tap_button_map for input devices
Diffstat (limited to 'sway/config/input.c')
-rw-r--r-- | sway/config/input.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/config/input.c b/sway/config/input.c index cbd7d5f0..8d687a6d 100644 --- a/sway/config/input.c +++ b/sway/config/input.c | |||
@@ -19,6 +19,7 @@ struct input_config *new_input_config(const char* identifier) { | |||
19 | } | 19 | } |
20 | 20 | ||
21 | input->tap = INT_MIN; | 21 | input->tap = INT_MIN; |
22 | input->tap_button_map = INT_MIN; | ||
22 | input->drag_lock = INT_MIN; | 23 | input->drag_lock = INT_MIN; |
23 | input->dwt = INT_MIN; | 24 | input->dwt = INT_MIN; |
24 | input->send_events = INT_MIN; | 25 | input->send_events = INT_MIN; |
@@ -80,6 +81,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { | |||
80 | if (src->tap != INT_MIN) { | 81 | if (src->tap != INT_MIN) { |
81 | dst->tap = src->tap; | 82 | dst->tap = src->tap; |
82 | } | 83 | } |
84 | if (src->tap_button_map != INT_MIN) { | ||
85 | dst->tap_button_map = src->tap_button_map; | ||
86 | } | ||
83 | if (src->xkb_layout) { | 87 | if (src->xkb_layout) { |
84 | free(dst->xkb_layout); | 88 | free(dst->xkb_layout); |
85 | dst->xkb_layout = strdup(src->xkb_layout); | 89 | dst->xkb_layout = strdup(src->xkb_layout); |