From: Andre Noll <maan@systemlinux.org>
Date: Tue, 7 Jan 2014 17:43:58 +0000 (+0000)
Subject: gui: Avoid magic number in enum gui_color_pair.
X-Git-Tag: v0.5.3~12^2~41
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=a5864deaaceba8eb2bdfe2b40d74574d3996b6a8

gui: Avoid magic number in enum gui_color_pair.

This way it works also if the set of status items is extended.
---

diff --git a/gui.c b/gui.c
index e854294e..49f59513 100644
--- a/gui.c
+++ b/gui.c
@@ -63,15 +63,23 @@ static struct gui_args_info conf;
 enum {GETCH_MODE, COMMAND_MODE, EXTERNAL_MODE};
 
 
-#define COLOR_STATUSBAR 52
-#define COLOR_COMMAND 53
-#define COLOR_OUTPUT 54
-#define COLOR_MSG 55
-#define COLOR_ERRMSG 56
-#define COLOR_WELCOME 57
-#define COLOR_SEPARATOR 58
-#define COLOR_TOP 59
-#define COLOR_BOT 60
+/**
+ * Codes for various colors.
+ *
+ * Each status item has its own color pair. The ones defined here start at a
+ * higher number so that they do not overlap with these.
+ */
+enum gui_color_pair {
+	COLOR_STATUSBAR = NUM_STAT_ITEMS + 1,
+	COLOR_COMMAND,
+	COLOR_OUTPUT,
+	COLOR_MSG,
+	COLOR_ERRMSG,
+	COLOR_WELCOME,
+	COLOR_SEPARATOR,
+	COLOR_TOP,
+	COLOR_BOT,
+};
 
 struct gui_command {
 	const char *key;