diff options
| author | Konstantin Đorđević <vomindoraan@gmail.com> | 2020-03-31 18:28:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-31 18:28:43 +0200 |
| commit | bdfdc506da7702960bf3f6167a3a95f1230b0397 (patch) | |
| tree | 7ff6d48d076fd04e55cb54320cc504d393985d80 /quantum/process_keycode/process_unicode_common.h | |
| parent | 51a81813b0191d95f3ed774cbc410579e606dc5c (diff) | |
| download | qmk_firmware-bdfdc506da7702960bf3f6167a3a95f1230b0397.tar.gz qmk_firmware-bdfdc506da7702960bf3f6167a3a95f1230b0397.zip | |
Rename UC_OSX (and related constants) to UC_MAC (#8589)
* Rename UC_OSX (and related constants) to UC_MAC
* Update UNICODE_SONG_OSX references to UNICODE_SONG_MAC
* Update UC_M_OS references to UC_M_MA
* Add UC_OSX alias for backwards compatibility
* Add deprecation warning for UC_OSX to Unicode docs
* Add UC_M_OS alias for backwards compatibility
* Update newly found UC_M_OS and UNICODE_SONG_OSX references
* Add legacy UNICODE_MODE_OSX alias, revert changes to user keymaps
* Add legacy UNICODE_SONG_OSX alias, revert changes to user keymaps
* Replace removed sounds in Unicode song doc examples
Diffstat (limited to 'quantum/process_keycode/process_unicode_common.h')
| -rw-r--r-- | quantum/process_keycode/process_unicode_common.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/quantum/process_keycode/process_unicode_common.h b/quantum/process_keycode/process_unicode_common.h index 13b6431bf..5421c28c7 100644 --- a/quantum/process_keycode/process_unicode_common.h +++ b/quantum/process_keycode/process_unicode_common.h | |||
| @@ -23,8 +23,8 @@ | |||
| 23 | #endif | 23 | #endif |
| 24 | 24 | ||
| 25 | // Keycodes used for starting Unicode input on different platforms | 25 | // Keycodes used for starting Unicode input on different platforms |
| 26 | #ifndef UNICODE_KEY_OSX | 26 | #ifndef UNICODE_KEY_MAC |
| 27 | # define UNICODE_KEY_OSX KC_LALT | 27 | # define UNICODE_KEY_MAC KC_LALT |
| 28 | #endif | 28 | #endif |
| 29 | #ifndef UNICODE_KEY_LNX | 29 | #ifndef UNICODE_KEY_LNX |
| 30 | # define UNICODE_KEY_LNX LCTL(LSFT(KC_U)) | 30 | # define UNICODE_KEY_LNX LCTL(LSFT(KC_U)) |
| @@ -49,8 +49,17 @@ | |||
| 49 | # define UNICODE_TYPE_DELAY 10 | 49 | # define UNICODE_TYPE_DELAY 10 |
| 50 | #endif | 50 | #endif |
| 51 | 51 | ||
| 52 | // Deprecated aliases | ||
| 53 | #if !defined(UNICODE_KEY_MAC) && defined(UNICODE_KEY_OSX) | ||
| 54 | # define UNICODE_KEY_MAC UNICODE_KEY_OSX | ||
| 55 | #endif | ||
| 56 | #if !defined(UNICODE_SONG_MAC) && defined(UNICODE_SONG_OSX) | ||
| 57 | # define UNICODE_SONG_MAC UNICODE_SONG_OSX | ||
| 58 | #endif | ||
| 59 | #define UC_OSX UC_MAC | ||
| 60 | |||
| 52 | enum unicode_input_modes { | 61 | enum unicode_input_modes { |
| 53 | UC_OSX, // Mac OS X using Unicode Hex Input | 62 | UC_MAC, // macOS using Unicode Hex Input |
| 54 | UC_LNX, // Linux using IBus | 63 | UC_LNX, // Linux using IBus |
| 55 | UC_WIN, // Windows using EnableHexNumpad | 64 | UC_WIN, // Windows using EnableHexNumpad |
| 56 | UC_BSD, // BSD (not implemented) | 65 | UC_BSD, // BSD (not implemented) |
