diff options
| author | Ryan <fauxpark@gmail.com> | 2023-02-13 03:19:02 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-13 03:19:02 +1100 |
| commit | bbf7a20b33de2d203518687cb5cd1aa85005ea27 (patch) | |
| tree | ee1a5c412a02021d085c81a26321c3424eca7022 /users/curry | |
| parent | d10350cd2ceb2b9d80522cdec3ea908118f7fd35 (diff) | |
Refactor Leader key feature (#19632)
Co-authored-by: Drashna Jaelre <drashna@live.com>
Diffstat (limited to 'users/curry')
| -rw-r--r-- | users/curry/leader.c | 24 | ||||
| -rw-r--r-- | users/curry/leader_user.c | 31 | ||||
| -rw-r--r-- | users/curry/leader_user.h (renamed from users/curry/leader.h) | 0 | ||||
| -rw-r--r-- | users/curry/rules.mk | 2 |
4 files changed, 32 insertions, 25 deletions
diff --git a/users/curry/leader.c b/users/curry/leader.c deleted file mode 100644 index 3fca6a2ec3..0000000000 --- a/users/curry/leader.c +++ /dev/null @@ -1,24 +0,0 @@ -#include "curry.h" -#include "leader.h" - -LEADER_EXTERNS(); - -void matrix_scan_user(void) { - static bool has_ran_yet; - if (!has_ran_yet) { - has_ran_yet = true; - startup_user(); - } - -#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) - matrix_scan_rgb(); -#endif // RGBLIGHT_ENABLE - LEADER_DICTIONARY() { - leading = false; - leader_end(); - SEQ_ONE_KEY(KC_F) { SEND_STRING(SS_LCTL("akf")); } // Select all and format - SEQ_ONE_KEY(KC_P) { SEND_STRING(SS_LCTL(SS_LSFT("4"))); } // Screenshot region - SEQ_TWO_KEYS(KC_D, KC_D) { SEND_STRING(SS_LCTL("ac")); } // Copy all - } - matrix_scan_keymap(); -} diff --git a/users/curry/leader_user.c b/users/curry/leader_user.c new file mode 100644 index 0000000000..9cee19af49 --- /dev/null +++ b/users/curry/leader_user.c @@ -0,0 +1,31 @@ +#include "curry.h" +#include "leader_user.h" + +void leader_end_user(void) { + if (leader_sequence_one_key(KC_F)) { + // Select all and format + SEND_STRING(SS_LCTL("akf")); + } + if (leader_sequence_one_key(KC_P)) { + // Screenshot region + SEND_STRING(SS_LCTL(SS_LSFT("4"))); + } + if (leader_sequence_two_keys(KC_D, KC_D)) { + // Copy all + SEND_STRING(SS_LCTL("ac")); + } +} + +void matrix_scan_user(void) { + static bool has_ran_yet; + if (!has_ran_yet) { + has_ran_yet = true; + startup_user(); + } + +#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) + matrix_scan_rgb(); +#endif // RGBLIGHT_ENABLE + + matrix_scan_keymap(); +} diff --git a/users/curry/leader.h b/users/curry/leader_user.h index f215893b9e..f215893b9e 100644 --- a/users/curry/leader.h +++ b/users/curry/leader_user.h diff --git a/users/curry/rules.mk b/users/curry/rules.mk index 724f97f5eb..aa89110276 100644 --- a/users/curry/rules.mk +++ b/users/curry/rules.mk @@ -29,7 +29,7 @@ ifeq ($(strip $(OLED_ENABLE)), yes) endif ifeq ($(strip $(LEADER_ENABLE)), yes) - SRC += leader.c + SRC += leader_user.c endif ifeq ($(strip $(RGBLIGHT_ENABLE)), yes) |