Added some more commands

ChangeLog.md

@@ -2,6 +2,12 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140829 ]
+    * Moved key/action/string comparison functions into CommandBind
+    * Added Renderflag command to toggle all flags in Render
+    * Reimplemented pigtail and ponypos commands. Now all commands
+      that were commented-out are back.
+
     [ 20140827 ]
     * Rewrote command system. Each command is now a unique class.
 

include/commands/CommandBind.h

@@ -10,7 +10,17 @@
 
 #include "commands/Command.h"
 
-DECLARE_SIMPLE_CMD(CommandBind);
+class CommandBind : public Command {
+public:
+    virtual std::string name();
+    virtual std::string brief();
+    virtual void printHelp();
+    virtual int execute(std::istream& args);
+
+private:
+    ActionEvents stringToActionEvent(std::string action);
+    KeyboardButton stringToKeyboardButton(std::string key);
+};
 
 #endif
 

include/commands/CommandGame.h

@@ -14,5 +14,9 @@ DECLARE_SIMPLE_CMD_NO_HELP(CommandPos);
 
 DECLARE_SIMPLE_CMD_NO_HELP(CommandViewmodel);
 
+DECLARE_SIMPLE_CMD_NO_HELP(CommandPigtail);
+
+DECLARE_SIMPLE_CMD_NO_HELP(CommandPonypos);
+
 #endif
 

include/commands/CommandRender.h

@@ -12,9 +12,16 @@
 
 DECLARE_SIMPLE_CMD(CommandMode);
 
-DECLARE_SIMPLE_CMD_NO_HELP(CommandFog);
+class CommandRenderflag : public Command {
+public:
+    virtual std::string name();
+    virtual std::string brief();
+    virtual void printHelp();
+    virtual int execute(std::istream& args);
 
-DECLARE_SIMPLE_CMD_NO_HELP(CommandLight);
+private:
+    int stringToFlag(std::string flag);
+};
 
 #endif
 

include/global.h

@@ -80,10 +80,6 @@ typedef enum {
     unknownKey // Should always be at the end
 } KeyboardButton;
 
-ActionEvents stringToActionEvent(const char *action);
-
-KeyboardButton stringToKeyboardButton(const char *key);
-
 // Visual C++ does not understand __attribute__
 #ifdef _MSC_VER
 #define __attribute__(x)

src/OpenRaider.cpp

@@ -51,11 +51,12 @@ OpenRaider::OpenRaider() {
     commands.push_back(std::shared_ptr<Command>(new CommandAnimate()));
     commands.push_back(std::shared_ptr<Command>(new CommandMove()));
     commands.push_back(std::shared_ptr<Command>(new CommandMode()));
-    commands.push_back(std::shared_ptr<Command>(new CommandFog()));
-    commands.push_back(std::shared_ptr<Command>(new CommandLight()));
+    commands.push_back(std::shared_ptr<Command>(new CommandRenderflag()));
     commands.push_back(std::shared_ptr<Command>(new CommandSound()));
     commands.push_back(std::shared_ptr<Command>(new CommandPos()));
     commands.push_back(std::shared_ptr<Command>(new CommandViewmodel()));
+    commands.push_back(std::shared_ptr<Command>(new CommandPigtail()));
+    commands.push_back(std::shared_ptr<Command>(new CommandPonypos()));
     commands.push_back(std::shared_ptr<Command>(new CommandQuit()));
 }
 

src/commands/CommandBind.cpp

@@ -61,3 +61,158 @@ int CommandBind::execute(std::istream& args) {
     }
 }
 
