Skip to content

Commit

Permalink
Fix Issue qmk#9533 - Delayed shift state handling (qmk#11220)
Browse files Browse the repository at this point in the history
Co-authored-by: Ryan <[email protected]>
  • Loading branch information
2 people authored and xgnxs committed Jan 9, 2021
1 parent c525896 commit df15a12
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
1 change: 0 additions & 1 deletion quantum/process_keycode/process_unicode_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 7 additions & 2 deletions quantum/process_keycode/process_unicodemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit df15a12

Please sign in to comment.