From 4b2ed1290f039a6fc050f06d83dc89e8836d29fa Mon Sep 17 00:00:00 2001
From: dakkar <dakkar@thenautilus.net>
Date: Sun, 10 Feb 2019 11:02:08 +0000
Subject: more flexible / simpler color specification

---
 keymap-wrapper.h | 45 +++++----------------------------------------
 1 file changed, 5 insertions(+), 40 deletions(-)

(limited to 'keymap-wrapper.h')

diff --git a/keymap-wrapper.h b/keymap-wrapper.h
index b39b669..71c7137 100644
--- a/keymap-wrapper.h
+++ b/keymap-wrapper.h
@@ -1,55 +1,20 @@
 #pragma once
 
-#define cOff(x) x
-#define cBase(x) x
-#define cLnch(x) x
-#define cWind(x) x
-#define cView(x) x
-#define cMs(x) x
-#define cMsW(x) x
-#define cMsB(x) x
-#define cFunc(x) x
+#define CK(k,c) k
 
 #define ColorKeymaps(layers...) KEYMAPS(layers)
 
 #include "keymaps.h"
 
-
-#undef cOff
-#undef cBase
-#undef cLnch
-#undef cWind
-#undef cView
-#undef cMs
-#undef cMsW
-#undef cMsB
-#undef cFunc
-
+#undef CK
 #undef ColorKeymaps
 
-#define cOff(x) DakkarColor::OFF
-#define cBase(x) DakkarColor::BASE
-#define cLnch(x) DakkarColor::LAUNCH
-#define cWind(x) DakkarColor::WINDOW
-#define cView(x) DakkarColor::VIEWPORT
-#define cMs(x) DakkarColor::MOUSE
-#define cMsW(x) DakkarColor::MOUSE_WARP
-#define cMsB(x) DakkarColor::MOUSE_BUTTON
-#define cFunc(x) DakkarColor::FUNCTION
+#define CK(k,c) c
 
 #define ColorKeymaps(layers...) \
-  static constexpr DakkarColor::color color_keymaps[][ROWS][COLS] = { layers };
+  static constexpr color_enum color_keymaps[][ROWS][COLS] = { layers };
 
 #include "keymaps.h"
 
-#undef cOff
-#undef cBase
-#undef cLnch
-#undef cWind
-#undef cView
-#undef cMs
-#undef cMsW
-#undef cMsB
-#undef cFunc
-
+#undef CK
 #undef ColorKeymaps
-- 
cgit v1.2.3