![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/options.c b/src/options.c
index 8c62e4b83b3d41b191d9b2e39903b6d8c7050516..e863c726f7173ddb73870d9338ee2aff4d92e42a 100644 (file)
--- a/src/options.c
+++ b/src/options.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
+
+ * 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 "charset.h"
#include "command.h"
#include "conf.h"
+#include "i18n.h"
#include <stdlib.h>
#include <stdio.h>
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,
#endif
.find_wrap = true,
+ .scroll_offset = 0,
.wide_cursor = true,
.audible_bell = true,
+ .bell_on_wrap = true,
+ .status_message_time = 3,
#ifndef NCMPC_MINI
.scroll = DEFAULT_SCROLL,
.welcome_screen_list = 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" },
option_table[i].shortopt,
tmp,
option_table[i].descrition);
- i++;
}
}
#ifndef NDEBUG
" debug"
#endif
+#ifdef ENABLE_MULTIBYTE
+ " multibyte"
+#endif
#ifdef ENABLE_WIDE
" wide"
#endif
+#ifdef ENABLE_LOCALE
+ " locale"
+#endif
#ifdef ENABLE_NLS
" nls"
#endif
#endif
"\n");
+#ifndef NCMPC_MINI
+ if (strcmp("translator-credits", _("translator-credits")) != 0)
+ /* To translators: these credits are shown
+ when ncmpc is started with "--version" */
+ printf("\n%s\n", _("translator-credits"));
+#endif
exit(EXIT_SUCCESS);
case 'c': /* --colors */
#ifdef ENABLE_COLORS
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
+#ifndef 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);
if (g_str_has_prefix(arg, "--")) {
char *name, *value;
- /* make shure we got an argument for the previous option */
+ /* make sure we got an argument for the previous option */
if( opt && opt->argument )
option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument);
- /* retreive a option argument */
+ /* retrieve a option argument */
if ((value=g_strrstr(arg+2, "="))) {
*value = '\0';
name = g_strdup(arg);
option_error(ERROR_UNKNOWN_OPTION, name, NULL);
g_free(name);
- /* abort if we got an argument to the option and dont want one */
+ /* abort if we got an argument to the option and don't want one */
if( value && opt->argument==NULL )
option_error(ERROR_GOT_ARGUMENT, arg, value);
size_t j;
for(j=1; j<len; j++) {
- /* make shure we got an argument for the previous option */
+ /* make sure we got an argument for the previous option */
if (opt && opt->argument)
option_error(ERROR_MISSING_ARGUMENT,
opt->longopt, opt->argument);
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 (enviroment) */
- 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 (enviroment) */
- 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
}
+
+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
+}