X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foptions.c;h=83ae5ff6a63ab57456ef7568a8432f38b478a859;hb=607bf2d55826f861d12b774884cb201bc683051c;hp=53f54b7ebfa099d6edc867ae7180aafdec95bdcd;hpb=7e81521772240ec3567a1773d2919a3e90d104c7;p=ncmpc.git diff --git a/src/options.c b/src/options.c index 53f54b7..83ae5ff 100644 --- a/src/options.c +++ b/src/options.c @@ -1,20 +1,21 @@ -/* - * (c) 2004 by Kalle Wallin - * +/* 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" @@ -22,8 +23,10 @@ #include "charset.h" #include "command.h" #include "conf.h" +#include "i18n.h" #include +#include #include #include @@ -45,7 +48,23 @@ typedef struct { 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, + .wide_cursor = true, + .audible_bell = true, + .bell_on_wrap = true, +#ifndef NCMPC_MINI + .scroll = DEFAULT_SCROLL, + .welcome_screen_list = true, + .display_time = true, +#endif +}; static const arg_opt_t option_table[] = { { '?', "help", NULL, "Show this help message" }, @@ -65,7 +84,6 @@ static const arg_opt_t option_table[] = { { 'S', "no-splash", NULL, "Don't show the splash screen" }, #ifndef NDEBUG { 'K', "dump-keys", NULL, "Dump key bindings to stdout" }, - { 'D', "debug", NULL, "Enable debug output on stderr" }, #endif }; @@ -145,9 +163,21 @@ handle_option(int c, const char *arg) 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 @@ -156,19 +186,41 @@ handle_option(int c, const char *arg) #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 @@ -181,13 +233,17 @@ handle_option(int c, const char *arg) #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 */ - options.reconnect = false; + /* deprecated */ break; case 'p': /* --port */ options.port = atoi(arg); @@ -221,9 +277,6 @@ handle_option(int c, const char *arg) write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL); exit(EXIT_SUCCESS); break; - case 'D': /* --debug */ - options.debug = true; - break; #endif default: fprintf(stderr,"Unknown Option %c = %s\n", c, arg); @@ -318,8 +371,6 @@ options_init(void) const char *value; char *tmp; - memset(&options, 0, sizeof(options_t)); - /* get initial values for host and password from MPD_HOST (enviroment) */ if ((value = g_getenv(MPD_HOST_ENV))) options.host = g_strdup(value); @@ -337,22 +388,13 @@ options_init(void) /* get initial values for port from MPD_PORT (enviroment) */ 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.reconnect = true; - 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 }