6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2024-11-26 08:49:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1106 from TomHarte/JoystickModifiers

Browse Source 
Ensure no dangling modifiers upon shortcut keyboard switch.
This commit is contained in:
Thomas Harte 2022-11-24 16:05:10 -05:00 committed by GitHub
commit 6aa8400996
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
OSBindings/Mac/Clock Signal/Machine/CSMachine.mm
View File

@ -337,6 +337,16 @@ struct ActivityObserver: public Activity::Observer {
}
}
- (void)setInputMode:(CSMachineKeyboardInputMode)inputMode {
_inputMode = inputMode;
// Avoid the risk that the user used a keyboard shortcut to change input mode,
// leaving any modifiers associated with that dangling.
if(_inputMode == CSMachineKeyboardInputModeJoystick) {
[self clearAllKeys];
}
}
- (void)setJoystickManager:(CSJoystickManager *)joystickManager {
_joystickManager = joystickManager;
if(_joystickMachine) {
@ -433,7 +443,7 @@ struct ActivityObserver: public Activity::Observer {
auto &joysticks = joystick_machine->get_joysticks();
if(!joysticks.empty()) {
// Convert to a C++ bool so that the following calls are resolved correctly even if overloaded.
bool is_pressed = !!isPressed;
const auto is_pressed = bool(isPressed);
switch(key) {
case VK_LeftArrow: joysticks[0]->set_input(Inputs::Joystick::Input::Left, is_pressed); break;
case VK_RightArrow: joysticks[0]->set_input(Inputs::Joystick::Input::Right, is_pressed); break;