diff --git a/src/options.c b/src/options.c
index 398a0688f11a0feca4135507be7f23b107dacb05..370215ef7cb0f8dd9bbc83c97a08c2b706768467 100644 (file)
--- a/src/options.c
+++ b/src/options.c
/* ncmpc (Ncurses MPD Client)
* (c) 2004-2010 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"
#include <string.h>
#include <glib.h>
-#define MAX_LONGOPT_LENGTH 32
-
#define ERROR_UNKNOWN_OPTION 0x01
#define ERROR_BAD_ARGUMENT 0x02
#define ERROR_GOT_ARGUMENT 0x03
.lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
.lyrics_autosave = false,
.lyrics_show_plugin = false,
+ .text_editor_ask = true,
#endif
.find_wrap = true,
.scroll_offset = 0,
.audible_bell = true,
.bell_on_wrap = true,
.status_message_time = 3,
+ .timeout_ms = DEFAULT_MPD_TIMEOUT,
#ifndef NCMPC_MINI
.scroll = DEFAULT_SCROLL,
.welcome_screen_list = true,
{ 'h', "host", "HOST", "Connect to server on host" },
{ 'P', "password","PASSWORD", "Connect with password" },
{ 'f', "config", "FILE", "Read configuration from file" },
- { 'k', "key-file","FILE", "Read configuration from file" },
+ { 'k', "key-file","FILE", "Read key bindings from file" },
#ifndef NDEBUG
{ 'K', "dump-keys", NULL, "Dump key bindings to stdout" },
#endif
for (i = 0; i < option_table_size; ++i) {
if (l && strcmp(l, option_table[i].longopt) == 0)
- return &option_table[i];;
+ return &option_table[i];
if (s && s == option_table[i].shortopt)
- return &option_table[i];;
+ return &option_table[i];
}
return NULL;
static void
display_help(void)
{
- unsigned i;
-
printf("Usage: %s [OPTION]...\n", PACKAGE);
- for (i = 0; i < option_table_size; ++i) {
- char tmp[MAX_LONGOPT_LENGTH];
+ for (unsigned i = 0; i < option_table_size; ++i) {
+ char tmp[32];
if (option_table[i].argument)
- g_snprintf(tmp, MAX_LONGOPT_LENGTH, "%s=%s",
+ g_snprintf(tmp, sizeof(tmp), "%s=%s",
option_table[i].longopt,
option_table[i].argument);
else
#ifdef ENABLE_MULTIBYTE
" multibyte"
#endif
-#ifdef ENABLE_WIDE
+#ifdef HAVE_CURSES_ENHANCED
" wide"
#endif
#ifdef ENABLE_LOCALE
#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" */
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);
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);
{
/* 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
options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
#endif
+ if (getenv("MPD_TIMEOUT") != NULL)
+ /* let libmpdclient parse the environment variable */
+ options.timeout_ms = 0;
}
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
}