Command history for Console

ChangeLog.md

@@ -2,6 +2,9 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20141015 ]
+    * Added rudimentary command history support for Console
+
     [ 20141011 ]
     * Added simple level loader unit test driver
     * Fixed the parsing bug in the new loader that sometimes caused strange hangs on level load

TODO.md

@@ -1,7 +1,5 @@
 # To-Do List
 
-* Console no longer has command history (arrow up, down)
-
 ## General
 
 * Move to newer OpenGL (GL ES or 2.1 or 3.x or 4.x?)

include/Console.h

@@ -8,16 +8,21 @@
 #ifndef _CONSOLE_H_
 #define _CONSOLE_H_
 
+#include <string>
+#include <vector>
+
 class Console {
 public:
     static void display();
 
 private:
     const static int bufferLength = 256;
-    static char buffer[bufferLength];
+    static char buffer[bufferLength + 1];
     static bool scrollToBottom;
     static bool focusInput;
     static unsigned long lastLogLength;
+    static std::vector<std::string> lastCommands;
+    static long lastCommandIndex;
 };
 
 #endif

src/Console.cpp

@@ -5,16 +5,20 @@
  * \author xythobuz
  */
 
+#include <cstring>
+
 #include "global.h"
 #include "Log.h"
 #include "UI.h"
 #include "commands/Command.h"
 #include "Console.h"
 
-char Console::buffer[bufferLength] = "";
+char Console::buffer[bufferLength + 1] = "";
 bool Console::scrollToBottom = false;
 bool Console::focusInput = false;
 unsigned long Console::lastLogLength = 0;
+std::vector<std::string> Console::lastCommands;
+long Console::lastCommandIndex = -1;
 
 void Console::display() {
     if (ImGui::Begin("Console", NULL, ImVec2(600, 400), -1.0f)) {
@@ -38,6 +42,41 @@ void Console::display() {
             focusInput = false;
         }
 
+        if (ImGui::GetWindowIsFocused()) {
+            ImGuiIO& io = ImGui::GetIO();
+            static bool hold = false;
+            bool update = false;
+
+            if ((!hold) && (io.KeysDown[upKey] || io.KeysDown[downKey]))
+                update = hold = true;
+
+            if (hold && (!(io.KeysDown[upKey] || io.KeysDown[downKey])))
+                hold = false;
+
+            if (update) {
+                if (io.KeysDown[upKey]) {
+                    if (lastCommandIndex < static_cast<long>(lastCommands.size() - 1))
+                        lastCommandIndex++;
+                }
+
+                if (io.KeysDown[downKey]) {
+                    if (lastCommandIndex > -1)
+                        lastCommandIndex--;
+                }
+
+                if ((lastCommandIndex >= 0) && (lastCommandIndex < lastCommands.size())) {
+                    strncpy(buffer,
+                            lastCommands.at(lastCommands.size() - 1 - lastCommandIndex).c_str(),
+                            bufferLength);
+                    buffer[bufferLength] = '\0';
+                } else {
+                    buffer[0] = '\0';
+                }
+
+                update = false;
+            }
+        }
+
         if (ImGui::InputText("Command", buffer, bufferLength,
                     ImGuiInputTextFlags_AutoSelectAll | ImGuiInputTextFlags_EnterReturnsTrue)) {
             getLog() << "> " << buffer << Log::endl;
@@ -45,6 +84,11 @@ void Console::display() {
             if (error != 0) {
                 getLog() << "Error code: " << error << Log::endl;
             }
+
+            if ((lastCommands.size() == 0) || (lastCommands[lastCommands.size() - 1] != buffer))
+                lastCommands.push_back(std::string(buffer));
+            lastCommandIndex = -1;
+
             buffer[0] = '\0';
             scrollToBottom = true;
             focusInput = true;

src/UI.cpp

@@ -94,8 +94,6 @@ void UI::eventsFinished() {
 
     ImGui::NewFrame();
 
-    bool clicked = !clickEvents.empty();
-
     if (!visible) {
         while (!clickEvents.empty()) {
             auto i = clickEvents.front();
@@ -124,10 +122,10 @@ void UI::eventsFinished() {
         }
     }
 
-    if ((!io.WantCaptureKeyboard) || (!visible)) {
-        while (!keyboardEvents.empty()) {
-            auto i = keyboardEvents.front();
+    while (!keyboardEvents.empty()) {
+        auto i = keyboardEvents.front();
 
+        if (!visible) {
             if (getMenu().isVisible()) {
                 getMenu().handleKeyboard(std::get<0>(i), std::get<1>(i));
             } else {
@@ -136,29 +134,42 @@ void UI::eventsFinished() {
                         getGame().handleAction((ActionEvents)n, !std::get<1>(i));
                 }
             }
+        }
 
-            if (std::get<1>(i)) {
+        if (std::get<1>(i)) {
+            if (!visible) {
                 if (getRunTime().getKeyBinding(menuAction) == std::get<0>(i)) {
                     getMenu().setVisible(!getMenu().isVisible());
-                    visible = false;
-                } else if (getRunTime().getKeyBinding(debugAction) == std::get<0>(i)) {
+                }
+            }
+
+            if ((!io.WantCaptureKeyboard) || (!visible)) {
+                if (getRunTime().getKeyBinding(debugAction) == std::get<0>(i)) {
                     if (!metaKeyIsActive)
                         visible = !visible;
                 }
             }
-
-            keyboardEvents.pop_front();
         }
+
+        keyboardEvents.pop_front();
     }
 
-    if ((!io.WantCaptureKeyboard) && (!io.WantCaptureMouse) && visible && clicked) {
-        visible = false;
+    bool clicked = !clickEvents.empty();
+    // Only already empty when !visible
+    if (visible) {
+        clickEvents.clear();
+        motionEvents.clear();
+        scrollEvents.clear();
     }
 
-    keyboardEvents.clear();
-    clickEvents.clear();
-    motionEvents.clear();
-    scrollEvents.clear();
+    if (visible && (
+                ((!io.WantCaptureKeyboard) && io.KeysDown[escapeKey])
+                || ((!io.WantCaptureMouse) && clicked)
+            )) {
+        visible = false;
+
+        getLog() << io.WantCaptureKeyboard << io.WantCaptureMouse << io.KeysDown[escapeKey] << Log::endl;
+    }
 
     if (getWindow().getTextInput() != visible)
         getWindow().setTextInput(visible);