Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove legacy international keycodes #18588

Merged
merged 14 commits into from
Oct 9, 2022
Prev Previous commit
Next Next commit
KC_LANG1-9 -> KC_LNG1-9
  • Loading branch information
fauxpark committed Oct 4, 2022
commit a4c2029cc13fab8b321ab367f955059d2ab536ed
4 changes: 2 additions & 2 deletions keyboards/25keys/aleth42/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
// tap_code(KC_VOLU);
if(keymap_config.swap_lalt_lgui==false){
tap_code(KC_LANG2);
tap_code(KC_LNG2);
}else {
tap_code16(A(KC_GRV));
}
} else {
if(keymap_config.swap_lalt_lgui==false){
tap_code(KC_LANG1);
tap_code(KC_LNG1);
} else {
tap_code16(A(KC_GRV));
}
Expand Down
4 changes: 2 additions & 2 deletions keyboards/25keys/aleth42/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ bool encoder_update_user(uint8_t index, bool clockwise) {
if (clockwise) {
// tap_code(KC_VOLU);
if(keymap_config.swap_lalt_lgui==false){
tap_code(KC_LANG2);
tap_code(KC_LNG2);
}else {
tap_code16(A(KC_GRV));
}
} else {
if(keymap_config.swap_lalt_lgui==false){
tap_code(KC_LANG1);
tap_code(KC_LNG1);
} else {
tap_code16(A(KC_GRV));
}
Expand Down
8 changes: 4 additions & 4 deletions keyboards/25keys/zinc/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -271,24 +271,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG2);
register_code(KC_LNG2);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
unregister_code(KC_LANG2);
unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG1);
register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
unregister_code(KC_LANG1);
unregister_code(KC_LNG1);
}
return false;
break;
Expand Down
8 changes: 4 additions & 4 deletions keyboards/25keys/zinc/keymaps/ginjake/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -283,24 +283,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG2);
register_code(KC_LNG2);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
unregister_code(KC_LANG2);
unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG1);
register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
unregister_code(KC_LANG1);
unregister_code(KC_LNG1);
}
return false;
break;
Expand Down
8 changes: 4 additions & 4 deletions keyboards/25keys/zinc/keymaps/monks/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,24 +212,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG2);
register_code(KC_LNG2);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
unregister_code(KC_LANG2);
unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG1);
register_code(KC_LNG1);
}else{
SEND_STRING(SS_LALT("`"));
}
} else {
unregister_code(KC_LANG1);
unregister_code(KC_LNG1);
}
return false;
break;
Expand Down
2 changes: 1 addition & 1 deletion keyboards/25keys/zinc/keymaps/toshi0383/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_ADJUST] = LAYOUT_ortho_4x12(
RGB_VAI, RGB_SAI, RGB_HUI, RGB_MOD, XXXXXXX, RGB_TOG, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, XXXXXXX,
RGB_VAD, RGB_SAD, RGB_HUD, RGB_RMOD, XXXXXXX, XXXXXXX, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, XXXXXXX,
KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LANG1, KC_LANG2,
KC_MUTE, KC_VOLD, KC_VOLU, KC_BRID, KC_BRIU, QK_BOOT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LNG1, KC_LNG2,
_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_INT2
),
};
8 changes: 4 additions & 4 deletions keyboards/25keys/zinc/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -154,23 +154,23 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case EISU:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG2);
register_code(KC_LNG2);
} else {
SEND_STRING(SS_LALT("`"));
}
} else {
unregister_code(KC_LANG2);
unregister_code(KC_LNG2);
}
return false;
case KANA:
if (record->event.pressed) {
if(keymap_config.swap_lalt_lgui==false){
register_code(KC_LANG1);
register_code(KC_LNG1);
} else {
SEND_STRING(SS_LALT("`"));
}
} else {
unregister_code(KC_LANG1);
unregister_code(KC_LNG1);
}
return false;
case RGBRST:
Expand Down
4 changes: 2 additions & 2 deletions keyboards/bandominedoni/bandominedoni.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
// Long press: go to _FN layer, tap: MUTE
#define FN_MUTE LT(_FN, KC_MUTE)
#define DF_QWER DF(_QWERTY)
#define MIS_EIS LT(_MISC,KC_LANG2)
#define MIS_KAN LT(_MISC,KC_LANG1)
#define MIS_EIS LT(_MISC,KC_LNG2)
#define MIS_KAN LT(_MISC,KC_LNG1)


