Created UI windowing interface

ChangeLog.md

@@ -2,6 +2,10 @@
 
 ## OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+    [ 20140901 ]
+    * Created abstract UI class handling “windows” like menu and console. Windows
+      can be stacked arbitrarily. The top most gets keyboard/mouse/action events.
+
     [ 20140831 ]
     * Moved command specific code from OpenRaider to static Command methods
 

include/Console.h

@@ -12,20 +12,16 @@
 #include <sstream>
 #include <vector>
 
+#include "UI.h"
+
 /*!
  * \brief Console 'overlay'
  */
-class Console {
+class Console : public UI {
 public:
 
-    /*!
-     * \brief Constructs an object of Console
-     */
     Console();
-
-    void setVisible(bool visible);
-
-    bool isVisible();
+    ~Console();
 
     template<typename T>
     Console &operator<<(const T t) {
@@ -40,13 +36,12 @@ public:
         return (*this);
     }
 
-    void display();
-
-    void handleKeyboard(KeyboardButton key, bool pressed);
-
-    void handleText(char *text, bool notFinished);
-
-    void handleMouseScroll(int xrel, int yrel);
+    virtual void moveToTop();
+    virtual void makeInvisible();
+    virtual void display();
+    virtual void handleKeyboard(KeyboardButton key, bool pressed);
+    virtual void handleText(char *text, bool notFinished);
+    virtual void handleMouseScroll(int xrel, int yrel);
 
     const static char endl = '\n';
 
@@ -54,7 +49,6 @@ private:
 
     void moveInHistory(bool up);
 
-    bool mVisible;
     std::string mInputBuffer;
     std::string mPartialInput;
     std::vector<std::string> mHistory;

include/Game.h

@@ -12,16 +12,16 @@
 #include <vector>
 
 #include "Entity.h"
+#include "UI.h"
 #include "TombRaider.h"
 
 /*!
  * \brief Game abstraction
  */
-class Game {
+class Game : public UI {
 public:
 
     Game();
-
     ~Game();
 
     int initialize();
@@ -32,9 +32,11 @@ public:
 
     void destroy();
 
-    void handleAction(ActionEvents action, bool isFinished);
-
-    void handleMouseMotion(int xrel, int yrel);
+    virtual void display();
+    virtual void handleAction(ActionEvents action, bool isFinished);
+    virtual void handleMouseMotion(int xrel, int yrel);
+    virtual void moveToTop() { }
+    virtual void makeInvisible() { }
 
     unsigned int getTextureStart();
     unsigned int getTextureOffset();

include/Menu.h

@@ -10,28 +10,18 @@
 
 #include <functional>
 
+#include "UI.h"
+
 /*!
  * \brief Menu 'overlay'
  */
-class Menu {
+class Menu : public UI {
 public:
 
     virtual ~Menu() { }
 
-    virtual void setVisible(bool visible);
-
-    virtual bool isVisible();
-
     virtual int initialize() = 0;
 
-    virtual void display() = 0;
-
-    virtual void handleKeyboard(KeyboardButton key, bool pressed) = 0;
-
-    virtual void handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) = 0;
-
-    virtual void handleMouseScroll(int xrel, int yrel) = 0;
-
 protected:
 
     virtual void showDialog(std::string msg, std::string btn1, std::string btn2,
@@ -48,7 +38,6 @@ protected:
 
     virtual void displayDialog();
 
-    bool mVisible;
     bool dialogState;
     std::string dialogText;
     std::string dialogButton1;

include/MenuFolder.h

@@ -30,11 +30,8 @@ public:
     virtual int initialize();
 
     virtual void display();
-
     virtual void handleKeyboard(KeyboardButton key, bool pressed);
-
     virtual void handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released);
-
     virtual void handleMouseScroll(int xrel, int yrel);
 
 private:

include/OpenRaider.h

@@ -39,12 +39,6 @@ public:
     void run();
     void frame();
 
-    void handleKeyboard(KeyboardButton key, bool pressed);
-    void handleText(char *text, bool notFinished);
-    void handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released);
-    void handleMouseMotion(int xrel, int yrel);
-    void handleMouseScroll(int xrel, int yrel);
-
     //! \fixme should be private
     char *mBaseDir;
     char *mPakDir;

include/UI.h

@@ -0,0 +1,54 @@
+/*!
+ * \file include/UI.h
+ * \brief Abstract UI interface
+ *
+ * \author xythobuz
+ */
+
+#ifndef _UI_H_
+#define _UI_H_
+
+#include <functional>
+#include <memory>
+#include <vector>
+
+class UI {
+public:
+    virtual ~UI();
+
+    virtual void display();
+    virtual void handleKeyboard(KeyboardButton key, bool pressed);
+    virtual void handleText(char *text, bool notFinished);
+    virtual void handleAction(ActionEvents action, bool isFinished);
+    virtual void handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released);
+    virtual void handleMouseMotion(int xrel, int yrel);
+    virtual void handleMouseScroll(int xrel, int yrel);
+
+    virtual bool isOnTop();
+    virtual void moveToTop();
+    virtual void makeInvisible();
+
+    static void addWindow(UI* window);
+    static void removeWindow(UI *window);
+    static void displayInOrder();
+    static void passKeyboard(KeyboardButton key, bool pressed);
+    static void passText(char *text, bool notFinished);
+    static void passMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released);
+    static void passMouseMotion(int xrel, int yrel);
+    static void passMouseScroll(int xrel, int yrel);
+
+protected:
+    long zPos;
+
+private:
+    static void findInList(UI *w, std::function<void (unsigned long i)> func);
+    static bool isOnTop(unsigned long windowID);
+    static void moveToTop(unsigned long windowID);
+    static void makeInvisible(unsigned long windowID);
+    static bool compareUIs(UI* a, UI* b);
+
+    static std::vector<UI*> windows;
+};
+
+#endif
+

include/Window.h

@@ -30,6 +30,8 @@ public:
 
     virtual void setTextInput(bool on) = 0;
 
+    virtual bool getTextInput() = 0;
+
     virtual void delay(unsigned int ms) = 0;
 
     virtual void swapBuffersGL() = 0;
@@ -54,6 +56,7 @@ protected:
     bool mInit;
     bool mFullscreen;
     bool mMousegrab;
+    bool mTextInput;
     unsigned int mWidth;
     unsigned int mHeight;
 };

include/WindowSDL.h

@@ -42,6 +42,8 @@ public:
 
     virtual void setTextInput(bool on);
 
+    virtual bool getTextInput();
+
     virtual void delay(unsigned int ms);
 
     virtual void swapBuffersGL();
@@ -49,8 +51,6 @@ public:
 private:
     SDL_Window *mWindow;      //!< This is the pointer to the SDL surface
     SDL_GLContext mGLContext; //!< The OpenGL Context
-
-    bool mTextInput;
 };
 
 #endif

