jbrechtel/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename UC_OSX (and related constants) to UC_MAC (#8589)

Browse Source 
* 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
This commit is contained in:
Konstantin Đorđević
2020-03-31 18:28:43 +02:00
committed by Florian Didron
parent 01f51b9cf7
commit 626da49ee0
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
quantum/process_keycode/process_unicode_common.c
View File

@@ -78,8 +78,8 @@ __attribute__((weak)) void unicode_input_start(void) {
clear_mods(); // Unregister mods to start from a clean state clear_mods(); // Unregister mods to start from a clean state
switch (unicode_config.input_mode) { switch (unicode_config.input_mode) {
case UC_OSX: case UC_MAC:
register_code(UNICODE_KEY_OSX); register_code(UNICODE_KEY_MAC);
break; break;
case UC_LNX: case UC_LNX:
tap_code16(UNICODE_KEY_LNX); tap_code16(UNICODE_KEY_LNX);
@@ -99,8 +99,8 @@ __attribute__((weak)) void unicode_input_start(void) {
__attribute__((weak)) void unicode_input_finish(void) { __attribute__((weak)) void unicode_input_finish(void) {
switch (unicode_config.input_mode) { switch (unicode_config.input_mode) {
case UC_OSX: case UC_MAC:
unregister_code(UNICODE_KEY_OSX); unregister_code(UNICODE_KEY_MAC);
break; break;
case UC_LNX: case UC_LNX:
tap_code(KC_SPC); tap_code(KC_SPC);
@@ -118,8 +118,8 @@ __attribute__((weak)) void unicode_input_finish(void) {
__attribute__((weak)) void unicode_input_cancel(void) { __attribute__((weak)) void unicode_input_cancel(void) {
switch (unicode_config.input_mode) { switch (unicode_config.input_mode) {
case UC_OSX: case UC_MAC:
unregister_code(UNICODE_KEY_OSX); unregister_code(UNICODE_KEY_MAC);
break; break;
case UC_LNX: case UC_LNX:
case UC_WINC: case UC_WINC:
@@ -253,11 +253,11 @@ bool process_unicode_common(uint16_t keycode, keyrecord_t *record) {
cycle_unicode_input_mode(-1); cycle_unicode_input_mode(-1);
break; break;
case UNICODE_MODE_OSX: case UNICODE_MODE_MAC:
set_unicode_input_mode(UC_OSX); set_unicode_input_mode(UC_MAC);
#if defined(AUDIO_ENABLE) && defined(UNICODE_SONG_OSX) #if defined(AUDIO_ENABLE) && defined(UNICODE_SONG_MAC)
static float song_osx[][2] = UNICODE_SONG_OSX; static float song_mac[][2] = UNICODE_SONG_MAC;
PLAY_SONG(song_osx); PLAY_SONG(song_mac);
#endif #endif
break; break;
case UNICODE_MODE_LNX: case UNICODE_MODE_LNX:

15
quantum/process_keycode/process_unicode_common.h
View File

@@ -23,8 +23,8 @@
#endif #endif
// Keycodes used for starting Unicode input on different platforms // Keycodes used for starting Unicode input on different platforms
#ifndef UNICODE_KEY_OSX #ifndef UNICODE_KEY_MAC
# define UNICODE_KEY_OSX KC_LALT # define UNICODE_KEY_MAC KC_LALT
#endif #endif
#ifndef UNICODE_KEY_LNX #ifndef UNICODE_KEY_LNX
# define UNICODE_KEY_LNX LCTL(LSFT(KC_U)) # define UNICODE_KEY_LNX LCTL(LSFT(KC_U))
@@ -49,8 +49,17 @@
# define UNICODE_TYPE_DELAY 10 # define UNICODE_TYPE_DELAY 10
#endif #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 { 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_LNX, // Linux using IBus
UC_WIN, // Windows using EnableHexNumpad UC_WIN, // Windows using EnableHexNumpad
UC_BSD, // BSD (not implemented) UC_BSD, // BSD (not implemented)

2
quantum/process_keycode/process_unicodemap.c
View File

@@ -43,7 +43,7 @@ bool process_unicodemap(uint16_t keycode, keyrecord_t *record) {
if (code > 0x10FFFF || (code > 0xFFFF && input_mode == UC_WIN)) { if (code > 0x10FFFF || (code > 0xFFFF && input_mode == UC_WIN)) {
// Character is out of range supported by the platform // Character is out of range supported by the platform
unicode_input_cancel(); unicode_input_cancel();
} else if (code > 0xFFFF && input_mode == UC_OSX) { } else if (code > 0xFFFF && input_mode == UC_MAC) {
// Convert to UTF-16 surrogate pair on Mac // Convert to UTF-16 surrogate pair on Mac
code -= 0x10000; code -= 0x10000;
uint32_t lo = code & 0x3FF, hi = (code & 0xFFC00) >> 10; uint32_t lo = code & 0x3FF, hi = (code & 0xFFC00) >> 10;

6
quantum/quantum_keycodes.h
View File

@@ -459,7 +459,7 @@ enum quantum_keycodes {
UNICODE_MODE_FORWARD, UNICODE_MODE_FORWARD,
UNICODE_MODE_REVERSE, UNICODE_MODE_REVERSE,
UNICODE_MODE_OSX, UNICODE_MODE_MAC,
UNICODE_MODE_LNX, UNICODE_MODE_LNX,
UNICODE_MODE_WIN, UNICODE_MODE_WIN,
UNICODE_MODE_BSD, UNICODE_MODE_BSD,
@@ -779,7 +779,9 @@ enum quantum_keycodes {
#define UC_MOD UNICODE_MODE_FORWARD #define UC_MOD UNICODE_MODE_FORWARD
#define UC_RMOD UNICODE_MODE_REVERSE #define UC_RMOD UNICODE_MODE_REVERSE
#define UC_M_OS UNICODE_MODE_OSX #define UC_M_MA UNICODE_MODE_MAC
#define UNICODE_MODE_OSX UNICODE_MODE_MAC // Deprecated alias
#define UC_M_OS UNICODE_MODE_MAC // Deprecated alias
#define UC_M_LN UNICODE_MODE_LNX #define UC_M_LN UNICODE_MODE_LNX
#define UC_M_WI UNICODE_MODE_WIN #define UC_M_WI UNICODE_MODE_WIN
#define UC_M_BS UNICODE_MODE_BSD #define UC_M_BS UNICODE_MODE_BSD