summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2020-12-22 17:23:53 +0000
committerQMK Bot <hello@qmk.fm>2020-12-22 17:23:53 +0000
commit96a5e560d79dfd3f5700b42b7e67799472a21141 (patch)
tree9a7dcc41f5bc8d26a23ca7dd84249652924996f5
parent71fcfb3cb52b9adb9ace304503bc3c6addfb3916 (diff)
parent54e2bf3edefb670ede2c2c3934dc732264ac6381 (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--quantum/process_keycode/process_unicode_common.h1
-rw-r--r--quantum/process_keycode/process_unicodemap.c9
2 files changed, 7 insertions, 3 deletions
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h
index 3082fbb5f0..c10e171ec3 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -75,7 +75,6 @@ typedef union {
} unicode_config_t;
extern unicode_config_t unicode_config;
-extern uint8_t unicode_saved_mods;
void unicode_input_mode_init(void);
uint8_t get_unicode_input_mode(void);
diff --git a/quantum/process_keycode/process_unicodemap.c b/quantum/process_keycode/process_unicodemap.c
index fcf676c24e..459397014d 100644
--- a/quantum/process_keycode/process_unicodemap.c
+++ b/quantum/process_keycode/process_unicodemap.c
@@ -21,8 +21,13 @@ __attribute__((weak)) uint16_t unicodemap_index(uint16_t keycode) {
// 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;
- bool caps = IS_HOST_LED_ON(USB_LED_CAPS_LOCK);
+ uint8_t mods = get_mods() | get_weak_mods();
+#ifndef NO_ACTION_ONESHOT
+ mods |= get_oneshot_mods();
+#endif
+
+ bool shift = mods & MOD_MASK_SHIFT;
+ bool caps = host_keyboard_led_state().caps_lock;
if (shift ^ caps) {
index >>= 7;
}