ryujinx-backup/Opentk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #12 from zastrowm/patch-1

Browse source 
Remove lambdas from WinRawMouse.ProcessMouseEvents
This commit is contained in:
Andy Korth 2013-04-26 22:17:26 -07:00
commit cd66bfaf37
1 changed files with 49 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
Source/OpenTK/Platform/Windows/WinRawMouse.cs
View file

@ -145,8 +145,6 @@ namespace OpenTK.Platform.Windows
} }
} }
delegate void MouseButtonChangedHandler(MouseButton Button);
public bool ProcessMouseEvent(RawInput rin) public bool ProcessMouseEvent(RawInput rin)
{ {
RawMouse raw = rin.Data.Mouse; RawMouse raw = rin.Data.Mouse;
@ -169,23 +167,55 @@ namespace OpenTK.Platform.Windows
mouse = mice[mouse_handle]; mouse = mice[mouse_handle];
// Set and release capture of the mouse to fix http://www.opentk.com/node/2133, Patch by Artfunkel // Set and release capture of the mouse to fix http://www.opentk.com/node/2133, Patch by Artfunkel
MouseButtonChangedHandler EnableBit = (Button) => { if ((raw.ButtonFlags & RawInputMouseState.LEFT_BUTTON_DOWN) != 0){
mouse.EnableBit((int)Button); Functions.SetCapture(Window); mouse.EnableBit((int)MouseButton.Left);
}; Functions.SetCapture(Window);
MouseButtonChangedHandler DisableBit = (Button) => { }
mouse.DisableBit((int)Button); Functions.ReleaseCapture(); if ((raw.ButtonFlags & RawInputMouseState.LEFT_BUTTON_UP) != 0)
}; {
mouse.DisableBit((int)MouseButton.Left);
if ((raw.ButtonFlags & RawInputMouseState.LEFT_BUTTON_DOWN) != 0) EnableBit(MouseButton.Left); Functions.ReleaseCapture();
if ((raw.ButtonFlags & RawInputMouseState.LEFT_BUTTON_UP) != 0) DisableBit(MouseButton.Left); }
if ((raw.ButtonFlags & RawInputMouseState.RIGHT_BUTTON_DOWN) != 0) EnableBit(MouseButton.Right); if ((raw.ButtonFlags & RawInputMouseState.RIGHT_BUTTON_DOWN) != 0)
if ((raw.ButtonFlags & RawInputMouseState.RIGHT_BUTTON_UP) != 0) DisableBit(MouseButton.Right); {
if ((raw.ButtonFlags & RawInputMouseState.MIDDLE_BUTTON_DOWN) != 0) EnableBit(MouseButton.Middle); mouse.EnableBit((int)MouseButton.Right);
if ((raw.ButtonFlags & RawInputMouseState.MIDDLE_BUTTON_UP) != 0) DisableBit(MouseButton.Middle); Functions.SetCapture(Window);
if ((raw.ButtonFlags & RawInputMouseState.BUTTON_4_DOWN) != 0) EnableBit(MouseButton.Button1); }
if ((raw.ButtonFlags & RawInputMouseState.BUTTON_4_UP) != 0) DisableBit(MouseButton.Button1); if ((raw.ButtonFlags & RawInputMouseState.RIGHT_BUTTON_UP) != 0)
if ((raw.ButtonFlags & RawInputMouseState.BUTTON_5_DOWN) != 0) EnableBit(MouseButton.Button2); {
if ((raw.ButtonFlags & RawInputMouseState.BUTTON_5_UP) != 0) DisableBit(MouseButton.Button2); mouse.DisableBit((int)MouseButton.Right);
Functions.ReleaseCapture();
}
if ((raw.ButtonFlags & RawInputMouseState.MIDDLE_BUTTON_DOWN) != 0)
{
mouse.EnableBit((int)MouseButton.Middle);
Functions.SetCapture(Window);
}
if ((raw.ButtonFlags & RawInputMouseState.MIDDLE_BUTTON_UP) != 0)
{
mouse.DisableBit((int)MouseButton.Middle);
Functions.ReleaseCapture();
}
if ((raw.ButtonFlags & RawInputMouseState.BUTTON_4_DOWN) != 0)
{
mouse.EnableBit((int)MouseButton.Button1);
Functions.SetCapture(Window);
}
if ((raw.ButtonFlags & RawInputMouseState.BUTTON_4_UP) != 0)
{
mouse.DisableBit((int)MouseButton.Button1);
Functions.ReleaseCapture();
}
if ((raw.ButtonFlags & RawInputMouseState.BUTTON_5_DOWN) != 0)
{
mouse.EnableBit((int)MouseButton.Button2);
Functions.SetCapture(Window);
}
if ((raw.ButtonFlags & RawInputMouseState.BUTTON_5_UP) != 0)
{
mouse.DisableBit((int)MouseButton.Button2);
Functions.ReleaseCapture();
}
if ((raw.ButtonFlags & RawInputMouseState.WHEEL) != 0) if ((raw.ButtonFlags & RawInputMouseState.WHEEL) != 0)
mouse.WheelPrecise += (short)raw.ButtonData / 120.0f; mouse.WheelPrecise += (short)raw.ButtonData / 120.0f;