aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config/input.c
diff options
context:
space:
mode:
Diffstat (limited to 'sway/config/input.c')
-rw-r--r--sway/config/input.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/sway/config/input.c b/sway/config/input.c
index a9f20723..17303ccc 100644
--- a/sway/config/input.c
+++ b/sway/config/input.c
@@ -96,9 +96,16 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
96 free(dst->xkb_variant); 96 free(dst->xkb_variant);
97 dst->xkb_variant = strdup(src->xkb_variant); 97 dst->xkb_variant = strdup(src->xkb_variant);
98 } 98 }
99 if (src->mapped_output) { 99 if (src->mapped_from_region) {
100 free(dst->mapped_output); 100 free(dst->mapped_from_region);
101 dst->mapped_output = strdup(src->mapped_output); 101 dst->mapped_from_region =
102 malloc(sizeof(struct input_config_mapped_from_region));
103 memcpy(dst->mapped_from_region, src->mapped_from_region,
104 sizeof(struct input_config_mapped_from_region));
105 }
106 if (src->mapped_to_output) {
107 free(dst->mapped_to_output);
108 dst->mapped_to_output = strdup(src->mapped_to_output);
102 } 109 }
103} 110}
104 111