refactor ProcessInput to simplify logic and remove the distinction "internal hotkeys"; all hotkeys go to the hotkey controller now even if we don't expect to read that hotkey from the controller.

Fix: Hotkey overrides input would cause an input to continue after a button was released if the input is bound to a combination such as Shift+A and an "internal hotkey" is bound to a single button (such as A). Also input bound to Alt would not have the alt ignored by menus.
Passes tests HotkeyOverrideDoesNotEatReleaseEvents and InputIsNotSeenAsUnbound

Author: SuuperW

src/BizHawk.Client.Common/inputAdapters/InputManager.cs

@@ -155,7 +155,7 @@ private static AutofireController BindToDefinitionAF(
 		/// <param name="processUnboundInput">Events that did not do anything are forwarded out here.
 		/// This allows things like Windows' standard alt hotkeys (for menu items) to be handled by the
 		/// caller if the input didn't alrady do something else.</param>
-		public void ProcessInput(IInputSource source, Func<string, bool> processHotkey, Config config, Action<InputEvent> processUnboundInput, Func<string, bool> isInternalHotkey)
+		public void ProcessInput(IInputSource source, Func<string, bool> processHotkey, Config config, Action<InputEvent> processUnboundInput)
 		{
 			// loop through all available events
 			InputEvent ie;
@@ -166,76 +166,33 @@ public void ProcessInput(IInputSource source, Func<string, bool> processHotkey,
 
 				// TODO - wonder what happens if we pop up something interactive as a response to one of these hotkeys? may need to purge further processing
 
-				// look for hotkey bindings for this key
-				var triggers = ClientControls.SearchBindings(ie.LogicalButton.ToString());
-				if (triggers.Count == 0)
+				var hotkeyTriggers = ClientControls.SearchBindings(ie.LogicalButton.ToString());
+				bool isEmuInput = ie.LogicalButton.ToString().Split('+').Any(ActiveController.HasBinding);
+
+				bool shouldDoHotkey = config.InputHotkeyOverrideOptions != 1;
+				bool shouldDoEmuInput = config.InputHotkeyOverrideOptions != 2;
+				if (shouldDoEmuInput && !isEmuInput) shouldDoHotkey = true;
+
+				bool didHotkey = false;
+				if (shouldDoHotkey)
 				{
-					processUnboundInput(ie);
+					if (ie.EventType is InputEventType.Press)
+					{
+						didHotkey = hotkeyTriggers.Aggregate(false, (current, trigger) => current | processHotkey(trigger));
+					}
+					_hotkeyCoalescer.Receive(ie);
 				}
 
-				switch (config.InputHotkeyOverrideOptions)
+				if (!didHotkey) shouldDoEmuInput = true;
+				if (shouldDoEmuInput)
 				{
-					default:
-					case 0: // Both allowed
-						{
-							ControllerInputCoalescer.Receive(ie);
-
-							var handled = false;
-							if (ie.EventType is InputEventType.Press)
-							{
-								handled = triggers.Aggregate(handled, (current, trigger) => current | processHotkey(trigger));
-							}
-
-							// hotkeys which aren't handled as actions get coalesced as pollable virtual client buttons
-							if (!handled)
-							{
-								_hotkeyCoalescer.Receive(ie);
-							}
-
-							break;
-						}
-					case 1: // Input overrides Hotkeys
-						{
-							ControllerInputCoalescer.Receive(ie);
-							if (!ie.LogicalButton.ToString().Split('+').Any(ActiveController.HasBinding))
-							{
-								var handled = false;
-								if (ie.EventType is InputEventType.Press)
-								{
-									handled = triggers.Aggregate(false, (current, trigger) => current | processHotkey(trigger));
-								}
-
-								// hotkeys which aren't handled as actions get coalesced as pollable virtual client buttons
-								if (!handled)
-								{
-									_hotkeyCoalescer.Receive(ie);
-								}
-							}
-
-							break;
-						}
-					case 2: // Hotkeys override Input
-						{
-							var handled = false;
-							if (ie.EventType is InputEventType.Press)
-							{
-								handled = triggers.Aggregate(false, (current, trigger) => current | processHotkey(trigger));
-							}
-
-							// hotkeys which aren't handled as actions get coalesced as pollable virtual client buttons
-							if (!handled)
-							{
-								_hotkeyCoalescer.Receive(ie);
-
-								// Check for hotkeys that may not be handled through processHotkey() method, reject controller input mapped to these
-								if (!triggers.Exists((t) => isInternalHotkey(t)))
-								{
-									ControllerInputCoalescer.Receive(ie);
-								}
-							}
-
-							break;
-						}
+					ControllerInputCoalescer.Receive(ie);
+				}
+				bool didEmuInput = shouldDoEmuInput;
+
+				if (!didHotkey && !didEmuInput)
+				{
+					processUnboundInput(ie);
 				}
 			} // foreach event
 

src/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs

@@ -26,14 +26,24 @@ void SelectAndLoadFromSlot(int slot)
 				default:
 					return false;
 
+				// Hotkeys handled elsewhere, via the hotkey controller
+				case "Autohold":
+				case "Autofire":
+				case "Frame Advance":
+				case "Turbo":
+				case "Rewind":
+				case "Fast Forward":
+				case "Open RA Overlay":
+					break;
+
 				// General
 				case "Pause":
 					TogglePause();
 					break;
 				case "Frame Inch":
 					//special! allow this key to get handled as Frame Advance, too
 					FrameInch = true;
-					return false;
+					break;
 				case "Toggle Throttle":
 					ToggleUnthrottled();
 					break;
@@ -549,32 +559,5 @@ void SelectAndLoadFromSlot(int slot)
 
 			return true;
 		}
-
-		// Determines if the value is a hotkey  that would be handled outside of the CheckHotkey method
-		private bool IsInternalHotkey(string trigger)
-		{
-			switch (trigger)
-			{
-				default:
-					return false;
-				case "Autohold":
-				case "Autofire":
-				case "Frame Advance":
-				case "Turbo":
-				case "Rewind":
-				case "Fast Forward":
-				case "Open RA Overlay":
-					return true;
-				case "RA Up":
-				case "RA Down":
-				case "RA Left":
-				case "RA Right":
-				case "RA Confirm":
-				case "RA Cancel":
-				case "RA Quit":
-					// don't consider these keys outside of RAIntegration overlay being active
-					return RA is RAIntegration { OverlayActive: true };
-			}
-		}
 	}
 }

src/BizHawk.Client.EmuHawk/MainForm.cs

@@ -941,7 +941,7 @@ public int ProgramRunLoop()
 					{
 						MainFormContextMenu.Show(PointToScreen(new(0, MainformMenu.Height)));
 					}
-				}, IsInternalHotkey);
+				});
 
 				// translate mouse coordinates
 				// NOTE: these must go together, because in the case of screen rotation, X and Y are transformed together
@@ -2085,7 +2085,7 @@ private void InitControls()
 			foreach (var (k, v) in Config.HotkeyBindings) controls.BindMulti(k, v);
 
 			InputManager.ClientControls = controls;
-			InputManager.ControllerInputCoalescer = new(); // ctor initialises values for host haptics
+			InputManager.ControllerInputCoalescer = new();
 		}
 
 		private void LoadMoviesFromRecent(string path)