userspace and keymap changes for rupa (#10489)

* userspace and keymap changes for rupa

* remove layout wrappers and blocker rows from wrappers

handle this in keymaps for now

1 files changed, 43 insertions, 9 deletions

diff --git a/users/rupa/unicode.h b/users/rupa/unicode.h
index 0c067bd91..92303b13f 100755..100644
--- a/users/rupa/unicode.h
+++ b/users/rupa/unicode.h
@@ -20,24 +20,58 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #if defined(UNICODEMAP_ENABLE)
 enum unicode_names {
-    CHEK,
-    /*
-    DI1, // ⚀
-    DI2, // ⚁
-    DI3, // ⚂
-    DI4, // ⚃
-    DI5, // ⚄
-    DI6, // ⚅
-    */
+    CCIR, // COMBINING  ⃝
+    CENT, // ¢
+    CHEK, // ✓
+    CKEY, // COMBINING  ⃣
+    CUI,  // ⚠
+    ECKS, // ✖
+    EFF,  // ſ
     HAS,  // ☭
+    HUN,  // 💯
     IBNG, // ‽
     IRNY, // ⸮
+    LALL, // ∀
+    LELM, // ∈
+    LEXI, // ∃
+    LPRO, // ⊢
     M4,   // ♩
     M8,   // ♪
     M8B,  // ♫
     M16,  // ♬
+    NEG,  // COMBINING  ⃠
+    NOPE, // 🚫
+    NUM,  // №
     OM,   // ॐ
+    SMB,  // ☻
+    SMW,  // ☺
     STB,  // ★
+    STOP, // ⛔
     STW,  // ☆
 };
 #endif
+
+typedef enum combined_modes {
+    CM_NULL = 0,
+    CM_CIRCLE,
+    CM_NO,
+    CM_KEYCAP,
+    CM_ZALGO,
+    CM_MAX
+} combined_mode_t;
+
+combined_mode_t combined_mode;
+
+// random choices
+const char * d6(void);
+const char * dance(bool more);
+const char * flip(bool back);
+const char * joy(bool harder);
+
+// like X and XP
+bool u_x(const char *text);
+bool u_xp(bool is_shifted, const char * shifted, const char *plain);
+
+bool combined_text(uint16_t keycode);
+void cycle_combined_mode(void);
+combined_mode_t set_combined_mode(combined_mode_t mode);