Fix for //e keyboard's AKD. (Fixes #330)

source/Frame.cpp

@@ -1262,6 +1262,9 @@ LRESULT CALLBACK FrameWndProc (
 		KeybUpdateCtrlShiftStatus();
 		KeybSpecialKeyTransition(WM_KEYDOWN, wparam);
 
+		if ((HIWORD(lparam) & KF_REPEAT) == 0)
+			KeybAnyKeyDown(WM_KEYDOWN, wparam);
+
 		// 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 == -1))
 		{
@@ -1320,7 +1323,18 @@ LRESULT CALLBACK FrameWndProc (
 
 			Config_Save_Video();
 		}
-		else if ((wparam == VK_F11) && (GetKeyState(VK_CONTROL) >= 0))	// Save state (F11)
+		else if (wparam == VK_F10)
+		{
+			if (g_Apple2Type == A2TYPE_PRAVETS8A && !g_bCtrlKey)
+			{
+				KeybToggleP8ACapsLock ();	// F10: Toggles P8 Capslock
+			}
+			else
+			{
+				SetUsingCursor(FALSE);		// Ctrl+F10
+			}
+		}
+		else if (wparam == VK_F11 && !g_bCtrlKey)	// Save state (F11)
 		{
 			SoundCore_SetFade(FADE_OUT);
 			if(sg_PropertySheet.SaveStateSelectImage(window, true))
@@ -1329,7 +1343,7 @@ LRESULT CALLBACK FrameWndProc (
 			}
 			SoundCore_SetFade(FADE_IN);
 		}
-		else if (wparam == VK_F12)										// Load state (F12 or Ctrl+F12)
+		else if (wparam == VK_F12)					// Load state (F12 or Ctrl+F12)
 		{
 			SoundCore_SetFade(FADE_OUT);
 			if(sg_PropertySheet.SaveStateSelectImage(window, false))
@@ -1385,22 +1399,11 @@ LRESULT CALLBACK FrameWndProc (
 		{		
 			DebuggerProcessKey(wparam); // Debugger already active, re-direct key to debugger
 		}
-
-		if (wparam == VK_F10)
-		{
-			if ((g_Apple2Type == A2TYPE_PRAVETS8A) && (GetKeyState(VK_CONTROL) >= 0))
-			{
-				KeybToggleP8ACapsLock ();//Toggles P8 Capslock
-			}
-			else 
-			{
-				SetUsingCursor(FALSE);
-			}
-		}
 		break;
 
 	case WM_KEYUP:
 		KeybSpecialKeyTransition(WM_KEYUP, wparam);
+		KeybAnyKeyDown(WM_KEYUP, wparam);
 
 		// 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))

source/Keyboard.cpp

@@ -119,7 +119,7 @@ BYTE KeybGetKeycode ()		// Used by MemCheckPaging() & VideoCheckMode()
 //===========================================================================
 void KeybQueueKeypress (int key, BOOL bASCII)
 {
-	if (bASCII == ASCII)
+	if (bASCII == ASCII)	// WM_CHAR
 	{
 		if (g_bFreshReset && key == VK_CANCEL) // OLD HACK: 0x03
 		{
@@ -274,9 +274,10 @@ void KeybQueueKeypress (int key, BOOL bASCII)
 					keycode = key;
 			}
 		}
+
 		lastvirtkey = LOBYTE(VkKeyScan(key));
 	} 
-	else //(bASCII != ASCII)
+	else //(bASCII != ASCII)	// WM_KEYDOWN
 	{
 		// Note: VK_CANCEL is Control-Break
 		if ((key == VK_CANCEL) && (GetKeyState(VK_CONTROL) < 0))
@@ -389,12 +390,12 @@ static char ClipboardCurrChar(bool bIncPtr)
 
 //===========================================================================
 
-// For AKD (Any Key Down), need special handling for the hooked key combos(*), as GetKeyState() doesn't detect the keys as being down.
+// For AKD (Any Key Down), need special handling for the hooked key combos(*), as GetKeyState() doesn't detect the keys as being up/down.
-// . And equally GetKeyState() doesn't detect the keys as being up: eg. Whilst pressing TAB, press LEFT ALT, then release TAB.
+// . EG. Whilst pressing TAB, press LEFT ALT, then release TAB.
 // (*) ALT+TAB, ALT+ESCAPE, ALT+SPACE
 
-static enum {AKD_TAB=0, AKD_ESCAPE, AKD_SPACE};
+static enum {AKD_TAB=0, AKD_ESCAPE, AKD_SPACE, AKD_RETURN};
-static bool g_specialAKD[3] = {false,false,false};
+static bool g_specialAKD[4] = {false,false,false,false};
 
 void KeybSpecialKeyTransition(UINT message, WPARAM wparam)
 {
@@ -412,17 +413,75 @@ void KeybSpecialKeyTransition(UINT message, WPARAM wparam)
 	case VK_SPACE:
 		g_specialAKD[AKD_SPACE] = bState;
 		break;
+	case VK_RETURN:	// Treat as special too, as get a WM_KEYUP after using RETURN to OK the Config/Load-State dialogs!
+		g_specialAKD[AKD_RETURN] = bState;
+		break;
 	};
 }
 
-static void GetKeyStateOfSpecialAKD(int lastvirtkey, bool& bState)
+static void GetKeyStateOfSpecialAKD(bool& bState)
 {
-	if (VK_TAB == lastvirtkey)
+	if ( g_specialAKD[AKD_TAB] || g_specialAKD[AKD_ESCAPE] || g_specialAKD[AKD_SPACE] || g_specialAKD[AKD_RETURN] )
-		bState = g_specialAKD[AKD_TAB];
+		bState = true;
-	else if (VK_ESCAPE == lastvirtkey)
+}
-		bState = g_specialAKD[AKD_ESCAPE];
+
-	else if (VK_SPACE == lastvirtkey)
+//===========================================================================
-		bState = g_specialAKD[AKD_SPACE];
+
+static int g_AKDRefCount = 0;
+
+void KeybAnyKeyDown(UINT message, WPARAM wparam)
+{
+	if (IS_APPLE2)	// Include Pravets machines too?
+		return;	// No AKD support
+
+	if (wparam == VK_TAB || wparam == VK_ESCAPE || wparam == VK_SPACE || wparam == VK_RETURN)
+		return;	// Could be from hook-filter, so ignore and handle via KeybSpecialKeyTransition()
+
+	const int value = message == WM_KEYDOWN ? 1 : -1;
+	bool bDoRefCount = false;
+
+	if (wparam == VK_BACK ||
+		wparam == VK_TAB ||
+		wparam == VK_RETURN ||
+		wparam == VK_ESCAPE ||
+		wparam == VK_SPACE ||
+		(wparam >= VK_LEFT && wparam <= VK_DOWN) ||
+		wparam == VK_DELETE ||
+		(wparam >= '0' && wparam <= '9') ||
+		(wparam >= 'A' && wparam <= 'Z'))
+	{
+		bDoRefCount = true;
+	}
+	else if (wparam >= VK_NUMPAD0 && wparam <= VK_NUMPAD9)
+	{
+		bDoRefCount = true;
+	}
+	else if (wparam >= VK_MULTIPLY && wparam <= VK_DIVIDE)
+	{
+		bDoRefCount = true;
+	}
+	else if (wparam >= VK_OEM_1 && wparam <= VK_OEM_3)	// 7 in total
+	{
+		bDoRefCount = true;
+	}
+	else if (wparam >= VK_OEM_4 && wparam <= VK_OEM_8)	// 5 in total
+	{
+		bDoRefCount = true;
+	}
+	else if (wparam == VK_OEM_102)
+	{
+		bDoRefCount = true;
+	}
+
+	if (bDoRefCount)
+	{
+		g_AKDRefCount += value;
+		if (g_AKDRefCount < 0)
+		{
+			_ASSERT(0);
+			g_AKDRefCount = 0;
+		}
+	}
 }
 
 //===========================================================================
@@ -471,9 +530,8 @@ BYTE __stdcall KeybReadFlag (WORD, WORD, BYTE, BYTE, ULONG)
 
 	// AKD
 
-	bool bState = GetKeyState(lastvirtkey) < 0;
+	bool bState = g_AKDRefCount > 0;
-	GetKeyStateOfSpecialAKD(lastvirtkey, bState);
+	GetKeyStateOfSpecialAKD(bState);
-
 	return keycode | (bState ? 0x80 : 0);
 }
 

source/Keyboard.h

@@ -15,6 +15,7 @@ void    KeybQueueKeypress (int,BOOL);
 void    KeybToggleCapsLock ();
 void    KeybToggleP8ACapsLock ();
 void    KeybSpecialKeyTransition(UINT message, WPARAM wparam);
+void    KeybAnyKeyDown(UINT message, WPARAM wparam);
 void    KeybSetSnapshot_v1(const BYTE LastKey);
 void    KeybSaveSnapshot(class YamlSaveHelper& yamlSaveHelper);
 void    KeybLoadSnapshot(class YamlLoadHelper& yamlLoadHelper);