+ActionEvents CommandBind::stringToActionEvent(std::string action) {
+    if (action == "menu") {
+        return menuAction;
+    } else if (action == "console") {
+        return consoleAction;
+    } else if (action == "forward") {
+        return forwardAction;
+    } else if (action == "backward") {
+        return backwardAction;
+    } else if (action == "left") {
+        return leftAction;
+    } else if (action == "right") {
+        return rightAction;
+    } else if (action == "jump") {
+        return jumpAction;
+    } else if (action == "crouch") {
+        return crouchAction;
+    } else if (action == "use") {
+        return useAction;
+    } else if (action == "holster") {
+        return holsterAction;
+    } else if (action == "walk") {
+        return walkAction;
+    } else {
+        return ActionEventCount;
+    }
+}
+
+KeyboardButton CommandBind::stringToKeyboardButton(std::string key) {
+    if ((key.length() == 3) && (key[0] == '\'') && (key[2] == '\'')) {
+        // Literal character like w, a, s, d, 0, 1...
+        char c = key[1];
+        if (((c >= '0') && (c <= '9'))
+            || ((c >= 'a') && (c <= 'z')))
+            return (KeyboardButton)c;
+    } else if ((key.length() >= 3) && (key[0] == '\"') && (key[key.length() - 1] == '\"')) {
+        // Special characters like tilde, esc, quote...
+        key.erase(key.length() - 1); // Delete " at end
+        key.erase(0, 1); // Delete " at beginning
+        if (key == "quote") {
+            return quoteKey;
+        } else if (key == "backslash") {
+            return backslashKey;
+        } else if (key == "backspace") {
+            return backspaceKey;
+        } else if (key == "capslock") {
+            return capslockKey;
+        } else if (key == "comma") {
+            return commaKey;
+        } else if (key == "del") {
+            return delKey;
+        } else if (key == "up") {
+            return upKey;
+        } else if (key == "down") {
+            return downKey;
+        } else if (key == "left") {
+            return leftKey;
+        } else if (key == "right") {
+            return rightKey;
+        } else if (key == "end") {
+            return endKey;
+        } else if (key == "equals") {
+            return equalsKey;
+        } else if (key == "escape") {
+            return escapeKey;
+        } else if (key == "f1") {
+            return f1Key;
+        } else if (key == "f2") {
+            return f2Key;
+        } else if (key == "f3") {
+            return f3Key;
+        } else if (key == "f4") {
+            return f4Key;
+        } else if (key == "f5") {
+            return f5Key;
+        } else if (key == "f6") {
+            return f6Key;
+        } else if (key == "f7") {
+            return f7Key;
+        } else if (key == "f8") {
+            return f8Key;
+        } else if (key == "f9") {
+            return f9Key;
+        } else if (key == "f10") {
+            return f10Key;
+        } else if (key == "f11") {
+            return f11Key;
+        } else if (key == "f12") {
+            return f12Key;
+        } else if (key == "backquote") {
+            return backquoteKey;
+        } else if (key == "home") {
+            return homeKey;
+        } else if (key == "insert") {
+            return insertKey;
+        } else if (key == "leftalt") {
+            return leftaltKey;
+        } else if (key == "leftctrl") {
+            return leftctrlKey;
+        } else if (key == "leftbracket") {
+            return leftbracketKey;
+        } else if (key == "leftgui") {
+            return leftguiKey;
+        } else if (key == "leftshift") {
+            return leftshiftKey;
+        } else if (key == "minus") {
+            return minusKey;
+        } else if (key == "numlock") {
+            return numlockKey;
+        } else if (key == "pagedown") {
+            return pagedownKey;
+        } else if (key == "pageup") {
+            return pageupKey;
+        } else if (key == "pause") {
+            return pauseKey;
+        } else if (key == "dot") {
+            return dotKey;
+        } else if (key == "rightalt") {
+            return rightaltKey;
+        } else if (key == "rightctrl") {
+            return rightctrlKey;
+        } else if (key == "enter") {
+            return enterKey;
+        } else if (key == "rightgui") {
+            return rightguiKey;
+        } else if (key == "rightbracket") {
+            return rightbracketKey;
+        } else if (key == "rightshift") {
+            return rightshiftKey;
+        } else if (key == "scrolllock") {
+            return scrolllockKey;
+        } else if (key == "semicolon") {
+            return semicolonKey;
+        } else if (key == "slash") {
+            return slashKey;
+        } else if (key == "space") {
+            return spaceKey;
+        } else if (key == "tab") {
+            return tabKey;
+        } else if (key == "leftmouse") {
+            return leftmouseKey;
+        } else if (key == "middlemouse") {
+            return middlemouseKey;
+        } else if (key == "rightmouse") {
+            return rightmouseKey;
+        } else if (key == "fourthmouse") {
+            return fourthmouseKey;
+        } else if (key == "fifthmouse") {
+            return fifthmouseKey;
+        }
+    }
+
+    return unknownKey;
+}
+

src/commands/CommandGame.cpp

@@ -61,3 +61,58 @@ int CommandViewmodel::execute(std::istream& args) {
     }
 }
 
