More hacking for gamepads

Source/OpenTK/Input/GamePadAxis.cs

@@ -0,0 +1,56 @@
+//
+// GamePadAxis.cs
+//
+// Author:
+//       robert <${AuthorEmail}>
+//
+// Copyright (c) 2012 robert
+//
+// 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.
+using System;
+
+namespace OpenTK
+{
+	public enum GamePadAxis
+	{
+		/// <summary>The first axis of the gamepad.</summary>
+        Axis0 = 0,
+        /// <summary>The second axis of the gamepad.</summary>
+        Axis1,
+        /// <summary>The third axis of the gamepad.</summary>
+        Axis2,
+        /// <summary>The fourth axis of the gamepad.</summary>
+        Axis3,
+        /// <summary>The fifth axis of the gamepad.</summary>
+        Axis4,
+        /// <summary>The sixth axis of the gamepad.</summary>
+        Axis5,
+        /// <summary>The seventh axis of the gamepad.</summary>
+        Axis6,
+        /// <summary>The eighth axis of the gamepad.</summary>
+        Axis7,
+        /// <summary>The ninth axis of the gamepad.</summary>
+        Axis8,
+        /// <summary>The tenth axis of the gamepad.</summary>
+        Axis9,
+		/// <summary>The last axis of the gamepad.</summary>
+		LastAxis
+	}
+}
+

Source/OpenTK/Input/GamePadButton.cs

@@ -0,0 +1,68 @@
+//
+// GamePadButton.cs
+//
+// Author:
+//       robert <${AuthorEmail}>
+//
+// Copyright (c) 2012 robert
+//
+// 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.
+using System;
+
+namespace OpenTK
+{
+	public enum GamePadButton
+	{
+		/// <summary>The first button of the gamepad.</summary>
+        Button0 = 0,
+        /// <summary>The second button of the gamepad.</summary>
+        Button1,
+        /// <summary>The third button of the gamepad.</summary>
+        Button2,
+        /// <summary>The fourth button of the gamepad.</summary>
+        Button3,
+        /// <summary>The fifth button of the gamepad.</summary>
+        Button4,
+        /// <summary>The sixth button of the gamepad.</summary>
+        Button5,
+        /// <summary>The seventh button of the gamepad.</summary>
+        Button6,
+        /// <summary>The eighth button of the gamepad.</summary>
+        Button7,
+        /// <summary>The ninth button of the gamepad.</summary>
+        Button8,
+        /// <summary>The tenth button of the gamepad.</summary>
+        Button9,
+        /// <summary>The eleventh button of the gamepad.</summary>
+        Button10,
+        /// <summary>The twelfth button of the gamepad.</summary>
+        Button11,
+        /// <summary>The thirteenth button of the gamepad.</summary>
+        Button12,
+        /// <summary>The fourteenth button of the gamepad.</summary>
+        Button13,
+        /// <summary>The fifteenth button of the gamepad.</summary>
+        Button14,
+        /// <summary>The sixteenth button of the gamepad.</summary>
+        Button15,
+		/// <summary>The last button of the gamepad.</summary>
+		LastButton
+    }
+}
+

Source/OpenTK/Input/GamePadState.cs

@@ -32,7 +32,8 @@ namespace OpenTK.Input
     /// <summary>
     /// Encapsulates the state of a GamePad device.
     /// </summary>
-    public struct GamePadState
+	public struct GamePadState : IEquatable<GamePadState>
     {
+
     }
 }

Source/OpenTK/OpenTK.csproj

@@ -767,6 +767,8 @@
     <Compile Include="Platform\MacOS\HIDInput.cs" />
     <Compile Include="IntPtrEqualityComparer.cs" />
     <Compile Include="Math\Matrix3.cs" />
+	<Compile Include="Input\GamePadButton.cs" />
+	<Compile Include="Input\GamePadAxis.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

Source/OpenTK/Platform/X11/X11Joystick.cs

@@ -89,7 +89,7 @@ public int DeviceCount
 
         public IList<JoystickDevice> Joysticks
         {
-            get { return sticks_readonly; }
+			get { Poll(); return sticks_readonly; }
         }
 
         public void Poll()
@@ -267,7 +267,8 @@ public GamePadState GetState()
 
         public GamePadState GetState(int index)
         {
-            throw new NotImplementedException();
+			Poll();
+
         }
 
         public string GetDeviceName(int index)