From 2f236cb6ea2721460df0e0fee0cb16ac1e0b06df Mon Sep 17 00:00:00 2001
From: auria <auria@178a84e3-b1eb-0310-8ba1-8eac791a3b58>
Date: Fri, 19 Mar 2010 01:02:40 +0000
Subject: [PATCH] Fixed keyboard configuration. For some reason, the code that
 sensed keyboard input disappear... weird

git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@5024 178a84e3-b1eb-0310-8ba1-8eac791a3b58
---
 src/input/input_manager.cpp | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/input/input_manager.cpp b/src/input/input_manager.cpp
index 92afd2958..c11abc032 100644
--- a/src/input/input_manager.cpp
+++ b/src/input/input_manager.cpp
@@ -183,26 +183,46 @@ void InputManager::handleStaticAction(int key, int value)
   */
 void InputManager::inputSensing(Input::InputType type, int deviceID, int btnID, int axisDirection,  int value)
 {
+#if INPUT_MODE_DEBUG
+    std::cout << "INPUT SENSING... ";
+#endif
+    
     bool store_new = true;
         
     // don't store if we're trying to do something like bindings keyboard keys on a gamepad
-    if(m_mode == INPUT_SENSE_KEYBOARD && type != Input::IT_KEYBOARD) store_new = false;
-    if(m_mode == INPUT_SENSE_GAMEPAD && type != Input::IT_STICKMOTION && type != Input::IT_STICKBUTTON) store_new = false;
-    
-    if(store_new)
+    if (m_mode == INPUT_SENSE_KEYBOARD && type != Input::IT_KEYBOARD)
     {
+        store_new = false;
+    }
+    if (m_mode == INPUT_SENSE_GAMEPAD  && type != Input::IT_STICKMOTION && type != Input::IT_STICKBUTTON)
+    {
+        store_new = false;
+    }
+
+#if INPUT_MODE_DEBUG
+    std::cout << (store_new ? "storing it" : "ignoring it") << "\n";
+#endif
+    
+    if (store_new)
+    {
+        
         m_sensed_input->type = type;
         m_sensed_input->deviceID = deviceID;
         m_sensed_input->btnID = btnID;
         m_sensed_input->axisDirection = axisDirection;
 
-        if(type == Input::IT_STICKMOTION)
+        if (type == Input::IT_KEYBOARD)
+        {
+            OptionsScreenInput::getInstance()->gotSensedInput(m_sensed_input);
+            return;
+        }
+        else if (type == Input::IT_STICKMOTION)
         {
             std::cout << "%% storing new axis binding, value=" << value <<
                     " deviceID=" << deviceID << " btnID=" << btnID << " axisDirection=" <<
                     (axisDirection == Input::AD_NEGATIVE ? "-" : "+") << "\n";
         }
-        else if(type == Input::IT_STICKBUTTON)
+        else if (type == Input::IT_STICKBUTTON)
         {
             std::cout << "%% storing new gamepad button binding value=" << value <<
             " deviceID=" << deviceID << " btnID=" << btnID << "\n";
@@ -214,7 +234,7 @@ void InputManager::inputSensing(Input::InputType type, int deviceID, int btnID,
             }
         }
         
-        if( type == Input::IT_STICKMOTION )
+        if (type == Input::IT_STICKMOTION)
         {
             // It is necessary to test both ids because the center position is always positive (0)
             const int input_id = axisDirection*50 + btnID;