+// --------------------------------------
+
+std::string CommandPigtail::name() {
+    return "pigtail";
+}
+
+std::string CommandPigtail::brief() {
+    return "BOOL";
+}
+
+int CommandPigtail::execute(std::istream& args) {
+    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+        getConsole() << "Use pigtail command interactively!" << Console::endl;
+        return -1;
+    }
+
+    bool b;
+    args >> b;
+    if (!args) {
+        getConsole() << "Pass BOOL to pigtail command!" << Console::endl;
+        return -2;
+    }
+
+    getGame().getLara().getModel().setPigTail(b);
+    getConsole() << "Pigtail is now " << (b ? "on" : "off") << Console::endl;
+    return 0;
+}
+
+// --------------------------------------
+
+std::string CommandPonypos::name() {
+    return "ponypos";
+}
+
+std::string CommandPonypos::brief() {
+    return "FLOAT FLOAT FLOAT FLOAT - x y z angle";
+}
+
+int CommandPonypos::execute(std::istream& args) {
+    if ((!getOpenRaider().mRunning) || (!getGame().isLoaded())) {
+        getConsole() << "Use ponypos command interactively!" << Console::endl;
+        return -1;
+    }
+
+    float a, b, c, d;
+    args >> a >> b >> c >> d;
+    if (!args) {
+        getConsole() << "Pass four FLOATs to ponypos command!" << Console::endl;
+        return -2;
+    }
+
+    getGame().getLara().getModel().setPonyPos(a, b, c, d);
+    return 0;
+}
+

src/commands/CommandRender.cpp

@@ -8,6 +8,7 @@
 #include "global.h"
 #include "Console.h"
 #include "Game.h"
+#include "OpenRaider.h"
 #include "Render.h"
 #include "commands/CommandRender.h"
 
@@ -65,55 +66,67 @@ int CommandMode::execute(std::istream& args) {
 
 // --------------------------------------
 
-std::string CommandFog::name() {
-    return "fog";
+std::string CommandRenderflag::name() {
+    return "renderflag";
 }
 
-std::string CommandFog::brief() {
-    return "BOOL - GL Fog";
+std::string CommandRenderflag::brief() {
+    return "STRING BOOL - Toggle Render flag";
 }
 
-int CommandFog::execute(std::istream& args) {
-    bool b;
-    args >> b;
-    if (!args) {
-        getConsole() << "Pass BOOL to fog command!" << Console::endl;
+void CommandRenderflag::printHelp() {
+    getConsole() << "renderflag-Command Usage:" << Console::endl;
+    getConsole() << "  renderflag STRING BOOL" << Console::endl;
+    getConsole() << "Where STRING is one of the following:" << Console::endl;
+    getConsole() << "  ralpha" << Console::endl;
+    getConsole() << "  entmodel" << Console::endl;
+    getConsole() << "  fog" << Console::endl;
+    getConsole() << "  light" << Console::endl;
+    getConsole() << "  ponytail" << Console::endl;
+}
+
+int CommandRenderflag::execute(std::istream& args) {
+    if (!getOpenRaider().mRunning) {
+        getConsole() << "Use renderflag-Command interactively!" << Console::endl;
         return -1;
     }
 
-    if (b)
-        getRender().setFlags(Render::fFog);
-    else
-        getRender().clearFlags(Render::fFog);
-
-    getConsole() << "Fog is now " << (b ? "on" : "off") << Console::endl;
-    return 0;
-}
+    std::string flag;
+    bool b;
+    args >> flag >> b;
+    if (!args) {
+        getConsole() << "Pass STRING and BOOL to renderflag command!" << Console::endl;
+        return -2;
+    }
 
-// --------------------------------------
+    int f = stringToFlag(flag);
+    if (f == -1) {
+        getConsole() << "Unknown flag \"" << flag << "\"!" << Console::endl;
+        return -3;
+    }
 
-std::string CommandLight::name() {
-    return "light";
-}
+    if (b) {
+        getRender().setFlags((unsigned int)f);
+    } else {
+        getRender().clearFlags((unsigned int)f);
+    }
 
-std::string CommandLight::brief() {
-    return "BOOL - GL Lights";
+    return 0;
 }
 
-int CommandLight::execute(std::istream& args) {
-    bool b;
-    args >> b;
-    if (!args) {
-        getConsole() << "Pass BOOL to light command!" << Console::endl;
+int CommandRenderflag::stringToFlag(std::string flag) {
+    if (flag == "ralpha") {
+        return Render::fRoomAlpha;
+    } else if (flag == "entmodel") {
+        return Render::fEntityModels;
+    } else if (flag == "fog") {
+        return Render::fFog;
+    } else if (flag == "light") {
+        return Render::fGL_Lights;
+    } else if (flag == "ponytail") {
+        return Render::fRenderPonytail;
+    } else {
         return -1;
     }
-
-    if (b)
-        getRender().setFlags(Render::fGL_Lights);
-    else
-        getRender().clearFlags(Render::fGL_Lights);
-
-    getConsole() << "GL-Lights are now " << (b ? "on" : "off") << Console::endl;
-    return 0;
 }
 

src/commands/OldCommands.cpp

@@ -1,161 +0,0 @@
-/*!
- * \file src/Command.cpp
- * \brief OpenRaider command implementation
- *
- * \author xythobuz
- */
-
-#include <fstream>
-#include <sstream>
-
-#include "global.h"
-#include "Camera.h"
-#include "Console.h"
-#include "Entity.h"
-#include "Font.h"
-#include "Game.h"
-#include "math/math.h"
-#include "Menu.h"
-#include "Render.h"
-#include "Sound.h"
-#include "TombRaider.h"
-#include "Window.h"
-#include "World.h"
-#include "utils/strings.h"
-#include "utils/time.h"
-#include "OpenRaider.h"
-
-int OpenRaider::command(std::string c) {
-    // Remove comment, if any
-    size_t comment = c.find_first_of('#');
-    if (comment != std::string::npos)
-        c.erase(comment);
-
-    // Execute command
-    std::stringstream command(c);
-    std::string cmd;
-    command >> cmd;
-    command >> std::boolalpha >> std::ws;
-
-    if (cmd.length() == 0)
-        return 0;
-
-    if (cmd.compare("help") == 0) {
-        std::string tmp;
-        if (!(command >> tmp)) {
-/*
-            getConsole() << "  ralpha    - BOOL - Room Alpha" << Console::endl;
-            getConsole() << "  upf       - BOOL - Update Room List Per Frame" << Console::endl;
-            getConsole() << "  entmodel  - BOOL" << Console::endl;
-            getConsole() << "  ponytail  - BOOL" << Console::endl;
-            getConsole() << "  pigtail   - BOOL" << Console::endl;
-            getConsole() << "  ponypos   - FLOAT FLOAT FLOAT FLOAT - x y z angle" << Console::endl;
-*/
-        } else {
-            return help(tmp);
-        }
-/*
-    } else if (cmd.compare("ralpha") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to ralpha command!");
-                return -24;
-            }
-            if (b)
-                getRender().setFlags(Render::fRoomAlpha);
-            else
-                getRender().clearFlags(Render::fRoomAlpha);
-            getConsole().print("Room Alpha is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of ralpha-command!");
-            return -25;
-        }
-    } else if (cmd.compare("upf") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to upf command!");
-                return -30;
-            }
-            if (b)
-                getRender().setFlags(Render::fUpdateRoomListPerFrame);
-            else
-                getRender().clearFlags(Render::fUpdateRoomListPerFrame);
-            getConsole().print("URLPF is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of upf-command!");
-            return -31;
-        }
-    } else if (cmd.compare("entmodel") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to entmodel command!");
-                return -38;
-            }
-            if (b)
-                getRender().setFlags(Render::fEntityModels);
-            else
-                getRender().clearFlags(Render::fEntityModels);
-            getConsole().print("Entmodels are now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of entmodel-command!");
-            return -39;
-        }
-    } else if (cmd.compare("ponytail") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to ponytail command!");
-                return -44;
-            }
-            if (b)
-                getRender().setFlags(Render::fRenderPonytail);
-            else
-                getRender().clearFlags(Render::fRenderPonytail);
-            getConsole().print("Ponytail is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of ponytail-command!");
-            return -45;
-        }
-    } else if (cmd.compare("pigtail") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole().print("Use pigtail command interactively!");
-            return -999;
-        }
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to pigtail command!");
-                return -46;
-            }
-            SkeletalModel &tmp = getGame().getLara().getModel();
-            tmp.setPigTail(b);
-            getConsole().print("Pigtail is now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of pigtail-command!");
-            return -47;
-        }
-    } else if (cmd.compare("ponypos") == 0) {
-        if ((!mRunning) || (!getGame().isLoaded())) {
-            getConsole().print("Use ponypos command interactively!");
-            return -999;
-        }
-        if (args->size() > 3) {
-            SkeletalModel &tmp = getGame().getLara().getModel();
-            tmp.setPonyPos((float)atof(args->at(0)), (float)atof(args->at(1)),
-                    (float)atof(args->at(2)), (float)atof(args->at(3)));
-        } else {
-            getConsole().print("Invalid use of ponypos-command!");
-            return -48;
-        }
-*/
-    } else {
-        getConsole() << "Unknown command: " << cmd.c_str() << Console::endl;
-        return -50;
-    }
-
-    return 0;
-}
-

src/main.cpp

@@ -152,217 +152,6 @@ int main(int argc, char *argv[]) {
     return 0;
 }
 
-ActionEvents stringToActionEvent(const char *action) {
-    if (strcmp(action, "menu") == 0) {
-        return menuAction;
-    } else if (strcmp(action, "console") == 0) {
-        return consoleAction;
-    } else if (strcmp(action, "forward") == 0) {
-        return forwardAction;
-    } else if (strcmp(action, "backward") == 0) {
-        return backwardAction;
-    } else if (strcmp(action, "left") == 0) {
-        return leftAction;
-    } else if (strcmp(action, "right") == 0) {
-        return rightAction;
-    } else if (strcmp(action, "jump") == 0) {
-        return jumpAction;
-    } else if (strcmp(action, "crouch") == 0) {
-        return crouchAction;
-    } else if (strcmp(action, "use") == 0) {
-        return useAction;
-    } else if (strcmp(action, "holster") == 0) {
-        return holsterAction;
-    } else if (strcmp(action, "walk") == 0) {
-        return walkAction;
-    } else {
-        return ActionEventCount;
-    }
-}
-
-KeyboardButton stringToKeyboardButton(const char *key) {
-    size_t length = strlen(key);
-    if ((key[0] == '\'') && (key[length - 1] == '\'') && (length == 3)) {
-        // Literal character like w, a, s, d, 0, 1...
-        char c = key[1];
-        if (((c >= '0') && (c <= '9'))
-            || ((c >= 'a') && (c <= 'z')))
-            return (KeyboardButton)c;
-    } else if ((key[0] == '\"') && (key[length - 1] == '\"')) {
-        // Special characters like tilde, esc, quote...
-        char *tmp = stringRemoveQuotes(key);
-        if (strcmp(tmp, "quote") == 0) {
-            delete [] tmp;
-            return quoteKey;
-        } else if (strcmp(tmp, "backslash") == 0) {
-            delete [] tmp;
-            return backslashKey;
-        } else if (strcmp(tmp, "backspace") == 0) {
-            delete [] tmp;
-            return backspaceKey;
-        } else if (strcmp(tmp, "capslock") == 0) {
-            delete [] tmp;
-            return capslockKey;
-        } else if (strcmp(tmp, "comma") == 0) {
-            delete [] tmp;
-            return commaKey;
-        } else if (strcmp(tmp, "del") == 0) {
-            delete [] tmp;
-            return delKey;
-        } else if (strcmp(tmp, "up") == 0) {
-            delete [] tmp;
-            return upKey;
-        } else if (strcmp(tmp, "down") == 0) {
-            delete [] tmp;
-            return downKey;
-        } else if (strcmp(tmp, "left") == 0) {
-            delete [] tmp;
-            return leftKey;
-        } else if (strcmp(tmp, "right") == 0) {
-            delete [] tmp;
-            return rightKey;
-        } else if (strcmp(tmp, "end") == 0) {
-            delete [] tmp;
-            return endKey;
-        } else if (strcmp(tmp, "equals") == 0) {
-            delete [] tmp;
-            return equalsKey;
-        } else if (strcmp(tmp, "escape") == 0) {
-            delete [] tmp;
-            return escapeKey;
-        } else if (strcmp(tmp, "f1") == 0) {
-            delete [] tmp;
-            return f1Key;
-        } else if (strcmp(tmp, "f2") == 0) {
-            delete [] tmp;
-            return f2Key;
-        } else if (strcmp(tmp, "f3") == 0) {
-            delete [] tmp;
-            return f3Key;
-        } else if (strcmp(tmp, "f4") == 0) {
-            delete [] tmp;
-            return f4Key;
-        } else if (strcmp(tmp, "f5") == 0) {
-            delete [] tmp;
-            return f5Key;
-        } else if (strcmp(tmp, "f6") == 0) {
-            delete [] tmp;
-            return f6Key;
-        } else if (strcmp(tmp, "f7") == 0) {
-            delete [] tmp;
-            return f7Key;
-        } else if (strcmp(tmp, "f8") == 0) {
-            delete [] tmp;
-            return f8Key;
-        } else if (strcmp(tmp, "f9") == 0) {
-            delete [] tmp;
-            return f9Key;
-        } else if (strcmp(tmp, "f10") == 0) {
-            delete [] tmp;
-            return f10Key;
-        } else if (strcmp(tmp, "f11") == 0) {
-            delete [] tmp;
-            return f11Key;
-        } else if (strcmp(tmp, "f12") == 0) {
-            delete [] tmp;
-            return f12Key;
-        } else if (strcmp(tmp, "backquote") == 0) {
-            delete [] tmp;
-            return backquoteKey;
-        } else if (strcmp(tmp, "home") == 0) {
-            delete [] tmp;
-            return homeKey;
-        } else if (strcmp(tmp, "insert") == 0) {
-            delete [] tmp;
-            return insertKey;
-        } else if (strcmp(tmp, "leftalt") == 0) {
-            delete [] tmp;
-            return leftaltKey;
-        } else if (strcmp(tmp, "leftctrl") == 0) {
-            delete [] tmp;
-            return leftctrlKey;
-        } else if (strcmp(tmp, "leftbracket") == 0) {
-            delete [] tmp;
-            return leftbracketKey;
-        } else if (strcmp(tmp, "leftgui") == 0) {
-            delete [] tmp;
-            return leftguiKey;
-        } else if (strcmp(tmp, "leftshift") == 0) {
-            delete [] tmp;
-            return leftshiftKey;
-        } else if (strcmp(tmp, "minus") == 0) {
-            delete [] tmp;
-            return minusKey;
-        } else if (strcmp(tmp, "numlock") == 0) {
-            delete [] tmp;
-            return numlockKey;
-        } else if (strcmp(tmp, "pagedown") == 0) {
-            delete [] tmp;
-            return pagedownKey;
-        } else if (strcmp(tmp, "pageup") == 0) {
-            delete [] tmp;
-            return pageupKey;
-        } else if (strcmp(tmp, "pause") == 0) {
-            delete [] tmp;
-            return pauseKey;
-        } else if (strcmp(tmp, "dot") == 0) {
-            delete [] tmp;
-            return dotKey;
-        } else if (strcmp(tmp, "rightalt") == 0) {
-            delete [] tmp;
-            return rightaltKey;
-        } else if (strcmp(tmp, "rightctrl") == 0) {
-            delete [] tmp;
-            return rightctrlKey;
-        } else if (strcmp(tmp, "enter") == 0) {
-            delete [] tmp;
-            return enterKey;
-        } else if (strcmp(tmp, "rightgui") == 0) {
-            delete [] tmp;
-            return rightguiKey;
-        } else if (strcmp(tmp, "rightbracket") == 0) {
-            delete [] tmp;
-            return rightbracketKey;
-        } else if (strcmp(tmp, "rightshift") == 0) {
-            delete [] tmp;
-            return rightshiftKey;
-        } else if (strcmp(tmp, "scrolllock") == 0) {
-            delete [] tmp;
-            return scrolllockKey;
-        } else if (strcmp(tmp, "semicolon") == 0) {
-            delete [] tmp;
-            return semicolonKey;
-        } else if (strcmp(tmp, "slash") == 0) {
-            delete [] tmp;
-            return slashKey;
-        } else if (strcmp(tmp, "space") == 0) {
-            delete [] tmp;
-            return spaceKey;
-        } else if (strcmp(tmp, "tab") == 0) {
-            delete [] tmp;
-            return tabKey;
-        } else if (strcmp(tmp, "leftmouse") == 0) {
-            delete [] tmp;
-            return leftmouseKey;
-        } else if (strcmp(tmp, "middlemouse") == 0) {
-            delete [] tmp;
-            return middlemouseKey;
-        } else if (strcmp(tmp, "rightmouse") == 0) {
-            delete [] tmp;
-            return rightmouseKey;
-        } else if (strcmp(tmp, "fourthmouse") == 0) {
-            delete [] tmp;
-            return fourthmouseKey;
-        } else if (strcmp(tmp, "fifthmouse") == 0) {
-            delete [] tmp;
-            return fifthmouseKey;
-        }
-        delete [] tmp;
-    }
-
-    return unknownKey;
-}
-
 #endif // UNIT_TEST
 
 #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && defined(HAVE_BACKTRACE_SYMBOLS)