diff --git a/src/options.c b/src/options.c
index 2c818279580f1c247df9e47e9e971f58c34deedd..b6a49e3c68204d7cdef42abb9271c5c8d0e73145 100644 (file)
--- a/src/options.c
+++ b/src/options.c
#include "options.h"
#include "config.h"
-#include "ncmpc.h"
-#include "support.h"
+#include "defaults.h"
+#include "charset.h"
#include "command.h"
#include "conf.h"
#include <stdlib.h>
#include <string.h>
+#include <glib.h>
#define MAX_LONGOPT_LENGTH 32
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,
+#ifndef NCMPC_MINI
+ .scroll = DEFAULT_SCROLL,
+ .welcome_screen_list = true,
+#endif
+};
static const arg_opt_t option_table[] = {
{ '?', "help", NULL, "Show this help message" },
{ '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
- { 0, NULL, NULL, NULL },
};
+static const unsigned option_table_size = sizeof(option_table) / sizeof(option_table[0]);
+
static const arg_opt_t *
lookup_option(int s, char *l)
{
- int i;
+ unsigned i;
- i=0;
- while (option_table[i].descrition) {
+ for (i = 0; i < option_table_size; ++i) {
if (l && strcmp(l, option_table[i].longopt) == 0)
return &option_table[i];;
if (s && s == option_table[i].shortopt)
return &option_table[i];;
- i++;
}
return NULL;
static void
display_help(void)
{
- int i = 0;
+ unsigned i;
printf("Usage: %s [OPTION]...\n", PACKAGE);
- while (option_table[i].descrition) {
+
+ for (i = 0; i < option_table_size; ++i) {
char tmp[MAX_LONGOPT_LENGTH];
if (option_table[i].argument)
static void
handle_option(int c, const char *arg)
{
- D("option callback -%c %s\n", c, arg);
switch (c) {
case '?': /* --help */
display_help();
exit(EXIT_SUCCESS);
case 'V': /* --version */
- printf("%s version: %s\n", PACKAGE, VERSION);
- printf("build options:");
+ puts(PACKAGE " version: " VERSION "\n"
+ "build options:"
#ifndef NDEBUG
- printf(" debug");
+ " debug"
#endif
#ifdef ENABLE_NLS
- printf(" nls");
+ " nls"
+#endif
+#ifdef ENABLE_COLORS
+ " colors"
+#else
+ " no-colors"
#endif
#ifdef HAVE_GETMOUSE
- printf(" getmouse");
+ " getmouse"
#endif
#ifdef ENABLE_ARTIST_SCREEN
- printf(" artist-screen");
+ " artist-screen"
#endif
#ifdef ENABLE_SEARCH_SCREEN
- printf(" search-screen");
+ " search-screen"
#endif
#ifdef ENABLE_KEYDEF_SCREEN
- printf(" key-screen");
+ " key-screen"
#endif
- printf("\n");
+ "\n");
exit(EXIT_SUCCESS);
case 'c': /* --colors */
- options.enable_colors = TRUE;
+#ifdef ENABLE_COLORS
+ options.enable_colors = true;
+#endif
break;
case 'C': /* --no-colors */
- options.enable_colors = FALSE;
+#ifdef ENABLE_COLORS
+ options.enable_colors = false;
+#endif
break;
case 'm': /* --mouse */
- options.enable_mouse = TRUE;
+#ifdef HAVE_GETMOUSE
+ options.enable_mouse = true;
+#endif
break;
case 'M': /* --no-mouse */
- options.enable_mouse = FALSE;
+#ifdef HAVE_GETMOUSE
+ options.enable_mouse = false;
+#endif
break;
case 'e': /* --exit */
- options.reconnect = FALSE;
+ /* deprecated */
break;
case 'p': /* --port */
options.port = atoi(arg);
break;
#ifndef NDEBUG
case 'K': /* --dump-keys */
- read_configuration(&options);
+ read_configuration();
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);
}
}
-options_t *
+void
options_parse(int argc, const char *argv[])
{
int i;
option_cb (opt->shortopt, NULL);
else if (opt && opt->argument)
option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument);
-
- return &options;
}
-options_t *
-options_init( void )
+void
+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);
/* 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.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.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);
- options.lyrics_timeout = DEFAULT_LYRICS_TIMEOUT;
- options.scroll = DEFAULT_SCROLL;
+#ifndef NCMPC_MINI
options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
-
- return &options;
+#endif
}