summaryrefslogtreecommitdiffstats
path: root/sway/config
diff options
context:
space:
mode:
authorLibravatar Drew DeVault <sir@cmpwn.com>2018-09-30 13:44:11 +0200
committerLibravatar GitHub <noreply@github.com>2018-09-30 13:44:11 +0200
commit8f6aca2166030846655432d92498bb8d2e22036b (patch)
tree0660b8052702d43b142a58e1c664e246918e8d7c /sway/config
parentMerge pull request #2730 from ivyl/remove_cap_leftovers (diff)
parentadd tap-and-drag setting to sway-input (diff)
downloadsway-8f6aca2166030846655432d92498bb8d2e22036b.tar.gz
sway-8f6aca2166030846655432d92498bb8d2e22036b.tar.zst
sway-8f6aca2166030846655432d92498bb8d2e22036b.zip
Merge pull request #2725 from PumbaPe/add-tap-and-drag
Add tap and drag to sway-input
Diffstat (limited to 'sway/config')
-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) {
20 20
21 input->tap = INT_MIN; 21 input->tap = INT_MIN;
22 input->tap_button_map = INT_MIN; 22 input->tap_button_map = INT_MIN;
23 input->drag = INT_MIN;
23 input->drag_lock = INT_MIN; 24 input->drag_lock = INT_MIN;
24 input->dwt = INT_MIN; 25 input->dwt = INT_MIN;
25 input->send_events = INT_MIN; 26 input->send_events = INT_MIN;
@@ -46,6 +47,9 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
46 if (src->click_method != INT_MIN) { 47 if (src->click_method != INT_MIN) {
47 dst->click_method = src->click_method; 48 dst->click_method = src->click_method;
48 } 49 }
50 if (src->drag != INT_MIN) {
51 dst->drag = src->drag;
52 }
49 if (src->drag_lock != INT_MIN) { 53 if (src->drag_lock != INT_MIN) {
50 dst->drag_lock = src->drag_lock; 54 dst->drag_lock = src->drag_lock;
51 } 55 }