diff options
author | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-02 19:25:10 +0200 |
---|---|---|
committer | Wojciech Siewierski <wojciech.siewierski@onet.pl> | 2016-04-02 19:25:10 +0200 |
commit | 97cc44e063f4c4ea18a8ad3f3bb2519f1117c93a (patch) | |
tree | 7d86738d03c1edb1f940f4be460e661d41097b72 /tmk_core/common/action.c | |
parent | 1a09e96b9558f3d08394ec50546cfb366271f014 (diff) | |
parent | 5a9091689c3e1b4c444f56c9cb335817dc9fc2bb (diff) | |
download | qmk_firmware-97cc44e063f4c4ea18a8ad3f3bb2519f1117c93a.tar.gz qmk_firmware-97cc44e063f4c4ea18a8ad3f3bb2519f1117c93a.tar.xz |
Merge branch 'modifier-release-fix' of https://github.com/eltang/qmk_firmware into modifier-release-fix
Diffstat (limited to 'tmk_core/common/action.c')
-rw-r--r-- | tmk_core/common/action.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/tmk_core/common/action.c b/tmk_core/common/action.c index acc6d11ea..bf609f5e7 100644 --- a/tmk_core/common/action.c +++ b/tmk_core/common/action.c @@ -55,7 +55,7 @@ void action_exec(keyevent_t event) #if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS) bool disable_action_cache = false; -int8_t pressed_actions_cache[MATRIX_ROWS][MATRIX_COLS]; +uint8_t source_layers_cache[5][(MATRIX_ROWS * MATRIX_COLS + 7) / 8] = {0}; void process_action_nocache(keyrecord_t *record) { @@ -82,11 +82,23 @@ action_t store_or_get_action(bool pressed, keypos_t key) if (disable_action_cache) { return layer_switch_get_action(key); } - + uint8_t key_number = key.col + (key.row * MATRIX_COLS); + uint8_t storage_row = key_number / 8; + uint8_t storage_bit = key_number % 8; + uint8_t layer; if (pressed) { - pressed_actions_cache[key.row][key.col] = layer_switch_get_layer(key); + layer = layer_switch_get_layer(key); + for (uint8_t bit_number = 0; bit_number <= 4; bit_number++) { + source_layers_cache[bit_number][storage_row] ^= (-(bool)((layer & (1U << bit_number)) != 0) ^ source_layers_cache[bit_number][storage_row])) & (1U << storage_bit); + } + } + else { + layer = 0; + for (uint8_t bit_number = 0; bit_number <= 4; bit_number++) { + layer |= (uint8_t)((source_layers_cache[bit_number][storage_row] & (1U << storage_bit)) != 0) << bit_number; + } } - return action_for_key(pressed_actions_cache[key.row][key.col], key); + return action_for_key(layer, key); #else return layer_switch_get_action(key); #endif |