aboutsummaryrefslogtreecommitdiffstats
path: root/sway/config.c
diff options
context:
space:
mode:
authorLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-15 05:22:51 -0500
committerLibravatar Tony Crisci <tony@dubstepdish.com>2017-12-15 05:22:51 -0500
commit9eecbb5d8a988a0dded57ead1982dd0121071454 (patch)
tree3b02befcc78d300a0fd84b5962b323d015369398 /sway/config.c
parentbasic configuration (diff)
downloadsway-9eecbb5d8a988a0dded57ead1982dd0121071454.tar.gz
sway-9eecbb5d8a988a0dded57ead1982dd0121071454.tar.zst
sway-9eecbb5d8a988a0dded57ead1982dd0121071454.zip
xkb config
Diffstat (limited to 'sway/config.c')
-rw-r--r--sway/config.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/sway/config.c b/sway/config.c
index 52633ad8..4e34aa8c 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -292,6 +292,26 @@ void merge_input_config(struct input_config *dst, struct input_config *src) {
292 if (src->tap != INT_MIN) { 292 if (src->tap != INT_MIN) {
293 dst->tap = src->tap; 293 dst->tap = src->tap;
294 } 294 }
295 if (src->xkb_layout) {
296 free(dst->xkb_layout);
297 dst->xkb_layout = strdup(src->xkb_layout);
298 }
299 if (src->xkb_model) {
300 free(dst->xkb_model);
301 dst->xkb_model = strdup(src->xkb_model);
302 }
303 if (src->xkb_options) {
304 free(dst->xkb_options);
305 dst->xkb_options = strdup(src->xkb_options);
306 }
307 if (src->xkb_rules) {
308 free(dst->xkb_rules);
309 dst->xkb_rules = strdup(src->xkb_rules);
310 }
311 if (src->xkb_variant) {
312 free(dst->xkb_variant);
313 dst->xkb_variant = strdup(src->xkb_variant);
314 }
295} 315}
296 316
297void free_input_config(struct input_config *ic) { 317void free_input_config(struct input_config *ic) {