From 74223c34a969c0877bde035c721c21a1f25890fa Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 17 Oct 2022 00:14:40 +1100 Subject: Remove legacy keycodes, part 6 (#18740) * `KC_RSHIFT` -> `KC_RSFT` * `KC_RCTRL` -> `KC_RCTL` * `KC_LSHIFT` -> `KC_LSFT` * `KC_LCTRL` -> `KC_LCTL` --- users/twschum/twschum.c | 2 +- users/twschum/xtonhasvim.c | 42 +++++++++++++++++++++--------------------- 2 files changed, 22 insertions(+), 22 deletions(-) (limited to 'users/twschum') diff --git a/users/twschum/twschum.c b/users/twschum/twschum.c index 2d34f95718..7f1cb3de78 100644 --- a/users/twschum/twschum.c +++ b/users/twschum/twschum.c @@ -79,7 +79,7 @@ static inline bool tap_ctrl_other_pressed(void) { // need to send the plain keycode plus potential mods if (get_mods() & MOD_MASK_CTRL) { // make sure to send a shift if prssed - repeat_send_keys(key->count, KC_RSHIFT, key->keycode); + repeat_send_keys(key->count, KC_RSFT, key->keycode); } else { repeat_send_keys(key->count, key->keycode); diff --git a/users/twschum/xtonhasvim.c b/users/twschum/xtonhasvim.c index 15d1b0d940..b3f410bc26 100644 --- a/users/twschum/xtonhasvim.c +++ b/users/twschum/xtonhasvim.c @@ -144,9 +144,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { break; case VIM_C: if(SHIFTED) { - register_code(KC_LSHIFT); + register_code(KC_LSFT); tap_code16(LGUI(KC_RIGHT)); - unregister_code(KC_LSHIFT); + unregister_code(KC_LSFT); tap_code16(LGUI(KC_X)); yank_was_lines = false; EDIT; @@ -225,9 +225,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { // s for substitute? if(SHIFTED) { tap_code16(LGUI(KC_LEFT)); - register_code(KC_LSHIFT); + register_code(KC_LSFT); tap_code16(LGUI(KC_RIGHT)); - unregister_code(KC_LSHIFT); + unregister_code(KC_LSFT); tap_code16(LGUI(KC_X)); yank_was_lines = false; EDIT; @@ -242,7 +242,7 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { if(SHIFTED) { register_code(KC_LSFT); tap_code16(LGUI(KC_Z)); - unregister_code(KC_LSHIFT); + unregister_code(KC_LSFT); } else { tap_code16(LGUI(KC_Z)); } @@ -305,9 +305,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { case VIM_C: tap_code16(LGUI(KC_LEFT)); - register_code(KC_LSHIFT); + register_code(KC_LSFT); tap_code16(LGUI(KC_RIGHT)); - unregister_code(KC_LSHIFT); + unregister_code(KC_LSFT); tap_code16(LGUI(KC_X)); yank_was_lines = false; EDIT; @@ -327,9 +327,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { switch(keycode) { case VIM_W: tap_code16(LALT(KC_LEFT)); - register_code(KC_LSHIFT); + register_code(KC_LSFT); tap_code16(LALT(KC_RIGHT)); - unregister_code(KC_LSHIFT); + unregister_code(KC_LSFT); tap_code16(LGUI(KC_X)); yank_was_lines = false; EDIT; @@ -377,9 +377,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { switch(keycode) { case VIM_W: tap_code16(LALT(KC_LEFT)); - register_code(KC_LSHIFT); + register_code(KC_LSFT); tap_code16(LALT(KC_RIGHT)); - unregister_code(KC_LSHIFT); + unregister_code(KC_LSFT); tap_code16(LGUI(KC_X)); yank_was_lines = false; vstate = VIM_START; @@ -401,33 +401,33 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { break; case VIM_B: register_code(KC_LALT); - register_code(KC_LSHIFT); + register_code(KC_LSFT); register_code(KC_LEFT); // leave open for key repeat break; case VIM_E: register_code(KC_LALT); - register_code(KC_LSHIFT); + register_code(KC_LSFT); register_code(KC_RIGHT); // leave open for key repeat break; case VIM_H: - register_code(KC_LSHIFT); + register_code(KC_LSFT); register_code(KC_LEFT); break; case VIM_I: vstate = VIM_VI; break; case VIM_J: - register_code(KC_LSHIFT); + register_code(KC_LSFT); register_code(KC_DOWN); break; case VIM_K: - register_code(KC_LSHIFT); + register_code(KC_LSFT); register_code(KC_UP); break; case VIM_L: - register_code(KC_LSHIFT); + register_code(KC_LSFT); register_code(KC_RIGHT); break; case VIM_W: @@ -468,9 +468,9 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { switch(keycode) { case VIM_W: tap_code16(LALT(KC_LEFT)); - register_code(KC_LSHIFT); + register_code(KC_LSFT); tap_code16(LALT(KC_RIGHT)); - unregister_code(KC_LSHIFT); + unregister_code(KC_LSFT); vstate = VIM_V; default: // ignore @@ -490,11 +490,11 @@ bool process_record_vimlayer(uint16_t keycode, keyrecord_t *record) { vstate = VIM_START; break; case VIM_J: - register_code(KC_LSHIFT); + register_code(KC_LSFT); register_code(KC_DOWN); break; case VIM_K: - register_code(KC_LSHIFT); + register_code(KC_LSFT); register_code(KC_UP); break; case VIM_Y: -- cgit v1.2.3