![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/conf.c b/src/conf.c
index 3ec37b855776cde142e8eae35e854daa45bb835a..87fa51e7a05e2b356dc9118d81f09975438bb6af 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 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.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
#include "conf.h"
#include "config.h"
#include "colors.h"
#include "screen_list.h"
+#include <assert.h>
#include <ctype.h>
#include <stdio.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
#include <fcntl.h>
#include <glib.h>
+#include <glib/gstdio.h>
#define MAX_LINE_LENGTH 1024
#define COMMENT_TOKEN '#'
#define CONF_HOST "host"
#define CONF_PORT "port"
#define CONF_PASSWORD "password"
+#define CONF_TIMEOUT "timeout"
#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_HARDWARE_CURSOR "hardware-cursor"
#define CONF_WELCOME_SCREEN_LIST "welcome-screen-list"
#define CONF_DISPLAY_TIME "display-time"
#define CONF_JUMP_PREFIX_ONLY "jump-prefix-only"
#define CONF_LYRICS_AUTOSAVE "lyrics-autosave"
+#define CONF_LYRICS_SHOW_PLUGIN "lyrics-show-plugin"
+#define CONF_TEXT_EDITOR "text-editor"
+#define CONF_TEXT_EDITOR_ASK "text-editor-ask"
+#define CONF_CHAT_PREFIX "chat-prefix"
+#define CONF_SECOND_COLUMN "second-column"
static bool
str2bool(char *str)
{
char **tmp = g_strsplit_set(value, " \t,", 100);
char **screen = NULL;
- int i,j;
+ int i = 0, j = 0;
- i=0;
- j=0;
while( tmp && tmp[i] ) {
char *name = g_ascii_strdown(tmp[i], -1);
if (*name != '\0') {
static bool
parse_line(char *line)
{
- size_t len = strlen(line), i = 0, j;
+ size_t len = strlen(line), i = 0, j = 0;
char name[MAX_LINE_LENGTH];
char value[MAX_LINE_LENGTH];
- bool match_found;
/* get the name part */
- j = 0;
- while (i < len && line[i] != '=' &&
- !g_ascii_isspace(line[i])) {
+ while (i < len && line[i] != '=' && !g_ascii_isspace(line[i]))
name[j++] = line[i++];
- }
name[j] = '\0';
value[j++] = line[i++];
value[j] = '\0';
- match_found = true;
-
/* key definition */
if (!strcasecmp(CONF_KEY_DEFINITION, name))
parse_key_definition(value);
/* wide cursor */
else if (!strcasecmp(CONF_WIDE_CURSOR, name))
options.wide_cursor = str2bool(value);
- else if (strcasecmp(name, "hardware-cursor") == 0)
+ else if (strcasecmp(name, CONF_HARDWARE_CURSOR) == 0)
options.hardware_cursor = str2bool(value);
/* welcome screen list */
else if (!strcasecmp(CONF_WELCOME_SCREEN_LIST, name))
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_TIMEOUT, name))
+ options.timeout_ms = atoi(get_format(value))
+ * 1000 /* seconds -> milliseconds */;
else if (!strcasecmp(CONF_LYRICS_TIMEOUT, name))
#ifdef ENABLE_LYRICS_SCREEN
options.lyrics_timeout = atoi(get_format(value));
#else
{}
#endif
- else
- match_found = false;
-
- if (!match_found)
- print_error(_("Unknown configuration parameter"),
- name);
+ else if (!strcasecmp(CONF_LYRICS_SHOW_PLUGIN, name))
+#ifdef ENABLE_LYRICS_SCREEN
+ options.lyrics_show_plugin = str2bool(value);
+#else
+ {}
+#endif
+ else if (!strcasecmp(name, CONF_TEXT_EDITOR))
+#ifdef ENABLE_LYRICS_SCREEN
+ {
+ g_free(options.text_editor);
+ options.text_editor = get_format(value);
+ }
+#else
+ {}
+#endif
+ else if (!strcasecmp(name, CONF_TEXT_EDITOR_ASK))
+#ifdef ENABLE_LYRICS_SCREEN
+ options.text_editor_ask = str2bool(value);
+#else
+ {}
+#endif
+ else if (!strcasecmp(name, CONF_CHAT_PREFIX))
+#ifdef ENABLE_CHAT_SCREEN
+ options.chat_prefix = get_format(value);
+#else
+ {}
+#endif
+ else if (!strcasecmp(CONF_SECOND_COLUMN, name))
+#ifdef NCMPC_MINI
+ {}
+#else
+ options.second_column = str2bool(value);
+#endif
+ else {
+ print_error(_("Unknown configuration parameter"), name);
+ return false;
+ }
- return match_found;
+ return true;
}
static int
read_rc_file(char *filename)
{
+ assert(filename != NULL);
+
FILE *file;
char line[MAX_LINE_LENGTH];
- if (filename == NULL)
- return -1;
-
file = fopen(filename, "r");
if (file == NULL) {
perror(filename);
return 0;
}
- retval = mkdir(directory, 0755);
+ retval = g_mkdir(directory, 0755);
g_free(directory);
return retval;
}
char *
-get_user_key_binding_filename(void)
+build_user_conf_filename(void)
{
+#ifdef WIN32
+ return g_build_filename(g_get_user_config_dir(), PACKAGE, "ncmpc.conf", NULL);
+#else
+ return g_build_filename(g_get_home_dir(), "." PACKAGE, "config", NULL);
+#endif
+}
+
+char *
+build_system_conf_filename(void)
+{
+#ifdef WIN32
+ const gchar* const *system_data_dirs;
+ gchar *pathname = NULL;
+
+ for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
+ {
+ g_message (*system_data_dirs);
+ pathname = g_build_filename(*system_data_dirs, PACKAGE, "ncmpc.conf", NULL);
+ if (g_file_test(pathname, G_FILE_TEST_EXISTS))
+ {
+ break;
+ }
+ else
+ {
+ g_free (pathname);
+ pathname = NULL;
+ }
+ }
+ return pathname;
+#else
+ return g_build_filename(SYSCONFDIR, PACKAGE, "config", NULL);
+#endif
+}
+
+char *
+build_user_key_binding_filename(void)
+{
+#ifdef WIN32
+ return g_build_filename(g_get_user_config_dir(), PACKAGE, "keys.conf", NULL);
+#else
return g_build_filename(g_get_home_dir(), "." PACKAGE, "keys", NULL);
+#endif
}
-int
-read_configuration(void)
+static char *
+g_build_system_key_binding_filename(void)
{
- char *filename = NULL;
+#ifdef WIN32
+ const gchar* const *system_data_dirs;
+ gchar *pathname = NULL;
+ for (system_data_dirs = g_get_system_config_dirs (); *system_data_dirs != NULL; system_data_dirs++)
+ {
+ g_message (*system_data_dirs);
+ pathname = g_build_filename(*system_data_dirs, PACKAGE, "keys.conf", NULL);
+ if (g_file_test(pathname, G_FILE_TEST_EXISTS))
+ {
+ break;
+ }
+ else
+ {
+ g_free (pathname);
+ pathname = NULL;
+ }
+ }
+ return pathname;
+#else
+ return g_build_filename(SYSCONFDIR, PACKAGE, "keys", NULL);
+#endif
+}
+
+static char *
+find_config_file(void)
+{
/* check for command line configuration file */
- if (options.config_file)
- filename = g_strdup(options.config_file);
+ if (options.config_file != NULL)
+ return g_strdup(options.config_file);
/* check for user configuration ~/.ncmpc/config */
- if (filename == NULL) {
- filename = g_build_filename(g_get_home_dir(),
- "." PACKAGE, "config", NULL);
- if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
- g_free(filename);
- filename = NULL;
- }
- }
+ char *filename = build_user_conf_filename();
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ return filename;
+
+ g_free(filename);
/* check for global configuration SYSCONFDIR/ncmpc/config */
- if (filename == NULL) {
- filename = g_build_filename(SYSCONFDIR, PACKAGE, "config", NULL);
- if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
- g_free(filename);
- filename = NULL;
- }
- }
+ filename = build_system_conf_filename();
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ return filename;
- /* load configuration */
- if (filename) {
- read_rc_file(filename);
- g_free(filename);
- filename = NULL;
- }
+ g_free(filename);
+ return NULL;
+}
+static char *
+find_keys_file(void)
+{
/* check for command line key binding file */
- if (options.key_file)
- filename = g_strdup(options.key_file);
+ if (options.key_file != NULL)
+ return g_strdup(options.key_file);
/* check for user key bindings ~/.ncmpc/keys */
- if (filename == NULL) {
- filename = get_user_key_binding_filename();
- if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
- g_free(filename);
- filename = NULL;
- }
- }
+ char *filename = build_user_key_binding_filename();
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ return filename;
+
+ g_free(filename);
/* check for global key bindings SYSCONFDIR/ncmpc/keys */
- if (filename == NULL) {
- filename = g_build_filename(SYSCONFDIR, PACKAGE, "keys", NULL);
- if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
- g_free(filename);
- filename = NULL;
- }
+ filename = g_build_system_key_binding_filename();
+ if (g_file_test(filename, G_FILE_TEST_IS_REGULAR))
+ return filename;
+
+ g_free(filename);
+ return NULL;
+}
+
+void
+read_configuration(void)
+{
+ /* load configuration */
+ char *filename = find_config_file();
+ if (filename != NULL) {
+ read_rc_file(filename);
+ g_free(filename);
}
/* load key bindings */
- if (filename) {
+ filename = find_keys_file();
+ if (filename != NULL) {
read_rc_file(filename);
g_free(filename);
- filename = NULL;
}
-
- return 0;
}