From 8f3be5cd0544af07c6cb65bef7a1f3ba1a3704bb Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 9 Apr 2012 23:59:46 +0300
Subject: Fix asigning keys unknown for SDL. Allow full use of keys unknown for
 SDL (with press state also).

---
 src/inputmanager.cpp | 45 ++++++++++++++++++++++++++++-----------------
 1 file changed, 28 insertions(+), 17 deletions(-)

(limited to 'src/inputmanager.cpp')

diff --git a/src/inputmanager.cpp b/src/inputmanager.cpp
index b539c4bcf..3c73376df 100644
--- a/src/inputmanager.cpp
+++ b/src/inputmanager.cpp
@@ -156,7 +156,7 @@ void InputManager::store()
                         default:
                             break;
                     }
-                    if (key.value >= 0)
+                    if (key.value != -1)
                     {
                         if (keyStr.empty())
                         {
@@ -264,16 +264,17 @@ std::string InputManager::getKeyStringLong(int index) const
         const KeyItem &key = mKey[index].values[i];
         if (key.type == INPUT_KEYBOARD)
         {
+            std::string str;
             if (key.value >= 0)
+                str = keyboard.getKeyName(key.value);
+            else if (key.value < -1)
+                str = strprintf(_("key_%d"), -key.value);
+            if (!str.empty())
             {
-                std::string str = keyboard.getKeyName(key.value);
-                if (!str.empty())
-                {
-                    if (keyStr.empty())
-                        keyStr = str;
-                    else
-                        keyStr += std::string(" ") + str;
-                }
+                if (keyStr.empty())
+                    keyStr = str;
+                else
+                    keyStr += std::string(" ") + str;
             }
         }
     }
@@ -292,17 +293,22 @@ std::string InputManager::getKeyValueString(int index) const
         const KeyItem &key = mKey[index].values[i];
         if (key.type == INPUT_KEYBOARD)
         {
+            std::string str;
             if (key.value >= 0)
             {
-                std::string str = keyboard.getKeyShortString(
+                str = keyboard.getKeyShortString(
                     keyboard.getKeyName(key.value));
-                if (!str.empty())
-                {
-                    if (keyStr.empty())
-                        keyStr = str;
-                    else
-                        keyStr += std::string(" ") + str;
-                }
+            }
+            else if (key.value < -1)
+            {
+                str = strprintf(_("key_%d"), -key.value);
+            }
+            if (!str.empty())
+            {
+                if (keyStr.empty())
+                    keyStr = str;
+                else
+                    keyStr += std::string(" ") + str;
             }
         }
     }
@@ -382,6 +388,7 @@ bool InputManager::handleEvent(const SDL_Event &event)
         if (handleAssignKey(event))
             return true;
 
+        keyboard.handleActicateKey(event);
         // send straight to gui for certain windows
         if (quitDialog || TextDialog::isActive() ||
             NpcPostDialog::isActive())
@@ -401,6 +408,10 @@ bool InputManager::handleEvent(const SDL_Event &event)
             return true;
         }
     }
+    else if (event.type == SDL_KEYUP)
+    {
+        keyboard.handleDeActicateKey(event);
+    }
 
     try
     {
-- 
cgit v1.2.3-70-g09d2