[X11] Split X11 and XI2 input drivers

Source/OpenTK/OpenTK.csproj

@@ -800,6 +800,8 @@
     </Compile>
     <Compile Include="Platform\X11\Bindings\Xkb.cs" />
     <Compile Include="Input\MouseScroll.cs" />
+    <Compile Include="Platform\X11\X11Input.cs" />
+    <Compile Include="Platform\X11\XI2Input.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

Source/OpenTK/Platform/X11/X11Factory.cs

@@ -34,7 +34,25 @@ namespace OpenTK.Platform.X11
 {
     class X11Factory : PlatformFactoryBase
     {
-        static IMouseDriver2 MouseDriver;
+        IInputDriver2 input_driver;
+        IInputDriver2 InputDriver
+        {
+            get
+            {
+                if (input_driver == null)
+                {
+                    if (XI2Mouse.IsSupported(IntPtr.Zero))
+                    {
+                        input_driver = new XI2Input();
+                    }
+                    else
+                    {
+                        input_driver = new X11Input();
+                    }
+                }
+                return input_driver;
+            }
+        }
 
         #region Constructors
 
@@ -83,25 +101,17 @@ namespace OpenTK.Platform.X11
 
         public override IKeyboardDriver2 CreateKeyboardDriver()
         {
-            return new X11Keyboard();
+            return InputDriver.KeyboardDriver;
         }
 
         public override IMouseDriver2 CreateMouseDriver()
         {
-            lock (this)
+            return InputDriver.MouseDriver;
-            {
-                MouseDriver =
-                    MouseDriver ??
-                    (XI2Mouse.IsSupported(IntPtr.Zero) ?
-                        (IMouseDriver2)new XI2Mouse() : // Requires xorg 1.7 or higher.
-                        (IMouseDriver2)new X11Mouse()); // Always supported.
-                return MouseDriver;
-            }
         }
 
         public override IJoystickDriver2 CreateJoystickDriver()
         {
-            return new X11Joystick();
+            return InputDriver.JoystickDriver;
         }
 
         #endregion
@@ -109,12 +119,12 @@ namespace OpenTK.Platform.X11
         protected override void Dispose(bool manual)
         {
             base.Dispose(manual);
-            if (manual && MouseDriver != null)
+            if (manual)
             {
-                if (MouseDriver is IDisposable)
+                if (input_driver is IDisposable)
                 {
-                    (MouseDriver as IDisposable).Dispose();
+                    (input_driver as IDisposable).Dispose();
-                    MouseDriver = null;
+                    input_driver = null;
                 }
             }
         }

Source/OpenTK/Platform/X11/X11Input.cs

@@ -0,0 +1,97 @@
+#region License
+//
+// X11Input.cs
+//
+// Author:
+//       thefiddler <stapostol@gmail.com>
+//
+// Copyright (c) 2006-2014 
+//
+// 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.Diagnostics;
+using OpenTK.Input;
+
+namespace OpenTK.Platform.X11
+{
+    class X11Input : IInputDriver2
+    {
+        readonly X11Mouse mouse = new X11Mouse();
+        readonly X11Keyboard keyboard = new X11Keyboard();
+        readonly X11Joystick joystick = new X11Joystick();
+        readonly IGamePadDriver gamepad = new MappedGamePadDriver();
+
+        internal X11Input()
+        {
+            Debug.WriteLine("Using X11 core input driver.");
+            Debug.WriteLine("[Warning] Mouse functionality will be significantly reduced.");
+            Debug.WriteLine("[Warning] Copy OpenTK.dll.config to use the XI2 input driver instead.");
+        }
+
+        #region IInputDriver2 Members
+
+        public IMouseDriver2 MouseDriver
+        {
+            get
+            {
+                return mouse;
+            }
+        }
+
+        public IKeyboardDriver2 KeyboardDriver
+        {
+            get
+            {
+                return keyboard;
+            }
+        }
+
+        public IGamePadDriver GamePadDriver
+        {
+            get
+            {
+                return gamepad;
+            }
+        }
+
+        public IJoystickDriver2 JoystickDriver
+        {
+            get
+            {
+                return joystick;
+            }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            joystick.Dispose();
+        }
+
+        #endregion
+
+    }
+}
+

Source/OpenTK/Platform/X11/XI2Input.cs

@@ -0,0 +1,95 @@
+#region License
+//
+// XI2Input.cs
+//
+// Author:
+//       thefiddler <stapostol@gmail.com>
+//
+// Copyright (c) 2006-2014 
+//
+// 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.Diagnostics;
+using OpenTK.Input;
+
+namespace OpenTK.Platform.X11
+{
+    class XI2Input : IInputDriver2
+    {
+        readonly XI2Mouse mouse_keyboard = new XI2Mouse();
+        readonly X11Joystick joystick = new X11Joystick();
+        readonly IGamePadDriver gamepad = new MappedGamePadDriver();
+
+        internal XI2Input()
+        {
+            Debug.WriteLine("Using XI2 input driver.");
+        }
+
+        #region IInputDriver2 Members
+
+        public IMouseDriver2 MouseDriver
+        {
+            get
+            {
+                return mouse_keyboard;
+            }
+        }
+
+        public IKeyboardDriver2 KeyboardDriver
+        {
+            get
+            {
+                return mouse_keyboard;
+            }
+        }
+
+        public IGamePadDriver GamePadDriver
+        {
+            get
+            {
+                return gamepad;
+            }
+        }
+
+        public IJoystickDriver2 JoystickDriver
+        {
+            get
+            {
+                return joystick;
+            }
+        }
+
+        #endregion
+
+        #region IDisposable Members
+
+        public void Dispose()
+        {
+            mouse_keyboard.Dispose();
+            joystick.Dispose();
+        }
+
+        #endregion
+
+    }
+}
+