rootston: add missing properties to kb config merge

7 years ago · d6513cef5d
parent 739361aa70
commit d6513cef5d
1 changed files with 6 additions and 0 deletions
--- a/rootston/keyboard.c
+++ b/rootston/keyboard.c
@ -230,6 +230,12 @@ static void keyboard_config_merge(struct keyboard_config *config,
 	if (config->options == NULL) {
 		config->options = fallback->options;
 	}
+	if (config->meta_key == 0) {
+		config->meta_key = fallback->meta_key;
+	}
+	if (config->name == NULL) {
+		config->name = fallback->name;
+	}
 }

 struct roots_keyboard *roots_keyboard_create(struct wlr_input_device *device,