mirror of
https://github.com/zsa/qmk_firmware.git
synced 2026-01-25 14:56:28 +00:00
Merge remote-tracking branch 'upstream/master' into firmware23
This commit is contained in:
@@ -13,6 +13,62 @@
|
||||
// limitations under the License.
|
||||
|
||||
#include "process_caps_word.h"
|
||||
#include "process_auto_shift.h"
|
||||
#include "caps_word.h"
|
||||
#include "keycodes.h"
|
||||
#include "quantum_keycodes.h"
|
||||
#include "modifiers.h"
|
||||
#include "timer.h"
|
||||
#include "action_tapping.h"
|
||||
#include "action_util.h"
|
||||
|
||||
#ifdef CAPS_WORD_INVERT_ON_SHIFT
|
||||
static uint8_t held_mods = 0;
|
||||
|
||||
static bool handle_shift(uint16_t keycode, keyrecord_t* record) {
|
||||
switch (keycode) {
|
||||
case OSM(MOD_LSFT):
|
||||
keycode = KC_LSFT;
|
||||
break;
|
||||
case OSM(MOD_RSFT):
|
||||
keycode = KC_RSFT;
|
||||
break;
|
||||
|
||||
# ifndef NO_ACTION_TAPPING
|
||||
case QK_MOD_TAP ... QK_MOD_TAP_MAX:
|
||||
if (record->tap.count == 0) { // Mod-tap key is held.
|
||||
switch (QK_MOD_TAP_GET_MODS(keycode)) {
|
||||
case MOD_LSFT:
|
||||
keycode = KC_LSFT;
|
||||
break;
|
||||
case MOD_RSFT:
|
||||
keycode = KC_RSFT;
|
||||
break;
|
||||
}
|
||||
}
|
||||
# endif // NO_ACTION_TAPPING
|
||||
}
|
||||
|
||||
if (keycode == KC_LSFT || keycode == KC_RSFT) {
|
||||
const uint8_t mod = MOD_BIT(keycode);
|
||||
|
||||
if (is_caps_word_on()) {
|
||||
if (record->event.pressed) {
|
||||
held_mods |= mod;
|
||||
} else {
|
||||
held_mods &= ~mod;
|
||||
}
|
||||
return false;
|
||||
} else if ((held_mods & mod) != 0) {
|
||||
held_mods &= ~mod;
|
||||
del_mods(mod);
|
||||
return record->event.pressed;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
#endif // CAPS_WORD_INVERT_ON_SHIFT
|
||||
|
||||
bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
|
||||
if (keycode == QK_CAPS_WORD_TOGGLE) {
|
||||
@@ -21,6 +77,11 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
|
||||
}
|
||||
return false;
|
||||
}
|
||||
#ifdef CAPS_WORD_INVERT_ON_SHIFT
|
||||
if (!handle_shift(keycode, record)) {
|
||||
return false;
|
||||
}
|
||||
#endif // CAPS_WORD_INVERT_ON_SHIFT
|
||||
|
||||
#ifndef NO_ACTION_ONESHOT
|
||||
const uint8_t mods = get_mods() | get_oneshot_mods();
|
||||
@@ -95,6 +156,7 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
|
||||
case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
|
||||
case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
|
||||
case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
|
||||
case QK_TRI_LAYER_LOWER ... QK_TRI_LAYER_UPPER:
|
||||
// Ignore AltGr.
|
||||
case KC_RALT:
|
||||
case OSM(MOD_RALT):
|
||||
@@ -111,12 +173,14 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
|
||||
if (record->tap.count == 0) { // Mod-tap key is held.
|
||||
const uint8_t mods = QK_MOD_TAP_GET_MODS(keycode);
|
||||
switch (mods) {
|
||||
# ifndef CAPS_WORD_INVERT_ON_SHIFT
|
||||
case MOD_LSFT:
|
||||
keycode = KC_LSFT;
|
||||
break;
|
||||
case MOD_RSFT:
|
||||
keycode = KC_RSFT;
|
||||
break;
|
||||
# endif // CAPS_WORD_INVERT_ON_SHIFT
|
||||
case MOD_RSFT | MOD_RALT:
|
||||
keycode = RSFT(KC_RALT);
|
||||
break;
|
||||
@@ -124,6 +188,9 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
|
||||
return true;
|
||||
default:
|
||||
caps_word_off();
|
||||
# ifdef CAPS_WORD_INVERT_ON_SHIFT
|
||||
add_mods(held_mods);
|
||||
# endif // CAPS_WORD_INVERT_ON_SHIFT
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
@@ -163,12 +230,20 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
|
||||
clear_weak_mods();
|
||||
#endif // AUTO_SHIFT_ENABLE
|
||||
if (caps_word_press_user(keycode)) {
|
||||
#ifdef CAPS_WORD_INVERT_ON_SHIFT
|
||||
if (held_mods) {
|
||||
set_weak_mods(get_weak_mods() ^ MOD_BIT(KC_LSFT));
|
||||
}
|
||||
#endif // CAPS_WORD_INVERT_ON_SHIFT
|
||||
send_keyboard_report();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
caps_word_off();
|
||||
#ifdef CAPS_WORD_INVERT_ON_SHIFT
|
||||
add_mods(held_mods);
|
||||
#endif // CAPS_WORD_INVERT_ON_SHIFT
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user