aboutsummaryrefslogtreecommitdiff
path: root/sway/config/input.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-09-30 13:44:11 +0200
committerGitHub <noreply@github.com>2018-09-30 13:44:11 +0200
commit8f6aca2166030846655432d92498bb8d2e22036b (patch)
tree0660b8052702d43b142a58e1c664e246918e8d7c /sway/config/input.c
parent7355959d7f28714e77f43f987431c664f476d8eb (diff)
parentae2b70f59ec988ae1ad108316ec04d1f634ec735 (diff)
Merge pull request #2725 from PumbaPe/add-tap-and-drag
Add tap and drag to sway-input
Diffstat (limited to 'sway/config/input.c')
-rw-r--r--sway/config/input.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sway/config/input.c b/sway/config/input.c
index 6b43a5b9..794d5194 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -20,6 +20,7 @@ struct input_config *new_input_config(const char* identifier) {
input->tap = INT_MIN;
input->tap_button_map = INT_MIN;
+ input->drag = INT_MIN;
input->drag_lock = INT_MIN;
input->dwt = INT_MIN;
input->send_events = INT_MIN;
@@ -46,6 +47,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
if (src->click_method != INT_MIN) {
dst->click_method = src->click_method;
}
+ if (src->drag != INT_MIN) {
+ dst->drag = src->drag;
+ }
if (src->drag_lock != INT_MIN) {
dst->drag_lock = src->drag_lock;
}