basic menu functionality working

include/Menu.h

@@ -36,10 +36,15 @@ public:
 
 private:
 
+    void displayMapList();
+
     void drawText(unsigned int x, unsigned int y, float scale, const char *s, ...) __attribute__((format(printf, 5, 0)));
 
     bool mVisible;
+    unsigned int mCursor;
+
     WindowString mainText;
+    WindowString tempText;
 };
 
 #endif

include/OpenRaider.h

@@ -75,7 +75,15 @@ public:
     Sound *mSound;
     Menu *mMenu;
 
+    bool mMapListFilled;
+    std::vector<char *> mMapList;
+
 private:
+
+    void loadPakFolderRecursive(const char *dir);
+
+    void fillMapList();
+
     bool mInit;
     bool mRunning;
 

src/Menu.cpp

@@ -22,18 +22,31 @@
 
 Menu::Menu() {
     mVisible = false;
+    mCursor = 0;
+
     mainText.text = bufferString(VERSION);
     mainText.color[0] = 0xFF;
     mainText.color[1] = 0xFF;
     mainText.color[2] = 0xFF;
     mainText.color[3] = 0xFF;
     mainText.scale = 1.2f;
+    mainText.y = 10;
     mainText.w = 0;
     mainText.h = 0;
+
+    tempText.text = new char[256];
+    tempText.color[0] = 0xFF;
+    tempText.color[1] = 0xFF;
+    tempText.color[2] = 0xFF;
+    tempText.color[3] = 0xFF;
+    tempText.scale = 1.2f;
+    tempText.w = 0;
+    tempText.h = 0;
 }
 
 Menu::~Menu() {
     delete [] mainText.text;
+    delete [] tempText.text;
 }
 
 void Menu::setVisible(bool visible) {
@@ -47,18 +60,53 @@ bool Menu::isVisible() {
 void Menu::drawText(unsigned int x, unsigned int y, float scale, const char *s, ...) {
     va_list args;
     va_start(args, s);
-    WindowString w;
-    w.text = bufferString(s, args);
+    vsnprintf(tempText.text, 256, s, args);
+    tempText.text[255] = '\0';
     va_end(args);
-    w.scale = scale;
-    w.x = x;
-    w.y = y;
-    w.color[0] = 0xFF;
-    w.color[1] = 0xFF;
-    w.color[2] = 0xFF;
-    w.color[3] = 0xFF;
-    gOpenRaider->mWindow->writeString(&w);
-    delete [] w.text;
+
+    tempText.scale = scale;
+    tempText.x = x;
+    tempText.y = y;
+    gOpenRaider->mWindow->writeString(&tempText);
+}
+
+void Menu::displayMapList() {
+    // Estimate displayable number of items
+    int items = (gOpenRaider->mWindow->mHeight - 110) / 25;
+
+    // Select which part of the list to show
+    int min, max;
+    if (((int)mCursor - (items / 2)) > 0)
+        min = mCursor - (items / 2);
+    else
+        min = 0;
+
+    if ((mCursor + (items / 2)) < gOpenRaider->mMapList.size())
+        max = mCursor + (items / 2);
+    else
+        max = gOpenRaider->mMapList.size();
+
+    while ((max - min) < items) {
+        if (min > 0)
+            min--;
+        else if (max < (gOpenRaider->mMapList.size()))
+            max++;
+        else
+            break;
+    }
+
+    for (int i = 0; i < (max - min); i++) {
+        char *map = gOpenRaider->mMapList[i + min];
+        if ((i + min) == mCursor) {
+            // Less greem & red --> highlight in red
+            tempText.color[1] = 0x42;
+            tempText.color[2] = 0x42;
+        } else {
+            tempText.color[1] = 0xFF;
+            tempText.color[2] = 0xFF;
+        }
+        drawText(25, 100 + (25 * i), 0.75f, "%s", map);
+    }
 }
 
 void Menu::display() {
@@ -73,14 +121,44 @@ void Menu::display() {
 
         // Draw heading text
         mainText.x = (window->mWidth / 2) - (mainText.w / 2);
-        mainText.y = 10;
         window->writeString(&mainText);
 
-        drawText(20, (window->mHeight / 2) - 20, 0.75f, "Generating map list...");
+        if (!gOpenRaider->mMapListFilled) {
+            drawText(25, (window->mHeight / 2) - 20, 0.75f, "Generating map list...");
+        } else {
+            displayMapList();
+        }
     }
 }
 
 void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
+    if (!pressed)
+        return;
+
+    if (key == up) {
+        if (mCursor > 0)
+            mCursor--;
+        else
+            mCursor = gOpenRaider->mMapList.size() - 1;
+    } else if (key == down) {
+        if (mCursor < (gOpenRaider->mMapList.size() - 1))
+            mCursor++;
+        else
+            mCursor = 0;
+    } else if (key == right) {
+        int i = 10;
+        if (mCursor > (gOpenRaider->mMapList.size() - 11))
+            i = gOpenRaider->mMapList.size() - 1 - mCursor;
+        while (i-- > 0)
+            handleKeyboard(down, true);
+    } else if (key == left) {
+        int i = 10;
+        if (mCursor < 10)
+            i = mCursor;
+        while (i-- > 0)
+            handleKeyboard(up, true);
+    } else if (key == enter) {
 
+    }
 }
 

src/OpenRaider.cpp

@@ -8,6 +8,7 @@
 #include <cstdio>
 #include <cstring>
 #include <assert.h>
+#include <dirent.h>
 
 #include "WindowSDL.h"
 
@@ -25,6 +26,7 @@ OpenRaider::OpenRaider() {
     mPakDir = NULL;
     mAudioDir = NULL;
     mDataDir = NULL;
+    mMapListFilled = false;
 
     mMenu = new Menu();
     mSound = new Sound();
@@ -55,6 +57,11 @@ OpenRaider::~OpenRaider() {
 
     if (mDataDir)
         delete mDataDir;
+
+    while (mMapList.size() > 0) {
+        delete [] mMapList.back();
+        mMapList.pop_back();
+    }
 }
 
 int OpenRaider::loadConfig(const char *config) {
@@ -425,6 +432,60 @@ int OpenRaider::bind(ActionEvents action, const char *key) {
     return 0;
 }
 
+void OpenRaider::loadPakFolderRecursive(const char *dir) {
+    struct dirent *ep;
+    DIR *pakDir;
+
+    pakDir = opendir(dir);
+    if (pakDir != NULL) {
+        while ((ep = readdir(pakDir)) != NULL) {
+            if (ep->d_type == DT_DIR) {
+                if ((strcmp(".", ep->d_name) != 0)
+                 && (strcmp("..", ep->d_name) != 0)) {
+                    char *tmp = bufferString("%s%s", dir, ep->d_name);
+                    char *next = fullPath(tmp, '/');
+                    loadPakFolderRecursive(next);
+                    delete next;
+                    delete tmp;
+                }
+            } else {
+                char *fullPathMap = bufferString("%s%s", dir, ep->d_name);
+
+                char *lowerPath = bufferString("%s", fullPathMap);
+                for (char *p = lowerPath; *p; ++p) *p = (char)tolower(*p);
+
+                // Check for valid extension
+                if (stringEndsWith(lowerPath, ".phd")
+                     || stringEndsWith(lowerPath, ".tr2")
+                     || stringEndsWith(lowerPath, ".tr4")
+                     || stringEndsWith(lowerPath, ".trc")) {
+                    //if (m_tombraider.checkMime(fullPathMap) == 0) {
+                        // printf("Validated pak: '%s'\n", fullPathMap);
+
+                        // Just load relative filename
+                        mMapList.push_back(bufferString("%s", (fullPathMap + strlen(mPakDir))));
+                    //} else {
+                    //    printf("ERROR: pak file '%s' not found or invalid\n", fullPathMap);
+                    //}
+                }
+
+                delete [] lowerPath;
+                delete [] fullPathMap;
+            }
+        }
+        closedir(pakDir);
+    } else {
+        printf("Could not open PAK dir %s!\n", dir);
+    }
+}
+
+void OpenRaider::fillMapList() {
+    char *tmp = fullPath(mPakDir, '/');
+    loadPakFolderRecursive(tmp);
+    delete [] tmp;
+    mMapListFilled = true;
+}
+
 int OpenRaider::initialize() {
     assert(mInit == false);
     assert(mRunning == false);
@@ -474,6 +535,11 @@ void OpenRaider::run() {
 
         mWindow->swapBuffersGL();
 
+        // Fill map list after first render pass,
+        // so menu *loading screen* is visible
+        if (!mMapListFilled)
+            fillMapList();
+
         clock_t stopTime = systemTimerGet();
         if (MAX_MS_PER_FRAME > (stopTime - startTime))
             mWindow->delay(MAX_MS_PER_FRAME - (stopTime - startTime));