From cda0e9f6f9b9461f87af33f8a2f46c4464d473b5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 9 Nov 2011 04:08:14 +0300
Subject: Enable joystick hat support for moving. Now only support hat with
 index 0.

---
 src/joystick.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src/joystick.cpp')

diff --git a/src/joystick.cpp b/src/joystick.cpp
index bc4572370..6925ca27e 100644
--- a/src/joystick.cpp
+++ b/src/joystick.cpp
@@ -60,7 +60,8 @@ Joystick::Joystick(int no):
     mCalibrating(false),
     mCalibrated(false),
     mButtonsNumber(MAX_BUTTONS),
-    mUseInactive(false)
+    mUseInactive(false),
+    mHaveHats(false)
 {
     if (no >= joystickCount)
         no = joystickCount;
@@ -96,6 +97,8 @@ bool Joystick::open()
     logger->log("Hats: %i", SDL_JoystickNumHats(mJoystick));
     logger->log("Buttons: %i", mButtonsNumber);
 
+    mHaveHats = (SDL_JoystickNumHats(mJoystick) > 0);
+
     if (mButtonsNumber > MAX_BUTTONS)
         mButtonsNumber = MAX_BUTTONS;
 
@@ -164,6 +167,20 @@ void Joystick::update()
         else if (position >= mDownTolerance)
             mDirection |= DOWN;
 
+        if (!mDirection && mHaveHats)
+        {
+            // reading only hat 0
+            Uint8 hat = SDL_JoystickGetHat(mJoystick, 0);
+            if (hat & SDL_HAT_RIGHT)
+                mDirection |= RIGHT;
+            else if (hat & SDL_HAT_LEFT)
+                mDirection |= LEFT;
+            if (hat & SDL_HAT_UP)
+                mDirection |= UP;
+            else if (hat & SDL_HAT_DOWN)
+                mDirection |= DOWN;
+        }
+
         // Buttons
         for (int i = 0; i < mButtonsNumber; i++)
             mButtons[i] = (SDL_JoystickGetButton(mJoystick, i) == 1);
-- 
cgit v1.2.3-60-g2f50