colors: colors_update_pair(), colors_start() and colors_use() return void

[ncmpc.git] / src / colors.h

diff --git a/src/colors.h b/src/colors.h
index f8a22d2f4c1f380a718bab6f2bd055789c6bf182..c166c363be4378e7c774eff76cc099a1b50a78a0 100644 (file)
--- a/src/colors.h
+++ b/src/colors.h
@@ -1,25 +1,60 @@
+/* ncmpc (Ncurses MPD Client)
+ * (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
+ * 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.
+ */
+
 #ifndef COLORS_H
 #define COLORS_H
 
-#include <ncurses.h>
+#include "config.h"
+#include "ncmpc_curses.h"
+#include "Compiler.h"
 
-#define COLOR_TITLE 1
-#define COLOR_TITLE_BOLD 2
-#define COLOR_LINE 3
-#define COLOR_LINE_BOLD 4
-#define COLOR_LIST 5
-#define COLOR_LIST_BOLD 6
-#define COLOR_PROGRESSBAR 7
-#define COLOR_STATUS 8
-#define COLOR_STATUS_BOLD 9
-#define COLOR_STATUS_TIME 10
-#define COLOR_STATUS_ALERT 11
+enum color {
+       COLOR_TITLE = 1,
+       COLOR_TITLE_BOLD,
+       COLOR_LINE,
+       COLOR_LINE_BOLD,
+       COLOR_LINE_FLAGS,
+       COLOR_LIST,
+       COLOR_LIST_BOLD,
+       COLOR_PROGRESSBAR,
+       COLOR_STATUS,
+       COLOR_STATUS_BOLD,
+       COLOR_STATUS_TIME,
+       COLOR_STATUS_ALERT,
+       COLOR_DIRECTORY,
+       COLOR_PLAYLIST,
+       COLOR_BACKGROUND,
+       COLOR_END
+};
 
-short colors_str2color(const char *str);
+gcc_pure
+int colors_str2color(const char *str);
 
+#ifdef ENABLE_COLORS
 int colors_assign(const char *name, const char *value);
 int colors_define(const char *name, short r, short g, short b);
-int colors_start(void);
-int colors_use(WINDOW *w, int id);
+
+void
+colors_start(void);
+#endif
+
+void
+colors_use(WINDOW *w, enum color id);
 
 #endif /* COLORS_H */