Displaying empty SDL window

include/OpenRaider.h

@@ -36,8 +36,6 @@ public:
 
     void run();
 
-    void cleanup();
-
 private:
     bool mInit;
     bool mRunning;

include/Window.h

@@ -46,8 +46,6 @@ public:
     virtual void swapBuffersGL() = 0;
 
     virtual void resizeGL(unsigned int w, unsigned int h);
-
-    virtual void cleanup() = 0;
 };
 
 #endif

include/WindowSDL.h

@@ -46,8 +46,6 @@ public:
 
     virtual void swapBuffersGL();
 
-    virtual void cleanup();
-
 private:
     bool mInit;
     char *mDriver;

src/OpenRaider.cpp

@@ -15,6 +15,8 @@
 #include "utils/time.h"
 #include "OpenRaider.h"
 
+#define MAX_MS_PER_FRAME (1000 / MAXIMUM_FPS)
+
 OpenRaider::OpenRaider() {
     mInit = false;
     mRunning = false;
@@ -60,11 +62,8 @@ void OpenRaider::run() {
         mWindow->eventHandling();
 
         clock_t stopTime = systemTimerGet();
-        mWindow->delay((1000 / MAXIMUM_FPS) - (stopTime - startTime));
+        if (MAX_MS_PER_FRAME > (stopTime - startTime))
+            mWindow->delay(MAX_MS_PER_FRAME - (stopTime - startTime));
     }
 }
 
-void OpenRaider::cleanup() {
-    mWindow->cleanup();
-}
-

src/WindowSDL.cpp

@@ -12,6 +12,8 @@
 #include "utils/strings.h"
 #include "WindowSDL.h"
 
+#define SUBSYSTEMS_USED (SDL_INIT_VIDEO | SDL_INIT_EVENTS)
+
 WindowSDL::WindowSDL() {
     mInit = false;
     mDriver = NULL;
@@ -26,6 +28,11 @@ WindowSDL::WindowSDL() {
 WindowSDL::~WindowSDL() {
     if (mDriver)
         delete [] mDriver;
+
+    if (mInit) {
+        SDL_QuitSubSystem(SUBSYSTEMS_USED);
+        SDL_Quit();
+    }
 }
 
 void WindowSDL::setDriver(const char *driver) {
@@ -76,7 +83,7 @@ void WindowSDL::setMousegrab(bool grab) {
 int WindowSDL::initialize() {
     assert(mInit == false);
 
-    if (SDL_Init(SDL_INIT_VIDEO) != 0) {
+    if (SDL_Init(SUBSYSTEMS_USED) != 0) {
         printf("SDL_Init Error: %s\n", SDL_GetError());
         return -1;
     }
@@ -142,10 +149,6 @@ void WindowSDL::eventHandling() {
 
     while(SDL_PollEvent(&event)) {
         switch (event.type) {
-            case SDL_QUIT:
-                exit(0);
-                break;
-
             case SDL_MOUSEMOTION:
 
                 break;
@@ -164,6 +167,9 @@ void WindowSDL::eventHandling() {
                 if (event.window.event == SDL_WINDOWEVENT_RESIZED)
                     setSize(event.window.data1, event.window.data2);
                 break;
+
+            case SDL_QUIT:
+                exit(0);
         }
     }
 }
@@ -188,10 +194,3 @@ void WindowSDL::swapBuffersGL() {
     SDL_GL_SwapWindow(mWindow);
 }
 
-void WindowSDL::cleanup() {
-    if (mInit) {
-        //SDL_QuitSubSystem(SDL_OPENGL);
-        SDL_Quit();
-    }
-}
-

src/main.cpp

@@ -16,10 +16,8 @@
 OpenRaider *gOpenRaider = NULL;
 
 void cleanupHandler() {
-    if (gOpenRaider) {
-        gOpenRaider->cleanup();
+    if (gOpenRaider)
         delete gOpenRaider;
-    }
 }
 
 int main(int argc, char *argv[]) {