diff options
author | Jack Humbert <jack.humb@gmail.com> | 2017-02-15 18:14:07 -0500 |
---|---|---|
committer | Jack Humbert <jack.humb@gmail.com> | 2017-02-15 18:14:07 -0500 |
commit | f89499e255afbe5f8adeae5e71367f3d358af527 (patch) | |
tree | 311e6c84e5bf42ca059988cb124ae888e6997e18 /quantum/process_keycode | |
parent | c2a9acffd712145dc8b924005feb060c5ac3e2ff (diff) | |
download | qmk_firmware-f89499e255afbe5f8adeae5e71367f3d358af527.tar.gz qmk_firmware-f89499e255afbe5f8adeae5e71367f3d358af527.zip |
unique variable name
Diffstat (limited to 'quantum/process_keycode')
-rw-r--r-- | quantum/process_keycode/process_unicode_common.c | 36 | ||||
-rw-r--r-- | quantum/process_keycode/process_unicode_common.h | 2 |
2 files changed, 19 insertions, 19 deletions
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c index baeee6d08..d924c364a 100644 --- a/quantum/process_keycode/process_unicode_common.c +++ b/quantum/process_keycode/process_unicode_common.c | |||
@@ -12,17 +12,17 @@ uint8_t get_unicode_input_mode(void) { | |||
12 | __attribute__((weak)) | 12 | __attribute__((weak)) |
13 | void unicode_input_start (void) { | 13 | void unicode_input_start (void) { |
14 | // save current mods | 14 | // save current mods |
15 | mods = keyboard_report->mods; | 15 | unicode_mods = keyboard_report->mods; |
16 | 16 | ||
17 | // unregister all mods to start from clean state | 17 | // unregister all mods to start from clean state |
18 | if (mods & MOD_BIT(KC_LSFT)) unregister_code(KC_LSFT); | 18 | if (unicode_mods & MOD_BIT(KC_LSFT)) unregister_code(KC_LSFT); |
19 | if (mods & MOD_BIT(KC_RSFT)) unregister_code(KC_RSFT); | 19 | if (unicode_mods & MOD_BIT(KC_RSFT)) unregister_code(KC_RSFT); |
20 | if (mods & MOD_BIT(KC_LCTL)) unregister_code(KC_LCTL); | 20 | if (unicode_mods & MOD_BIT(KC_LCTL)) unregister_code(KC_LCTL); |
21 | if (mods & MOD_BIT(KC_RCTL)) unregister_code(KC_RCTL); | 21 | if (unicode_mods & MOD_BIT(KC_RCTL)) unregister_code(KC_RCTL); |
22 | if (mods & MOD_BIT(KC_LALT)) unregister_code(KC_LALT); | 22 | if (unicode_mods & MOD_BIT(KC_LALT)) unregister_code(KC_LALT); |
23 | if (mods & MOD_BIT(KC_RALT)) unregister_code(KC_RALT); | 23 | if (unicode_mods & MOD_BIT(KC_RALT)) unregister_code(KC_RALT); |
24 | if (mods & MOD_BIT(KC_LGUI)) unregister_code(KC_LGUI); | 24 | if (unicode_mods & MOD_BIT(KC_LGUI)) unregister_code(KC_LGUI); |
25 | if (mods & MOD_BIT(KC_RGUI)) unregister_code(KC_RGUI); | 25 | if (unicode_mods & MOD_BIT(KC_RGUI)) unregister_code(KC_RGUI); |
26 | 26 | ||
27 | switch(input_mode) { | 27 | switch(input_mode) { |
28 | case UC_OSX: | 28 | case UC_OSX: |
@@ -63,15 +63,15 @@ void unicode_input_finish (void) { | |||
63 | break; | 63 | break; |
64 | } | 64 | } |
65 | 65 | ||
66 | // reregister previously set mods | 66 | // reregister previously set unicode_mods |
67 | if (mods & MOD_BIT(KC_LSFT)) register_code(KC_LSFT); | 67 | if (unicode_mods & MOD_BIT(KC_LSFT)) register_code(KC_LSFT); |
68 | if (mods & MOD_BIT(KC_RSFT)) register_code(KC_RSFT); | 68 | if (unicode_mods & MOD_BIT(KC_RSFT)) register_code(KC_RSFT); |
69 | if (mods & MOD_BIT(KC_LCTL)) register_code(KC_LCTL); | 69 | if (unicode_mods & MOD_BIT(KC_LCTL)) register_code(KC_LCTL); |
70 | if (mods & MOD_BIT(KC_RCTL)) register_code(KC_RCTL); | 70 | if (unicode_mods & MOD_BIT(KC_RCTL)) register_code(KC_RCTL); |
71 | if (mods & MOD_BIT(KC_LALT)) register_code(KC_LALT); | 71 | if (unicode_mods & MOD_BIT(KC_LALT)) register_code(KC_LALT); |
72 | if (mods & MOD_BIT(KC_RALT)) register_code(KC_RALT); | 72 | if (unicode_mods & MOD_BIT(KC_RALT)) register_code(KC_RALT); |
73 | if (mods & MOD_BIT(KC_LGUI)) register_code(KC_LGUI); | 73 | if (unicode_mods & MOD_BIT(KC_LGUI)) register_code(KC_LGUI); |
74 | if (mods & MOD_BIT(KC_RGUI)) register_code(KC_RGUI); | 74 | if (unicode_mods & MOD_BIT(KC_RGUI)) register_code(KC_RGUI); |
75 | } | 75 | } |
76 | 76 | ||
77 | void register_hex(uint16_t hex) { | 77 | void register_hex(uint16_t hex) { |
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h index 9c26cfb07..aa233db22 100644 --- a/quantum/process_keycode/process_unicode_common.h +++ b/quantum/process_keycode/process_unicode_common.h | |||
@@ -8,7 +8,7 @@ | |||
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | static uint8_t input_mode; | 10 | static uint8_t input_mode; |
11 | uint8_t mods; | 11 | uint8_t unicode_mods; |
12 | 12 | ||
13 | void set_unicode_input_mode(uint8_t os_target); | 13 | void set_unicode_input_mode(uint8_t os_target); |
14 | uint8_t get_unicode_input_mode(void); | 14 | uint8_t get_unicode_input_mode(void); |