Mouse support for menu

include/Menu.h

@@ -34,6 +34,8 @@ public:
 
     void handleKeyboard(KeyboardButton key, bool pressed);
 
+    void handleMouseClick(unsigned int x, unsigned int y, MouseButton button, bool released);
+
 private:
 
     void displayMapList();
@@ -42,6 +44,7 @@ private:
 
     bool mVisible;
     unsigned int mCursor;
+    unsigned int mMin;
 
     WindowString mainText;
     WindowString tempText;

include/OpenRaider.h

@@ -71,6 +71,8 @@ public:
 
     void handleText(char *text, bool notFinished);
 
+    void handleMouseClick(unsigned int x, unsigned int y, MouseButton button, bool released);
+
     Window *mWindow;
     Sound *mSound;
     Menu *mMenu;

include/Window.h

@@ -40,6 +40,12 @@ typedef enum {
     semicolon, slash, space, tab, unknown
 } KeyboardButton;
 
+typedef enum {
+    leftButton,
+    rightButton,
+    middleButton
+} MouseButton;
+
 typedef struct {
     char *text;
     unsigned int x;

src/Menu.cpp

@@ -23,6 +23,7 @@
 Menu::Menu() {
     mVisible = false;
     mCursor = 0;
+    mMin = 0;
 
     mainText.text = bufferString(VERSION);
     mainText.color[0] = 0xFF;
@@ -89,15 +90,17 @@ void Menu::displayMapList() {
     while ((max - min) < items) {
         if (min > 0)
             min--;
-        else if (max < (gOpenRaider->mMapList.size()))
+        else if (max < ((int)gOpenRaider->mMapList.size()))
             max++;
         else
             break;
     }
 
+    mMin = min;
+
     for (int i = 0; i < (max - min); i++) {
         char *map = gOpenRaider->mMapList[i + min];
-        if ((i + min) == mCursor) {
+        if ((i + min) == (int)mCursor) {
             // Less greem & red --> highlight in red
             tempText.color[1] = 0x42;
             tempText.color[2] = 0x42;
@@ -126,7 +129,24 @@ void Menu::display() {
         if (!gOpenRaider->mMapListFilled) {
             drawText(25, (window->mHeight / 2) - 20, 0.75f, "Generating map list...");
         } else {
-            displayMapList();
+            if (gOpenRaider->mMapList.size() == 0) {
+                drawText(25, (window->mHeight / 2) - 20, 0.75f, "No maps found! See README.md");
+            } else {
+                // draw *play button* above list
+                glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
+                glDisable(GL_TEXTURE_2D);
+                glRecti(25, 25, 100, 75);
+                glEnable(GL_TEXTURE_2D);
+                tempText.color[0] = 0x00;
+                tempText.color[1] = 0x00;
+                tempText.color[2] = 0x00;
+                drawText(40, 35, 0.75f, "Play");
+                tempText.color[0] = 0xFF;
+                tempText.color[1] = 0xFF;
+                tempText.color[2] = 0xFF;
+
+                displayMapList();
+            }
         }
     }
 }
@@ -162,3 +182,18 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
     }
 }
 
+void Menu::handleMouseClick(unsigned int x, unsigned int y, MouseButton button, bool released) {
+    int items = (gOpenRaider->mWindow->mHeight - 110) / 25;
+
+    if ((!released) || (button != leftButton))
+        return;
+
+    if ((y >= 100) && (y <= (100 + (25 * items)))) {
+        y -= 100;
+        mCursor = mMin + (y / 25);
+    } else if ((y >= 25) && (y <= 100) && (x >= 25) && (x <= 125)) {
+        // Play button
+        mCursor = 0;
+    }
+}
+

src/OpenRaider.cpp

@@ -578,3 +578,9 @@ void OpenRaider::handleText(char *text, bool notFinished) {
 
 }
 
+void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, MouseButton button, bool released) {
+    if (mMenu->isVisible()) {
+        mMenu->handleMouseClick(x, y, button, released);
+    }
+}
+

src/WindowSDL.cpp

@@ -175,7 +175,14 @@ void WindowSDL::eventHandling() {
 
             case SDL_MOUSEBUTTONDOWN:
             case SDL_MOUSEBUTTONUP:
-
+                MouseButton button;
+                if (event.button.button == SDL_BUTTON_LEFT)
+                    button = leftButton;
+                else if (event.button.button == SDL_BUTTON_RIGHT)
+                    button = rightButton;
+                else
+                    button = middleButton;
+                gOpenRaider->handleMouseClick(event.button.x, event.button.y, button, (event.type == SDL_MOUSEBUTTONUP));
                 break;
 
             case SDL_TEXTINPUT: