Port from git

Source/Control/UserInput.cpp

@@ -0,0 +1,78 @@
+/* This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code package.
+ */
+#include "UserInput.h"
+#include "../Database/Configuration.h"
+#include "../Utility/Log.h"
+
+UserInput::UserInput(Configuration *c)
+: Config(c)
+{
+}
+
+UserInput::~UserInput()
+{
+}
+
+bool UserInput::Initialize()
+{
+   bool retVal = true;
+
+   retVal = MapKey("nextItem", KeyCodeNextItem) && retVal;
+   retVal = MapKey("previousItem", KeyCodePreviousItem) && retVal;
+   retVal = MapKey("pageDown", KeyCodePageDown) && retVal;
+   retVal = MapKey("pageUp", KeyCodePageUp) && retVal;
+   retVal = MapKey("select", KeyCodeSelect) && retVal;
+   retVal = MapKey("back", KeyCodeBack) && retVal;
+   retVal = MapKey("quit", KeyCodeQuit) && retVal;
+   // these features will need to be implemented at a later time
+//   retVal = MapKey("admin", KeyCodeAdminMode) && retVal;
+//   retVal = MapKey("remove", KeyCodeHideItem) && retVal;
+
+   return retVal;
+}
+
+SDL_Scancode UserInput::GetScancode(KeyCode_E key)
+{
+   SDL_Scancode scancode = SDL_SCANCODE_UNKNOWN;
+   std::map<KeyCode_E, SDL_Scancode>::iterator it = KeyMap.find(key);
+
+   if(it != KeyMap.end())
+   {
+      scancode = it->second;
+   }
+
+   return scancode;
+}
+
+
+bool UserInput::MapKey(std::string keyDescription, KeyCode_E key)
+{
+   bool retVal = false;
+   SDL_Scancode scanCode;
+   std::string description;
+
+   std::string configKey = "controls." + keyDescription;
+
+   if(!Config->GetProperty(configKey, description))
+   {
+      Logger::Write(Logger::ZONE_ERROR, "Configuration", "Missing property " + configKey);
+   }
+   else
+   {
+      scanCode = SDL_GetScancodeFromName(description.c_str());
+
+      if(scanCode == SDL_SCANCODE_UNKNOWN)
+      {
+         Logger::Write(Logger::ZONE_ERROR, "Configuration", "Unsupported property value for " + configKey + "(" + description + "). See Documentation/Keycodes.txt for valid inputs");
+      }
+      else
+      {
+         KeyMap[key] = scanCode;
+         retVal = true;
+      }
+   }
+
+   return retVal;
+}
+

Source/Control/UserInput.h

@@ -0,0 +1,38 @@
+/* This file is subject to the terms and conditions defined in
+ * file 'LICENSE.txt', which is part of this source code package.
+ */
+#pragma once
+#include <map>
+#include <SDL2/SDL.h>
+#include <string>
+
+class Configuration;
+
+class UserInput
+{
+public:
+   enum KeyCode_E
+   {
+      KeyCodeNextItem,
+      KeyCodePreviousItem,
+      KeyCodeSelect,
+      KeyCodeBack,
+      KeyCodePageDown,
+      KeyCodePageUp,
+      KeyCodeAdminMode,
+      KeyCodeHideItem,
+      KeyCodeQuit
+   };
+
+   UserInput(Configuration *c);
+   virtual ~UserInput();
+   bool Initialize();
+   SDL_Scancode GetScancode(KeyCode_E key);
+
+
+private:
+   bool MapKey(std::string keyDescription, KeyCode_E key);
+   std::map<KeyCode_E, SDL_Scancode> KeyMap;
+
+   Configuration *Config;
+};