Merge pull request #1227 from Heinrich-F/master

Support for SDL2 style controller hats

src/input/src/controller.rs

@@ -24,6 +24,27 @@ impl ControllerButton {
     }
 }
 
+/// Components of a controller hat move event (d-Pad).
+#[derive(Copy, Clone, Deserialize, Serialize, PartialEq, Eq, Debug, Hash)]
+pub struct ControllerHat {
+  /// Which Controller was the button on.
+  pub id: i32,
+  /// Which button was pressed.
+  pub state: ::HatState,
+  /// Which hat on the controller was changed
+  pub which: u8,
+}
+
+impl ControllerHat {
+  /// Create a new ControllerButton object. Intended for use by backends when
+  /// emitting events.
+  pub fn new(id: i32, which: u8, state: ::HatState) -> Self {
+    ControllerHat {
+      id, state, which,
+    }
+  }
+}
+
 /// Components of a controller axis move event. Not guaranteed consistent across
 /// backends.
 #[derive(Copy, Clone, Deserialize, Serialize, PartialEq, Debug)]

src/input/src/lib.rs

@@ -18,7 +18,7 @@ use std::sync::Arc;
 
 pub use mouse::MouseButton;
 pub use keyboard::Key;
-pub use controller::{ControllerAxisArgs, ControllerButton};
+pub use controller::{ControllerAxisArgs, ControllerButton, ControllerHat};
 
 pub mod controller;
 pub mod keyboard;
@@ -82,6 +82,8 @@ pub enum Button {
     Mouse(MouseButton),
     /// A controller button.
     Controller(ControllerButton),
+    /// A controller hat (d-Pad)
+    Hat(ControllerHat),
 }
 
 /// Models different kinds of motion.
@@ -99,6 +101,20 @@ pub enum Motion {
     Touch(TouchArgs),
 }
 
+#[derive(Copy, Clone, Deserialize, Serialize, PartialEq, Eq, Debug, Hash)]
+#[allow(missing_docs)]
+pub enum HatState {
+  Centered,
+  Up,
+  Right,
+  Down,
+  Left,
+  RightUp,
+  RightDown,
+  LeftUp,
+  LeftDown,
+}
+
 /// Models input events.
 #[derive(Clone, Debug, PartialEq, Deserialize, Serialize)]
 pub enum Input {