andrejl
/
qmk-dactyl-manuform-a
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #994 from priyadi/unicode_mods_fix 

Unregister all mods before inputting Unicode, and reregister afterwards
master
Jack Humbert 2017-01-08 21:12:02 -05:00 committed by GitHub
parent 18d013b25b 30b80a23f3
commit 176b93d08e
1 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
quantum/process_keycode/process_unicode.c
View File

@ -1,6 +1,8 @@
#include "process_unicode.h" #include "process_unicode.h"
#include "action_util.h"
static uint8_t input_mode; static uint8_t input_mode;
uint8_t mods;
__attribute__((weak)) __attribute__((weak))
uint16_t hex_to_keycode(uint8_t hex) uint16_t hex_to_keycode(uint8_t hex)
@ -25,6 +27,19 @@ uint8_t get_unicode_input_mode(void) {
__attribute__((weak)) __attribute__((weak))
void unicode_input_start (void) { void unicode_input_start (void) {
// save current mods
mods = keyboard_report->mods;
// unregister all mods to start from clean state
if (mods & MOD_BIT(KC_LSFT)) unregister_code(KC_LSFT);
if (mods & MOD_BIT(KC_RSFT)) unregister_code(KC_RSFT);
if (mods & MOD_BIT(KC_LCTL)) unregister_code(KC_LCTL);
if (mods & MOD_BIT(KC_RCTL)) unregister_code(KC_RCTL);
if (mods & MOD_BIT(KC_LALT)) unregister_code(KC_LALT);
if (mods & MOD_BIT(KC_RALT)) unregister_code(KC_RALT);
if (mods & MOD_BIT(KC_LGUI)) unregister_code(KC_LGUI);
if (mods & MOD_BIT(KC_RGUI)) unregister_code(KC_RGUI);
switch(input_mode) { switch(input_mode) {
case UC_OSX: case UC_OSX:
register_code(KC_LALT); register_code(KC_LALT);
@ -54,15 +69,25 @@ void unicode_input_start (void) {
__attribute__((weak)) __attribute__((weak))
void unicode_input_finish (void) { void unicode_input_finish (void) {
switch(input_mode) { switch(input_mode) {
case UC_OSX: case UC_OSX:
case UC_WIN: case UC_WIN:
unregister_code(KC_LALT); unregister_code(KC_LALT);
break; break;
case UC_LNX: case UC_LNX:
register_code(KC_SPC); register_code(KC_SPC);
unregister_code(KC_SPC); unregister_code(KC_SPC);
break; break;
} }
// reregister previously set mods
if (mods & MOD_BIT(KC_LSFT)) register_code(KC_LSFT);
if (mods & MOD_BIT(KC_RSFT)) register_code(KC_RSFT);
if (mods & MOD_BIT(KC_LCTL)) register_code(KC_LCTL);
if (mods & MOD_BIT(KC_RCTL)) register_code(KC_RCTL);
if (mods & MOD_BIT(KC_LALT)) register_code(KC_LALT);
if (mods & MOD_BIT(KC_RALT)) register_code(KC_RALT);
if (mods & MOD_BIT(KC_LGUI)) register_code(KC_LGUI);
if (mods & MOD_BIT(KC_RGUI)) register_code(KC_RGUI);
} }
void register_hex(uint16_t hex) { void register_hex(uint16_t hex) {