[Keyboard] Clueboard 60 fix col 11 12 mixup (#7685)

[qmk_firmware.git] / quantum / process_keycode / process_unicodemap.c

diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c
index 0227fbdd7b148d5f4fc26378d0785632c1c7b216..4364f156c4237cf3516b23e9caae853e64f1aa26 100644 (file)
--- a/quantum/process_keycode/process_unicodemap.c
+++ b/quantum/process_keycode/process_unicodemap.c
@@ -15,58 +15,65 @@
  */
 
 #include "process_unicodemap.h"
-#include "process_unicode_common.h"
-
-__attribute__((weak))
-const uint32_t PROGMEM unicode_map[] = {
-};
 
 void register_hex32(uint32_t hex) {
-  bool onzerostart = true;
-  for(int i = 7; i >= 0; i--) {
-    if (i <= 3) {
-      onzerostart = false;
+    bool onzerostart = true;
+    for (int i = 7; i >= 0; i--) {
+        if (i <= 3) {
+            onzerostart = false;
+        }
+        uint8_t digit = ((hex >> (i * 4)) & 0xF);
+        if (digit == 0) {
+            if (!onzerostart) {
+                register_code(hex_to_keycode(digit));
+                unregister_code(hex_to_keycode(digit));
+            }
+        } else {
+            register_code(hex_to_keycode(digit));
+            unregister_code(hex_to_keycode(digit));
+            onzerostart = false;
+        }
     }
-    uint8_t digit = ((hex >> (i*4)) & 0xF);
-    if (digit == 0) {
-      if (!onzerostart) {
-        register_code(hex_to_keycode(digit));
-        unregister_code(hex_to_keycode(digit));
-      }
+}
+
+__attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
+    if (keycode >= QK_UNICODEMAP_PAIR) {
+        // Keycode is a pair: extract index based on Shift / Caps Lock state
+        uint16_t index = keycode - QK_UNICODEMAP_PAIR;
+
+        bool shift = unicode_saved_mods & MOD_MASK_SHIFT, caps = IS_HOST_LED_ON(USB_LED_CAPS_LOCK);
+        if (shift ^ caps) {
+            index >>= 7;
+        }
+
+        return index & 0x7F;
     } else {
-      register_code(hex_to_keycode(digit));
-      unregister_code(hex_to_keycode(digit));
-      onzerostart = false;
+        // Keycode is a regular index
+        return keycode - QK_UNICODEMAP;
     }
-  }
 }
 
-__attribute__((weak))
-void unicode_map_input_error() {}
+bool process_unicodemap(uint16_t keycode, keyrecord_t *record) {
+    if (keycode >= QK_UNICODEMAP && keycode <= QK_UNICODEMAP_PAIR_MAX && record->event.pressed) {
+        unicode_input_start();
 
-bool process_unicode_map(uint16_t keycode, keyrecord_t *record) {
-  uint8_t input_mode = get_unicode_input_mode();
-  if ((keycode & QK_UNICODE_MAP) == QK_UNICODE_MAP && record->event.pressed) {
-    const uint32_t* map = unicode_map;
-    uint16_t index = keycode - QK_UNICODE_MAP;
-    uint32_t code = pgm_read_dword_far(&map[index]);
-    if (code > 0xFFFF && code <= 0x10ffff && input_mode == UC_OSX) {
-      // Convert to UTF-16 surrogate pair
-      code -= 0x10000;
-      uint32_t lo = code & 0x3ff;
-      uint32_t hi = (code & 0xffc00) >> 10;
-      unicode_input_start();
-      register_hex32(hi + 0xd800);
-      register_hex32(lo + 0xdc00);
-      unicode_input_finish();
-    } else if ((code > 0x10ffff && input_mode == UC_OSX) || (code > 0xFFFFF && input_mode == UC_LNX)) {
-      // when character is out of range supported by the OS
-      unicode_map_input_error();
-    } else {
-      unicode_input_start();
-      register_hex32(code);
-      unicode_input_finish();
+        uint32_t code       = pgm_read_dword(unicode_map + unicodemap_index(keycode));
+        uint8_t  input_mode = get_unicode_input_mode();
+
+        if (code > 0x10FFFF || (code > 0xFFFF && input_mode == UC_WIN)) {
+            // Character is out of range supported by the platform
+            unicode_input_cancel();
+        } else if (code > 0xFFFF && input_mode == UC_OSX) {
+            // Convert to UTF-16 surrogate pair on Mac
+            code -= 0x10000;
+            uint32_t lo = code & 0x3FF, hi = (code & 0xFFC00) >> 10;
+            register_hex32(hi + 0xD800);
+            register_hex32(lo + 0xDC00);
+            unicode_input_finish();
+        } else {
+            register_hex32(code);
+            unicode_input_finish();
+        }
     }
-  }
-  return true;
+    return true;
 }