Client: Tweaking the application initialization procedure

skyjake · Sep 1, 2019 · 9b40059 · 9b40059
1 parent f90b06c
commit 9b40059
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 25 deletions.
diff --git a/doomsday/apps/client/src/dd_main.cpp b/doomsday/apps/client/src/dd_main.cpp
@@ -56,6 +56,7 @@
 #ifdef __CLIENT__
 #  include <de/texgamma.h>
 #  include <de/DisplayMode>
+#  include <de/GLWindow>
 #endif
 #include <doomsday/AbstractSession>
 #include <doomsday/console/alias.h>
@@ -1055,6 +1056,7 @@ static void initializeWithWindowReady()
     static char const *AUTOEXEC_NAME = "autoexec.cfg";
 
 #ifdef __CLIENT__
+    GLWindow::main().glActivate();
     GL_EarlyInit();
 #endif
 
@@ -1292,22 +1294,30 @@ void DD_FinishInitializationAfterWindowReady()
 #endif // __CLIENT__
 
     // Initialize engine subsystems and initial state.
-    try
-    {
-        initializeWithWindowReady();
-        // Let everyone know we're up and running (via another timer callback).
-        Loop::timer(0.1, [] () { App::app().notifyStartupComplete(); });
-        return;
-    }
-    catch (Error const &er)
-    {
-        EscapeParser esc;
-        esc.parse(er.asText());
-        Sys_CriticalMessage(esc.plainText());
-    }
-    catch (...)
-    {}
-    exit(2);  // Cannot continue...
+    Loop::timer(0.01, []() {
+        try
+        {
+            // The rest of the initialization assumes that the main window exists.
+            initializeWithWindowReady();
+            // Let everyone know we're up and running.
+            /*Loop::timer(0.1, []() {*/ App::app().notifyStartupComplete(); //});
+            return;
+        }
+        catch (Error const &er)
+        {
+            EscapeParser esc;
+            esc.parse(er.asText());
+            Sys_CriticalMessage(esc.plainText());
+        }
+        catch (...)
+        {}
+        // Shut down the application.
+#if defined (__CLIENT__)
+        DE_GUI_APP->quit(2);
+#else
+        DE_TEXT_APP->quit(2);
+#endif
+    });
 }
 
 static dint DD_StartupWorker(void * /*context*/)

diff --git a/doomsday/apps/client/src/main_client.cpp b/doomsday/apps/client/src/main_client.cpp
@@ -101,18 +101,17 @@ int main(int argc, char **argv)
          * parse tr strings from inside private implementation classes. Workaround
          * or fix is needed?
          */
-#if 0
+/*#if 0
         // Load the current locale's translation.
         QTranslator translator;
         translator.load(QString("client_") + QLocale::system().name());
         clientApp.installTranslator(&translator);
-#endif
+#endif*/
 
         try
         {
-            clientApp.initialize();
-
-#if defined (DE_MOBILE)
+/*
+ #if defined (DE_MOBILE)
             // On mobile, Qt Quick is actually in charge of drawing the screen.
             // GLWindow is just an item that draws the UI background.
             qmlRegisterType<de::GLQuickItemT<ClientWindow>>("Doomsday", 1, 0, "ClientWindow");
@@ -121,8 +120,8 @@ int main(int argc, char **argv)
             view.setSource(QUrl("qrc:///qml/main.qml"));
             view.show();
 #endif
-
-            exitCode = clientApp.exec();
+*/
+            exitCode = clientApp.exec([&]() { clientApp.initialize(); });
         }
         catch (const de::Error &er)
         {

diff --git a/doomsday/apps/client/src/ui/inputsystem.cpp b/doomsday/apps/client/src/ui/inputsystem.cpp
@@ -577,6 +577,7 @@ DE_PIMPL(InputSystem)
      */
     void readMouse()
     {
+#if 0
         if (!Mouse_IsPresent())
             return;
 
@@ -675,6 +676,7 @@ DE_PIMPL(InputSystem)
                 }
             }
         }
+#endif
     }
 
     /**

diff --git a/doomsday/libs/legacy/src/concurrency.cpp b/doomsday/libs/legacy/src/concurrency.cpp
@@ -25,6 +25,7 @@
 #include <de/App>
 #include <de/Time>
 #include <de/Log>
+#include <de/Loop>
 #include <de/Garbage>
 #include <assert.h>
 
@@ -58,10 +59,10 @@ CallbackThread::~CallbackThread()
     }
 }
 
-//void CallbackThread::deleteNow()
 void CallbackThread::threadFinished(Thread &)
 {
-    de::trash(this); //delete this;
+    using namespace de;
+    Loop::mainCall([this]() { trash(this); });
 }
 
 void CallbackThread::run()