summaryrefslogtreecommitdiff
path: root/quantum/process_keycode/process_unicode_common.h
diff options
context:
space:
mode:
authorKonstantin Đorđević <vomindoraan@gmail.com>2020-03-31 18:28:43 +0200
committerGitHub <noreply@github.com>2020-03-31 18:28:43 +0200
commitbdfdc506da7702960bf3f6167a3a95f1230b0397 (patch)
tree7ff6d48d076fd04e55cb54320cc504d393985d80 /quantum/process_keycode/process_unicode_common.h
parent51a81813b0191d95f3ed774cbc410579e606dc5c (diff)
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.h15
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 13b6431bf0..5421c28c7f 100644
--- a/quantum/process_keycode/process_unicode_common.h
+++ b/quantum/process_keycode/process_unicode_common.h
@@ -23,8 +23,8 @@
#endif
// Keycodes used for starting Unicode input on different platforms
-#ifndef UNICODE_KEY_OSX
-# define UNICODE_KEY_OSX KC_LALT
+#ifndef UNICODE_KEY_MAC
+# define UNICODE_KEY_MAC KC_LALT
#endif
#ifndef UNICODE_KEY_LNX
# define UNICODE_KEY_LNX LCTL(LSFT(KC_U))
@@ -49,8 +49,17 @@
# define UNICODE_TYPE_DELAY 10
#endif
+// Deprecated aliases
+#if !defined(UNICODE_KEY_MAC) && defined(UNICODE_KEY_OSX)
+# define UNICODE_KEY_MAC UNICODE_KEY_OSX
+#endif
+#if !defined(UNICODE_SONG_MAC) && defined(UNICODE_SONG_OSX)
+# define UNICODE_SONG_MAC UNICODE_SONG_OSX
+#endif
+#define UC_OSX UC_MAC
+
enum unicode_input_modes {
- UC_OSX, // Mac OS X using Unicode Hex Input
+ UC_MAC, // macOS using Unicode Hex Input
UC_LNX, // Linux using IBus
UC_WIN, // Windows using EnableHexNumpad
UC_BSD, // BSD (not implemented)