X-Git-Url: https://git.deb.at/w?p=pkg%2Fabook.git;a=blobdiff_plain;f=options.c;h=6f75a06db368f215c85f6731b3415222badb2a41;hp=28aaf7c1268de317c0fd4b8df83d2c8e872a7b5e;hb=b722eae92e8deb6bd080dea1f2f929a7dd9edddb;hpb=c709a074a95eb48055acf5f49295806d95d0c747

diff --git a/options.c b/options.c
index 28aaf7c..6f75a06 100644
--- a/options.c
+++ b/options.c
@@ -67,7 +67,30 @@ static struct option abook_vars[] = {
 	{ "preserve_fields", OT_STR, STR_PRESERVE_FIELDS, UL "standard" },
 	{ "sort_field", OT_STR, STR_SORT_FIELD, UL "nick" },
 	{ "show_cursor", OT_BOOL, BOOL_SHOW_CURSOR, FALSE },
-
+	{ "use_mouse", OT_BOOL, BOOL_USE_MOUSE, FALSE },
+	{ "scroll_speed", OT_INT, INT_SCROLL_SPEED, UL 2 },
+	{ "use_colors", OT_BOOL, BOOL_USE_COLORS, FALSE },
+	{ "color_header_fg", OT_STR, STR_COLOR_HEADER_FG, UL "blue" },
+	{ "color_header_fg", OT_STR, STR_COLOR_HEADER_FG, UL "blue" },
+	{ "color_header_bg", OT_STR, STR_COLOR_HEADER_BG, UL "red" },
+	{ "color_footer_fg", OT_STR, STR_COLOR_FOOTER_FG, UL "red" },
+	{ "color_footer_bg", OT_STR, STR_COLOR_FOOTER_BG, UL "default" },
+	{ "color_list_even_fg", OT_STR, STR_COLOR_LIST_EVEN_FG, UL "yellow" },
+	{ "color_list_even_bg", OT_STR, STR_COLOR_LIST_EVEN_BG, UL "default" },
+	{ "color_list_odd_fg", OT_STR, STR_COLOR_LIST_ODD_FG, UL "default" },
+	{ "color_list_odd_bg", OT_STR, STR_COLOR_LIST_ODD_BG, UL "default" },
+	{ "color_list_header_fg", OT_STR, STR_COLOR_LIST_HEADER_FG, UL "white" },
+	{ "color_list_header_bg", OT_STR, STR_COLOR_LIST_HEADER_BG, UL "blue" },
+	{ "color_list_highlight_fg", OT_STR, STR_COLOR_LIST_HIGHLIGHT_FG, UL "black" },
+	{ "color_list_highlight_bg", OT_STR, STR_COLOR_LIST_HIGHLIGHT_BG, UL "green" },
+	{ "color_tab_border_fg", OT_STR, STR_COLOR_TAB_BORDER_FG, UL "cyan" },
+	{ "color_tab_border_bg", OT_STR, STR_COLOR_TAB_BORDER_BG, UL "default" },
+	{ "color_tab_label_fg", OT_STR, STR_COLOR_TAB_LABEL_FG, UL "magenta" },
+	{ "color_tab_label_bg", OT_STR, STR_COLOR_TAB_LABEL_BG, UL "default" },
+	{ "color_field_name_fg", OT_STR, STR_COLOR_FIELD_NAME_FG, UL "yellow" },
+	{ "color_field_name_bg", OT_STR, STR_COLOR_FIELD_NAME_BG, UL "default" },
+	{ "color_field_value_fg", OT_STR, STR_COLOR_FIELD_VALUE_FG, UL "green" },
+	{ "color_field_value_bg", OT_STR, STR_COLOR_FIELD_VALUE_BG, UL "default" },
 	{ NULL }
 };
 
@@ -279,11 +302,12 @@ opt_set_set_option(char *p, struct option *opt)
 {
 	int len;
 
-	strtrim(p);
+	assert(p);
 
+	strtrim(p);
 	len = strlen(p);
 
-	if(p[len - 1] == '\"' && *p == '\"') {
+	if(*p == '\"' && p[len - 1] == '\"') {
 		if(len < 3)
 			return _("invalid value");
 		p[len - 1] = 0;
@@ -318,6 +342,9 @@ opt_set_option(char *var, char *p)
 {
 	int i;
 
+	assert(var);
+	assert(p);
+
 	for(i = 0; abook_vars[i].option; i++)
 		if(!strcmp(abook_vars[i].option, var))
 			return opt_set_set_option(p, &abook_vars[i]);