Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2025-01-10 13:29:56 +00:00
Code Issues Projects Releases Wiki Activity

Fixed regression for CTRL+ALT+BREAK (where ALT wasn't recognised). (Fixes #752)

Browse Source
This commit is contained in:
tomcw 2020-01-26 11:57:40 +00:00
parent fcd1b2aa68
commit 0f681de531
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/Frame.cpp
View File

@ -1420,7 +1420,6 @@ LRESULT CALLBACK FrameWndProc (
LogOutput("WM_KEYDOWN: %08X (scanCode=%04X)\n", wparam, (lparam>>16)&0xfff); LogOutput("WM_KEYDOWN: %08X (scanCode=%04X)\n", wparam, (lparam>>16)&0xfff);
#endif #endif
if (!IsJoyKey && if (!IsJoyKey &&
!KeybGetAltStatus() && // GH#749 - AltGr also fakes CTRL being pressed!
(g_nAppMode != MODE_LOGO)) // !MODE_LOGO - not emulating so don't pass to the VM's keyboard (g_nAppMode != MODE_LOGO)) // !MODE_LOGO - not emulating so don't pass to the VM's keyboard
{ {
// GH#678 Alternate key(s) to toggle max speed // GH#678 Alternate key(s) to toggle max speed
@ -1428,7 +1427,9 @@ LRESULT CALLBACK FrameWndProc (
// . Ctrl-1: Speed = 1 MHz // . Ctrl-1: Speed = 1 MHz
// . Ctrl-3: Speed = Full-Speed // . Ctrl-3: Speed = Full-Speed
bool keyHandled = false; bool keyHandled = false;
if( KeybGetCtrlStatus() && wparam >= '0' && wparam <= '9' ) if( KeybGetCtrlStatus() &&
!KeybGetAltStatus() && // GH#749 - AltGr also fakes CTRL being pressed!
wparam >= '0' && wparam <= '9' )
{ {
switch (wparam) switch (wparam)
{ {