release v0.29

[ncmpc.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index e84b5013b1859d80b3d20eeec03a75f96e4baaf0..ca6d415e41e5da28f0c08376f3039e0af189cd80 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
-
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "options.h"
 #include "config.h"
@@ -53,6 +53,7 @@ options_t options = {
        .lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
        .lyrics_autosave = false,
        .lyrics_show_plugin = false,
+       .text_editor_ask = true,
 #endif
        .find_wrap = true,
        .scroll_offset = 0,
@@ -60,6 +61,7 @@ options_t options = {
        .audible_bell = true,
        .bell_on_wrap = true,
        .status_message_time = 3,
+       .timeout_ms = 0,
 #ifndef NCMPC_MINI
        .scroll = DEFAULT_SCROLL,
        .welcome_screen_list = true,
@@ -132,11 +134,9 @@ option_error(int error, const char *option, const char *arg)
 static void
 display_help(void)
 {
-       unsigned i;
-
        printf("Usage: %s [OPTION]...\n", PACKAGE);
 
-       for (i = 0; i < option_table_size; ++i) {
+       for (unsigned i = 0; i < option_table_size; ++i) {
                char tmp[32];
 
                if (option_table[i].argument)
@@ -213,9 +213,22 @@ handle_option(int c, const char *arg)
 #ifdef ENABLE_OUTPUTS_SCREEN
                     " outputs-screen"
 #endif
+#ifdef ENABLE_CHAT_SCREEN
+                    " chat-screen"
+#endif
 
                     "\n");
 #ifndef NCMPC_MINI
+               {
+                       char *user_conf = build_user_conf_filename();
+                       char *system_conf = build_system_conf_filename();
+
+                       printf("configuration files:\n %s\n %s\n\n",
+                              user_conf, system_conf);
+
+                       g_free(user_conf);
+                       g_free(system_conf);
+               }
                if (strcmp("translator-credits", _("translator-credits")) != 0)
                        /* To translators: these credits are shown
                           when ncmpc is started with "--version" */
@@ -264,14 +277,12 @@ handle_option(int c, const char *arg)
                g_free(options.key_file);
                options.key_file = g_strdup(arg);
                break;
-#ifndef NDEBUG
-#ifndef NCMPC_MINI
+#if !defined(NDEBUG) && !defined(NCMPC_MINI)
        case 'K': /* --dump-keys */
                read_configuration();
                write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL);
                exit(EXIT_SUCCESS);
                break;
-#endif
 #endif
        default:
                fprintf(stderr,"Unknown Option %c = %s\n", c, arg);
@@ -282,11 +293,10 @@ handle_option(int c, const char *arg)
 void
 options_parse(int argc, const char *argv[])
 {
-       int i;
        const arg_opt_t *opt = NULL;
        option_callback_fn_t option_cb = handle_option;
 
-       for (i = 1; i < argc; i++) {
+       for (int i = 1; i < argc; i++) {
                const char *arg = argv[i];
                size_t len = strlen(arg);
 
@@ -368,6 +378,7 @@ options_init(void)
 {
        /* default option values */
        options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
+       options.search_format = NULL;
        options.status_format = g_strdup(DEFAULT_STATUS_FORMAT);
        options.screen_list = g_strsplit_set(DEFAULT_SCREEN_LIST, " ", 0);
 #ifndef NCMPC_MINI
@@ -384,10 +395,17 @@ options_deinit(void)
        g_free(options.config_file);
        g_free(options.key_file);
        g_free(options.list_format);
+       g_free(options.search_format);
        g_free(options.status_format);
        g_strfreev(options.screen_list);
 #ifndef NCMPC_MINI
        g_free(options.xterm_title_format);
        g_free(options.scroll_sep);
 #endif
+#ifdef ENABLE_LYRICS_SCREEN
+       g_free(options.text_editor);
+#endif
+#ifdef ENABLE_CHAT_SCREEN
+       g_free(options.chat_prefix);
+#endif
 }