refactor
parent
118f511e61
commit
5dc33a30d0
40
src/main.c
40
src/main.c
|
@ -262,17 +262,9 @@ void layer_enable_upto(layer max_layer) {
|
||||||
// layout info
|
// layout info
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
keycode kb_keycode(layer l, u8 row, u8 col) {
|
keycode kb_keycode (layer l, u8 row, u8 col) { return (keycode) pgm_read_byte(&(_kb_layout[l][row][col])); }
|
||||||
return (keycode) pgm_read_byte(&(_kb_layout[l][row][col]));
|
keyfunc kb_keyfunc_press (layer l, u8 row, u8 col) { return (keyfunc) pgm_read_word(&(_kb_layout_press[l][row][col])); }
|
||||||
}
|
keyfunc kb_keyfunc_release (layer l, u8 row, u8 col) { return (keyfunc) pgm_read_word(&(_kb_layout_release[l][row][col])); }
|
||||||
|
|
||||||
keyfunc kb_keyfunc_press(layer l, u8 row, u8 col) {
|
|
||||||
return (keyfunc) pgm_read_word(&(_kb_layout_press[l][row][col]));
|
|
||||||
}
|
|
||||||
|
|
||||||
keyfunc kb_keyfunc_release(layer l, u8 row, u8 col) {
|
|
||||||
return (keyfunc) pgm_read_word(&(_kb_layout_release[l][row][col]));
|
|
||||||
}
|
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
// keyfunc primitives
|
// keyfunc primitives
|
||||||
|
@ -454,29 +446,15 @@ void kbfun_layer_sticky() {
|
||||||
// combo keyfuncs
|
// combo keyfuncs
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
|
||||||
// +shift
|
void _kbfun_combo_press_release(keycode combo_key) {
|
||||||
void kbfun_shift_press_release() {
|
_kbfun_press_release(current_is_pressed, combo_key);
|
||||||
_kbfun_press_release(current_is_pressed, KEY_LeftShift);
|
|
||||||
kbfun_press_release();
|
kbfun_press_release();
|
||||||
}
|
}
|
||||||
|
|
||||||
// +control
|
void kbfun_shift_press_release() { _kbfun_combo_press_release(KEY_LeftShift); } // +shift
|
||||||
void kbfun_control_press_release() {
|
void kbfun_control_press_release() { _kbfun_combo_press_release(KEY_LeftControl); } // +control
|
||||||
_kbfun_press_release(current_is_pressed, KEY_LeftControl);
|
void kbfun_alt_press_release() { _kbfun_combo_press_release(KEY_LeftAlt); } // +alt
|
||||||
kbfun_press_release();
|
void kbfun_win_press_release() { _kbfun_combo_press_release(KEY_LeftGUI); } // +win
|
||||||
}
|
|
||||||
|
|
||||||
// +alt
|
|
||||||
void kbfun_alt_press_release() {
|
|
||||||
_kbfun_press_release(current_is_pressed, KEY_LeftAlt);
|
|
||||||
kbfun_press_release();
|
|
||||||
}
|
|
||||||
|
|
||||||
// +win
|
|
||||||
void kbfun_win_press_release() {
|
|
||||||
_kbfun_press_release(current_is_pressed, KEY_LeftGUI);
|
|
||||||
kbfun_press_release();
|
|
||||||
}
|
|
||||||
|
|
||||||
// capslock
|
// capslock
|
||||||
void kbfun_2_keys_capslock_press_release() {
|
void kbfun_2_keys_capslock_press_release() {
|
||||||
|
|
|
@ -4,6 +4,7 @@ void kbfun_win_press_release();
|
||||||
void kbfun_alt_press_release();
|
void kbfun_alt_press_release();
|
||||||
void kbfun_control_press_release();
|
void kbfun_control_press_release();
|
||||||
void kbfun_shift_press_release();
|
void kbfun_shift_press_release();
|
||||||
|
void _kbfun_combo_press_release(keycode combo_key);
|
||||||
void kbfun_mediakey_press_release();
|
void kbfun_mediakey_press_release();
|
||||||
void kbfun_press_release();
|
void kbfun_press_release();
|
||||||
bool key_is_modifier(keycode key);
|
bool key_is_modifier(keycode key);
|
||||||
|
|
Loading…
Reference in New Issue