// Overriding is_keyboard_left() in qmk_firmware/quantum/split_common/split_util.c to limit the handedness check only once.
Expand Down
4 changes: 2 additions & 2 deletions keyboards/biacco42/ergo42/keymaps/koba/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ enum {
_FUNC
};

#define KC_KNA KC_LANG1
#define KC_EISU KC_LANG2
#define KC_KNA KC_LNG1
#define KC_EISU KC_LNG2
#define LOWER MO(_LOWER)
#define RAISE MO(_RAISE)
#define FN MO(_FUNC)
Expand Down
8 changes: 4 additions & 4 deletions keyboards/biacco42/ergo42/keymaps/yshrsmz/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,17 +143,17 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
break;
case EISU:
if (record->event.pressed) {
register_code(KC_LANG2);
register_code(KC_LNG2);
} else {
unregister_code(KC_LANG2);
unregister_code(KC_LNG2);
}
return false;
break;
case KANA:
if (record->event.pressed) {
register_code(KC_LANG1);
register_code(KC_LNG1);
} else {
unregister_code(KC_LANG1);
unregister_code(KC_LNG1);
}
return false;
break;
Expand Down
4 changes: 2 additions & 2 deletions keyboards/crkbd/keymaps/mcrown/mcrown.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
#define KC_LOWER LOWER
#define KC_RAISE RAISE
#define KC_CTLTB CTL_T(KC_TAB)
#define KC_GUIEI GUI_T(KC_LANG2)
#define KC_ALTKN ALT_T(KC_LANG1)
#define KC_GUIEI GUI_T(KC_LNG2)
#define KC_ALTKN ALT_T(KC_LNG1)

#define LAYOUT_wrapper(...) LAYOUT(__VA_ARGS__)

