Make colour macros more flexible.

[rrace.git] / t / ewmhicon.c

diff --git a/t/ewmhicon.c b/t/ewmhicon.c
index 755cf5dbdd51a945333f99b52f45cab02b31a481..6983cf9f7f4a006f4f8e5a57da5a1ed2af2565bf 100644 (file)
--- a/t/ewmhicon.c
+++ b/t/ewmhicon.c
@@ -42,21 +42,20 @@ static const struct option lopts[] = {
        { 0 }
 };
 
-#define PASTE(a, b) a ## b
-#define INDIR(a) a
-
 #define S8TO16(x) ((x) * 0xfffful / 0xff)
 
-#define RGB8_(r, g, b) { \
-       0xff000000 | (r << 16) | (g << 8) | b, \
-       S8TO16(r), S8TO16(g), S8TO16(b) }
+#define RGB8(r, g, b) { \
+        0xff000000 | (r << 16) | (g << 8) | b, \
+        S8TO16(r), S8TO16(g), S8TO16(b) }
+
+#define COLOUR_SYS_EWMHICON(r, g, b) \
+       RGB8(0x ## r ## ul, 0x ## g ## ul, 0x ## b ## ul)
 
-#define RGB8(r, g, b) RGB8_(0x ## r ## ul, 0x ## g ## ul, 0x ## b ## ul)
+#undef COLOUR_SYSTEM
+#define COLOUR_SYSTEM EWMHICON
 
-#define COLOURTAB(n) { \
-       INDIR(RGB8 PASTE(COLOUR ## n, _PRIMARY_RGB_)), \
-       INDIR(RGB8 PASTE(COLOUR ## n, _DARK_RGB_)), \
-       INDIR(RGB8 PASTE(COLOUR ## n, _LIGHT_RGB_)) }
+#define COLOURTAB_(n) { n ## _PRIMARY, n ## _DARK, n ## _LIGHT }
+#define COLOURTAB(n) COLOURTAB_(COLOUR ## n)
 
 static const XColor colours[7][3] = {
        {