diff --git a/src/options.c b/src/options.c
index 44840548eb1c734521d5d1a1b3d8a0426b24d1a6..6f674c6cd61b9d3736dfd27ebfd87d2ea224813b 100644 (file)
--- a/src/options.c
+++ b/src/options.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (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
options_t options = {
- .port = DEFAULT_PORT,
.crossfade_time = DEFAULT_CROSSFADE_TIME,
.seek_time = 1,
#ifdef ENABLE_LYRICS_SCREEN
.lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
+ .lyrics_autosave = false,
+ .lyrics_show_plugin = false,
+ .text_editor_ask = true,
#endif
.find_wrap = true,
+ .scroll_offset = 0,
.wide_cursor = true,
.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,
- .display_time = true,
.jump_prefix_only = true,
+ .second_column = true,
#endif
};
{ 'M', "no-mouse", NULL, "Disable mouse" },
#endif
{ 'e', "exit", NULL, "Exit on connection errors" },
- { 'p', "port", "PORT", "Connect to server on port [" DEFAULT_PORT_STR "]" },
- { 'h', "host", "HOST", "Connect to server on host [" DEFAULT_HOST "]" },
+ { 'p', "port", "PORT", "Connect to server on port" },
+ { '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" },
- { 'S', "no-splash", NULL, "Don't show the splash screen" },
+ { '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;
printf("Usage: %s [OPTION]...\n", PACKAGE);
for (i = 0; i < option_table_size; ++i) {
- char tmp[MAX_LONGOPT_LENGTH];
+ 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
option_table[i].shortopt,
tmp,
option_table[i].descrition);
- i++;
}
}
#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" */
options.port = atoi(arg);
break;
case 'h': /* --host */
- if( options.host )
- g_free(options.host);
+ g_free(options.host);
options.host = g_strdup(arg);
break;
case 'P': /* --password */
- if( options.password )
- g_free(options.password);
+ g_free(options.password);
options.password = locale_to_utf8(arg);
break;
case 'f': /* --config */
- if( options.config_file )
- g_free(options.config_file);
+ g_free(options.config_file);
options.config_file = g_strdup(arg);
break;
case 'k': /* --key-file */
- if( options.key_file )
- g_free(options.key_file);
+ g_free(options.key_file);
options.key_file = g_strdup(arg);
break;
- case 'S': /* --key-file */
- /* the splash screen was removed */
- break;
-#ifndef NDEBUG
+#if !defined(NDEBUG) && !defined(NCMPC_MINI)
case 'K': /* --dump-keys */
read_configuration();
write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL);
const arg_opt_t *opt = NULL;
option_callback_fn_t option_cb = handle_option;
- i=1;
- while (i < argc) {
+ for (i = 1; i < argc; i++) {
const char *arg = argv[i];
size_t len = strlen(arg);
} else
option_error(ERROR_BAD_ARGUMENT, arg, NULL);
}
- i++;
}
if (opt && opt->argument == NULL)
option_cb (opt->shortopt, NULL);
else if (opt && opt->argument)
option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument);
+
+ if (!options.host && getenv("MPD_HOST")) {
+ g_free(options.host);
+ options.host = g_strdup(getenv("MPD_HOST"));
+ }
}
void
options_init(void)
{
- const char *value;
- char *tmp;
-
- /* get initial values for host and password from MPD_HOST (environment) */
- if ((value = g_getenv(MPD_HOST_ENV)))
- options.host = g_strdup(value);
- else
- options.host = g_strdup(DEFAULT_HOST);
-
- if ((tmp = g_strstr_len(options.host, strlen(options.host), "@"))) {
- char *oldhost = options.host;
- *tmp = '\0';
- options.password = locale_to_utf8(oldhost);
- options.host = g_strdup(tmp+1);
- g_free(oldhost);
- }
-
- /* get initial values for port from MPD_PORT (environment) */
- if ((value = g_getenv(MPD_PORT_ENV)))
- options.port = atoi(value);
-
/* default option values */
options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
options.status_format = g_strdup(DEFAULT_STATUS_FORMAT);
options.screen_list = g_strsplit_set(DEFAULT_SCREEN_LIST, " ", 0);
- options.timedisplay_type = g_strdup(DEFAULT_TIMEDISPLAY_TYPE);
#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
+options_deinit(void)
+{
+ g_free(options.host);
+ g_free(options.username);
+ g_free(options.password);
+ g_free(options.config_file);
+ g_free(options.key_file);
+ g_free(options.list_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
}