![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/options.c b/src/options.c
index 1b745bb76467854c7ebc488d13797d13b228d9ad..5d8b1fda448cac033905d64a5ff602a94c6926be 100644 (file)
--- a/src/options.c
+++ b/src/options.c
-/*
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
- *
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2009 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>
#include <string.h>
#include <glib.h>
typedef void (*option_callback_fn_t)(int c, const char *arg);
-options_t options;
+options_t options = {
+ .port = DEFAULT_PORT,
+ .crossfade_time = DEFAULT_CROSSFADE_TIME,
+ .seek_time = 1,
+#ifdef ENABLE_LYRICS_SCREEN
+ .lyrics_timeout = DEFAULT_LYRICS_TIMEOUT,
+#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,
+ .display_time = true,
+ .jump_prefix_only = true,
+#endif
+};
static const arg_opt_t option_table[] = {
{ '?', "help", NULL, "Show this help message" },
option_table[i].shortopt,
tmp,
option_table[i].descrition);
- i++;
}
}
case 'V': /* --version */
puts(PACKAGE " version: " VERSION "\n"
"build options:"
+#ifdef NCMPC_MINI
+ " mini"
+#endif
#ifndef NDEBUG
" debug"
#endif
+#ifdef ENABLE_MULTIBYTE
+ " multibyte"
+#endif
+#ifdef ENABLE_WIDE
+ " wide"
+#endif
+#ifdef ENABLE_LOCALE
+ " locale"
+#endif
#ifdef ENABLE_NLS
" nls"
#endif
#else
" no-colors"
#endif
+#ifdef ENABLE_LIRC
+ " lirc"
+#endif
#ifdef HAVE_GETMOUSE
" getmouse"
#endif
#ifdef ENABLE_ARTIST_SCREEN
" artist-screen"
#endif
+#ifdef ENABLE_HELP_SCREEN
+ " help-screen"
+#endif
#ifdef ENABLE_SEARCH_SCREEN
" search-screen"
#endif
+#ifdef ENABLE_SONG_SCREEN
+ " song-screen"
+#endif
#ifdef ENABLE_KEYDEF_SCREEN
" key-screen"
#endif
+#ifdef ENABLE_LYRICS_SCREEN
+ " lyrics-screen"
+#endif
+#ifdef ENABLE_OUTPUTS_SCREEN
+ " outputs-screen"
+#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
#endif
break;
case 'm': /* --mouse */
+#ifdef HAVE_GETMOUSE
options.enable_mouse = true;
+#endif
break;
case 'M': /* --no-mouse */
+#ifdef HAVE_GETMOUSE
options.enable_mouse = false;
+#endif
break;
case 'e': /* --exit */
/* deprecated */
/* 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);
const char *value;
char *tmp;
- /* get initial values for host and password from MPD_HOST (enviroment) */
+ /* get initial values for host and password from MPD_HOST (environment) */
if ((value = g_getenv(MPD_HOST_ENV)))
options.host = g_strdup(value);
else
g_free(oldhost);
}
- /* get initial values for port from MPD_PORT (enviroment) */
+ /* get initial values for port from MPD_PORT (environment) */
if ((value = g_getenv(MPD_PORT_ENV)))
options.port = atoi(value);
- else
- options.port = DEFAULT_PORT;
/* default option values */
options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
options.status_format = g_strdup(DEFAULT_STATUS_FORMAT);
- options.find_wrap = true;
- options.wide_cursor = true;
- options.welcome_screen_list = true;
- options.audible_bell = true;
- options.crossfade_time = DEFAULT_CROSSFADE_TIME;
- options.seek_time = 1;
options.screen_list = g_strsplit_set(DEFAULT_SCREEN_LIST, " ", 0);
options.timedisplay_type = g_strdup(DEFAULT_TIMEDISPLAY_TYPE);
- options.lyrics_timeout = DEFAULT_LYRICS_TIMEOUT;
- options.scroll = DEFAULT_SCROLL;
+#ifndef NCMPC_MINI
options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
+#endif
}