From a07407c6f85d385e3a53280afde372db7f1f9fac Mon Sep 17 00:00:00 2001 From: tomcw Date: Mon, 28 May 2018 22:36:00 +0100 Subject: [PATCH] Suppress AKD support for II and II+ models. (Fixed #116) --- source/Frame.cpp | 7 ------- source/Keyboard.cpp | 5 +++++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/source/Frame.cpp b/source/Frame.cpp index 8b84d581..b212b29d 100644 --- a/source/Frame.cpp +++ b/source/Frame.cpp @@ -1402,13 +1402,6 @@ LRESULT CALLBACK FrameWndProc ( case WM_KEYUP: KeybSpecialKeyTransition(WM_KEYUP, wparam); - if (wparam == VK_ESCAPE || wparam == VK_SPACE || wparam == VK_TAB) - { - char str[40]; - sprintf(str, "WM_KEYUP: %d\n", wparam); - OutputDebugString(str); - } - // Process is done in WM_KEYUP: VK_F1 VK_F2 VK_F3 VK_F4 VK_F5 VK_F6 VK_F7 VK_F8 if ((wparam >= VK_F1) && (wparam <= VK_F8) && (buttondown == (int)wparam-VK_F1)) { diff --git a/source/Keyboard.cpp b/source/Keyboard.cpp index ebc180ad..c1a90e0d 100644 --- a/source/Keyboard.cpp +++ b/source/Keyboard.cpp @@ -466,6 +466,11 @@ BYTE __stdcall KeybReadFlag (WORD, WORD, BYTE, BYTE, ULONG) keywaiting = 0; + if (IS_APPLE2) // Include Pravets machines too? + return keycode; + + // AKD + bool bState = GetKeyState(lastvirtkey) < 0; GetKeyStateOfSpecialAKD(lastvirtkey, bState);