From 765ad9e05b55979c475e884209f3d967f0a1f886 Mon Sep 17 00:00:00 2001
From: Stefanos A <stapostol@gmail.com>
Date: Wed, 15 Jan 2014 23:36:35 +0100
Subject: [PATCH] [Win] WinRawInput is IKeyboard/MouseDriver2

Since we do not use Raw Input for joystick devices, it does not make
sense to expose the IJoystickDriver2 interface through WinRawInput. This
keeps allows joystick and keyboard/mouse implementations to reside in
distinct, modular classes, instantiated separately through WinFactory.
---
 Source/OpenTK/Platform/Windows/WinInputBase.cs |  8 +++-----
 Source/OpenTK/Platform/Windows/WinRawInput.cs  | 27 --------------------------
 2 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/Source/OpenTK/Platform/Windows/WinInputBase.cs b/Source/OpenTK/Platform/Windows/WinInputBase.cs
index 7d0865f..b0565ba 100644
--- a/Source/OpenTK/Platform/Windows/WinInputBase.cs
+++ b/Source/OpenTK/Platform/Windows/WinInputBase.cs
@@ -33,7 +33,7 @@ using OpenTK.Input;
 
 namespace OpenTK.Platform.Windows
 {
-    abstract class WinInputBase : IInputDriver2
+    abstract class WinInputBase
     {
         #region Fields
 
@@ -158,13 +158,11 @@ namespace OpenTK.Platform.Windows
 
         #endregion
 
-        #region IInputDriver2 Members
+        #region Public Members
 
         public abstract IMouseDriver2 MouseDriver { get; }
-        public abstract IKeyboardDriver2 KeyboardDriver { get; }
-        public abstract IGamePadDriver GamePadDriver { get; }
 
-        public abstract IJoystickDriver2 JoystickDriver { get; }
+        public abstract IKeyboardDriver2 KeyboardDriver { get; }
 
         #endregion
 
diff --git a/Source/OpenTK/Platform/Windows/WinRawInput.cs b/Source/OpenTK/Platform/Windows/WinRawInput.cs
index 0e99bc9..0872e27 100644
--- a/Source/OpenTK/Platform/Windows/WinRawInput.cs
+++ b/Source/OpenTK/Platform/Windows/WinRawInput.cs
@@ -42,8 +42,6 @@ namespace OpenTK.Platform.Windows
 
         WinRawKeyboard keyboard_driver;
         WinRawMouse mouse_driver;
-        IGamePadDriver gamepad_driver;
-        IJoystickDriver2 joystick_driver;
 
         IntPtr DevNotifyHandle;
         static readonly Guid DeviceInterfaceHid = new Guid("4D1E55B2-F16F-11CF-88CB-001111000030");
@@ -138,17 +136,6 @@ namespace OpenTK.Platform.Windows
         {
             keyboard_driver = new WinRawKeyboard(Parent.Handle);
             mouse_driver = new WinRawMouse(Parent.Handle);
-            joystick_driver = new WinMMJoystick();
-            try
-            {
-                gamepad_driver = new XInputJoystick();
-            }
-            catch (Exception)
-            {
-                Debug.Print("[Win] XInput driver not supported, falling back to WinMM");
-                gamepad_driver = new MappedGamePadDriver();
-            }
-
             DevNotifyHandle = RegisterForDeviceNotifications(Parent);
         }
 
@@ -181,10 +168,6 @@ namespace OpenTK.Platform.Windows
 
         #endregion
 
-        #endregion
-
-        #region IInputDriver2 Members
-
         public override IKeyboardDriver2 KeyboardDriver
         {
             get { return keyboard_driver; }
@@ -195,16 +178,6 @@ namespace OpenTK.Platform.Windows
             get { return mouse_driver; }
         }
 
-        public override IGamePadDriver GamePadDriver
-        {
-            get { return gamepad_driver; }
-        }
-
-        public override IJoystickDriver2 JoystickDriver
-        {
-            get { return joystick_driver; }
-        }
-
         #endregion
     }
 }
-- 
2.7.4