diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-14 06:11:44 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-14 06:11:44 -0700 |
| commit | dbeb03aa680dde36bd917057a54dc2651b780f27 (patch) | |
| tree | 078891937a369fae4a7399374c58c3352734f199 /sway/config | |
| parent | 63f28bcf1efa0f60fef7d50d8c5db541295281c7 (diff) | |
| parent | 13c6627ddb7dbe235426e123ee6ff8e6794bda6d (diff) | |
| download | sway-dbeb03aa680dde36bd917057a54dc2651b780f27.tar.xz | |
Merge pull request #2271 from RedSoxFan/implement-1569
Implement tap_button_map for input devices
Diffstat (limited to 'sway/config')
| -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) { } input->tap = INT_MIN; + input->tap_button_map = INT_MIN; input->drag_lock = INT_MIN; input->dwt = INT_MIN; input->send_events = INT_MIN; @@ -80,6 +81,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) { if (src->tap != INT_MIN) { dst->tap = src->tap; } + if (src->tap_button_map != INT_MIN) { + dst->tap_button_map = src->tap_button_map; + } if (src->xkb_layout) { free(dst->xkb_layout); dst->xkb_layout = strdup(src->xkb_layout); |