darkkirb/qmk_firmware
1
0
Fork 0
forked from mirrors/qmk_firmware
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix Layer Mod handling of with right-handed mods. (#19845)

Browse source
This commit is contained in:
Pascal Getreuer 2023-02-14 12:44:42 -08:00 committed by GitHub
parent 9908ed7ecd
commit 7d692d64f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
quantum/keymap_common.c
View file

@ -128,7 +128,7 @@ action_t action_for_keycode(uint16_t keycode) {
case QK_LAYER_MOD ... QK_LAYER_MOD_MAX: case QK_LAYER_MOD ... QK_LAYER_MOD_MAX:
mod = mod_config(QK_LAYER_MOD_GET_MODS(keycode)); mod = mod_config(QK_LAYER_MOD_GET_MODS(keycode));
action_layer = QK_LAYER_MOD_GET_LAYER(keycode); action_layer = QK_LAYER_MOD_GET_LAYER(keycode);
action.code = ACTION_LAYER_MODS(action_layer, mod); action.code = ACTION_LAYER_MODS(action_layer, (mod & 0x10) ? mod << 4 : mod);
break; break;
#endif #endif
#ifndef NO_ACTION_TAPPING #ifndef NO_ACTION_TAPPING

63
tests/basic/test_action_layer.cpp
View file

@ -19,6 +19,7 @@
#include "test_common.hpp" #include "test_common.hpp"
using testing::_; using testing::_;
using testing::AnyNumber;
using testing::InSequence; using testing::InSequence;
class ActionLayer : public TestFixture {}; class ActionLayer : public TestFixture {};
@ -399,3 +400,65 @@ TEST_F(ActionLayer, LayerTapReleasedBeforeKeypressReleaseWithModifiers) {
EXPECT_TRUE(layer_state_is(0)); EXPECT_TRUE(layer_state_is(0));
VERIFY_AND_CLEAR(driver); VERIFY_AND_CLEAR(driver);
} }
TEST_F(ActionLayer, LayerModWithKeypress) {
TestDriver driver;
KeymapKey layer_key = KeymapKey{0, 0, 0, LM(1, MOD_RALT)};
KeymapKey regular_key = KeymapKey{0, 1, 0, KC_A};
set_keymap({layer_key, regular_key, KeymapKey{1, 1, 0, KC_B}});
// Allow any number of reports with no keys or only KC_RALT.
// clang-format off
EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
KeyboardReport(),
KeyboardReport(KC_RALT))))
.Times(AnyNumber());
// clang-format on
EXPECT_REPORT(driver, (KC_RALT, KC_B)).Times(1);
layer_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
EXPECT_EQ(get_mods(), MOD_BIT(KC_RALT));
tap_key(regular_key);
layer_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
EXPECT_EQ(get_mods(), 0);
VERIFY_AND_CLEAR(driver);
}
TEST_F(ActionLayer, LayerModHonorsModConfig) {
TestDriver driver;
KeymapKey layer_key = KeymapKey{0, 0, 0, LM(1, MOD_RALT)};
KeymapKey regular_key = KeymapKey{0, 1, 0, KC_A};
set_keymap({layer_key, regular_key, KeymapKey{1, 1, 0, KC_B}});
// Allow any number of reports with no keys or only KC_RALT.
// clang-format off
EXPECT_CALL(driver, send_keyboard_mock(AnyOf(
KeyboardReport(),
KeyboardReport(KC_RGUI))))
.Times(AnyNumber());
// clang-format on
EXPECT_REPORT(driver, (KC_RGUI, KC_B)).Times(1);
keymap_config.swap_ralt_rgui = true;
layer_key.press();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(1));
EXPECT_EQ(get_mods(), MOD_BIT(KC_RGUI));
tap_key(regular_key);
layer_key.release();
run_one_scan_loop();
EXPECT_TRUE(layer_state_is(0));
EXPECT_EQ(get_mods(), 0);
VERIFY_AND_CLEAR(driver);
}