Added mouse scrolling support.

Used in Console to scroll the history.

include/Console.h

@@ -41,6 +41,8 @@ public:
 
     void handleText(char *text, bool notFinished);
 
+    void handleMouseScroll(int xrel, int yrel);
+
 private:
 
     void moveInHistory(bool up);
@@ -54,6 +56,8 @@ private:
     size_t mHistoryPointer;
     std::vector<char *> mCommandHistory;
     char *mUnfinishedInput;
+
+    unsigned int mLineOffset;
 };
 
 #endif

include/OpenRaider.h

@@ -66,6 +66,8 @@ public:
 
     void handleMouseMotion(int xrel, int yrel);
 
+    void handleMouseScroll(int xrel, int yrel);
+
     Window *mWindow;
     Sound *mSound;
     Menu *mMenu;

include/utils/strings.h

@@ -16,8 +16,6 @@ char *stringRemoveQuotes(const char *s);
 
 char *stringReplace(const char *s, const char *search, const char *replace);
 
-void printStringVector(std::vector<char *> *args);
-
 int readBool(const char *value, bool *var);
 
 /*!

src/Console.cpp

@@ -29,6 +29,7 @@ Console::Console() {
     mPartialInput = NULL;
     mHistoryPointer = 0;
     mUnfinishedInput = NULL;
+    mLineOffset = 0;
 }
 
 Console::~Console() {
@@ -77,6 +78,16 @@ void Console::print(const char *s, ...) {
     }
 }
 
+#define LINE_GEOMETRY(window) unsigned int firstLine = 35; \
+        unsigned int lastLine = (window->mHeight / 2) - 55; \
+        unsigned int inputLine = (window->mHeight / 2) - 30; \
+        unsigned int lineSteps = 20; \
+        unsigned int lineCount = (lastLine - firstLine + lineSteps) / lineSteps; \
+        while (((lineCount * lineSteps) + firstLine) < inputLine) { \
+            lineSteps++; \
+            lineCount = (lastLine - firstLine + lineSteps) / lineSteps; \
+        }
+
 void Console::display() {
     Window *window = gOpenRaider->mWindow;
     unsigned char color[4] = {0xFF, 0xFF, 0xFF, 0xFF};
@@ -84,15 +95,7 @@ void Console::display() {
     if (mVisible) {
         // Calculate line drawing geometry
         // Depends on window height, so recalculate every time
-        unsigned int firstLine = 35;
-        unsigned int lastLine = (window->mHeight / 2) - 55;
-        unsigned int inputLine = (window->mHeight / 2) - 30;
-        unsigned int lineSteps = 20;
-        unsigned int lineCount = (lastLine - firstLine + lineSteps) / lineSteps;
-        while (((lineCount * lineSteps) + firstLine) < inputLine) {
-            lineSteps++;
-            lineCount = (lastLine - firstLine + lineSteps) / lineSteps;
-        }
+        LINE_GEOMETRY(window);
 
         // Draw half-transparent *overlay*
         glColor4f(0.0f, 0.0f, 0.0f, 0.5f);
@@ -100,7 +103,15 @@ void Console::display() {
         glRecti(0, 0, window->mWidth, window->mHeight / 2);
         glEnable(GL_TEXTURE_2D);
 
-        gOpenRaider->mWindow->drawText(10, 10, 0.70f, color, "%s uptime %lus", VERSION, systemTimerGet() / 1000);
+        int scrollIndicator;
+        if (mHistory.size() > lineCount) {
+            scrollIndicator = (mHistory.size() - lineCount - mLineOffset) * 100 / (mHistory.size() - lineCount);
+        } else {
+            scrollIndicator = 100;
+        }
+
+        gOpenRaider->mWindow->drawText(10, 10, 0.70f, color,
+                "%s uptime %lus scroll %d%%", VERSION, systemTimerGet() / 1000, scrollIndicator);
 
         // Draw output log
         int end = lineCount;
@@ -114,7 +125,7 @@ void Console::display() {
         }
         for (int i = 0; i < end; i++) {
             gOpenRaider->mWindow->drawText(10, ((i + drawOffset) * lineSteps) + firstLine,
-                    0.75f, color, "%s", mHistory[i + historyOffset]);
+                    0.75f, color, "%s", mHistory[i + historyOffset - mLineOffset]);
         }
 
         // Draw current input
@@ -135,6 +146,8 @@ void Console::handleKeyboard(KeyboardButton key, bool pressed) {
             mHistory.push_back(bufferString("> %s", mInputBuffer));
             mCommandHistory.push_back(bufferString("%s", mInputBuffer));
             gOpenRaider->command(mInputBuffer);
+        } else {
+            mHistory.push_back(bufferString("> "));
         }
 
         // Clear partial and input buffer
@@ -200,6 +213,9 @@ void Console::moveInHistory(bool up) {
 void Console::handleText(char *text, bool notFinished) {
     //printf("Text: %s (%s)\n", text, (notFinished ? "not finished" : "finished"));
 
+    // Always scroll to bottom when text input is received
+    mLineOffset = 0;
+
     if (!notFinished) {
         // Finished entering character
         // delete previous partial character, if present
@@ -228,3 +244,19 @@ void Console::handleText(char *text, bool notFinished) {
     }
 }
 
+void Console::handleMouseScroll(int xrel, int yrel) {
+    LINE_GEOMETRY(gOpenRaider->mWindow);
+
+    if (mHistory.size() > lineCount) {
+        if (yrel > 0) {
+            if (mLineOffset < (mHistory.size() - lineCount)) {
+                mLineOffset++;
+            }
+        } else if (yrel < 0) {
+            if (mLineOffset > 0) {
+                mLineOffset--;
+            }
+        }
+    }
+}
+

src/OpenRaider.cpp

@@ -133,8 +133,6 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
     if (strcmp(command, "set") == 0) {
         if (args->size() != 2) {
             mConsole->print("Invalid use of set-command ");
-            printStringVector(args);
-            printf("\n");
             return -2;
         } else {
             return set(args->at(0), args->at(1));
@@ -142,8 +140,6 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
     } else if (strcmp(command, "bind") == 0) {
         if (args->size() != 2) {
             mConsole->print("Invalid use of bind-command ");
-            printStringVector(args);
-            printf("\n");
             return -3;
         } else {
             return bind(args->at(0), args->at(1));
@@ -162,14 +158,10 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             return help(args->at(0));
         } else {
             mConsole->print("Invalid use of help-command ");
-            printStringVector(args);
-            printf("\n");
             return -4;
         }
     } else {
         mConsole->print("Unknown command: %s ", command);
-        printStringVector(args);
-        printf("\n");
         return -1;
     }
 
@@ -660,3 +652,9 @@ void OpenRaider::handleMouseMotion(int xrel, int yrel) {
 
 }
 
+void OpenRaider::handleMouseScroll(int xrel, int yrel) {
+    if ((mConsole->isVisible()) && (!mMenu->isVisible())) {
+        mConsole->handleMouseScroll(xrel, yrel);
+    }
+}
+

src/WindowSDL.cpp

@@ -197,6 +197,10 @@ void WindowSDL::eventHandling() {
                 gOpenRaider->handleMouseClick(event.button.x, event.button.y, button, (event.type == SDL_MOUSEBUTTONUP));
                 break;
 
+            case SDL_MOUSEWHEEL:
+                gOpenRaider->handleMouseScroll(event.wheel.x, event.wheel.y);
+                break;
+
             case SDL_TEXTINPUT:
             case SDL_TEXTEDITING:
                 gOpenRaider->handleText(event.text.text, (event.type == SDL_TEXTEDITING));

src/utils/strings.cpp

@@ -58,16 +58,6 @@ char *stringReplace(const char *s, const char *search, const char *replace) {
     }
 }
 
-void printStringVector(std::vector<char *> *args) {
-    printf("(");
-    for (std::vector<char *>::size_type i = 0; i < args->size(); i++) {
-        printf("%s", args->at(i));
-        if (i < (args->size() - 1))
-            printf(" ");
-    }
-    printf(")");
-}
-
 int readBool(const char *value, bool *var) {
     if ((strcmp(value, "1") == 0) || (strcmp(value, "true") == 0) || (strcmp(value, "TRUE") == 0)) {
         *var = true;