blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rootston: add missing properties to kb config merge

This commit is contained in:
Tony Crisci 2017-11-09 17:47:59 -05:00
parent 739361aa70
commit d6513cef5d
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rootston/keyboard.c
View File

@ -230,6 +230,12 @@ static void keyboard_config_merge(struct keyboard_config *config,
if (config->options == NULL) { if (config->options == NULL) {
config->options = fallback->options; 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, struct roots_keyboard *roots_keyboard_create(struct wlr_input_device *device,