Normalise Unicode keycodes (#18898)
* `UC_MOD`/`UC_RMOD` -> `UC_NEXT`/`UC_PREV` * `UNICODE_MODE_*` -> `QK_UNICODE_MODE_*` * `UC_MAC` -> `UNICODE_MODE_MACOS` * `UC_LNX` -> `UNICODE_MODE_LINUX` * `UC_WIN` -> `UNICODE_MODE_WINDOWS` * `UC_BSD` -> `UNICODE_MODE_BSD` * `UC_WINC` -> `UNICODE_MODE_WINCOMPOSE` * `UC_EMACS` -> `UNICODE_MODE_EMACS` * `UC__COUNT` -> `UNICODE_MODE_COUNT` * `UC_M_MA` -> `UC_MAC` * `UC_M_LN` -> `UC_LINX` * `UC_M_WI` -> `UC_WIN` * `UC_M_BS` -> `UC_BSD` * `UC_M_WC` -> `UC_WINC` * `UC_M_EM` -> `UC_EMAC` * Docs * Update quantum/unicode/unicode.h
This commit is contained in:
@@ -135,7 +135,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
void matrix_init_user(void)
|
||||
{
|
||||
set_unicode_input_mode(UC_WINC); /* See https://jayliu50.github.io/qmk-cheatsheet/ */
|
||||
set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE); /* See https://jayliu50.github.io/qmk-cheatsheet/ */
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
|
||||
// Set the unicode input mode for using UC.
|
||||
void matrix_init_user(void) {
|
||||
set_unicode_input_mode(UC_LNX);
|
||||
set_unicode_input_mode(UNICODE_MODE_LINUX);
|
||||
}
|
||||
|
||||
// Processing all the key pressed.
|
||||
|
||||
@@ -133,7 +133,7 @@ void keyboard_post_init_user(void) {
|
||||
}
|
||||
|
||||
void eeconfig_init_user(void) {
|
||||
set_unicode_input_mode(UC_LNX);
|
||||
set_unicode_input_mode(UNICODE_MODE_LINUX);
|
||||
}
|
||||
|
||||
void matrix_init_user(void) {
|
||||
|
||||
@@ -110,7 +110,7 @@ void keyboard_post_init_user(void) {
|
||||
}
|
||||
|
||||
void eeconfig_init_user(void) {
|
||||
set_unicode_input_mode(UC_LNX);
|
||||
set_unicode_input_mode(UNICODE_MODE_LINUX);
|
||||
}
|
||||
|
||||
static uint32_t last_update = 0;
|
||||
|
||||
@@ -339,7 +339,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
// Unicode input mode set to Windows using WinCompose
|
||||
void matrix_init_user(void) {
|
||||
set_unicode_input_mode(UC_WINC);
|
||||
set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
|
||||
};
|
||||
#ifdef OLED_ENABLE
|
||||
bool oled_task_user(void) {
|
||||
|
||||
@@ -603,14 +603,14 @@ void led_set_unicode_input_mode(void) {
|
||||
rgbsps_set(LED_IND_WINDOWS, COLOR_BLANK);
|
||||
|
||||
switch (get_unicode_input_mode()) {
|
||||
case UC_LNX:
|
||||
case UNICODE_MODE_LINUX:
|
||||
rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
|
||||
break;
|
||||
case UC_MAC:
|
||||
case UNICODE_MODE_MACOS:
|
||||
rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
|
||||
break;
|
||||
case UC_WIN:
|
||||
case UC_WINC:
|
||||
case UNICODE_MODE_WINDOWS:
|
||||
case UNICODE_MODE_WINCOMPOSE:
|
||||
rgbsps_set(LED_IND_WINDOWS, THEME_COLOR_WINDOWS);
|
||||
break;
|
||||
}
|
||||
@@ -1199,21 +1199,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
// OS switchers
|
||||
case LINUX:
|
||||
set_unicode_input_mode(UC_LNX);
|
||||
set_unicode_input_mode(UNICODE_MODE_LINUX);
|
||||
#ifdef RGBSPS_ENABLE
|
||||
led_set_unicode_input_mode();
|
||||
#endif
|
||||
return false;
|
||||
break;
|
||||
case WIN:
|
||||
set_unicode_input_mode(UC_WINC);
|
||||
set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
|
||||
#ifdef RGBSPS_ENABLE
|
||||
led_set_unicode_input_mode();
|
||||
#endif
|
||||
return false;
|
||||
break;
|
||||
case OSX:
|
||||
set_unicode_input_mode(UC_MAC);
|
||||
set_unicode_input_mode(UNICODE_MODE_MACOS);
|
||||
#ifdef RGBSPS_ENABLE
|
||||
led_set_unicode_input_mode();
|
||||
#endif
|
||||
@@ -1278,7 +1278,7 @@ void set_output_user(uint8_t output) {
|
||||
void matrix_init_user() {
|
||||
wait_ms(500); // give time for usb to initialize
|
||||
|
||||
set_unicode_input_mode(UC_LNX);
|
||||
set_unicode_input_mode(UNICODE_MODE_LINUX);
|
||||
|
||||
#ifdef RGBSPS_ENABLE
|
||||
led_init();
|
||||
|
||||
@@ -606,14 +606,14 @@ void led_set_unicode_input_mode(void) {
|
||||
rgbsps_set(LED_IND_WINDOWS, COLOR_BLANK);
|
||||
|
||||
switch (get_unicode_input_mode()) {
|
||||
case UC_LNX:
|
||||
case UNICODE_MODE_LINUX:
|
||||
rgbsps_set(LED_IND_LINUX, THEME_COLOR_LINUX);
|
||||
break;
|
||||
case UC_MAC:
|
||||
case UNICODE_MODE_MACOS:
|
||||
rgbsps_set(LED_IND_APPLE, THEME_COLOR_APPLE);
|
||||
break;
|
||||
case UC_WIN:
|
||||
case UC_WINC:
|
||||
case UNICODE_MODE_WINDOWS:
|
||||
case UNICODE_MODE_WINCOMPOSE:
|
||||
rgbsps_set(LED_IND_WINDOWS, THEME_COLOR_WINDOWS);
|
||||
break;
|
||||
}
|
||||
@@ -1202,21 +1202,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
// OS switchers
|
||||
case LINUX:
|
||||
set_unicode_input_mode(UC_LNX);
|
||||
set_unicode_input_mode(UNICODE_MODE_LINUX);
|
||||
#ifdef RGBSPS_ENABLE
|
||||
led_set_unicode_input_mode();
|
||||
#endif
|
||||
return false;
|
||||
break;
|
||||
case WIN:
|
||||
set_unicode_input_mode(UC_WINC);
|
||||
set_unicode_input_mode(UNICODE_MODE_WINCOMPOSE);
|
||||
#ifdef RGBSPS_ENABLE
|
||||
led_set_unicode_input_mode();
|
||||
#endif
|
||||
return false;
|
||||
break;
|
||||
case OSX:
|
||||
set_unicode_input_mode(UC_MAC);
|
||||
set_unicode_input_mode(UNICODE_MODE_MACOS);
|
||||
#ifdef RGBSPS_ENABLE
|
||||
led_set_unicode_input_mode();
|
||||
#endif
|
||||
@@ -1281,7 +1281,7 @@ void set_output_user(uint8_t output) {
|
||||
void matrix_init_user() {
|
||||
wait_ms(500); // give time for usb to initialize
|
||||
|
||||
set_unicode_input_mode(UC_LNX);
|
||||
set_unicode_input_mode(UNICODE_MODE_LINUX);
|
||||
|
||||
#ifdef RGBSPS_ENABLE
|
||||
led_init();
|
||||
|
||||
@@ -17,4 +17,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#pragma once
|
||||
|
||||
#define UNICODE_SELECTED_MODES UC_WIN, UC_WINC
|
||||
#define UNICODE_SELECTED_MODES UNICODE_MODE_WINDOWS, UNICODE_MODE_WINCOMPOSE
|
||||
@@ -116,7 +116,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
* `-------------------------------------------------------------------------------------------------------------------------------------'
|
||||
*/
|
||||
[1] = LAYOUT(
|
||||
VRSN, KC_SLEP, _______, UC_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
VRSN, KC_SLEP, _______, UC_NEXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, _______, X(UAT), X(UHSH), X(UDLR), X(USCT), X(UCFX), X(UAMP), X(UAST), _______, _______, _______, _______, _______, _______, _______, _______, KC_CALC, _______, _______, _______,
|
||||
_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_BTN3, _______, _______, _______, KC_SYRQ, KC_SCRL, KC_PAUS, XP(ULSB, ULCB), XP(URSB, URCB), _______, _______, _______, _______, _______, _______, _______,
|
||||
_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN5, _______, _______, _______, _______, _______, XP(USCO, UCLN), XP(UAPO, UQOT), _______, _______, _______, _______, _______, _______, _______,
|
||||
|
||||
@@ -107,7 +107,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
[_ADJUST] = LAYOUT_4x6_right_wrapper(
|
||||
QK_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, QK_BOOT,
|
||||
VRSN, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EE_CLR,
|
||||
UC_MOD, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
|
||||
UC_NEXT, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, TG_MODS,
|
||||
HPT_DWLI, HPT_DWLD, TG_GAME, TG_DBLO,
|
||||
HPT_TOG, HPT_BUZ, KC_NUKE,
|
||||
_______, _______, _______,
|
||||
|
||||
@@ -123,7 +123,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
|
||||
QK_MAKE, KC_WIDE,KC_AUSSIE,KC_SCRIPT,KC_ZALGO,KC_NOMODE, KC_NOMODE,KC_BLOCKS,KC_REGIONAL,_______,_______, QK_BOOT,
|
||||
VRSN, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, EE_CLR,
|
||||
KEYLOCK, _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, TG_MODS,
|
||||
UC_MOD, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY,
|
||||
UC_NEXT, _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, KC_MPLY,
|
||||
TG(_DIABLOII), AUTO_CTN, TG_GAME, TG_DBLO,
|
||||
_______, QK_RBT, KC_NUKE,
|
||||
_______, _______, _______,
|
||||
|
||||
@@ -103,6 +103,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
|
||||
void matrix_init_user(void) {
|
||||
set_unicode_input_mode(UC_WIN);
|
||||
set_unicode_input_mode(UNICODE_MODE_WINDOWS);
|
||||
}
|
||||
|
||||
|
||||
@@ -107,5 +107,5 @@ layer_state_t layer_state_set_user(layer_state_t state) {
|
||||
}
|
||||
|
||||
void eeconfig_init_user(void) {
|
||||
set_unicode_input_mode(UC_LNX);
|
||||
set_unicode_input_mode(UNICODE_MODE_LINUX);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user