Expand Down
2 changes: 1 addition & 1 deletion keyboards/crkbd/keymaps/mcrown/oled.c
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ inline static char get_ascii(int16_t keycode){
ascii_idx=code_to_ascii[(uint8_t)keycode];
}else if(keycode<KC_KP_ENTER){
ascii_idx=code_to_ascii[SPECIAL_KEYS_SHIFT(keycode)];
}else if(KC_LANG1==keycode){
}else if(KC_LNG1==keycode){
ascii_idx=code_to_ascii[ALT_CODE];
}else if( QK_LSFT==(QK_LSFT&keycode) ){
ascii_idx=code_to_ascii[RM_LSFT(keycode)];
Expand Down
4 changes: 2 additions & 2 deletions keyboards/crkbd/keymaps/oled_sample/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ enum crkbd_layers {
#define RAISE MO(_RAISE)
#define LOWER MO(_LOWER)
#define CTLTB CTL_T(KC_TAB)
#define GUIEI GUI_T(KC_LANG2)
#define ALTKN ALT_T(KC_LANG1)
#define GUIEI GUI_T(KC_LNG2)
#define ALTKN ALT_T(KC_LNG1)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY] = LAYOUT_split_3x6_3(
Expand Down
10 changes: 5 additions & 5 deletions keyboards/crkbd/keymaps/thumb_ctrl/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@ enum custom_keycodes {
#define KC_LVAD RGB_VAD
#define KC_LMOD RGB_MOD
#define KC_CTLTB CTL_T(KC_TAB)
#define KC_GUIEI GUI_T(KC_LANG2)
#define KC_ALTKN ALT_T(KC_LANG1)
#define KC_CTLEN CTL_T(KC_LANG2) // for Linux and Windows
#define KC_GUIEN GUI_T(KC_LANG2) // for Mac
#define KC_SFTJP SFT_T(KC_LANG1)
#define KC_GUIEI GUI_T(KC_LNG2)
#define KC_ALTKN ALT_T(KC_LNG1)
#define KC_CTLEN CTL_T(KC_LNG2) // for Linux and Windows
#define KC_GUIEN GUI_T(KC_LNG2) // for Mac
#define KC_SFTJP SFT_T(KC_LNG1)
#define KC_ALTSP ALT_T(KC_SPACE)
#define KC_ALTDL ALT_T(KC_DEL)

Expand Down
2 changes: 1 addition & 1 deletion keyboards/dailycraft/bat43/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_RSFT,
KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL,
KC_LGUI, KC_LANG2,L_SPC, R_ENT, KC_LANG1,KC_RALT,
KC_LGUI, KC_LNG2, L_SPC, R_ENT, KC_LNG1, KC_RALT,
KC_A, KC_B, KC_C, KC_D, KC_E
),
[_LOWER] = LAYOUT(
Expand Down
2 changes: 1 addition & 1 deletion keyboards/dailycraft/bat43/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_MINS,
KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_BSPC, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_RSFT,
KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RCTL,
KC_LGUI, KC_LANG2,L_SPC, R_ENT, KC_LANG1,KC_RALT,
KC_LGUI, KC_LNG2, L_SPC, R_ENT, KC_LNG1, KC_RALT,
KC_A, KC_B, KC_C, KC_D, KC_E
),
[_LOWER] = LAYOUT(
Expand Down
4 changes: 2 additions & 2 deletions keyboards/dailycraft/claw44/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ enum layer_number {

#define KC_L_SPC LT(_LOWER, KC_SPC) // lower
#define KC_R_ENT LT(_RAISE, KC_ENT) // raise
#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win
#define KC_G_EN LGUI_T(KC_LANG2) // cmd or win
#define KC_G_JA LGUI_T(KC_LNG1) // cmd or win
#define KC_G_EN LGUI_T(KC_LNG2) // cmd or win
#define KC_C_BS LCTL_T(KC_BSPC) // ctrl
#define KC_A_DEL ALT_T(KC_DEL) // alt

Expand Down
4 changes: 2 additions & 2 deletions keyboards/dailycraft/claw44/keymaps/oled/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ enum layer_number {

#define KC_L_SPC LT(_LOWER, KC_SPC) // lower
#define KC_R_ENT LT(_RAISE, KC_ENT) // raise
#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win
#define KC_G_EN LGUI_T(KC_LANG2) // cmd or win
#define KC_G_JA LGUI_T(KC_LNG1) // cmd or win
#define KC_G_EN LGUI_T(KC_LNG2) // cmd or win
#define KC_C_BS LCTL_T(KC_BSPC) // ctrl
#define KC_A_DEL ALT_T(KC_DEL) // alt

Expand Down
4 changes: 2 additions & 2 deletions keyboards/dailycraft/claw44/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ enum layer_number {

#define KC_L_SPC LT(_LOWER, KC_SPC) // lower
#define KC_R_ENT LT(_RAISE, KC_ENT) // raise
#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win
#define KC_G_EN LGUI_T(KC_LANG2) // cmd or win
#define KC_G_JA LGUI_T(KC_LNG1) // cmd or win
#define KC_G_EN LGUI_T(KC_LNG2) // cmd or win
#define KC_C_BS LCTL_T(KC_BSPC) // ctrl
#define KC_A_DEL ALT_T(KC_DEL) // alt

Expand Down
4 changes: 2 additions & 2 deletions keyboards/dailycraft/wings42/rev1/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ enum layer_number {
#define KC_G_BS LGUI_T(KC_BSPC)
#define KC_L_SPC LT(_LOWER, KC_SPC)
#define KC_R_ENT LT(_RAISE, KC_ENT)
#define KC_S_JA LSFT_T(KC_LANG1)
#define KC_S_EN LSFT_T(KC_LANG2)
#define KC_S_JA LSFT_T(KC_LNG1)
#define KC_S_EN LSFT_T(KC_LNG2)
#define KC_A_DEL ALT_T(KC_DEL)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
4 changes: 2 additions & 2 deletions keyboards/dailycraft/wings42/rev1/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ enum layer_number {
#define KC_G_BS LGUI_T(KC_BSPC)
#define KC_L_SPC LT(_LOWER, KC_SPC)
#define KC_R_ENT LT(_RAISE, KC_ENT)
#define KC_S_JA LSFT_T(KC_LANG1)
#define KC_S_EN LSFT_T(KC_LANG2)
#define KC_S_JA LSFT_T(KC_LNG1)
#define KC_S_EN LSFT_T(KC_LNG2)
#define KC_A_DEL ALT_T(KC_DEL)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ enum layer_number {
#define KC_G_BS LGUI_T(KC_BSPC)
#define KC_L_SPC LT(_LOWER, KC_SPC)
#define KC_R_ENT LT(_RAISE, KC_ENT)
#define KC_S_JA LSFT_T(KC_LANG1)
#define KC_S_EN LSFT_T(KC_LANG2)
#define KC_S_JA LSFT_T(KC_LNG1)
#define KC_S_EN LSFT_T(KC_LNG2)
#define KC_A_DEL ALT_T(KC_DEL)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ enum layer_number {
#define KC_G_BS LGUI_T(KC_BSPC)
#define KC_L_SPC LT(_LOWER, KC_SPC)
#define KC_R_ENT LT(_RAISE, KC_ENT)
#define KC_S_JA LSFT_T(KC_LANG1)
#define KC_S_EN LSFT_T(KC_LANG2)
#define KC_S_JA LSFT_T(KC_LNG1)
#define KC_S_EN LSFT_T(KC_LNG2)
#define KC_A_DEL ALT_T(KC_DEL)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
4 changes: 2 additions & 2 deletions keyboards/dailycraft/wings42/rev2/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ enum layer_number {
#define KC_G_BS LGUI_T(KC_BSPC)
#define KC_L_SPC LT(_LOWER, KC_SPC)
#define KC_R_ENT LT(_RAISE, KC_ENT)
#define KC_S_JA LSFT_T(KC_LANG1)
#define KC_S_EN LSFT_T(KC_LANG2)
#define KC_S_JA LSFT_T(KC_LNG1)
#define KC_S_EN LSFT_T(KC_LNG2)
#define KC_A_DEL ALT_T(KC_DEL)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
4 changes: 2 additions & 2 deletions keyboards/dailycraft/wings42/rev2/keymaps/via/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ enum layer_number {
#define KC_G_BS LGUI_T(KC_BSPC)
#define KC_L_SPC LT(_LOWER, KC_SPC)
#define KC_R_ENT LT(_RAISE, KC_ENT)
#define KC_S_JA LSFT_T(KC_LANG1)
#define KC_S_EN LSFT_T(KC_LANG2)
#define KC_S_JA LSFT_T(KC_LNG1)
#define KC_S_EN LSFT_T(KC_LNG2)
#define KC_A_DEL ALT_T(KC_DEL)

const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
Expand Down
2 changes: 1 addition & 1 deletion keyboards/ergodox_ez/keymaps/toshi0383/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
_______, _______, _______, _______, _______, _______, _______,
KC_NO, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______,
KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______,
_______, _______, _______, _______, _______, KC_LANG1, KC_LANG2,
_______, _______, _______, _______, _______, KC_LNG1, KC_LNG2,
_______, _______, _______, _______, _______,
_______, KC_NO,
_______,
Expand Down
4 changes: 2 additions & 2 deletions keyboards/fluorite/keymaps/default/keymap.c
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ enum custom_keycodes {
#define KC_TTCM1 TT(_CUSTOM1)
#define KC_TTCM2 TT(_CUSTOM2)
#define KC_CTLTB CTL_T(KC_TAB)
#define KC_GUIEI GUI_T(KC_LANG2)
#define KC_ALTKN ALT_T(KC_LANG1)
#define KC_GUIEI GUI_T(KC_LNG2)
#define KC_ALTKN ALT_T(KC_LNG1)
#define KC_RSHM RSFT(KC_HOME)
#define KC_RSEN RSFT(KC_END)
#define KC_RSJY RSFT(KC_INT3)
Expand Down
Loading