From 5fcdfb06ff4ceab3d69f90f2cb17f2381cd19b88 Mon Sep 17 00:00:00 2001
From: void <theprismaticvoid@gmail.com>
Date: Wed, 10 Jul 2019 13:55:11 -0500
Subject: [PATCH 01/10] Start of Input.Common

---
 Silk.NET.sln                                    | 17 +++++++++++++++++
 src/Input/Silk.NET.Input.Common/Class1.cs       |  8 ++++++++
 .../Silk.NET.Input.Common.csproj                |  7 +++++++
 3 files changed, 32 insertions(+)
 create mode 100644 src/Input/Silk.NET.Input.Common/Class1.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj

diff --git a/Silk.NET.sln b/Silk.NET.sln
index 3298c81bf4..81164fbe62 100644
--- a/Silk.NET.sln
+++ b/Silk.NET.sln
@@ -59,6 +59,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenAL.Extensions.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.OpenAL.Extensions.Soft.DeferredUpdates", "src\OpenAL\Extensions\Silk.NET.OpenAL.Extensions.Soft.DeferredUpdates\Silk.NET.OpenAL.Extensions.Soft.DeferredUpdates.csproj", "{50987EDD-9F49-4981-ADAE-98F01F4A4FBA}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Input", "Input", "{AE36230C-E8F4-4332-9F50-9253E6511FED}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Silk.NET.Input.Common", "src\Input\Silk.NET.Input.Common\Silk.NET.Input.Common.csproj", "{8FFF49D6-B029-400B-8510-19088868DFA6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -360,6 +364,18 @@ Global
 		{50987EDD-9F49-4981-ADAE-98F01F4A4FBA}.Release|x64.Build.0 = Release|Any CPU
 		{50987EDD-9F49-4981-ADAE-98F01F4A4FBA}.Release|x86.ActiveCfg = Release|Any CPU
 		{50987EDD-9F49-4981-ADAE-98F01F4A4FBA}.Release|x86.Build.0 = Release|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Debug|x64.Build.0 = Debug|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Debug|x86.Build.0 = Debug|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Release|x64.ActiveCfg = Release|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Release|x64.Build.0 = Release|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Release|x86.ActiveCfg = Release|Any CPU
+		{8FFF49D6-B029-400B-8510-19088868DFA6}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{BFE429EB-4C2E-4BF3-A302-C9C5A2FDA6D7} = {23324041-2076-477C-A4BF-B385B8066C6C}
@@ -385,5 +401,6 @@ Global
 		{4EE697B8-E6AA-47EF-B9E3-C4F9FFBCA4E7} = {896B1A79-FEC8-4B7A-8A9C-0CC8EDA2CCFC}
 		{94D7D3A3-3640-4791-BE19-CA50C59187C6} = {896B1A79-FEC8-4B7A-8A9C-0CC8EDA2CCFC}
 		{50987EDD-9F49-4981-ADAE-98F01F4A4FBA} = {896B1A79-FEC8-4B7A-8A9C-0CC8EDA2CCFC}
+		{8FFF49D6-B029-400B-8510-19088868DFA6} = {AE36230C-E8F4-4332-9F50-9253E6511FED}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Input/Silk.NET.Input.Common/Class1.cs b/src/Input/Silk.NET.Input.Common/Class1.cs
new file mode 100644
index 0000000000..448e0a0036
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Class1.cs
@@ -0,0 +1,8 @@
+using System;
+
+namespace Silk.NET.Input.Common
+{
+    public class Class1
+    {
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj b/src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj
new file mode 100644
index 0000000000..27560206de
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>netstandard2.0</TargetFramework>
+    </PropertyGroup>
+
+</Project>

From 752aee99f655ce4f395b6101ee2036dba622553e Mon Sep 17 00:00:00 2001
From: void <theprismaticvoid@gmail.com>
Date: Wed, 10 Jul 2019 14:14:54 -0500
Subject: [PATCH 02/10] Initial commit of Input

---
 src/Input/Silk.NET.Input.Common/Axis.cs       |  13 ++
 src/Input/Silk.NET.Input.Common/Button.cs     |  14 ++
 src/Input/Silk.NET.Input.Common/Class1.cs     |   8 -
 src/Input/Silk.NET.Input.Common/Deadzone.cs   |  12 ++
 .../Silk.NET.Input.Common/Enums/ButtonName.cs |  28 ++++
 .../Enums/DeadzoneMethod.cs                   |  15 ++
 src/Input/Silk.NET.Input.Common/Enums/Key.cs  | 158 ++++++++++++++++++
 .../Silk.NET.Input.Common/Enums/Position2D.cs |  23 +++
 src/Input/Silk.NET.Input.Common/Hat.cs        |  13 ++
 .../InputWindowExtensions.cs                  |  28 ++++
 .../Interfaces/IGamepad.cs                    |  22 +++
 .../Interfaces/IInputContext.cs               |  20 +++
 .../Interfaces/IInputDevice.cs                |  17 ++
 .../Interfaces/IInputPlatform.cs              |  15 ++
 .../Interfaces/IJoystick.cs                   |  22 +++
 .../Interfaces/IKeyboard.cs                   |  19 +++
 .../Interfaces/IMouse.cs                      |  20 +++
 .../Silk.NET.Input.Common/ScrollWheel.cs      |  13 ++
 .../Silk.NET.Input.Common.csproj              |   6 +-
 src/Input/Silk.NET.Input.Common/Thumbstick.cs |  14 ++
 src/Input/Silk.NET.Input.Common/Trigger.cs    |  13 ++
 21 files changed, 484 insertions(+), 9 deletions(-)
 create mode 100644 src/Input/Silk.NET.Input.Common/Axis.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Button.cs
 delete mode 100644 src/Input/Silk.NET.Input.Common/Class1.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Deadzone.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Enums/ButtonName.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Enums/DeadzoneMethod.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Enums/Key.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Enums/Position2D.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Hat.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Interfaces/IGamepad.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Interfaces/IInputContext.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Interfaces/IInputDevice.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Interfaces/IInputPlatform.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Interfaces/IJoystick.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Interfaces/IKeyboard.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Interfaces/IMouse.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/ScrollWheel.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Thumbstick.cs
 create mode 100644 src/Input/Silk.NET.Input.Common/Trigger.cs

diff --git a/src/Input/Silk.NET.Input.Common/Axis.cs b/src/Input/Silk.NET.Input.Common/Axis.cs
new file mode 100644
index 0000000000..37741b1c14
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Axis.cs
@@ -0,0 +1,13 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public struct Axis
+    {
+        public int Index { get; }
+        public float Position { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Button.cs b/src/Input/Silk.NET.Input.Common/Button.cs
new file mode 100644
index 0000000000..f6cbeb99ca
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Button.cs
@@ -0,0 +1,14 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public struct Button
+    {
+        public ButtonName Name { get; }
+        public int Index { get; }
+        public bool Pressed { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Class1.cs b/src/Input/Silk.NET.Input.Common/Class1.cs
deleted file mode 100644
index 448e0a0036..0000000000
--- a/src/Input/Silk.NET.Input.Common/Class1.cs
+++ /dev/null
@@ -1,8 +0,0 @@
-using System;
-
-namespace Silk.NET.Input.Common
-{
-    public class Class1
-    {
-    }
-}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Deadzone.cs b/src/Input/Silk.NET.Input.Common/Deadzone.cs
new file mode 100644
index 0000000000..6b32575441
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Deadzone.cs
@@ -0,0 +1,12 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public struct Deadzone
+    {
+        
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Enums/ButtonName.cs b/src/Input/Silk.NET.Input.Common/Enums/ButtonName.cs
new file mode 100644
index 0000000000..39a7680dd2
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Enums/ButtonName.cs
@@ -0,0 +1,28 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public enum ButtonName
+    {
+        A,
+        B,
+        X,
+        Y,
+        Back,
+        Home,
+        DPadUp,
+        DPadDown,
+        DPadLeft,
+        DPadRight,
+        LeftBumper,
+        LeftStick,
+        LeftTrigger,
+        RightBumper,
+        RightStick,
+        RightTrigger,
+        Start
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Enums/DeadzoneMethod.cs b/src/Input/Silk.NET.Input.Common/Enums/DeadzoneMethod.cs
new file mode 100644
index 0000000000..cac6bfca41
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Enums/DeadzoneMethod.cs
@@ -0,0 +1,15 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public enum DeadzoneMethod
+    {
+        // y = x except where |x| is between 0 and d (the deadzone value)
+        Traditional,
+        // y = (1 - d)x + (d * sgn(x))
+        AdaptiveGradient
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Enums/Key.cs b/src/Input/Silk.NET.Input.Common/Enums/Key.cs
new file mode 100644
index 0000000000..1f4840d6c1
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Enums/Key.cs
@@ -0,0 +1,158 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public enum Key
+    {
+        Unknown = 0,
+        ShiftLeft,
+        LShift = ShiftLeft,
+        ShiftRight,
+        RShift = ShiftRight,
+        ControlLeft,
+        LControl = ControlLeft,
+        ControlRight,
+        RControl = ControlRight,
+        AltLeft,
+        LAlt = AltLeft,
+        AltRight,
+        RAlt = AltRight,
+        WinLeft,
+        LWin = WinLeft,
+        WinRight,
+        RWin = WinRight,
+        Menu,
+        F1,
+        F2,
+        F3,
+        F4,
+        F5,
+        F6,
+        F7,
+        F8,
+        F9,
+        F10,
+        F11,
+        F12,
+        F13,
+        F14,
+        F15,
+        F16,
+        F17,
+        F18,
+        F19,
+        F20,
+        F21,
+        F22,
+        F23,
+        F24,
+        F25,
+        F26,
+        F27,
+        F28,
+        F29,
+        F30,
+        F31,
+        F32,
+        F33,
+        F34,
+        F35,
+        Up,
+        Down,
+        Left,
+        Right,
+        Enter,
+        Escape,
+        Space,
+        Tab,
+        BackSpace,
+        Back = BackSpace,
+        Insert,
+        Delete,
+        PageUp,
+        PageDown,
+        Home,
+        End,
+        CapsLock,
+        ScrollLock,
+        PrintScreen,
+        Pause,
+        NumLock,
+        Clear,
+        Sleep,
+        Keypad0,
+        Keypad1,
+        Keypad2,
+        Keypad3,
+        Keypad4,
+        Keypad5,
+        Keypad6,
+        Keypad7,
+        Keypad8,
+        Keypad9,
+        KeypadDivide,
+        KeypadMultiply,
+        KeypadSubtract,
+        KeypadMinus = KeypadSubtract,
+        KeypadAdd,
+        KeypadPlus = KeypadAdd,
+        KeypadDecimal,
+        KeypadPeriod = KeypadDecimal,
+        KeypadEnter,
+        A,
+        B,
+        C,
+        D,
+        E,
+        F,
+        G,
+        H,
+        I,
+        J,
+        K,
+        L,
+        M,
+        N,
+        O,
+        P,
+        Q,
+        R,
+        S,
+        T,
+        U,
+        V,
+        W,
+        X,
+        Y,
+        Z,
+        Number0,
+        Number1,
+        Number2,
+        Number3,
+        Number4,
+        Number5,
+        Number6,
+        Number7,
+        Number8,
+        Number9,
+        Tilde,
+        Grave = Tilde,
+        Minus,
+        Plus,
+        BracketLeft,
+        LBracket = BracketLeft,
+        BracketRight,
+        RBracket = BracketRight,
+        Semicolon,
+        Quote,
+        Comma,
+        Period,
+        Slash,
+        BackSlash,
+        NonUSBackSlash,
+        LastKey
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Enums/Position2D.cs b/src/Input/Silk.NET.Input.Common/Enums/Position2D.cs
new file mode 100644
index 0000000000..1a8d6e0da0
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Enums/Position2D.cs
@@ -0,0 +1,23 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using System;
+
+namespace Silk.NET.Input.Common
+{
+    [Flags]
+    public enum Position2D
+    {
+        Up,
+        Down,
+        Left,
+        Right,
+        
+        UpLeft = Up | Left,
+        UpRight = Up | Right,
+        DownLeft = Down | Left,
+        DownRight = Down | Right
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Hat.cs b/src/Input/Silk.NET.Input.Common/Hat.cs
new file mode 100644
index 0000000000..e63d9e9d78
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Hat.cs
@@ -0,0 +1,13 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public struct Hat
+    {
+        public int Index { get; }
+        public Position2D Position { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs b/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs
new file mode 100644
index 0000000000..f651c6ca14
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs
@@ -0,0 +1,28 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using System;
+using Silk.NET.Windowing.Common;
+
+namespace Silk.NET.Input.Common
+{
+    public static class InputWindowExtensions
+    {
+        public static void RegisterInputPlatform(IInputPlatform platform)
+        {
+            throw new NotImplementedException();
+        }
+
+        public static void DeregisterInputPlatform(IInputPlatform platform)
+        {
+            throw new NotImplementedException();
+        }
+
+        public static IInputContext GetInput(this IWindow window)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Interfaces/IGamepad.cs b/src/Input/Silk.NET.Input.Common/Interfaces/IGamepad.cs
new file mode 100644
index 0000000000..e798a64f82
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Interfaces/IGamepad.cs
@@ -0,0 +1,22 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using System;
+using System.Collections.Generic;
+
+namespace Silk.NET.Input.Common
+{
+    public interface IGamepad : IInputDevice
+    {
+        IReadOnlyCollection<Button> Buttons { get; }
+        IReadOnlyCollection<Thumbstick> Thumbsticks { get; }
+        IReadOnlyCollection<Trigger> Triggers { get; }
+        Deadzone Deadzone { get; set; }
+        event Action<IGamepad, Button> ButtonDown;
+        event Action<IGamepad, Button> ButtonUp;
+        event Action<IGamepad, Thumbstick> ThumbstickMoved;
+        event Action<IGamepad, Thumbstick> TriggerMoved;
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Interfaces/IInputContext.cs b/src/Input/Silk.NET.Input.Common/Interfaces/IInputContext.cs
new file mode 100644
index 0000000000..c17406eb8f
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Interfaces/IInputContext.cs
@@ -0,0 +1,20 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using System;
+using System.Collections.Generic;
+
+namespace Silk.NET.Input.Common
+{
+    public interface IInputContext
+    {
+        IntPtr Handle { get; }
+        IReadOnlyCollection<IGamepad> Gamepads { get; }
+        IReadOnlyCollection<IJoystick> Joysticks { get; }
+        IReadOnlyCollection<IKeyboard> Keyboards { get; }
+        IReadOnlyCollection<IMouse> Mice { get; }
+        IReadOnlyCollection<IInputDevice> OtherDevices { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Interfaces/IInputDevice.cs b/src/Input/Silk.NET.Input.Common/Interfaces/IInputDevice.cs
new file mode 100644
index 0000000000..0c0c0a5e60
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Interfaces/IInputDevice.cs
@@ -0,0 +1,17 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using System;
+
+namespace Silk.NET.Input.Common
+{
+    public interface IInputDevice
+    {
+        string Name { get; }
+        int Index { get; }
+        bool IsConnected { get; }
+        event Action<IInputDevice, bool> ConnectionChanged;
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Interfaces/IInputPlatform.cs b/src/Input/Silk.NET.Input.Common/Interfaces/IInputPlatform.cs
new file mode 100644
index 0000000000..269e32da44
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Interfaces/IInputPlatform.cs
@@ -0,0 +1,15 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using Silk.NET.Windowing.Common;
+
+namespace Silk.NET.Input.Common
+{
+    public interface IInputPlatform
+    {
+        bool IsApplicable(IWindow window);
+        IInputContext GetInput(IWindow window);
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Interfaces/IJoystick.cs b/src/Input/Silk.NET.Input.Common/Interfaces/IJoystick.cs
new file mode 100644
index 0000000000..f49073b745
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Interfaces/IJoystick.cs
@@ -0,0 +1,22 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using System;
+using System.Collections.Generic;
+
+namespace Silk.NET.Input.Common
+{
+    public interface IJoystick : IInputDevice
+    {
+        IReadOnlyCollection<Axis> Axes { get; }
+        IReadOnlyCollection<Button> Buttons { get; }
+        IReadOnlyCollection<Hat> Hats { get; }
+        Deadzone Deadzone { get; set; }
+        event Action<IJoystick, Button> ButtonDown;
+        event Action<IJoystick, Button> ButtonUp;
+        event Action<IJoystick, Axis> AxisMoved;
+        event Action<IJoystick, Hat> HatMoved;
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Interfaces/IKeyboard.cs b/src/Input/Silk.NET.Input.Common/Interfaces/IKeyboard.cs
new file mode 100644
index 0000000000..00da6c96c2
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Interfaces/IKeyboard.cs
@@ -0,0 +1,19 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using System;
+using System.Collections.Generic;
+
+namespace Silk.NET.Input.Common
+{
+    public interface IKeyboard : IInputDevice
+    {
+        IReadOnlyCollection<Key> SupportedKeys { get; }
+        bool IsKeyPressed(Key key);
+        bool IsKeyPressed(uint scancode);
+        event Action<IKeyboard, Key> KeyDown;
+        event Action<IKeyboard, Key> KeyUp;
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Interfaces/IMouse.cs b/src/Input/Silk.NET.Input.Common/Interfaces/IMouse.cs
new file mode 100644
index 0000000000..b692e08207
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Interfaces/IMouse.cs
@@ -0,0 +1,20 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+using System;
+using System.Collections.Generic;
+
+namespace Silk.NET.Input.Common
+{
+    public interface IMouse : IInputDevice
+    {
+        IReadOnlyCollection<MouseButton> SupportedButtons { get; }
+        IReadOnlyCollection<ScrollWheel> ScrollWheels { get; }
+        bool IsButtonPressed(MouseButton btn);
+        event Action<IMouse, MouseButton> MouseDown;
+        event Action<IMouse, MouseButton> MouseUp;
+        event Action<IMouse, ScrollWheel> Scroll;
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/ScrollWheel.cs b/src/Input/Silk.NET.Input.Common/ScrollWheel.cs
new file mode 100644
index 0000000000..9de0c2d2b2
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/ScrollWheel.cs
@@ -0,0 +1,13 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public struct ScrollWheel
+    {
+        public float X { get; }
+        public float Y { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj b/src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj
index 27560206de..f02b043b95 100644
--- a/src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj
+++ b/src/Input/Silk.NET.Input.Common/Silk.NET.Input.Common.csproj
@@ -1,7 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netstandard2.0</TargetFramework>
     </PropertyGroup>
 
+    <ItemGroup>
+      <ProjectReference Include="..\..\Windowing\Silk.NET.Windowing.Common\Silk.NET.Windowing.Common.csproj" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Input/Silk.NET.Input.Common/Thumbstick.cs b/src/Input/Silk.NET.Input.Common/Thumbstick.cs
new file mode 100644
index 0000000000..3c3bfecbca
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Thumbstick.cs
@@ -0,0 +1,14 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public struct Thumbstick
+    {
+        public int Index { get; }
+        public float Position { get; }
+        public float Direction { get; }
+    }
+}
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Trigger.cs b/src/Input/Silk.NET.Input.Common/Trigger.cs
new file mode 100644
index 0000000000..f75bc37023
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Trigger.cs
@@ -0,0 +1,13 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public struct Trigger
+    {
+        public int Index { get; }
+        public float Position { get; }
+    }
+}
\ No newline at end of file

From 7ef8774d22dd6e0258b1c37fb5f02d8cd9581773 Mon Sep 17 00:00:00 2001
From: void <theprismaticvoid@gmail.com>
Date: Wed, 10 Jul 2019 14:18:08 -0500
Subject: [PATCH 03/10] Add MouseButton to the GLFW bindings

---
 .../Silk.NET.GLFW/Enums/MouseButton.cs        | 26 +++++++++++++++++++
 src/Windowing/Silk.NET.GLFW/GlfwCallbacks.cs  |  2 +-
 .../Silk.NET.GLFW/Silk.NET.GLFW.csproj        | 15 +++--------
 3 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 src/Windowing/Silk.NET.GLFW/Enums/MouseButton.cs

diff --git a/src/Windowing/Silk.NET.GLFW/Enums/MouseButton.cs b/src/Windowing/Silk.NET.GLFW/Enums/MouseButton.cs
new file mode 100644
index 0000000000..3d4e3d8756
--- /dev/null
+++ b/src/Windowing/Silk.NET.GLFW/Enums/MouseButton.cs
@@ -0,0 +1,26 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.GLFW
+{
+    /// <summary>
+    /// The mouse buttons.
+    /// </summary>
+    public enum MouseButton
+    {
+        MouseButton1 = 0,
+        MouseButton2,
+        MouseButton3,
+        MouseButton4,
+        MouseButton5,
+        MouseButton6,
+        MouseButton7,
+        MouseButton8,
+        MouseButtonLast = MouseButton8,
+        MouseButtonLeft = MouseButton1,
+        MouseButtonRight = MouseButton2,
+        MouseButtonMiddle = MouseButton3
+    }
+}
\ No newline at end of file
diff --git a/src/Windowing/Silk.NET.GLFW/GlfwCallbacks.cs b/src/Windowing/Silk.NET.GLFW/GlfwCallbacks.cs
index 3a3c113de8..9c7c154b58 100644
--- a/src/Windowing/Silk.NET.GLFW/GlfwCallbacks.cs
+++ b/src/Windowing/Silk.NET.GLFW/GlfwCallbacks.cs
@@ -104,7 +104,7 @@ public delegate void KeyCallback(WindowHandle* window, Keys key, int scanCode, I
         /// <param name="mods">Bit field describing which modifier keys were held down.</param>
         /// <seealso cref="IGlfw.SetMouseButtonCallback" />
         public delegate void
-            MouseButtonCallback(WindowHandle* window, int button, InputAction action,
+            MouseButtonCallback(WindowHandle* window, MouseButton button, InputAction action,
                 KeyModifiers mods);
 
         /// <summary>
diff --git a/src/Windowing/Silk.NET.GLFW/Silk.NET.GLFW.csproj b/src/Windowing/Silk.NET.GLFW/Silk.NET.GLFW.csproj
index df29435288..7a6519f53c 100644
--- a/src/Windowing/Silk.NET.GLFW/Silk.NET.GLFW.csproj
+++ b/src/Windowing/Silk.NET.GLFW/Silk.NET.GLFW.csproj
@@ -16,20 +16,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\build\native\glfw\glfw3-x64.dll"
-               Link="runtimes/win-x64/native/glfw3-x64.dll"
-               PackagePath="runtimes/win-x64/native"
-               InProject="false" />
+      <Content Include="..\..\..\build\native\glfw\glfw3-x64.dll" Link="runtimes/win-x64/native/glfw3-x64.dll" PackagePath="runtimes/win-x64/native" InProject="false" />
 
-      <Content Include="..\..\..\build\native\glfw\glfw3-x86.dll"
-               Link="runtimes/win-x86/native/glfw3-x86.dll"
-               PackagePath="runtimes/win-x86/native"
-               InProject="false" />
+      <Content Include="..\..\..\build\native\glfw\glfw3-x86.dll" Link="runtimes/win-x86/native/glfw3-x86.dll" PackagePath="runtimes/win-x86/native" InProject="false" />
 
-      <Content Include="..\..\..\build\native\glfw\libglfw.so.3.3"
-               Link="runtimes/linux-x64/native/libglfw.so.3.3"
-               PackagePath="runtimes/linux-x64/native"
-               InProject="false" />
+      <Content Include="..\..\..\build\native\glfw\libglfw.so.3.3" Link="runtimes/linux-x64/native/libglfw.so.3.3" PackagePath="runtimes/linux-x64/native" InProject="false" />
 
       <Content Include="Silk.NET.GLFW.targets" PackagePath="build/" />
     </ItemGroup>

From 8068b83f7bebfd2540d7dd1f55c3f7a34aba5a0b Mon Sep 17 00:00:00 2001
From: void <theprismaticvoid@gmail.com>
Date: Wed, 10 Jul 2019 14:28:13 -0500
Subject: [PATCH 04/10] Add MouseButton to Input.Common

---
 .../Enums/MouseButton.cs                      | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 src/Input/Silk.NET.Input.Common/Enums/MouseButton.cs

diff --git a/src/Input/Silk.NET.Input.Common/Enums/MouseButton.cs b/src/Input/Silk.NET.Input.Common/Enums/MouseButton.cs
new file mode 100644
index 0000000000..e20ef5870f
--- /dev/null
+++ b/src/Input/Silk.NET.Input.Common/Enums/MouseButton.cs
@@ -0,0 +1,23 @@
+// This file is part of Silk.NET.
+// 
+// You may modify and distribute Silk.NET under the terms
+// of the MIT license. See the LICENSE file for details.
+
+namespace Silk.NET.Input.Common
+{
+    public enum MouseButton
+    {
+        Left,
+        Middle,
+        Right,
+        Button4,
+        Button5,
+        Button6,
+        Button7,
+        Button8,
+        Button9,
+        Button10,
+        Button11,
+        Button12
+    }
+}
\ No newline at end of file

From 775adbcb82c75224e99caa48072c95478e1c2c54 Mon Sep 17 00:00:00 2001
From: void <theprismaticvoid@gmail.com>
Date: Wed, 10 Jul 2019 14:31:34 -0500
Subject: [PATCH 05/10] Add MouseButton to Input proposal

---
 documentation/proposals/Proposal - Input.md | 22 ++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/documentation/proposals/Proposal - Input.md b/documentation/proposals/Proposal - Input.md
index 2bc3608173..7dfe95331e 100644
--- a/documentation/proposals/Proposal - Input.md	
+++ b/documentation/proposals/Proposal - Input.md	
@@ -1,10 +1,11 @@
-# Summary    
+# Summary    
 Proposal API for Input via keyboards, mice, and controllers.
 
 # Contributors
 - Dylan Perks, Ultz Limited
 - Aaron Pearson, Ultz Limited
 - Vassalware, Silk.NET Contributors
+- Void, Silk.NET codeowners
 
 # Current Status
 - [x] Proposed
@@ -389,3 +390,22 @@ public enum Key
     LastKey
 }
 ```
+
+### MouseButton
+```cs
+public enum MouseButton
+{
+	Left,
+	Middle,
+	Right,
+	Button4,
+	Button5,
+	Button6,
+	Button7,
+	Button8,
+	Button9,
+	Button10,
+	Button11,
+	Button12
+}
+```

From 25de3ecc0ae121703e720c202149aa19edb1b245 Mon Sep 17 00:00:00 2001
From: Void <33298798+devvoid@users.noreply.github.com>
Date: Wed, 10 Jul 2019 14:33:54 -0500
Subject: [PATCH 06/10] Replace tabs with spaces

---
 documentation/proposals/Proposal - Input.md | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/documentation/proposals/Proposal - Input.md b/documentation/proposals/Proposal - Input.md
index 7dfe95331e..e14f17236a 100644
--- a/documentation/proposals/Proposal - Input.md	
+++ b/documentation/proposals/Proposal - Input.md	
@@ -395,17 +395,17 @@ public enum Key
 ```cs
 public enum MouseButton
 {
-	Left,
-	Middle,
-	Right,
-	Button4,
-	Button5,
-	Button6,
-	Button7,
-	Button8,
-	Button9,
-	Button10,
-	Button11,
-	Button12
+    Left,
+    Middle,
+    Right,
+    Button4,
+    Button5,
+    Button6,
+    Button7,
+    Button8,
+    Button9,
+    Button10,
+    Button11,
+    Button12
 }
 ```

From d386d1962b47d423a551a5ed606bb223b85aecbd Mon Sep 17 00:00:00 2001
From: void <theprismaticvoid@gmail.com>
Date: Wed, 10 Jul 2019 14:40:09 -0500
Subject: [PATCH 07/10] Add constructors

---
 src/Input/Silk.NET.Input.Common/Axis.cs        | 6 ++++++
 src/Input/Silk.NET.Input.Common/Button.cs      | 7 +++++++
 src/Input/Silk.NET.Input.Common/Deadzone.cs    | 9 ++++++++-
 src/Input/Silk.NET.Input.Common/Hat.cs         | 6 ++++++
 src/Input/Silk.NET.Input.Common/ScrollWheel.cs | 6 ++++++
 src/Input/Silk.NET.Input.Common/Thumbstick.cs  | 7 +++++++
 src/Input/Silk.NET.Input.Common/Trigger.cs     | 6 ++++++
 7 files changed, 46 insertions(+), 1 deletion(-)

diff --git a/src/Input/Silk.NET.Input.Common/Axis.cs b/src/Input/Silk.NET.Input.Common/Axis.cs
index 37741b1c14..1a953e0647 100644
--- a/src/Input/Silk.NET.Input.Common/Axis.cs
+++ b/src/Input/Silk.NET.Input.Common/Axis.cs
@@ -9,5 +9,11 @@ public struct Axis
     {
         public int Index { get; }
         public float Position { get; }
+
+        public Axis(int index, float position)
+        {
+            Index = index;
+            Position = position;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Button.cs b/src/Input/Silk.NET.Input.Common/Button.cs
index f6cbeb99ca..45275c5080 100644
--- a/src/Input/Silk.NET.Input.Common/Button.cs
+++ b/src/Input/Silk.NET.Input.Common/Button.cs
@@ -10,5 +10,12 @@ public struct Button
         public ButtonName Name { get; }
         public int Index { get; }
         public bool Pressed { get; }
+
+        public Button(ButtonName name, int index, bool pressed)
+        {
+            Name = name;
+            Index = index;
+            Pressed = pressed;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Deadzone.cs b/src/Input/Silk.NET.Input.Common/Deadzone.cs
index 6b32575441..9b0f1b57d0 100644
--- a/src/Input/Silk.NET.Input.Common/Deadzone.cs
+++ b/src/Input/Silk.NET.Input.Common/Deadzone.cs
@@ -7,6 +7,13 @@ namespace Silk.NET.Input.Common
 {
     public struct Deadzone
     {
-        
+        public float Value { get; }
+        public DeadzoneMethod Method { get; }
+
+        public Deadzone(float value, DeadzoneMethod method)
+        {
+            Value = value;
+            Method = method;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Hat.cs b/src/Input/Silk.NET.Input.Common/Hat.cs
index e63d9e9d78..a33676802d 100644
--- a/src/Input/Silk.NET.Input.Common/Hat.cs
+++ b/src/Input/Silk.NET.Input.Common/Hat.cs
@@ -9,5 +9,11 @@ public struct Hat
     {
         public int Index { get; }
         public Position2D Position { get; }
+
+        public Hat(int index, Position2D position)
+        {
+            Index = index;
+            Position = position;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/ScrollWheel.cs b/src/Input/Silk.NET.Input.Common/ScrollWheel.cs
index 9de0c2d2b2..9d705dfec2 100644
--- a/src/Input/Silk.NET.Input.Common/ScrollWheel.cs
+++ b/src/Input/Silk.NET.Input.Common/ScrollWheel.cs
@@ -9,5 +9,11 @@ public struct ScrollWheel
     {
         public float X { get; }
         public float Y { get; }
+
+        public ScrollWheel(float x, float y)
+        {
+            X = x;
+            Y = y;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Thumbstick.cs b/src/Input/Silk.NET.Input.Common/Thumbstick.cs
index 3c3bfecbca..770368b67d 100644
--- a/src/Input/Silk.NET.Input.Common/Thumbstick.cs
+++ b/src/Input/Silk.NET.Input.Common/Thumbstick.cs
@@ -10,5 +10,12 @@ public struct Thumbstick
         public int Index { get; }
         public float Position { get; }
         public float Direction { get; }
+
+        public Thumbstick(int index, float position, float direction)
+        {
+            Index = index;
+            Position = position;
+            Direction = direction;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Input/Silk.NET.Input.Common/Trigger.cs b/src/Input/Silk.NET.Input.Common/Trigger.cs
index f75bc37023..3d75e2647c 100644
--- a/src/Input/Silk.NET.Input.Common/Trigger.cs
+++ b/src/Input/Silk.NET.Input.Common/Trigger.cs
@@ -9,5 +9,11 @@ public struct Trigger
     {
         public int Index { get; }
         public float Position { get; }
+
+        public Trigger(int index, float position)
+        {
+            Index = index;
+            Position = position;
+        }
     }
 }
\ No newline at end of file

From e0fe2300c7cf972c61a027295cb6021aed7b633c Mon Sep 17 00:00:00 2001
From: Void <33298798+devvoid@users.noreply.github.com>
Date: Wed, 10 Jul 2019 14:44:21 -0500
Subject: [PATCH 08/10] Add constructors to proposal

---
 documentation/proposals/Proposal - Input.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/documentation/proposals/Proposal - Input.md b/documentation/proposals/Proposal - Input.md
index e14f17236a..0af23d43de 100644
--- a/documentation/proposals/Proposal - Input.md	
+++ b/documentation/proposals/Proposal - Input.md	
@@ -130,6 +130,8 @@ public struct ScrollWheel
 {
     public float X { get; }
     public float Y { get; }
+    
+    public ScrollWheel(float x, float y);
 }
 ```
 
@@ -140,6 +142,8 @@ public struct Button
     public ButtonName Name { get; }
     public int Index { get; }
     public bool Pressed { get; }
+    
+    public Button(ButtonName name, int index, bool pressed);
 }
 ```
 
@@ -149,6 +153,8 @@ public struct Axis
 {
     public int Index { get; }
     public float Position { get; }
+    
+    public Axis(int index, float position);
 }
 ```
 
@@ -159,6 +165,8 @@ public struct Thumbstick
     public int Index { get; }
     public float Position { get; }
     public float Direction { get; }
+    
+    public Thumbstick(int index, float position, float direction);
 }
 ```
 
@@ -168,6 +176,8 @@ public struct Trigger
 {
     public int Index { get; }
     public float Position { get; }
+    
+    public Trigger(int index, float position);
 }
 ```
 
@@ -177,6 +187,8 @@ public struct Hat
 {
     public int Index { get; }
     public Position2D Position { get; }
+    
+    public Hat(int index, Position2D position);
 }
 ```
 
@@ -186,6 +198,8 @@ public struct Deadzone
 {
     public float Value { get; }
     public DeadzoneMethod Method { get; }
+    
+    public Deadzone(float value, DeadzoneMethod method);
 }
 ```
 

From b81abc07396bd15c9dfc9bd87cf5a159d9e46ed8 Mon Sep 17 00:00:00 2001
From: void <theprismaticvoid@gmail.com>
Date: Wed, 10 Jul 2019 15:04:51 -0500
Subject: [PATCH 09/10] Deregister -> Unregister

---
 documentation/proposals/Proposal - Input.md              | 2 +-
 src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/documentation/proposals/Proposal - Input.md b/documentation/proposals/Proposal - Input.md
index e14f17236a..be9f904162 100644
--- a/documentation/proposals/Proposal - Input.md	
+++ b/documentation/proposals/Proposal - Input.md	
@@ -118,7 +118,7 @@ public interface IInputPlatform
 public static class InputWindowExtensions
 {
     public static void RegisterInputPlatform(IInputPlatform platform);
-    public static void DeregisterInputPlatform(IInputPlatform platform);
+    public static void UnregisterInputPlatform(IInputPlatform platform);
     public static IInputContext GetInput(this IWindow window);
 }
 ```
diff --git a/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs b/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs
index f651c6ca14..c8514c5697 100644
--- a/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs
+++ b/src/Input/Silk.NET.Input.Common/InputWindowExtensions.cs
@@ -15,7 +15,7 @@ public static void RegisterInputPlatform(IInputPlatform platform)
             throw new NotImplementedException();
         }
 
-        public static void DeregisterInputPlatform(IInputPlatform platform)
+        public static void UnregisterInputPlatform(IInputPlatform platform)
         {
             throw new NotImplementedException();
         }

From 785cdce431d276867061aaa14e744794475a27f0 Mon Sep 17 00:00:00 2001
From: void <theprismaticvoid@gmail.com>
Date: Fri, 12 Jul 2019 14:40:14 -0500
Subject: [PATCH 10/10] Start documenting Input.Common

---
 src/Input/Silk.NET.Input.Common/Axis.cs   | 15 +++++++++++++++
 src/Input/Silk.NET.Input.Common/Button.cs | 20 ++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/Input/Silk.NET.Input.Common/Axis.cs b/src/Input/Silk.NET.Input.Common/Axis.cs
index 1a953e0647..0b3736c6c8 100644
--- a/src/Input/Silk.NET.Input.Common/Axis.cs
+++ b/src/Input/Silk.NET.Input.Common/Axis.cs
@@ -5,11 +5,26 @@
 
 namespace Silk.NET.Input.Common
 {
+    /// <summary>
+    /// Represents a joystick axis.
+    /// </summary>
     public struct Axis
     {
+        /// <summary>
+        /// The index of this axis.
+        /// </summary>
         public int Index { get; }
+        
+        /// <summary>
+        /// The raw position of this axis.
+        /// </summary>
         public float Position { get; }
 
+        /// <summary>
+        /// Creates a new instance of the Axis struct.
+        /// </summary>
+        /// <param name="index">The index of this axis.</param>
+        /// <param name="position">The position of this axis.</param>
         public Axis(int index, float position)
         {
             Index = index;
diff --git a/src/Input/Silk.NET.Input.Common/Button.cs b/src/Input/Silk.NET.Input.Common/Button.cs
index 45275c5080..17925363aa 100644
--- a/src/Input/Silk.NET.Input.Common/Button.cs
+++ b/src/Input/Silk.NET.Input.Common/Button.cs
@@ -5,12 +5,32 @@
 
 namespace Silk.NET.Input.Common
 {
+    /// <summary>
+    /// Represents a joystick button.
+    /// </summary>
     public struct Button
     {
+        /// <summary>
+        /// The name of this button. Used to determine which button it is.
+        /// </summary>
         public ButtonName Name { get; }
+        
+        /// <summary>
+        /// The index of this button.
+        /// </summary>
         public int Index { get; }
+        
+        /// <summary>
+        /// Whether or not this button is currently pressed.
+        /// </summary>
         public bool Pressed { get; }
 
+        /// <summary>
+        /// Creates a new instance of the Button struct.
+        /// </summary>
+        /// <param name="name"></param>
+        /// <param name="index"></param>
+        /// <param name="pressed"></param>
         public Button(ButtonName name, int index, bool pressed)
         {
             Name = name;