From 88175b259a641a8967d2813e45d7fb42b81ca36e Mon Sep 17 00:00:00 2001 From: Zijung Chueh Date: Fri, 13 Jul 2018 21:31:51 +0800 Subject: [PATCH] Put the default value in the defaults --- config.h | 6 ++++++ src/settings.c | 27 +++++++++++++++++++++------ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/config.h b/config.h index 3dc7b0a..f0432f6 100644 --- a/config.h +++ b/config.h @@ -102,6 +102,12 @@ settings_t defaults = { .code = 0,.sym = NoSymbol,.is_valid = false }, /* ignore this */ +.mouse_left_click = MOUSE_CLOSE_CURRENT, + +.mouse_middle_click = MOUSE_DO_ACTION, + +.mouse_right_click = MOUSE_CLOSE_ALL, + }; rule_t default_rules[] = { diff --git a/src/settings.c b/src/settings.c index 3f02e21..5d3fbff 100644 --- a/src/settings.c +++ b/src/settings.c @@ -537,33 +537,48 @@ void load_settings(char *cmdline_config_path) { char *c = option_get_string( "global", - "mouse_left_click", "-left_click", "close_current", + "mouse_left_click", "-left_click", NULL, "Action of Left click event" ); - settings.mouse_left_click = parse_mouse_action(c); + if (c) { + settings.mouse_left_click = parse_mouse_action(c); + } else { + settings.mouse_left_click = defaults.mouse_left_click; + } + g_free(c); } { char *c = option_get_string( "global", - "mouse_middle_click", "-mouse_middle_click", "do_action", + "mouse_middle_click", "-mouse_middle_click", NULL, "Action of middle click event" ); - settings.mouse_middle_click = parse_mouse_action(c); + if (c) { + settings.mouse_middle_click = parse_mouse_action(c); + } else { + settings.mouse_middle_click = defaults.mouse_middle_click; + } + g_free(c); } { char *c = option_get_string( "global", - "mouse_right_click", "-mouse_right_click", "close_all", + "mouse_right_click", "-mouse_right_click", NULL, "Action of right click event" ); - settings.mouse_right_click = parse_mouse_action(c); + if (c) { + settings.mouse_right_click = parse_mouse_action(c); + } else { + settings.mouse_right_click = defaults.mouse_right_click; + } + g_free(c); }