mirror of
https://github.com/Ryujinx/Opentk.git
synced 2024-12-23 19:15:36 +00:00
Removed support for < Windows XP
The support burden for Windows versions prior to XP was too large, plus the relevant code was completely untested. Removing that will allow us to focus on the things that really matter.
This commit is contained in:
parent
913c4f16e6
commit
3f81bc26d4
|
@ -332,9 +332,6 @@
|
|||
<Compile Include="Platform\Windows\WinKeyMap.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Platform\Windows\WMInput.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Platform\Windows\WinGLNative.cs">
|
||||
<SubType>Code</SubType>
|
||||
</Compile>
|
||||
|
|
|
@ -1,209 +0,0 @@
|
|||
#region License
|
||||
//
|
||||
// The Open Toolkit Library License
|
||||
//
|
||||
// Copyright (c) 2006 - 2010 the Open Toolkit library.
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
// of this software and associated documentation files (the "Software"), to deal
|
||||
// in the Software without restriction, including without limitation the rights to
|
||||
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
// the Software, and to permit persons to whom the Software is furnished to do
|
||||
// so, subject to the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be included in all
|
||||
// copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||
// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||
// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||
// OTHER DEALINGS IN THE SOFTWARE.
|
||||
//
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
#if !MINIMAL
|
||||
using System.Drawing;
|
||||
#endif
|
||||
using System.Threading;
|
||||
using System.Text;
|
||||
|
||||
using OpenTK.Input;
|
||||
|
||||
|
||||
namespace OpenTK.Platform.Windows
|
||||
{
|
||||
// Input driver for legacy (pre XP) Windows platforms.
|
||||
// Supports a single mouse and keyboard through async input.
|
||||
// Supports multiple joysticks through WinMM.
|
||||
sealed class WMInput : IInputDriver2, IMouseDriver2, IKeyboardDriver2/*, IGamePadDriver*/ //HACK uncomment and implement
|
||||
{
|
||||
#region Fields
|
||||
|
||||
readonly object MouseLock = new object();
|
||||
readonly object KeyboardLock = new object();
|
||||
readonly WinMMJoystick gamepad_driver = new WinMMJoystick();
|
||||
readonly WinKeyMap KeyMap = new WinKeyMap();
|
||||
|
||||
KeyboardState keyboard = new KeyboardState();
|
||||
MouseState mouse = new MouseState();
|
||||
bool disposed;
|
||||
|
||||
#endregion
|
||||
|
||||
#region Constructor
|
||||
|
||||
public WMInput()
|
||||
: base()
|
||||
{
|
||||
Debug.WriteLine("Using WMInput.");
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Private Members
|
||||
|
||||
void UpdateKeyboard()
|
||||
{
|
||||
for (byte i = 0; i < byte.MaxValue; i++)
|
||||
{
|
||||
bool pressed = (Functions.GetAsyncKeyState((VirtualKeys)i) >> 8) != 0;
|
||||
Key key;
|
||||
KeyMap.TryGetValue((VirtualKeys)i,out key);
|
||||
keyboard.SetKeyState(key, i, pressed);
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateMouse()
|
||||
{
|
||||
POINT p = new POINT();
|
||||
Functions.GetCursorPos(ref p);
|
||||
mouse.X = p.X;
|
||||
mouse.Y = p.Y;
|
||||
// Note: we cannot poll the mouse wheel
|
||||
mouse[MouseButton.Left] = (Functions.GetAsyncKeyState(VirtualKeys.LBUTTON) >> 8) != 0;
|
||||
mouse[MouseButton.Middle] = (Functions.GetAsyncKeyState(VirtualKeys.RBUTTON) >> 8) != 0;
|
||||
mouse[MouseButton.Right] = (Functions.GetAsyncKeyState(VirtualKeys.MBUTTON) >> 8) != 0;
|
||||
mouse[MouseButton.Button1] = (Functions.GetAsyncKeyState(VirtualKeys.XBUTTON1) >> 8) != 0;
|
||||
mouse[MouseButton.Button2] = (Functions.GetAsyncKeyState(VirtualKeys.XBUTTON2) >> 8) != 0;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region IInputDriver2 Members
|
||||
|
||||
public IKeyboardDriver2 KeyboardDriver
|
||||
{
|
||||
get { return this; }
|
||||
}
|
||||
|
||||
public IMouseDriver2 MouseDriver
|
||||
{
|
||||
get { return this; }
|
||||
}
|
||||
|
||||
public IGamePadDriver GamePadDriver
|
||||
{
|
||||
get { return null; } //HACK return this when implemented.
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region IMouseDriver2 Members
|
||||
|
||||
public MouseState GetState()
|
||||
{
|
||||
lock (MouseLock)
|
||||
{
|
||||
UpdateMouse();
|
||||
return mouse;
|
||||
}
|
||||
}
|
||||
|
||||
public MouseState GetState(int index)
|
||||
{
|
||||
lock (MouseLock)
|
||||
{
|
||||
UpdateMouse();
|
||||
if (index == 0)
|
||||
return mouse;
|
||||
else
|
||||
return new MouseState();
|
||||
}
|
||||
}
|
||||
|
||||
public void SetPosition(double x, double y)
|
||||
{
|
||||
Functions.SetCursorPos((int)x, (int)y);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region IKeyboardDriver2 Members
|
||||
|
||||
KeyboardState IKeyboardDriver2.GetState()
|
||||
{
|
||||
lock (KeyboardLock)
|
||||
{
|
||||
UpdateKeyboard();
|
||||
return keyboard;
|
||||
}
|
||||
}
|
||||
|
||||
KeyboardState IKeyboardDriver2.GetState(int index)
|
||||
{
|
||||
lock (KeyboardLock)
|
||||
{
|
||||
UpdateKeyboard();
|
||||
if (index == 0)
|
||||
return keyboard;
|
||||
else
|
||||
return new KeyboardState();
|
||||
}
|
||||
}
|
||||
|
||||
string IKeyboardDriver2.GetDeviceName(int index)
|
||||
{
|
||||
return "Default Windows Keyboard";
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region IDisposable Members
|
||||
|
||||
void Dispose(bool manual)
|
||||
{
|
||||
if (!disposed)
|
||||
{
|
||||
if (manual)
|
||||
{
|
||||
// Todo: implement this
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Print("{0} leaked, did you forget to call Dispose()?", GetType());
|
||||
}
|
||||
disposed = true;
|
||||
}
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Dispose(true);
|
||||
GC.SuppressFinalize(this);
|
||||
}
|
||||
|
||||
~WMInput()
|
||||
{
|
||||
Dispose(false);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
|
@ -43,6 +43,11 @@ namespace OpenTK.Platform.Windows
|
|||
|
||||
public WinFactory()
|
||||
{
|
||||
if (System.Environment.OSVersion.Version.Major <= 4)
|
||||
{
|
||||
throw new PlatformNotSupportedException("OpenTK requires Windows XP or higher");
|
||||
}
|
||||
|
||||
if (System.Environment.OSVersion.Version.Major >= 6)
|
||||
{
|
||||
// Enable high-dpi support
|
||||
|
@ -112,13 +117,7 @@ namespace OpenTK.Platform.Windows
|
|||
{
|
||||
if (inputDriver == null)
|
||||
{
|
||||
// If Windows version is NT5 or higher, we are able to use raw input.
|
||||
if (System.Environment.OSVersion.Version.Major > 5 ||
|
||||
(System.Environment.OSVersion.Version.Major == 5 &&
|
||||
System.Environment.OSVersion.Version.Minor > 0))
|
||||
inputDriver = new WinRawInput();
|
||||
else
|
||||
inputDriver = new WMInput();
|
||||
inputDriver = new WinRawInput();
|
||||
}
|
||||
return inputDriver;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue