X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Foptions.c;h=f6fa63f6573319e89ba424143890ab07d0a1fdab;hb=c4aca0137a7a819270eabb3092e655ccaa721065;hp=e958e4b957531a96cfcc2c39161b84d8569fc6b5;hpb=8e032a17efe4851c9c9de61775101e890d5594f1;p=ncmpc.git

diff --git a/src/options.c b/src/options.c
index e958e4b..f6fa63f 100644
--- a/src/options.c
+++ b/src/options.c
@@ -1,7 +1,6 @@
-/* 
- * $Id$
- *
- * (c) 2004 by Kalle Wallin <kaw@linux.se>
+/* ncmpc (Ncurses MPD Client)
+ * (c) 2004-2017 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
@@ -12,181 +11,404 @@
  * 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 <stdio.h>
+#include "options.h"
+#include "config.h"
+#include "defaults.h"
+#include "charset.h"
+#include "command.h"
+#include "conf.h"
+#include "i18n.h"
+
 #include <stdlib.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <string.h>
-#include <ncurses.h>
 #include <glib.h>
-#include <popt.h>
 
-#include "config.h"
-#include "ncmpc.h"
-#include "options.h"
-#include "command.h"
-#include "support.h"
-
-options_t options;
-
-static char *mpd_host     = NULL;
-static char *mpd_password = NULL;
-static char *config_file  = NULL;
-static char *key_file     = NULL;
-
-static struct poptOption optionsTable[] = {
-#ifdef DEBUG
-  { "debug",        'D', 0, 0, 'D', "Enable debug output." },
-#endif
-  { "version",      'V', 0, 0, 'V', "Display version information." },
-  { "colors",       'c', 0, 0, 'c', "Enable colors." },
-  { "no-colors",    'C', 0, 0, 'C', "Disable colors." },
-  { "exit",         'e', 0, 0, 'e', "Exit on connection errors." },
-  { "port",         'p', POPT_ARG_INT, &options.port, 0, 
-    "Connect to server on port [" DEFAULT_PORT_STR "].", "PORT" },
-  { "host",         'h', POPT_ARG_STRING, &mpd_host, 0, 
-    "Connect to server [" DEFAULT_HOST "].", "HOSTNAME" },
-  { "password",     'P', POPT_ARG_STRING, &mpd_password, 0, 
-    "Connect with password.", "PASSWORD" },
-  { "config",       'f', POPT_ARG_STRING, &config_file, 0, 
-    "Read config from FILE." , "FILE" },
-  { "key-file",     'k', POPT_ARG_STRING, &key_file, 0, 
-    "Read key bindings from FILE." , "FILE" },
-
-  POPT_AUTOHELP
-  { NULL, 0, 0, NULL, 0 }
+#define ERROR_UNKNOWN_OPTION    0x01
+#define ERROR_BAD_ARGUMENT      0x02
+#define ERROR_GOT_ARGUMENT      0x03
+#define ERROR_MISSING_ARGUMENT  0x04
+
+typedef struct {
+	int shortopt;
+	const char *longopt;
+	const char *argument;
+	const char *descrition;
+} arg_opt_t;
+
+
+typedef void (*option_callback_fn_t)(int c, const char *arg);
+
+
+options_t options = {
+	.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,
+	.jump_prefix_only = true,
+	.second_column = true,
+#endif
 };
 
+static const arg_opt_t option_table[] = {
+	{ '?', "help", NULL, "Show this help message" },
+	{ 'V', "version", NULL, "Display version information" },
+	{ 'c', "colors", NULL, "Enable colors" },
+	{ 'C', "no-colors", NULL, "Disable colors" },
+#ifdef HAVE_GETMOUSE
+	{ 'm', "mouse", NULL, "Enable mouse" },
+	{ 'M', "no-mouse", NULL, "Disable mouse" },
+#endif
+	{ 'e', "exit", NULL, "Exit on connection errors" },
+	{ '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 key bindings from file" },
+#ifndef NDEBUG
+	{ 'K', "dump-keys", NULL, "Dump key bindings to stdout" },
+#endif
+};
+
+static const unsigned option_table_size = sizeof(option_table) / sizeof(option_table[0]);
+
+static const arg_opt_t *
+lookup_option(int s, char *l)
+{
+	unsigned i;
+
+	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];
+	}
+
+	return NULL;
+}
+
 static void
-usage(poptContext optCon, int exitcode, char *error, char *addl) 
+option_error(int error, const char *option, const char *arg)
 {
-  poptPrintUsage(optCon, stderr, 0);
-  if (error) 
-    fprintf(stderr, "%s: %s0", error, addl);
-  exit(exitcode);
+	switch (error) {
+	case ERROR_UNKNOWN_OPTION:
+		fprintf(stderr, PACKAGE ": invalid option %s\n", option);
+		break;
+	case ERROR_BAD_ARGUMENT:
+		fprintf(stderr, PACKAGE ": bad argument: %s\n", option);
+		break;
+	case ERROR_GOT_ARGUMENT:
+		fprintf(stderr, PACKAGE ": invalid option %s=%s\n", option, arg);
+		break;
+	case ERROR_MISSING_ARGUMENT:
+		fprintf(stderr, PACKAGE ": missing value for %s option\n", option);
+		break;
+	default:
+		fprintf(stderr, PACKAGE ": internal error %d\n", error);
+		break;
+	}
+
+	exit(EXIT_FAILURE);
 }
 
-options_t *
-options_parse( int argc, const char **argv)
+static void
+display_help(void)
 {
-  int c;
-  poptContext optCon;   /* context for parsing command-line options */
-
-  mpd_host = NULL;
-  mpd_password = NULL;
-  config_file = NULL;
-  key_file = NULL;
-  optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
-  while ((c = poptGetNextOpt(optCon)) >= 0) 
-    {
-      switch (c) 
-	{
-#ifdef DEBUG
-	case 'D':
-	  options.debug = 1;
-	  break;
-#endif
-	case 'c':
-	  options.enable_colors = 1;
-	  break;
-	case 'C':
-	  options.enable_colors = 0;
-	  break;
-	case 'V':
-	  printf("Version " VERSION "\n");
-	  exit(EXIT_SUCCESS);
-	case 'e':
-	  options.reconnect = 0;
-	  break;
+	printf("Usage: %s [OPTION]...\n", PACKAGE);
+
+	for (unsigned i = 0; i < option_table_size; ++i) {
+		char tmp[32];
+
+		if (option_table[i].argument)
+			g_snprintf(tmp, sizeof(tmp), "%s=%s",
+				   option_table[i].longopt,
+				   option_table[i].argument);
+		else
+			g_strlcpy(tmp, option_table[i].longopt, 64);
+
+		printf("  -%c, --%-20s %s\n",
+		       option_table[i].shortopt,
+		       tmp,
+		       option_table[i].descrition);
+	}
+}
+
+static void
+handle_option(int c, const char *arg)
+{
+	switch (c) {
+	case '?': /* --help */
+		display_help();
+		exit(EXIT_SUCCESS);
+	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 HAVE_CURSES_ENHANCED
+		     " wide"
+#endif
+#ifdef ENABLE_LOCALE
+		     " locale"
+#endif
+#ifdef ENABLE_NLS
+		     " nls"
+#endif
+#ifdef ENABLE_COLORS
+		     " colors"
+#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
+#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" */
+			printf("\n%s\n", _("translator-credits"));
+#endif
+		exit(EXIT_SUCCESS);
+	case 'c': /* --colors */
+#ifdef ENABLE_COLORS
+		options.enable_colors = true;
+#endif
+		break;
+	case 'C': /* --no-colors */
+#ifdef ENABLE_COLORS
+		options.enable_colors = false;
+#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 */
+		break;
+	case 'p': /* --port */
+		options.port = atoi(arg);
+		break;
+	case 'h': /* --host */
+		g_free(options.host);
+		options.host = g_strdup(arg);
+		break;
+	case 'P': /* --password */
+		g_free(options.password);
+		options.password = locale_to_utf8(arg);
+		break;
+	case 'f': /* --config */
+		g_free(options.config_file);
+		options.config_file = g_strdup(arg);
+		break;
+	case 'k': /* --key-file */
+		g_free(options.key_file);
+		options.key_file = g_strdup(arg);
+		break;
+#if !defined(NDEBUG) && !defined(NCMPC_MINI)
+	case 'K': /* --dump-keys */
+		read_configuration();
+		write_key_bindings(stdout, KEYDEF_WRITE_ALL | KEYDEF_COMMENT_ALL);
+		exit(EXIT_SUCCESS);
+		break;
+#endif
 	default:
-	  fprintf(stderr, "%s: %s\n",
-		  poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
-		  poptStrerror(c));
-	  poptFreeContext(optCon);
-	  exit(EXIT_FAILURE);
-	  break;
+		fprintf(stderr,"Unknown Option %c = %s\n", c, arg);
+		break;
 	}
-    }
-  if (c < -1) 
-    {
-      /* an error occurred during option processing */
-      fprintf(stderr, "%s: %s\n",
-	      poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
-	      poptStrerror(c));
-      poptFreeContext(optCon);
-      exit(EXIT_FAILURE);
-    }
-
-  if( mpd_host )
-    {
-      g_free(options.host);
-      options.host = mpd_host;
-    }
-  if( mpd_password )
-    {
-      g_free(options.password);
-      options.password = mpd_password;
-    }
-  if( config_file )
-    {
-      g_free(options.config_file);
-      options.config_file = config_file;
-    }
-  if( key_file )
-    {
-      g_free(options.key_file);
-      options.key_file = key_file;
-    }
-
-  poptFreeContext(optCon);
-  return &options;
 }
 