src/CMakeLists.txt

@@ -70,6 +70,7 @@ set (SRCS ${SRCS} "Sprite.cpp")
 set (SRCS ${SRCS} "StaticMesh.cpp")
 set (SRCS ${SRCS} "TextureManager.cpp")
 set (SRCS ${SRCS} "TombRaider.cpp")
+set (SRCS ${SRCS} "UI.cpp")
 set (SRCS ${SRCS} "ViewVolume.cpp")
 set (SRCS ${SRCS} "Window.cpp")
 set (SRCS ${SRCS} "World.cpp")

src/Console.cpp

@@ -17,43 +17,50 @@
 #include "Console.h"
 
 Console::Console() {
-    mVisible = false;
+    zPos = -1;
     mHistoryPointer = 0;
     mLineOffset = 0;
+
+    UI::addWindow(this);
 }
 
-void Console::setVisible(bool visible) {
-    mVisible = visible;
-    getWindow().setTextInput(mVisible);
+Console::~Console() {
+    UI::removeWindow(this);
 }
 
-bool Console::isVisible() {
-    return mVisible;
+void Console::moveToTop() {
+    if (!getWindow().getTextInput())
+        getWindow().setTextInput(true);
+
+    UI::moveToTop();
 }
 
-#define LINE_GEOMETRY(window) \
-    unsigned int firstLine = 35; \
-    unsigned int lastLine = (window.getHeight() / 2) - 55; \
-    unsigned int inputLine = (window.getHeight() / 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::makeInvisible() {
+    if (getWindow().getTextInput())
+        getWindow().setTextInput(false);
 
-void Console::display() {
-    if (!mVisible)
-        return;
+    UI::makeInvisible();
+}
 
+void Console::display() {
     // Calculate line drawing geometry
     // Depends on window height, so recalculate every time
-    LINE_GEOMETRY(getWindow());
+    unsigned int firstLine = 35;
+    unsigned int lastLine = (::getWindow().getHeight() / 2) - 55;
+    unsigned int inputLine = (::getWindow().getHeight() / 2) - 30;
+    unsigned int lineSteps = 20;
+    unsigned int lineCount = (lastLine - firstLine + lineSteps) / lineSteps;
+    while (((lineCount * lineSteps) + firstLine) < inputLine) {
+        lineSteps++;
+        lineCount = (lastLine - firstLine + lineSteps) / lineSteps;
+    }
+
+    ::getWindow().glEnter2D();
 
     // Draw half-transparent *overlay*
     glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
     glDisable(GL_TEXTURE_2D);
-    glRecti(0, 0, getWindow().getWidth(), getWindow().getHeight() / 2);
+    glRecti(0, 0, ::getWindow().getWidth(), ::getWindow().getHeight() / 2);
     glEnable(GL_TEXTURE_2D);
 
     unsigned long scrollIndicator;
@@ -87,6 +94,8 @@ void Console::display() {
 
     // Draw current input
     getFont().drawText(10, inputLine, 0.75f, BLUE, "> " + mInputBuffer + mPartialInput);
+
+    ::getWindow().glExit2D();
 }
 
 void Console::handleKeyboard(KeyboardButton key, bool pressed) {
@@ -178,7 +187,18 @@ void Console::handleText(char *text, bool notFinished) {
 
 void Console::handleMouseScroll(int xrel, int yrel) {
     assert((xrel != 0) || (yrel != 0));
-    LINE_GEOMETRY(getWindow());
+
+    // Calculate line drawing geometry
+    // Depends on window height, so recalculate every time
+    unsigned int firstLine = 35;
+    unsigned int lastLine = (::getWindow().getHeight() / 2) - 55;
+    unsigned int inputLine = (::getWindow().getHeight() / 2) - 30;
+    unsigned int lineSteps = 20;
+    unsigned int lineCount = (lastLine - firstLine + lineSteps) / lineSteps;
+    while (((lineCount * lineSteps) + firstLine) < inputLine) {
+        lineSteps++;
+        lineCount = (lastLine - firstLine + lineSteps) / lineSteps;
+    }
 
     if (mHistory.size() > lineCount) {
         if (yrel > 0) {

src/Game.cpp

@@ -30,14 +30,19 @@ std::map<int, int> gMapTex2Bump;
 #endif
 
 Game::Game() {
+    zPos = 0;
     mLoaded = false;
     mLara = -1;
     mTextureStart = 0;
     mTextureOffset = 0;
+
+    UI::addWindow(this);
 }
 
 Game::~Game() {
     destroy();
+
+    UI::removeWindow(this);
 }
 
 unsigned int Game::getTextureStart() {
@@ -57,6 +62,10 @@ int Game::initialize() {
     return 0;
 }
 
+void Game::display() {
+    getRender().display();
+}
+
 void Game::destroy() {
     mLoaded = false;
     mLara = -1;

src/Menu.cpp

@@ -11,14 +11,6 @@
 #include "Window.h"
 #include "Menu.h"
 
-void Menu::setVisible(bool visible) {
-    mVisible = visible;
-}
-
-bool Menu::isVisible() {
-    return mVisible;
-}
-
 void Menu::showDialog(std::string msg, std::string btn1, std::string btn2,
         std::function<int (bool state)> callback) {
     // Only show one dialog at a time
@@ -94,7 +86,7 @@ bool Menu::handleMouseScrollDialog(int xrel, int yrel) {
 
 void Menu::displayDialog() {
     if (dialogText.length() > 0) {
-        unsigned int wMax = ((unsigned int)(getWindow().getWidth() * 0.66f));
+        unsigned int wMax = ((unsigned int)(::getWindow().getWidth() * 0.66f));
 
         unsigned int w0 = getFont().widthText(1.0f, dialogText) + 20;
         if (w0 > wMax)
@@ -146,8 +138,8 @@ void Menu::displayDialog() {
             hOverlay = h0 + h1;
         }
 
-        unsigned int xOverlay = (getWindow().getWidth() - wOverlay) / 2;
-        unsigned int yOverlay = (getWindow().getHeight() - hOverlay) / 2;
+        unsigned int xOverlay = (::getWindow().getWidth() - wOverlay) / 2;
+        unsigned int yOverlay = (::getWindow().getHeight() - hOverlay) / 2;
 
         glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
         glDisable(GL_TEXTURE_2D);
@@ -162,13 +154,13 @@ void Menu::displayDialog() {
                 getFont().drawTextWrapped(xOverlay + 10 + w1, yOverlay + 10 + h0,
                     1.0f, dialogState ? RED : BLUE, w2, dialogButton2);
             } else {
-                getFont().drawTextWrapped((getWindow().getWidth() - w1) / 2,
+                getFont().drawTextWrapped((::getWindow().getWidth() - w1) / 2,
                     yOverlay + 10 + h0, 1.0f, dialogState ? BLUE : RED, w1, dialogButton1);
-                getFont().drawTextWrapped((getWindow().getWidth() - w2) / 2,
+                getFont().drawTextWrapped((::getWindow().getWidth() - w2) / 2,
                     yOverlay + 10 + h0 + h1, 1.0f, dialogState ? RED : BLUE, w2, dialogButton2);
             }
         } else {
-            getFont().drawTextWrapped((getWindow().getWidth() - w1) / 2,
+            getFont().drawTextWrapped((::getWindow().getWidth() - w1) / 2,
                     yOverlay + 10 + h0, 1.0f, RED, w1, dialogButton1);
         }
     }

src/MenuFolder.cpp

@@ -14,17 +14,21 @@
 #include "MenuFolder.h"
 
 MenuFolder::MenuFolder() {
-    mVisible = false;
+    zPos = -1;
     mCursor = 0;
     mMin = 0;
     mapFolder = nullptr;
     hiddenState = false;
     dialogState = false;
+
+    UI::addWindow(this);
 }
 
 MenuFolder::~MenuFolder() {
     delete mapFolder;
     mapFolder = nullptr;
+
+    UI::removeWindow(this);
 }
 
 int MenuFolder::initialize() {
@@ -71,20 +75,19 @@ int MenuFolder::initialize(Folder *folder, bool filter) {
 }
 
 void MenuFolder::display() {
-    if (!mVisible)
-        return;
+    ::getWindow().glEnter2D();
 
     // Draw half-transparent overlay
     glColor4f(0.0f, 0.0f, 0.0f, 0.75f);
     glDisable(GL_TEXTURE_2D);
-    glRecti(0, 0, (GLint)getWindow().getWidth(), (GLint)getWindow().getHeight());
+    glRecti(0, 0, (GLint)::getWindow().getWidth(), (GLint)::getWindow().getHeight());
     glEnable(GL_TEXTURE_2D);
 
     // Draw heading
-    getFont().drawTextCentered(0, 10, 1.2f, BLUE, getWindow().getWidth(), VERSION);
+    getFont().drawTextCentered(0, 10, 1.2f, BLUE, ::getWindow().getWidth(), VERSION);
 
     // Estimate displayable number of items
-    int items = (getWindow().getHeight() - 60) / 25;
+    int items = (::getWindow().getHeight() - 60) / 25;
 
     // Print list of "..", folders, files
     for (long i = mMin; (i < (mMin + items))
@@ -101,6 +104,8 @@ void MenuFolder::display() {
     }
 
     displayDialog();
+
+    ::getWindow().glExit2D();
 }
 
 void MenuFolder::loadOrOpen() {
@@ -117,7 +122,7 @@ void MenuFolder::loadOrOpen() {
         tmp += mapFolder->getFile((unsigned long)mCursor - 1 - mapFolder->folderCount()).getPath();
         int error = getOpenRaider().command(tmp.c_str());
         if (error == 0) {
-            setVisible(false);
+            makeInvisible();
         } else {
             std::ostringstream err;
             err << "Error loading map: " << error << "!";
@@ -134,7 +139,7 @@ void MenuFolder::handleKeyboard(KeyboardButton key, bool pressed) {
         return;
 
     assert(mapFolder != nullptr);
-    int items = (getWindow().getHeight() - 60) / 25;
+    int items = (::getWindow().getHeight() - 60) / 25;
 
     if (key == upKey) {
         if (mCursor > 0)
@@ -164,7 +169,7 @@ void MenuFolder::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton
     if (handleMouseClickDialog(x, y, button, released))
         return;
 
-    int items = (getWindow().getHeight() - 60) / 25;
+    int items = (::getWindow().getHeight() - 60) / 25;
 
     if (released || (button != leftmouseKey))
         return;
@@ -185,7 +190,7 @@ void MenuFolder::handleMouseScroll(int xrel, int yrel) {
 
     assert((xrel != 0) || (yrel != 0));
     assert(mapFolder != nullptr);
-    int items = (getWindow().getHeight() - 60) / 25;
+    int items = (::getWindow().getHeight() - 60) / 25;
 
     if ((mapFolder->folderCount() + mapFolder->fileCount() + 1) > items) {
         if (yrel < 0) {

src/OpenRaider.cpp

@@ -136,7 +136,7 @@ int OpenRaider::initialize() {
     mFPS = true;
 #endif
 
-    getMenu().setVisible(true);
+    getMenu().moveToTop();
     systemTimerReset();
 
     return 0;
@@ -159,15 +159,10 @@ void OpenRaider::frame() {
     // Get keyboard and mouse input
     getWindow().eventHandling();
 
-    // Draw game scene
-    getRender().display();
+    UI::displayInOrder();
 
-    // Draw 2D overlays (console and menu)
     getWindow().glEnter2D();
 
-    getConsole().display();
-    getMenu().display();
-
     // Draw FPS counter
     if (mFPS) {
         std::ostringstream fpsText;
@@ -177,7 +172,7 @@ void OpenRaider::frame() {
 
 #ifdef DEBUG
     // Draw debug infos
-    if (getGame().isLoaded() && (!getMenu().isVisible())) {
+    if (getGame().isLoaded() && (!getMenu().isOnTop())) {
         for (int i = 0; i < 3; i++) {
             std::ostringstream axis;
             axis << getGame().getLara().getPos(i) / 256.0f << " (" << getGame().getLara().getAngle(i) << ")";
@@ -201,91 +196,3 @@ void OpenRaider::frame() {
     }
 }
 
-void OpenRaider::handleKeyboard(KeyboardButton key, bool pressed) {
-    assert(key < unknownKey);
-    assert(mRunning == true);
-
-    if ((keyBindings[menuAction] == key) && pressed) {
-        getMenu().setVisible(!getMenu().isVisible());
-    } else if (!getMenu().isVisible()) {
-        if ((keyBindings[consoleAction] == key) && pressed) {
-            getConsole().setVisible(!getConsole().isVisible());
-        } else if (!getConsole().isVisible()) {
-            for (int i = forwardAction; i < ActionEventCount; i++) {
-                if (keyBindings[i] == key) {
-                    getGame().handleAction((ActionEvents)i, !pressed);
-                }
-            }
-        } else {
-            getConsole().handleKeyboard(key, pressed);
-        }
-    } else {
-        getMenu().handleKeyboard(key, pressed);
-    }
-
-    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
-    if (mousegrab != getWindow().getMousegrab())
-        getWindow().setMousegrab(mousegrab);
-}
-
-void OpenRaider::handleText(char *text, bool notFinished) {
-    assert(text != NULL);
-    assert(text[0] != '\0');
-    assert(mRunning == true);
-
-    if ((getConsole().isVisible()) && (!getMenu().isVisible())) {
-        getConsole().handleText(text, notFinished);
-    }
-
-    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
-    if (mousegrab != getWindow().getMousegrab())
-        getWindow().setMousegrab(mousegrab);
-}
-
-void OpenRaider::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) {
-    assert(button < unknownKey);
-    assert(mRunning == true);
-
-    if (getMenu().isVisible()) {
-        getMenu().handleMouseClick(x, y, button, released);
-    } else if (!getConsole().isVisible()) {
-        for (int i = forwardAction; i < ActionEventCount; i++) {
-            if (keyBindings[i] == button) {
-                getGame().handleAction((ActionEvents)i, released);
-            }
-        }
-    }
-
-    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
-    if (mousegrab != getWindow().getMousegrab())
-        getWindow().setMousegrab(mousegrab);
-}
-
-void OpenRaider::handleMouseMotion(int xrel, int yrel) {
-    assert((xrel != 0) || (yrel != 0));
-    assert(mRunning == true);
-
-    if ((!getConsole().isVisible()) && (!getMenu().isVisible())) {
-        getGame().handleMouseMotion(xrel, yrel);
-    }
-
-    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
-    if (mousegrab != getWindow().getMousegrab())
-        getWindow().setMousegrab(mousegrab);
-}
-
-void OpenRaider::handleMouseScroll(int xrel, int yrel) {
-    assert((xrel != 0) || (yrel != 0));
-    assert(mRunning == true);
-
-    if (getMenu().isVisible()) {
-        getMenu().handleMouseScroll(xrel, yrel);
-    } else if (getConsole().isVisible()) {
-        getConsole().handleMouseScroll(xrel, yrel);
-    }
-
-    bool mousegrab = !(getMenu().isVisible() || getConsole().isVisible());
-    if (mousegrab != getWindow().getMousegrab())
-        getWindow().setMousegrab(mousegrab);
-}
-

src/UI.cpp

@@ -0,0 +1,165 @@
+/*!
+ * \file src/UI.cpp
+ * \brief UI interface manager
+ *
+ * \author xythobuz
+ */
+
+#include <algorithm>
+
+#include "global.h"
+#include "Console.h"
+#include "Menu.h"
+#include "OpenRaider.h"
+#include "Window.h"
+#include "UI.h"
+
+std::vector<UI*> UI::windows;
+
+UI::~UI() {
+}
+
+void UI::display() { }
+void UI::handleKeyboard(KeyboardButton key, bool pressed) { }
+void UI::handleText(char *text, bool notFinished) { }
+void UI::handleAction(ActionEvents action, bool isFinished) { }
+void UI::handleMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) { }
+void UI::handleMouseMotion(int xrel, int yrel) { }
+void UI::handleMouseScroll(int xrel, int yrel) { }
+
+void UI::addWindow(UI* window) {
+    windows.push_back(window);
+}
+
+void UI::removeWindow(UI *window) {
+    findInList(window, [](unsigned long i){
+        windows.erase(windows.begin() + i);
+    });
+}
+
+bool UI::compareUIs(UI* a, UI* b) {
+    return a->zPos < b->zPos;
+}
+
+bool UI::isOnTop(unsigned long windowID) {
+    assert(windowID < windows.size());
+    auto maxIterator = std::max_element(windows.begin(), windows.end(), compareUIs);
+    unsigned long maxPos = (unsigned long)(maxIterator - windows.begin());
+    return (maxPos == windowID);
+}
+
+void UI::moveToTop(unsigned long windowID) {
+    assert(windowID < windows.size());
+
+    auto maxIterator = std::max_element(windows.begin(), windows.end(), compareUIs);
+    long max = (*maxIterator)->zPos;
+    unsigned long maxPos = (unsigned long)(maxIterator - windows.begin());
+
+    if (maxPos != windowID) {
+        windows.at(windowID)->zPos = max + 1;
+    }
+}
+
+void UI::makeInvisible(unsigned long windowID) {
+    assert(windowID < windows.size());
+    windows.at(windowID)->zPos = -1;
+}
+
+void UI::findInList(UI *w, std::function<void (unsigned long i)> func) {
+    for (unsigned long i = 0; i < windows.size(); i++) {
+        auto UIptr = &(*windows.at(i));
+        if (w == UIptr) {
+            func(i);
+            return;
+        }
+    }
+
+    assert(false); // called UI was not registered
+}
+
+bool UI::isOnTop() {
+    bool top = false;
+    findInList(this, [&](unsigned long i) {
+        top = UI::isOnTop(i);
+    });
+    return top;
+}
+
+void UI::moveToTop() {
+    findInList(this, [](unsigned long i) {
+        UI::moveToTop(i);
+    });
+}
+
+void UI::makeInvisible() {
+    findInList(this, [](unsigned long i) {
+        UI::makeInvisible(i);
+    });
+}
+
+void UI::passKeyboard(KeyboardButton key, bool pressed) {
+    if (pressed) {
+        if (getOpenRaider().keyBindings[menuAction] == key) {
+            if (getMenu().isOnTop()) {
+                getMenu().makeInvisible();
+            } else {
+                getMenu().moveToTop();
+            }
+        } else if (getOpenRaider().keyBindings[consoleAction] == key) {
+            if (getConsole().isOnTop()) {
+                getConsole().makeInvisible();
+            } else {
+                getConsole().moveToTop();
+            }
+        }
+    }
+
+    auto maxIterator = std::max_element(windows.begin(), windows.end(), compareUIs);
+    (*maxIterator)->handleKeyboard(key, pressed);
+
+    for (int i = forwardAction; i < ActionEventCount; i++) {
+        if (getOpenRaider().keyBindings[i] == key) {
+            (*maxIterator)->handleAction((ActionEvents)i, !pressed);
+        }
+    }
+
+    bool mousegrab = (*maxIterator)->zPos == 0;
+    if (mousegrab != getWindow().getMousegrab())
+        getWindow().setMousegrab(mousegrab);
+}
+
+void UI::passText(char *text, bool notFinished) {
+    auto maxIterator = std::max_element(windows.begin(), windows.end(), compareUIs);
+    (*maxIterator)->handleText(text, notFinished);
+}
+
+void UI::passMouseClick(unsigned int x, unsigned int y, KeyboardButton button, bool released) {
+    auto maxIterator = std::max_element(windows.begin(), windows.end(), compareUIs);
+    (*maxIterator)->handleMouseClick(x, y, button, released);
+
+    for (int i = forwardAction; i < ActionEventCount; i++) {
+        if (getOpenRaider().keyBindings[i] == button) {
+            (*maxIterator)->handleAction((ActionEvents)i, released);
+        }
+    }
+}
+
+void UI::passMouseMotion(int xrel, int yrel) {
+    auto maxIterator = std::max_element(windows.begin(), windows.end(), compareUIs);
+    (*maxIterator)->handleMouseMotion(xrel, yrel);
+}
+
+void UI::passMouseScroll(int xrel, int yrel) {
+    auto maxIterator = std::max_element(windows.begin(), windows.end(), compareUIs);
+    (*maxIterator)->handleMouseScroll(xrel, yrel);
+}
+
+void UI::displayInOrder() {
+    std::sort(windows.begin(), windows.end(), compareUIs);
+    for (auto &x : windows) {
+        if (x->zPos >= 0) {
+            x->display();
+        }
+    }
+}
+

src/WindowSDL.cpp

@@ -9,7 +9,7 @@
 #include <ctime>
 
 #include "global.h"
-#include "OpenRaider.h"
+#include "UI.h"
 #include "utils/strings.h"
 #include "WindowSDL.h"
 
@@ -127,7 +127,7 @@ void WindowSDL::eventHandling() {
     while(SDL_PollEvent(&event)) {
         switch (event.type) {
             case SDL_MOUSEMOTION:
-                getOpenRaider().handleMouseMotion(event.motion.xrel, event.motion.yrel);
+                UI::passMouseMotion(event.motion.xrel, event.motion.yrel);
                 break;
 
             case SDL_MOUSEBUTTONDOWN:
@@ -145,18 +145,18 @@ void WindowSDL::eventHandling() {
                     button = fifthmouseKey;
                 else
                     button = unknownKey;
-                getOpenRaider().handleMouseClick(event.button.x, event.button.y, button, (event.type == SDL_MOUSEBUTTONUP));
+                UI::passMouseClick(event.button.x, event.button.y, button, (event.type == SDL_MOUSEBUTTONUP));
                 break;
 
             case SDL_MOUSEWHEEL:
                 if ((event.wheel.x != 0) || (event.wheel.y != 0))
-                    getOpenRaider().handleMouseScroll(event.wheel.x, event.wheel.y);
+                    UI::passMouseScroll(event.wheel.x, event.wheel.y);
                 break;
 
             case SDL_TEXTINPUT:
             case SDL_TEXTEDITING:
                 if (event.text.text != NULL)
-                    getOpenRaider().handleText(event.text.text, (event.type == SDL_TEXTEDITING));
+                    UI::passText(event.text.text, (event.type == SDL_TEXTEDITING));
                 break;
 
             case SDL_KEYDOWN:
@@ -427,7 +427,7 @@ void WindowSDL::eventHandling() {
                         break;
 
                 }
-                getOpenRaider().handleKeyboard(key, (event.type == SDL_KEYDOWN));
+                UI::passKeyboard(key, (event.type == SDL_KEYDOWN));
                 break;
 
             case SDL_WINDOWEVENT:
@@ -451,6 +451,11 @@ void WindowSDL::setTextInput(bool on) {
         SDL_StopTextInput();
 }
 
+bool WindowSDL::getTextInput() {
+    assert(mInit == true);
+    return mTextInput;
+}
+
 void WindowSDL::delay(unsigned int ms) {
     assert(mInit == true);
 

src/commands/CommandEngine.cpp

@@ -50,7 +50,7 @@ std::string CommandScreenshot::brief() {
 
 void CommandScreenshot::printHelp() {
     getConsole() << "sshot-Command Usage:" << Console::endl;
-    getConsole() << "  sshot [console|menu]" << Console::endl;
+    getConsole() << "  sshot [console|menu] [console|menu]" << Console::endl;
     getConsole() << "Add console/menu to capture them too" << Console::endl;
 }
 
@@ -65,28 +65,28 @@ int CommandScreenshot::execute(std::istream& args) {
     filename += VERSION_SHORT;
 
     bool console = false, menu = false;
-    std::string temp;
-    args >> temp;
-    if (temp.compare("console") == 0)
-        console = true;
-    if (temp.compare("menu") == 0)
-        menu = true;
-
-    if (!console) {
-        getConsole().setVisible(false);
-        if (menu)
-            getMenu().setVisible(true);
-        getOpenRaider().frame();
-        getOpenRaider().frame(); // Double buffered
-    }
+    std::string temp, temp2;
+    args >> temp >> temp2;
+
+    getConsole().makeInvisible();
+    getMenu().makeInvisible();
+
+    if (temp == "console")
+        getConsole().moveToTop();
+    else if (temp == "menu")
+        getMenu().moveToTop();
 
+    if (temp2 == "console")
+        getConsole().moveToTop();
+    else if (temp2 == "menu")
+        getMenu().moveToTop();
+
+    getOpenRaider().frame();
+    getOpenRaider().frame(); // Double buffered
     getRender().screenShot(filename.c_str());
 
-    if (!console) {
-        getConsole().setVisible(true);
-        if (menu)
-            getMenu().setVisible(false);
-    }
+    getMenu().makeInvisible();
+    getConsole().moveToTop();
 
     getConsole() << "Screenshot stored..." << Console::endl;
     return 0;