ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move HotkeyCoalescer from GlobalWin to MainForm since only MainForm uses it anyway

This commit is contained in:
adelikat 2015-02-22 03:45:00 +00:00
parent 2bc68b99c7
commit e3f9388a17
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BizHawk.Client.EmuHawk/GlobalWin.cs
View File

@ -16,10 +16,5 @@ namespace BizHawk.Client.EmuHawk
public static OSDManager OSD = new OSDManager(); public static OSDManager OSD = new OSDManager();
public static DisplayManager DisplayManager; public static DisplayManager DisplayManager;
public static GLManager GLManager; public static GLManager GLManager;
//input state which has been destined for game controller inputs are coalesced here
//public static ControllerInputCoalescer ControllerInputCoalescer = new ControllerInputCoalescer();
//input state which has been destined for client hotkey consumption are colesced here
public static InputCoalescer HotkeyCoalescer = new InputCoalescer();
} }
} }

13
BizHawk.Client.EmuHawk/MainForm.cs
View File

@ -433,7 +433,7 @@ namespace BizHawk.Client.EmuHawk
// handle events and dispatch as a hotkey action, or a hotkey button, or an input button // handle events and dispatch as a hotkey action, or a hotkey button, or an input button
ProcessInput(); ProcessInput();
Global.ClientControls.LatchFromPhysical(GlobalWin.HotkeyCoalescer); Global.ClientControls.LatchFromPhysical(HotkeyCoalescer);
Global.ActiveController.LatchFromPhysical(Global.ControllerInputCoalescer); Global.ActiveController.LatchFromPhysical(Global.ControllerInputCoalescer);
@ -773,7 +773,7 @@ namespace BizHawk.Client.EmuHawk
// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons // hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
if (!handled) if (!handled)
{ {
GlobalWin.HotkeyCoalescer.Receive(ie); HotkeyCoalescer.Receive(ie);
} }
break; break;
@ -790,7 +790,7 @@ namespace BizHawk.Client.EmuHawk
// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons // hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
if (!handled) if (!handled)
{ {
GlobalWin.HotkeyCoalescer.Receive(ie); HotkeyCoalescer.Receive(ie);
} }
} }
break; break;
@ -804,7 +804,7 @@ namespace BizHawk.Client.EmuHawk
// hotkeys which arent handled as actions get coalesced as pollable virtual client buttons // hotkeys which arent handled as actions get coalesced as pollable virtual client buttons
if (!handled) if (!handled)
{ {
GlobalWin.HotkeyCoalescer.Receive(ie); HotkeyCoalescer.Receive(ie);
conInput.Receive(ie); conInput.Receive(ie);
} }
@ -1280,6 +1280,11 @@ namespace BizHawk.Client.EmuHawk
Bitmap StatusBarDiskLightOnImage, StatusBarDiskLightOffImage; Bitmap StatusBarDiskLightOnImage, StatusBarDiskLightOffImage;
Bitmap LinkCableOn, LinkCableOff; Bitmap LinkCableOn, LinkCableOff;
// input state which has been destined for game controller inputs are coalesced here
// public static ControllerInputCoalescer ControllerInputCoalescer = new ControllerInputCoalescer();
// input state which has been destined for client hotkey consumption are colesced here
private readonly InputCoalescer HotkeyCoalescer = new InputCoalescer();
#endregion #endregion
#region Private methods #region Private methods