From f874c3d585163f9346e81cbd45a0866fbd9c4b14 Mon Sep 17 00:00:00 2001 From: emersion Date: Wed, 18 Oct 2017 22:46:52 +0200 Subject: [PATCH] Add a default meta key --- rootston/config.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/rootston/config.c b/rootston/config.c index 5e911e39..5ed299a7 100644 --- a/rootston/config.c +++ b/rootston/config.c @@ -263,6 +263,10 @@ static int config_ini_handler(void *user, const char *section, const char *name, struct roots_config *parse_args(int argc, char *argv[]) { struct roots_config *config = calloc(1, sizeof(struct roots_config)); + if (config == NULL) { + return NULL; + } + config->xwayland = true; wl_list_init(&config->outputs); wl_list_init(&config->devices); @@ -296,7 +300,8 @@ struct roots_config *parse_args(int argc, char *argv[]) { int result = ini_parse(config->config_path, config_ini_handler, config); if (result == -1) { - wlr_log(L_DEBUG, "No config file found. Using empty config."); + wlr_log(L_DEBUG, "No config file found. Using sensible defaults."); + config->keyboard.meta_key = WLR_MODIFIER_LOGO; add_binding_config(&config->bindings, "Logo+Shift+e", "exit"); add_binding_config(&config->bindings, "Ctrl+q", "close"); add_binding_config(&config->bindings, "Alt+Tab", "next_window");