diff options
| author | William Chang <[email protected]> | 2019-05-09 21:16:15 -0700 | 
|---|---|---|
| committer | William Chang <[email protected]> | 2019-05-09 21:16:15 -0700 | 
| commit | 9ce186860e78d5afe350636cb7445e18c2577f33 (patch) | |
| tree | b7f5dded777a950e63c4dd967260744336bfaa6b /quantum/process_keycode/process_unicode_common.h | |
| parent | 57a6ea11df685d84a1ea07953e88f224ce2b24f7 (diff) | |
| parent | 4b2d3288d013b1a71ea25402224c4a8225a099e9 (diff) | |
| download | qmk_firmware-9ce186860e78d5afe350636cb7445e18c2577f33.tar.gz qmk_firmware-9ce186860e78d5afe350636cb7445e18c2577f33.zip | |
Merge branch 'qmk-master'
Diffstat (limited to 'quantum/process_keycode/process_unicode_common.h')
| -rw-r--r-- | quantum/process_keycode/process_unicode_common.h | 13 | 
1 files changed, 9 insertions, 4 deletions
| diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h index e608ab76be..7340800e56 100644 --- a/quantum/process_keycode/process_unicode_common.h +++ b/quantum/process_keycode/process_unicode_common.h @@ -23,11 +23,14 @@  #endif  // Keycodes used for starting Unicode input on different platforms -#ifndef UNICODE_OSX_KEY -  #define UNICODE_OSX_KEY  KC_LALT +#ifndef UNICODE_KEY_OSX +  #define UNICODE_KEY_OSX  KC_LALT  #endif -#ifndef UNICODE_WINC_KEY -  #define UNICODE_WINC_KEY KC_RALT +#ifndef UNICODE_KEY_LNX +  #define UNICODE_KEY_LNX  LCTL(LSFT(KC_U)) +#endif +#ifndef UNICODE_KEY_WINC +  #define UNICODE_KEY_WINC KC_RALT  #endif  // Comma-delimited, ordered list of input modes selected for use (e.g. in cycle) @@ -63,6 +66,7 @@ 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); @@ -72,6 +76,7 @@ void persist_unicode_input_mode(void);  void unicode_input_start(void);  void unicode_input_finish(void); +void unicode_input_cancel(void);  void register_hex(uint16_t hex);  void send_unicode_hex_string(const char *str); | 
