diff --git a/src/options.c b/src/options.c
index 5bb5fbadd7f20fd652706c211bbc9e42aeb250de..5d8b1fda448cac033905d64a5ff602a94c6926be 100644 (file)
--- a/src/options.c
+++ b/src/options.c
/* 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
.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
};
option_table[i].shortopt,
tmp,
option_table[i].descrition);
- i++;
}
}
/* 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);