Support for mouse keys 4 & 5

ChangeLog.md

@@ -5,6 +5,7 @@
     [ 20140621 ]
     * Created StaticMesh class replacing model_mesh_t stuff
     * Simplified StaticMesh’s data storage
+    * Added support for fourth & fifth mouse keys
 
     [ 20140617 ]
     * Finally fixed SkeletalModel bugs introduced a month ago

include/global.h

@@ -94,7 +94,7 @@ typedef enum {
     rightguiKey, rightbracketKey, rightshiftKey, scrolllockKey,
     semicolonKey, slashKey, spaceKey, tabKey,
     leftmouseKey, middlemouseKey, rightmouseKey,
-
+    fourthmouseKey, fifthmouseKey,
     unknownKey // Should always be at the end
 } KeyboardButton;
 

src/Console.cpp

@@ -237,6 +237,7 @@ void Console::handleText(char *text, bool notFinished) {
 }
 
 void Console::handleMouseScroll(int xrel, int yrel) {
+    assert((xrel != 0) || (yrel != 0));
     LINE_GEOMETRY(getWindow());
 
     if (mHistory.size() > lineCount) {

src/WindowSDL.cpp

@@ -156,18 +156,26 @@ void WindowSDL::eventHandling() {
                     button = leftmouseKey;
                 else if (event.button.button == SDL_BUTTON_RIGHT)
                     button = rightmouseKey;
-                else
+                else if (event.button.button == SDL_BUTTON_MIDDLE)
                     button = middlemouseKey;
+                else if (event.button.button == SDL_BUTTON_X1)
+                    button = fourthmouseKey;
+                else if (event.button.button == SDL_BUTTON_X2)
+                    button = fifthmouseKey;
+                else
+                    button = unknownKey;
                 getOpenRaider().handleMouseClick(event.button.x, event.button.y, button, (event.type == SDL_MOUSEBUTTONUP));
                 break;
 
             case SDL_MOUSEWHEEL:
-                getOpenRaider().handleMouseScroll(event.wheel.x, event.wheel.y);
+                if ((event.wheel.x != 0) || (event.wheel.y != 0))
+                    getOpenRaider().handleMouseScroll(event.wheel.x, event.wheel.y);
                 break;
 
             case SDL_TEXTINPUT:
             case SDL_TEXTEDITING:
-                getOpenRaider().handleText(event.text.text, (event.type == SDL_TEXTEDITING));
+                if (event.text.text != NULL)
+                    getOpenRaider().handleText(event.text.text, (event.type == SDL_TEXTEDITING));
                 break;
 
             case SDL_KEYDOWN:

src/main.cpp

@@ -138,7 +138,7 @@ int main(int argc, char *argv[]) {
     }
 
 #ifdef DEBUG
-    std::cout << "Initializing " << VERSION << std::endl;
+    getConsole().print("Initializing %s", VERSION);
 #endif
 
     atexit(cleanupHandler);
@@ -219,6 +219,7 @@ ActionEvents stringToActionEvent(const char *action) {
     } else if (strcmp(action, "walk") == 0) {
         return walkAction;
     } else {
+        getConsole().print("Unknown action: \"%s\"", action);
         return ActionEventCount;
     }
 }
@@ -393,10 +394,17 @@ KeyboardButton stringToKeyboardButton(const char *key) {
         } 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;
     }
 
+    getConsole().print("Unknown key: %s", key);
     return unknownKey;
 }
 

src/utils/pcx.cpp

@@ -13,9 +13,8 @@
 #include "global.h"
 #include "utils/pcx.h"
 
-#include "Console.h"
-
 #ifdef DEBUG
+#include "Console.h"
 #define pcxPrint getConsole().print
 #else
 void pcxPrint(...) { }