![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/conf.c b/src/conf.c
index f1f1223a3e10d839b4f8ffac0847e752e476a8aa..c02df52cf42f79e19273c0b8ca96aef27076f8d9 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
*
*/
+#define NO_GLOBAL_OPTIONS
+#include "conf.h"
+#include "config.h"
+#include "ncmpc.h"
+#include "support.h"
+#include "command.h"
+#include "colors.h"
+
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <glib.h>
-#include <ncurses.h>
-#include "config.h"
-#include "ncmpc.h"
-#include "options.h"
-#include "support.h"
-#include "command.h"
-#include "colors.h"
-#include "conf.h"
-
#define MAX_LINE_LENGTH 1024
#define COMMENT_TOKEN '#'
#define CONF_XTERM_TITLE_FORMAT "xterm-title-format"
#define CONF_LIST_WRAP "wrap-around"
#define CONF_FIND_WRAP "find-wrap"
+#define CONF_FIND_SHOW_LAST "find-show-last"
#define CONF_AUDIBLE_BELL "audible-bell"
#define CONF_VISIBLE_BELL "visible-bell"
#define CONF_XTERM_TITLE "set-xterm-title"
-#define CONF_MOUSE_EVENTS "enable-mouse"
+#define CONF_ENABLE_MOUSE "enable-mouse"
+#define CONF_CROSSFADE_TIME "crossfade-time"
+#define CONF_SEARCH_MODE "search-mode"
+#define CONF_HIDE_CURSOR "hide-cursor"
+#define CONF_SEEK_TIME "seek-time"
+#define CONF_SCREEN_LIST "screen-list"
+#define CONF_TIMEDISPLAY_TYPE "timedisplay-type"
+#define CONF_HOST "host"
+#define CONF_PORT "port"
+#define CONF_PASSWORD "password"
+#define CONF_LYRICS_TIMEOUT "lyrics-timeout"
+#define CONF_SHOW_SPLASH "show-splash"
+#define CONF_SCROLL "scroll"
+#define CONF_SCROLL_SEP "scroll-sep"
+#define CONF_VISIBLE_BITRATE "visible-bitrate"
+#define CONF_WELCOME_SCREEN_LIST "welcome-screen-list"
typedef enum {
KEY_PARSER_UNKNOWN,
KEY_PARSER_DONE
} key_parser_state_t;
+
+extern gint screen_get_id(char *name);
+
+
static gboolean
str2bool(char *str)
{
- if( !strcasecmp(str,"yes") || !strcasecmp(str,"true") ||
- !strcasecmp(str,"on") || !strcasecmp(str,"1") )
- return TRUE;
- return FALSE;
+ if (!strcasecmp(str, "yes") || !strcasecmp(str, "true") ||
+ !strcasecmp(str, "on") || !strcasecmp(str, "1"))
+ return TRUE;
+ return FALSE;
}
static int
parse_key_value(char *str, size_t len, char **end)
{
- int i, value;
- key_parser_state_t state;
-
- i=0;
- value=0;
- state=KEY_PARSER_UNKNOWN;
- *end = str;
-
- while( i<len && state!=KEY_PARSER_DONE )
- {
- int next = 0;
- int c = str[i];
-
- if( i+1<len )
- next = str[i+1];
-
- switch(state)
- {
- case KEY_PARSER_UNKNOWN:
- if( c=='\'' )
- state = KEY_PARSER_CHAR;
- else if( c=='0' && next=='x' )
- state = KEY_PARSER_HEX;
- else if( isdigit(c) )
- state = KEY_PARSER_DEC;
- else {
- fprintf(stderr,
- _("Error: Unsupported key definition - %s\n"),
- str);
- return -1;
- }
- break;
- case KEY_PARSER_CHAR:
- if( next!='\'' )
- {
- fprintf(stderr,
- _("Error: Unsupported key definition - %s\n"),
- str);
- return -1;
- }
- value = c;
- *end = str+i+2;
- state = KEY_PARSER_DONE;
- break;
- case KEY_PARSER_DEC:
- value = (int) strtol(str+(i-1), end, 10);
- state = KEY_PARSER_DONE;
- break;
- case KEY_PARSER_HEX:
- if( !isdigit(next) )
- {
- fprintf(stderr,_("Error: Digit expexted after 0x - %s\n"), str);
- return -1;
- }
- value = (int) strtol(str+(i+1), end, 16);
- state = KEY_PARSER_DONE;
- break;
- case KEY_PARSER_DONE:
- break;
+ size_t i;
+ int value;
+ key_parser_state_t state;
+
+ i=0;
+ value=0;
+ state=KEY_PARSER_UNKNOWN;
+ *end = str;
+
+ while (i < len && state != KEY_PARSER_DONE) {
+ int next = 0;
+ int c = str[i];
+
+ if( i+1<len )
+ next = str[i+1];
+
+ switch(state) {
+ case KEY_PARSER_UNKNOWN:
+ if( c=='\'' )
+ state = KEY_PARSER_CHAR;
+ else if( c=='0' && next=='x' )
+ state = KEY_PARSER_HEX;
+ else if( isdigit(c) )
+ state = KEY_PARSER_DEC;
+ else {
+ fprintf(stderr,
+ _("Error: Unsupported key definition - %s\n"),
+ str);
+ return -1;
+ }
+ break;
+ case KEY_PARSER_CHAR:
+ if( next!='\'' ) {
+ fprintf(stderr,
+ _("Error: Unsupported key definition - %s\n"),
+ str);
+ return -1;
+ }
+ value = c;
+ *end = str+i+2;
+ state = KEY_PARSER_DONE;
+ break;
+ case KEY_PARSER_DEC:
+ value = (int) strtol(str+(i-1), end, 10);
+ state = KEY_PARSER_DONE;
+ break;
+ case KEY_PARSER_HEX:
+ if( !isdigit(next) ) {
+ fprintf(stderr,_("Error: Digit expected after 0x - %s\n"), str);
+ return -1;
+ }
+ value = (int) strtol(str+(i+1), end, 16);
+ state = KEY_PARSER_DONE;
+ break;
+ case KEY_PARSER_DONE:
+ break;
+ }
+ i++;
}
- i++;
- }
- if( *end> str+len )
- *end = str+len;
+ if( *end> str+len )
+ *end = str+len;
- return value;
+ return value;
}
static int
parse_key_definition(char *str)
{
- char buf[MAX_LINE_LENGTH];
- char *p, *end;
- size_t len = strlen(str);
- int i,j,key;
- int keys[MAX_COMMAND_KEYS];
- command_t cmd;
-
- /* get the command name */
- i=0;
- j=0;
- memset(buf, 0, MAX_LINE_LENGTH);
- while( i<len && str[i]!='=' && !IS_WHITESPACE(str[i]) )
- buf[j++] = str[i++];
- if( (cmd=get_key_command_from_name(buf)) == CMD_NONE )
- {
- fprintf(stderr, _("Error: Unknown key command %s\n"), buf);
- return -1;
- }
+ char buf[MAX_LINE_LENGTH];
+ char *p, *end;
+ size_t len = strlen(str), i;
+ int j,key;
+ int keys[MAX_COMMAND_KEYS];
+ command_t cmd;
+
+ /* get the command name */
+ i=0;
+ j=0;
+ memset(buf, 0, MAX_LINE_LENGTH);
+ while( i<len && str[i]!='=' && !IS_WHITESPACE(str[i]) )
+ buf[j++] = str[i++];
+ if( (cmd=get_key_command_from_name(buf)) == CMD_NONE ) {
+ fprintf(stderr, _("Error: Unknown key command %s\n"), buf);
+ return -1;
+ }
- /* skip whitespace */
- while( i<len && (str[i]=='=' || IS_WHITESPACE(str[i])) )
- i++;
+ /* skip whitespace */
+ while( i<len && (str[i]=='=' || IS_WHITESPACE(str[i])) )
+ i++;
- /* get the value part */
- memset(buf, 0, MAX_LINE_LENGTH);
- g_strlcpy(buf, str+i, MAX_LINE_LENGTH);
- len = strlen(buf);
- if( len==0 )
- {
- fprintf(stderr,_("Error: Incomplete key definition - %s\n"), str);
- return -1;
- }
+ /* get the value part */
+ memset(buf, 0, MAX_LINE_LENGTH);
+ g_strlcpy(buf, str+i, MAX_LINE_LENGTH);
+ len = strlen(buf);
+ if( len==0 ) {
+ fprintf(stderr,_("Error: Incomplete key definition - %s\n"), str);
+ return -1;
+ }
- /* parse key values */
- i = 0;
- key = 0;
- len = strlen(buf);
- p = buf;
- end = buf+len;
- memset(keys, 0, sizeof(int)*MAX_COMMAND_KEYS);
- while( i<MAX_COMMAND_KEYS && p<end && (key=parse_key_value(p,len+1,&p))>=0 )
- {
- keys[i++] = key;
- while( p<end && (*p==',' || *p==' ' || *p=='\t') )
- p++;
- len = strlen(p);
- }
- if( key<0 )
- {
- fprintf(stderr,_("Error: Bad key definition - %s\n"), str);
- return -1;
- }
+ /* parse key values */
+ i = 0;
+ key = 0;
+ len = strlen(buf);
+ p = buf;
+ end = buf+len;
+ memset(keys, 0, sizeof(int)*MAX_COMMAND_KEYS);
+ while( i<MAX_COMMAND_KEYS && p<end &&
+ (key=parse_key_value(p,len+1,&p))>=0 ) {
+ keys[i++] = key;
+ while( p<end && (*p==',' || *p==' ' || *p=='\t') )
+ p++;
+ len = strlen(p);
+ }
+ if( key<0 ) {
+ fprintf(stderr,_("Error: Bad key definition - %s\n"), str);
+ return -1;
+ }
- return assign_keys(cmd, keys);
+ return assign_keys(cmd, keys);
+}
+
+static const char *
+parse_timedisplay_type(const char *str)
+{
+ if((!strcmp(str,"elapsed")) || (!strcmp(str,"remaining"))){
+ return str;
+ } else {
+ fprintf(stderr,_("Error: Bad time display type - %s\n"), str);
+ return DEFAULT_TIMEDISPLAY_TYPE;
+ }
}
static int
parse_color(char *str)
{
- char *name = str;
- char *value = NULL;
- int len,i;
-
- i=0;
- len=strlen(str);
- /* get the color name */
- while( i<len && str[i]!='=' && !IS_WHITESPACE(str[i]) )
- i++;
-
- /* skip whitespace */
- while( i<len && (str[i]=='=' || IS_WHITESPACE(str[i])) )
- {
- str[i]='\0';
- i++;
- }
-
- if( i<len )
- value = str+i;
-
- return colors_assign(name, value);
-}
+ const char *name = str;
+ const char *value = NULL;
+ int len,i;
+
+ i=0;
+ len=strlen(str);
+ /* get the color name */
+ while( i<len && str[i]!='=' && !IS_WHITESPACE(str[i]) )
+ i++;
+
+ /* skip whitespace */
+ while( i<len && (str[i]=='=' || IS_WHITESPACE(str[i])) ) {
+ str[i]='\0';
+ i++;
+ }
+ if( i<len )
+ value = str+i;
+
+ return colors_assign(name, value);
+}
static int
parse_color_definition(char *str)
{
- char buf[MAX_LINE_LENGTH];
- char *p, *end, *name;
- size_t len = strlen(str);
- int i,j,value;
- short color, rgb[3];
-
- /* get the command name */
- i=0;
- j=0;
- memset(buf, 0, MAX_LINE_LENGTH);
- while( i<len && str[i]!='=' && !IS_WHITESPACE(str[i]) )
- buf[j++] = str[i++];
- color=colors_str2color(buf);
- if( color<0 )
- {
- fprintf(stderr,_("Error: Bad color %s [%d]\n"), buf, color);
- return -1;
- }
- name = g_strdup(buf);
+ char buf[MAX_LINE_LENGTH];
+ char *p, *end, *name;
+ size_t len = strlen(str), i;
+ int j,value;
+ short color, rgb[3];
+
+ /* get the command name */
+ i=0;
+ j=0;
+ memset(buf, 0, MAX_LINE_LENGTH);
+ while( i<len && str[i]!='=' && !IS_WHITESPACE(str[i]) )
+ buf[j++] = str[i++];
+ color=colors_str2color(buf);
+ if( color<0 ) {
+ fprintf(stderr,_("Error: Bad color %s [%d]\n"), buf, color);
+ return -1;
+ }
+ name = g_strdup(buf);
- /* skip whitespace */
- while( i<len && (str[i]=='=' || IS_WHITESPACE(str[i])) )
- i++;
+ /* skip whitespace */
+ while( i<len && (str[i]=='=' || IS_WHITESPACE(str[i])) )
+ i++;
- /* get the value part */
- memset(buf, 0, MAX_LINE_LENGTH);
- g_strlcpy(buf, str+i, MAX_LINE_LENGTH);
- len = strlen(buf);
- if( len==0 )
- {
- fprintf(stderr,_("Error: Incomplete color definition - %s\n"), str);
- g_free(name);
- return -1;
- }
+ /* get the value part */
+ memset(buf, 0, MAX_LINE_LENGTH);
+ g_strlcpy(buf, str+i, MAX_LINE_LENGTH);
+ len = strlen(buf);
+ if( len==0 ) {
+ fprintf(stderr,_("Error: Incomplete color definition - %s\n"), str);
+ g_free(name);
+ return -1;
+ }
- /* parse r,g.b values with the key definition parser */
- i = 0;
- value = 0;
- len = strlen(buf);
- p = buf;
- end = buf+len;
- memset(rgb, 0, sizeof(short)*3);
- while( i<3 && p<end && (value=parse_key_value(p,len+1,&p))>=0 )
- {
- rgb[i++] = value;
- while( p<end && (*p==',' || *p==' ' || *p=='\t') )
- p++;
- len = strlen(p);
- }
- if( value<0 || i!=3)
- {
- fprintf(stderr,_("Error: Bad color definition - %s\n"), str);
- g_free(name);
- return -1;
- }
- value = colors_define(name, rgb[0], rgb[1], rgb[2]);
- g_free(name);
- return value;
+ /* parse r,g.b values with the key definition parser */
+ i = 0;
+ value = 0;
+ len = strlen(buf);
+ p = buf;
+ end = buf+len;
+ memset(rgb, 0, sizeof(short)*3);
+ while( i<3 && p<end && (value=parse_key_value(p,len+1,&p))>=0 ) {
+ rgb[i++] = value;
+ while( p<end && (*p==',' || *p==' ' || *p=='\t') )
+ p++;
+ len = strlen(p);
+ }
+ if( value<0 || i!=3) {
+ fprintf(stderr,_("Error: Bad color definition - %s\n"), str);
+ g_free(name);
+ return -1;
+ }
+ value = colors_define(name, rgb[0], rgb[1], rgb[2]);
+ g_free(name);
+ return value;
}
static char *
get_format(char *str)
{
- gsize len = strlen(str);
+ gsize len = strlen(str);
- if( str && str[0]=='\"' && str[len-1] == '\"' )
- {
- str[len-1] = '\0';
- str++;
- }
- return g_strdup(str);
+ if( str && str[0]=='\"' && str[len-1] == '\"' ) {
+ str[len-1] = '\0';
+ str++;
+ }
+ return g_strdup(str);
}
+static char **
+check_screen_list(char *value)
+{
+ char **tmp = g_strsplit_set(value, " \t,", 100);
+ char **screen = NULL;
+ int i,j;
+
+ i=0;
+ j=0;
+ while( tmp && tmp[i] ) {
+ tmp[i] = lowerstr(tmp[i]);
+ if( screen_get_id(tmp[i]) == -1 )
+ fprintf(stderr,
+ _("Error: Unsupported screen \"%s\"\n"),
+ tmp[i]);
+ else {
+ screen = g_realloc(screen, (j+2)*sizeof(char *));
+ screen[j++] = g_strdup(tmp[i]);
+ screen[j] = NULL;
+ }
+ i++;
+ }
+ g_strfreev(tmp);
+ if( screen == NULL )
+ return g_strsplit_set(DEFAULT_SCREEN_LIST, " ", 0);
+
+ return screen;
+}
static int
read_rc_file(char *filename, options_t *options)
{
options->wide_cursor = str2bool(value);
}
+ /* welcome screen list */
+ else if (!strcasecmp(CONF_WELCOME_SCREEN_LIST, name)) {
+ options->welcome_screen_list = str2bool(value);
+ }
+ /* visible bitrate */
+ else if (!strcasecmp(CONF_VISIBLE_BITRATE, name)) {
+ options->visible_bitrate = str2bool(value);
+ }
+ /* timer display type */
+ else if( !strcasecmp(CONF_TIMEDISPLAY_TYPE, name) )
+ {
+ g_free(options->timedisplay_type);
+ options->timedisplay_type=g_strdup(parse_timedisplay_type(value));
+ D("deb");
+ D(options->timedisplay_type);
+ }
/* color definition */
else if( !strcasecmp(CONF_COLOR_DEFINITION, name) )
{
{
options->find_wrap = str2bool(value);
}
+ else if( !strcasecmp(CONF_FIND_SHOW_LAST,name) )
+ {
+ options->find_show_last_pattern = str2bool(value);
+ }
else if( !strcasecmp(CONF_AUDIBLE_BELL, name) )
{
options->audible_bell = str2bool(value);
{
options->enable_xterm_title = str2bool(value);
}
- else if( !strcasecmp(CONF_MOUSE_EVENTS, name) )
+ else if( !strcasecmp(CONF_ENABLE_MOUSE, name) )
+ {
+ options->enable_mouse = str2bool(value);
+ }
+ else if( !strcasecmp(CONF_CROSSFADE_TIME, name) )
{
- options->enable_mouse_events = str2bool(value);
+ options->crossfade_time = atoi(value);
}
+ else if( !strcasecmp(CONF_SEARCH_MODE, name) )
+ {
+ options->search_mode = atoi(value);
+ }
+ else if( !strcasecmp(CONF_HIDE_CURSOR, name) )
+ {
+ options->hide_cursor = atoi(value);
+ }
+ else if( !strcasecmp(CONF_SEEK_TIME, name) )
+ {
+ options->seek_time = atoi(value);
+ }
+ else if( !strcasecmp(CONF_SCREEN_LIST, name) )
+ {
+ g_strfreev(options->screen_list);
+ options->screen_list = check_screen_list(value);
+ }
+ else if( !strcasecmp(CONF_SHOW_SPLASH, name) )
+ {
+ /* the splash screen was removed */
+ }
+ else if( !strcasecmp(CONF_HOST, name))
+ {
+ options->host = get_format(value);
+ }
+ else if( !strcasecmp(CONF_PORT, name))
+ {
+ options->port = atoi(get_format(value));
+ }
+ else if( !strcasecmp(CONF_PASSWORD, name))
+ {
+ options->password = get_format(value);
+ }
+ else if( !strcasecmp(CONF_LYRICS_TIMEOUT, name))
+ {
+ options->lyrics_timeout = atoi(get_format(value));
+ }
+ else if( !strcasecmp(CONF_SCROLL, name))
+ {
+ options->scroll = str2bool(value);
+ }
+ else if( !strcasecmp(CONF_SCROLL_SEP, name))
+ {
+ g_free(options->scroll_sep);
+ options->scroll_sep = get_format(value);
+ }
else
{
match_found = 0;
}
-
if( !match_found )
fprintf(stderr,
int
check_user_conf_dir(void)
{
- int retval;
- char *dirname = g_build_filename(g_get_home_dir(), "." PACKAGE, NULL);
-
- if( g_file_test(dirname, G_FILE_TEST_IS_DIR) )
- {
- g_free(dirname);
- return 0;
- }
- retval = mkdir(dirname, 0755);
- g_free(dirname);
- return retval;
+ int retval;
+ char *directory = g_build_filename(g_get_home_dir(), "." PACKAGE, NULL);
+
+ if (g_file_test(directory, G_FILE_TEST_IS_DIR)) {
+ g_free(directory);
+ return 0;
+ }
+
+ retval = mkdir(directory, 0755);
+ g_free(directory);
+ return retval;
}
char *
get_user_key_binding_filename(void)
{
- return g_build_filename(g_get_home_dir(), "." PACKAGE, "keys", NULL);
+ return g_build_filename(g_get_home_dir(), "." PACKAGE, "keys", NULL);
}
return 0;
}
-
-
-