-options_t *
-options_init( void )
+void
+options_parse(int argc, const char *argv[])
 {
-  const char *value;
-  char *tmp;
-
-  memset(&options, 0, sizeof(options_t));
-
-  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);
-    }
-
-  if( (value=g_getenv(MPD_PORT_ENV)) )
-    options.port = atoi(value);
-  else
-    options.port = DEFAULT_PORT;
-
-  options.list_format = NULL;
-  options.status_format = NULL;
-
-  options.reconnect = TRUE;
-  options.find_wrap = TRUE;
-  options.wide_cursor = TRUE;
-  options.audible_bell = TRUE;
-
-  return &options;
+	const arg_opt_t *opt = NULL;
+	option_callback_fn_t option_cb = handle_option;
+
+	for (int i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		size_t len = strlen(arg);
+
+		/* check for a long option */
+		if (g_str_has_prefix(arg, "--")) {
+			char *name, *value;
+
+			/* make sure we got an argument for the previous option */
+			if( opt && opt->argument )
+				option_error(ERROR_MISSING_ARGUMENT, opt->longopt, opt->argument);
+
+			/* retrieve a option argument */
+			if ((value=g_strrstr(arg+2, "="))) {
+				*value = '\0';
+				name = g_strdup(arg);
+				*value = '=';
+				value++;
+			} else
+				name = g_strdup(arg);
+
+			/* check if the option exists */
+			if( (opt=lookup_option(0, name+2)) == NULL )
+				option_error(ERROR_UNKNOWN_OPTION, name, NULL);
+			g_free(name);
+
+			/* 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);
+
+			/* execute option callback */
+			if (value || opt->argument==NULL) {
+				option_cb (opt->shortopt, value);
+				opt = NULL;
+			}
+		}
+		/* check for short options */
+		else if (len>=2 && g_str_has_prefix(arg, "-")) {
+			size_t j;
+
+			for(j=1; j<len; j++) {
+				/* make sure we got an argument for the previous option */
+				if (opt && opt->argument)
+					option_error(ERROR_MISSING_ARGUMENT,
+						     opt->longopt, opt->argument);
+
+				/* check if the option exists */
+				if ((opt=lookup_option(arg[j], NULL)) == NULL)
+					option_error(ERROR_UNKNOWN_OPTION, arg, NULL);
+
+				/* if no option argument is needed execute callback */
+				if (opt->argument == NULL) {
+					option_cb (opt->shortopt, NULL);
+					opt = NULL;
+				}
+			}
+		} else {
+			/* is this a option argument? */
+			if (opt && opt->argument) {
+				option_cb (opt->shortopt, arg);
+				opt = NULL;
+			} else
+				option_error(ERROR_BAD_ARGUMENT, arg, NULL);
+		}
+	}
+
+	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)
+{
+	/* default option values */
+	options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
+	options.search_format = NULL;
+	options.status_format = g_strdup(DEFAULT_STATUS_FORMAT);
+	options.screen_list = g_strsplit_set(DEFAULT_SCREEN_LIST, " ", 0);
+#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;
+}
 
-options_t *
-options_get(void)
+void
+options_deinit(void)
 {
-  return &options;
+	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.search_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
 }