fix: moving markers in TAStudio by alt-dragging would focus the menu (#4668)

Author: SuuperW

src/BizHawk.Bizware.Input/HostInputType.cs

@@ -9,5 +9,6 @@ public enum HostInputType
 		Mouse = 1,
 		Keyboard = 2,
 		Pad = 4,
+		Ignored = 8,
 	}
 }

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

@@ -162,6 +162,12 @@ public void ProcessInput(IPhysicalInputSource source, Func<string, bool> process
 				// useful debugging:
 				// Console.WriteLine(ie);
 
+				if (ie.Source == Bizware.Input.HostInputType.Ignored)
+				{
+					processSpecialInput(ie, false);
+					continue;
+				}
+
 				// TODO - wonder what happens if we pop up something interactive as a response to one of these hotkeys? may need to purge further processing
 
 				HostInputCoalescer.Receive(ie);

src/BizHawk.Client.EmuHawk/Input/Input.cs

@@ -174,6 +174,31 @@ private void EnqueueEvent(InputEvent ie)
 			}
 		}
 
+		private void EnqueueNewEvents(bool prohibitInput = false)
+		{
+			if (_newEvents.Count != 0)
+			{
+				//WHAT!? WE SHOULD NOT BE SO NAIVELY TOUCHING MAINFORM FROM THE INPUTTHREAD. ITS BUSY RUNNING.
+				AllowInput allowInput = prohibitInput ? AllowInput.None : MainFormInputAllowedCallback();
+
+				foreach (var ie in _newEvents)
+				{
+					if (ie.EventType == InputEventType.Press && ShouldSwallow(allowInput, ie.Source))
+					{
+						EnqueueEvent(new InputEvent() {
+							EventType = ie.EventType,
+							LogicalButton = ie.LogicalButton,
+							Source = HostInputType.Ignored, // no input or hotkey will happen, but special processing such as alt menuing may apply
+						});
+						continue;
+					}
+
+					EnqueueEvent(ie);
+				}
+			}
+			_newEvents.Clear();
+		}
+
 		public KeyValuePair<string, int>[] GetAxisValues()
 		{
 			lock (_axisValues)
@@ -205,8 +230,6 @@ private void UpdateThreadProc()
 				//this block is going to massively modify data structures that the binding method uses, so we have to lock it all
 				lock (this)
 				{
-					_newEvents.Clear();
-
 					//analyze keys
 					foreach (var ke in keyEvents)
 					{
@@ -217,9 +240,14 @@ private void UpdateThreadProc()
 					{
 						//_axisValues.Clear();
 						Adapter.ProcessHostGamepads(HandleButton, HandleAxis);
+					}
+					EnqueueNewEvents();
 
-						// analyze moose
-						if (_wantingMouseFocus.Contains(Form.ActiveForm))
+					// analyze moose
+					bool wantsMouse = _wantingMouseFocus.Contains(Form.ActiveForm);
+					if (wantsMouse)
+					{
+						lock (_axisValues)
 						{
 							var mousePos = Control.MousePosition;
 							if (_trackDeltas)
@@ -235,44 +263,19 @@ private void UpdateThreadProc()
 							_axisValues["WMouse X"] = mousePos.X;
 							_axisValues["WMouse Y"] = mousePos.Y;
 
-							var mouseBtns = Control.MouseButtons;
-							HandleButton("WMouse L", (mouseBtns & MouseButtons.Left) != 0, HostInputType.Mouse);
-							HandleButton("WMouse M", (mouseBtns & MouseButtons.Middle) != 0, HostInputType.Mouse);
-							HandleButton("WMouse R", (mouseBtns & MouseButtons.Right) != 0, HostInputType.Mouse);
-							HandleButton("WMouse 1", (mouseBtns & MouseButtons.XButton1) != 0, HostInputType.Mouse);
-							HandleButton("WMouse 2", (mouseBtns & MouseButtons.XButton2) != 0, HostInputType.Mouse);
-
 							// raw (relative) mouse input
 							_axisValues["RMouse X"] = mouseDeltaX + _axisValues.GetValueOrDefault("RMouse X");
 							_axisValues["RMouse Y"] = mouseDeltaY + _axisValues.GetValueOrDefault("RMouse Y");
 						}
-						else
-						{
-#if false // don't do this: for now, it will interfere with the virtualpad. don't do something similar for the mouse position either
-							// unpress all buttons
-							HandleButton("WMouse L", false, ClientInputFocus.Mouse);
-							HandleButton("WMouse M", false, ClientInputFocus.Mouse);
-							HandleButton("WMouse R", false, ClientInputFocus.Mouse);
-							HandleButton("WMouse 1", false, ClientInputFocus.Mouse);
-							HandleButton("WMouse 2", false, ClientInputFocus.Mouse);
-#endif
-						}
 					}
 
-					if (_newEvents.Count != 0)
-					{
-						//WHAT!? WE SHOULD NOT BE SO NAIVELY TOUCHING MAINFORM FROM THE INPUTTHREAD. ITS BUSY RUNNING.
-						AllowInput allowInput = MainFormInputAllowedCallback();
-
-						foreach (var ie in _newEvents)
-						{
-							//events are swallowed in some cases:
-							if (ie.EventType == InputEventType.Press && ShouldSwallow(allowInput, ie.Source))
-								continue;
-
-							EnqueueEvent(ie);
-						}
-					}
+					var mouseBtns = Control.MouseButtons;
+					HandleButton("WMouse L", (mouseBtns & MouseButtons.Left) != 0, HostInputType.Mouse);
+					HandleButton("WMouse M", (mouseBtns & MouseButtons.Middle) != 0, HostInputType.Mouse);
+					HandleButton("WMouse R", (mouseBtns & MouseButtons.Right) != 0, HostInputType.Mouse);
+					HandleButton("WMouse 1", (mouseBtns & MouseButtons.XButton1) != 0, HostInputType.Mouse);
+					HandleButton("WMouse 2", (mouseBtns & MouseButtons.XButton2) != 0, HostInputType.Mouse);
+					EnqueueNewEvents(prohibitInput: !wantsMouse);
 
 					_ignoreEventsNextPoll = false;
 				} //lock(this)