Remove legacy keycodes, part 6 (#18740)

* `KC_RSHIFT` -> `KC_RSFT`

* `KC_RCTRL` -> `KC_RCTL`

* `KC_LSHIFT` -> `KC_LSFT`

* `KC_LCTRL` -> `KC_LCTL`
This commit is contained in:
Ryan 2022-10-17 00:14:40 +11:00 committed by GitHub
parent 39c22f5cf5
commit 74223c34a9
Failed to generate hash of commit
553 changed files with 1139 additions and 1151 deletions

View file

@ -36,15 +36,15 @@ static void CMD(uint16_t keycode) {
}
static void CTRL(uint16_t keycode) {
PRESS(KC_LCTRL);
PRESS(KC_LCTL);
TAP(keycode);
RELEASE(KC_LCTRL);
RELEASE(KC_LCTL);
}
static void SHIFT(uint16_t keycode) {
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
TAP(keycode);
RELEASE(KC_LSHIFT);
RELEASE(KC_LSFT);
}
static void ALT(uint16_t keycode) {
@ -194,9 +194,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
break;
case VIM_C:
if(SHIFTED) {
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
CMD(KC_RIGHT);
RELEASE(KC_LSHIFT);
RELEASE(KC_LSFT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
@ -275,9 +275,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
// s for substitute?
if(SHIFTED) {
CMD(KC_LEFT);
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
CMD(KC_RIGHT);
RELEASE(KC_LSHIFT);
RELEASE(KC_LSFT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
@ -292,7 +292,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
if(SHIFTED) {
PRESS(KC_LSFT);
CMD(KC_Z);
RELEASE(KC_LSHIFT);
RELEASE(KC_LSFT);
} else {
CMD(KC_Z);
}
@ -355,9 +355,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
case VIM_C:
CMD(KC_LEFT);
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
CMD(KC_RIGHT);
RELEASE(KC_LSHIFT);
RELEASE(KC_LSFT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
@ -377,9 +377,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case VIM_W:
ALT(KC_LEFT);
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
ALT(KC_RIGHT);
RELEASE(KC_LSHIFT);
RELEASE(KC_LSFT);
CMD(KC_X);
yank_was_lines = false;
EDIT;
@ -427,9 +427,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case VIM_W:
ALT(KC_LEFT);
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
ALT(KC_RIGHT);
RELEASE(KC_LSHIFT);
RELEASE(KC_LSFT);
CMD(KC_X);
yank_was_lines = false;
vstate = VIM_START;
@ -451,33 +451,33 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
break;
case VIM_B:
PRESS(KC_LALT);
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
PRESS(KC_LEFT);
// leave open for key repeat
break;
case VIM_E:
PRESS(KC_LALT);
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
PRESS(KC_RIGHT);
// leave open for key repeat
break;
case VIM_H:
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
PRESS(KC_LEFT);
break;
case VIM_I:
vstate = VIM_VI;
break;
case VIM_J:
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
PRESS(KC_DOWN);
break;
case VIM_K:
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
PRESS(KC_UP);
break;
case VIM_L:
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
PRESS(KC_RIGHT);
break;
case VIM_W:
@ -518,9 +518,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
switch(keycode) {
case VIM_W:
ALT(KC_LEFT);
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
ALT(KC_RIGHT);
RELEASE(KC_LSHIFT);
RELEASE(KC_LSFT);
vstate = VIM_V;
default:
// ignore
@ -540,11 +540,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
vstate = VIM_START;
break;
case VIM_J:
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
PRESS(KC_DOWN);
break;
case VIM_K:
PRESS(KC_LSHIFT);
PRESS(KC_LSFT);
PRESS(KC_UP);
break;
case VIM_Y: