summaryrefslogtreecommitdiffstats
path: root/sway/config
diff options
context:
space:
mode:
authorLibravatar emersion <contact@emersion.fr>2018-04-24 19:39:29 +0100
committerLibravatar emersion <contact@emersion.fr>2018-04-26 10:53:47 +0100
commitff61df17ffd358b03663a35fe7140e51e1ee98fc (patch)
tree3736887591d8464f577d2ad4a753a404d38d77ae /sway/config
parentMerge pull request #1863 from RyanDwyer/remove-workspace-layout (diff)
downloadsway-ff61df17ffd358b03663a35fe7140e51e1ee98fc.tar.gz
sway-ff61df17ffd358b03663a35fe7140e51e1ee98fc.tar.zst
sway-ff61df17ffd358b03663a35fe7140e51e1ee98fc.zip
Add map_from_region command
Diffstat (limited to 'sway/config')
-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