1 files changed, 30 insertions, 7 deletions

diff --git a/users/konstantin/unicode.h b/users/konstantin/unicode.h
index 09af7e1c7..d76f2a170 100644
--- a/users/konstantin/unicode.h
+++ b/users/konstantin/unicode.h
@@ -2,10 +2,33 @@
 
 #include "quantum.h"
 
-#define COMMA   UC(0x002C)
-#define L_PAREN UC(0x0028)
-#define R_PAREN UC(0x0029)
-#define EQUALS  UC(0x003D)
-#define TIMES   UC(0x00D7)
-#define DIVIDE  UC(0x00F7)
-#define MINUS   UC(0x2212)
+#define FOREACH_UNICODE(M) \
+  M(COMMA,   0x002C)       \
+  M(L_PAREN, 0x0028)       \
+  M(R_PAREN, 0x0029)       \
+  M(EQUALS,  0x003D)       \
+  M(TIMES,   0x00D7)       \
+  M(DIVIDE,  0x00F7)       \
+  M(MINUS,   0x2212)
+
+#define UC_KEYCODE(name, code)  name = UC(code),
+
+#define X_NAME(name, code)    X_ ## name,
+#define X_ENTRY(name, code)   [X_ ## name] = code,
+#define X_KEYCODE(name, code) name = X(X_ ## name),
+
+#if defined(UNICODE_ENABLE)
+  enum unicode_keycodes {
+    FOREACH_UNICODE(UC_KEYCODE)
+  };
+#elif defined(UNICODEMAP_ENABLE)
+  enum unicode_names {
+    FOREACH_UNICODE(X_NAME)
+  };
+
+  extern const uint32_t PROGMEM unicode_map[];
+
+  enum unicode_keycodes {
+    FOREACH_UNICODE(X_KEYCODE)
+  };
+#endif