mirror of
https://github.com/qmk/qmk_userspace.git
synced 2025-05-07 16:14:17 -04:00
Keymap tweaks
- Brought back Mouse Z for temporary mouse usage - Combined Mouse and Function Keys into one Layer - Cleaned up unused code (e.g. combos, key overrides) - Updated all keyboards with new layer - Updated documentation - I think this will be it for now. Making a list somewhere else for future enhancements
This commit is contained in:
parent
2f6929eae1
commit
82832d4fc7
17 changed files with 127 additions and 172 deletions
|
@ -2,47 +2,35 @@
|
|||
|
||||
|
||||
bool get_combo_must_tap(uint16_t index, combo_t *combo) {
|
||||
|
||||
switch (index) {
|
||||
|
||||
// case MOUSE_BUTTON3:
|
||||
// case MOUSE_BUTTON4:
|
||||
// case MOUSE_BUTTON5:
|
||||
// case MOUSE_DRGTOG:
|
||||
|
||||
case KEY_ENT:
|
||||
case KEY_TAB:
|
||||
return true;
|
||||
|
||||
default:
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
|
||||
|
||||
|
||||
bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
|
||||
// disable all combos on config layer
|
||||
if ( get_highest_layer(layer_state | default_layer_state) == _CONFIG ) return false;
|
||||
|
||||
switch (combo_index) {
|
||||
|
||||
|
||||
// case MOUSE_BUTTON1:
|
||||
// case MOUSE_BUTTON2:
|
||||
// case MOUSE_BUTTON3:
|
||||
// case MOUSE_BUTTON4:
|
||||
// case MOUSE_BUTTON5:
|
||||
case MOUSE_BUTTON1:
|
||||
if ( get_highest_layer(layer_state | default_layer_state) > FIRST_DEFAULT_LAYER ) {
|
||||
return false;
|
||||
}
|
||||
|
||||
case MOUSE_DRGTOG:
|
||||
if (( get_highest_layer(layer_state | default_layer_state) != FIRST_DEFAULT_LAYER )
|
||||
&& ( get_highest_layer(layer_state | default_layer_state) != _MOUSE )) {
|
||||
&& ( get_highest_layer(layer_state | default_layer_state) != _MOUSE_FUNC )) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue