diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-11-09 17:47:59 -0500 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-11-09 17:47:59 -0500 |
| commit | d6513cef5dc3f2c20e1bf11ff6a468b60ce35aca (patch) | |
| tree | 69d1afe35280f51a77e2f4f68327685dce35259f /rootston | |
| parent | 739361aa70d61cbc9e062d6a90df09f258a1bbcb (diff) | |
rootston: add missing properties to kb config merge
Diffstat (limited to 'rootston')
| -rw-r--r-- | rootston/keyboard.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/rootston/keyboard.c b/rootston/keyboard.c index da75b44f..72567eef 100644 --- 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, |