ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-25 08:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Disabled initialization from Windows.Forms. InputDriver now needs a GameWindow to function.

Browse source
This commit is contained in:
the_fiddler 2007-09-26 11:52:40 +00:00
parent 9ade72ad34
commit f4b0c19f44
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
Source/OpenTK/InputDriver.cs
View file

@ -19,7 +19,7 @@ namespace OpenTK
#region --- Constructors --- #region --- Constructors ---
public InputDriver(IWindowInfo parent) public InputDriver(GameWindow parent)
{ {
if (parent == null) if (parent == null)
throw new ArgumentException("A valid window (IWindowInfo) must be specified to construct an InputDriver"); throw new ArgumentException("A valid window (IWindowInfo) must be specified to construct an InputDriver");
@ -27,13 +27,14 @@ namespace OpenTK
if (Environment.OSVersion.Version.Major > 5 || if (Environment.OSVersion.Version.Major > 5 ||
(Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor >= 1)) (Environment.OSVersion.Version.Major == 5 && Environment.OSVersion.Version.Minor >= 1))
{ {
inputDriver = new OpenTK.Platform.Windows.WinRawInput(parent); inputDriver = new OpenTK.Platform.Windows.WinRawInput(parent.WindowInfo);
} }
else if (Environment.OSVersion.Platform == PlatformID.Unix) else if (Environment.OSVersion.Platform == PlatformID.Unix)
{ {
inputDriver = new OpenTK.Platform.X11.X11Input( //inputDriver = new OpenTK.Platform.X11.X11Input(
parent is OpenTK.Platform.X11.WindowInfo ? (OpenTK.Platform.X11.WindowInfo)parent : // parent is OpenTK.Platform.X11.WindowInfo ? (OpenTK.Platform.X11.WindowInfo)parent :
parent is OpenTK.Platform.WindowInfo ? (OpenTK.Platform.X11.WindowInfo)(parent as OpenTK.Platform.WindowInfo) : null); // parent is OpenTK.Platform.WindowInfo ? (OpenTK.Platform.X11.WindowInfo)(parent as OpenTK.Platform.WindowInfo) : null);
inputDriver = new OpenTK.Platform.X11.X11Input(parent.WindowInfo);
} }
else else
{ {
@ -46,12 +47,12 @@ namespace OpenTK
#region --- IInputDriver Members --- #region --- IInputDriver Members ---
public IList<Keyboard> Keyboard public IList<KeyboardDevice> Keyboard
{ {
get { return inputDriver.Keyboard; } get { return inputDriver.Keyboard; }
} }
public IList<Mouse> Mouse public IList<MouseDevice> Mouse
{ {
get { return inputDriver.Mouse; } get { return inputDriver.Mouse; }
} }