diff --git a/src/colors.c b/src/colors.c
index 06362623bf9fa43bc391aae339fef4851993e25c..5a79fd9bbfff8b2c6a7967e499af18df19c98544 100644 (file)
--- a/src/colors.c
+++ b/src/colors.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (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
[COLOR_TITLE_BOLD] = {"title-bold", COLOR_YELLOW | A_BOLD, A_BOLD },
[COLOR_LINE] = {"line", COLOR_WHITE, A_NORMAL},
[COLOR_LINE_BOLD] = {"line-bold", COLOR_WHITE | A_BOLD, A_BOLD },
+ [COLOR_LINE_FLAGS] = {"line-flags", COLOR_YELLOW, A_NORMAL},
[COLOR_LIST] = {"list", COLOR_GREEN, A_NORMAL},
[COLOR_LIST_BOLD] = {"list-bold", COLOR_GREEN | A_BOLD, A_BOLD },
[COLOR_PROGRESSBAR] = {"progressbar", COLOR_WHITE, A_NORMAL},
static color_entry_t *
colors_lookup_by_name(const char *name)
{
- enum color i;
-
- for (i = 1; i < COLOR_END; ++i)
+ for (enum color i = 1; i < COLOR_END; ++i)
if (!strcasecmp(colors[i].name, name))
return &colors[i];
return NULL;
}
-static int
+static void
colors_update_pair(enum color id)
{
- int fg, bg;
-
assert(id > 0 && id < COLOR_END);
- fg = colors[id].color;
- bg = colors[COLOR_BACKGROUND].color;
+ int fg = colors[id].color;
+ int bg = colors[COLOR_BACKGROUND].color;
/* If color == COLOR_NONE (negative),
* pass -1 to avoid cast errors */
init_pair(id,
(fg < 0 ? -1 : fg),
(bg < 0 ? -1 : bg));
- return 0;
}
int
colors_str2color(const char *str)
{
- int i, color = 0;
+ int color = 0;
char **parts = g_strsplit(str, ",", 0);
- for (i = 0; parts[i]; i++) {
+ for (int i = 0; parts[i]; i++) {
char *cur = parts[i];
/* Legacy colors (brightblue,etc) */
if (cur != endptr && endptr[0] == '\0') {
color |= tmp;
} else {
- fprintf(stderr,_("Warning: Unknown color - %s\n"), str);
+ fprintf(stderr, "%s: %s\n",
+ _("Unknown color"), str);
return COLOR_ERROR;
}
}
/* This function is called from conf.c before curses have been started,
* it adds the definition to the color_definition_list and init_color() is
* done in colors_start() */
-int
+bool
colors_define(const char *name, short r, short g, short b)
{
- color_definition_entry_t *entry;
int color = colors_str2color(name);
if (color < 0)
- return color;
+ return false;
- entry = g_malloc(sizeof(color_definition_entry_t));
+ color_definition_entry_t *entry =
+ g_malloc(sizeof(color_definition_entry_t));
entry->color = color;
entry->r = r;
entry->g = g;
color_definition_list = g_list_append(color_definition_list, entry);
- return 0;
+ return true;
}
-int
+bool
colors_assign(const char *name, const char *value)
{
color_entry_t *entry = colors_lookup_by_name(name);
- int color;
if (!entry) {
- fprintf(stderr,_("Warning: Unknown color field - %s\n"), name);
- return -1;
+ fprintf(stderr, "%s: %s",
+ _("Unknown color field"), name);
+ return false;
}
- if ((color = colors_str2color(value)) == COLOR_ERROR)
- return -1;
+ const int color = colors_str2color(value);
+ if (color == COLOR_ERROR)
+ return false;
entry->color = color;
- return 0;
+ return true;
}
-
-int
+void
colors_start(void)
{
if (has_colors()) {
_("Terminal lacks support for changing colors"));
if (options.enable_colors) {
- enum color i;
-
- for (i = 1; i < COLOR_END; ++i)
+ for (enum color i = 1; i < COLOR_END; ++i)
/* update the color pairs */
colors_update_pair(i);
}
/* free the color_definition_list */
if (color_definition_list) {
- GList *list = color_definition_list;
-
- while (list) {
- g_free(list->data);
- list=list->next;
- }
-
- g_list_free(color_definition_list);
+ g_list_free_full(color_definition_list, g_free);
color_definition_list = NULL;
}
-
- return 0;
}
#endif
-int
+void
colors_use(WINDOW *w, enum color id)
{
color_entry_t *entry = &colors[id];
- short pair;
- attr_t attrs;
assert(id > 0 && id < COLOR_END);
+ attr_t attrs;
+ short pair;
fix_wattr_get(w, &attrs, &pair, NULL);
#ifdef ENABLE_COLORS
#ifdef ENABLE_COLORS
}
#endif
-
- return 0;
}