common: Port remote nicks to NickHighlightMatcher

[quassel.git] / src / qtui / monoapplication.cpp

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 67bee8e..e92afcc 100644 (file)
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,35 +22,34 @@
 #include "coreapplication.h"
 #include "client.h"
 #include "core.h"
+#include "internalpeer.h"
 #include "qtui.h"
 
-class InternalConnection;
+class InternalPeer;
 
 MonolithicApplication::MonolithicApplication(int &argc, char **argv)
-    : QtUiApplication(argc, argv),
-    _internalInitDone(false)
+    : QtUiApplication(argc, argv)
 {
-    _internal = new CoreApplicationInternal(); // needed for parser options
-#if defined(HAVE_KDE) || defined(Q_OS_MAC)
-    disableCrashhandler();
-#endif /* HAVE_KDE || Q_OS_MAC */
-    setRunMode(Quassel::Monolithic);
+#if defined(HAVE_KDE4) || defined(Q_OS_MAC)
+    Quassel::disableCrashHandler();
+#endif /* HAVE_KDE4 || Q_OS_MAC */
+
+    Quassel::setRunMode(Quassel::Monolithic);
 }
 
 
-bool MonolithicApplication::init()
+void MonolithicApplication::init()
 {
-    if (!Quassel::init()) // parse args
-        return false;
+    QtUiApplication::init();
 
-    connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
+    connect(Client::coreConnection(), SIGNAL(connectToInternalCore(QPointer<InternalPeer>)), this, SLOT(onConnectionRequest(QPointer<InternalPeer>)));
 
-    // FIXME what's this for?
-    if (isOptionSet("port")) {
+    // If port is set, start internal core directly so external clients can connect
+    // This is useful in case the mono client re-gains remote connection capability,
+    // in which case the internal core would not have to be started by default.
+    if (Quassel::isOptionSet("port")) {
         startInternalCore();
     }
-
-    return QtUiApplication::init();
 }
 
 
@@ -58,18 +57,43 @@ MonolithicApplication::~MonolithicApplication()
 {
     // Client needs to be destroyed first
     Client::destroy();
-    delete _internal;
+    _coreThread.quit();
+    _coreThread.wait();
+    Quassel::destroy();
 }
 
 
 void MonolithicApplication::startInternalCore()
 {
-    if (!_internalInitDone) {
-        _internal->init();
-        _internalInitDone = true;
+    if (_core) {
+        // Already started
+        return;
     }
-    Core *core = Core::instance();
-    CoreConnection *connection = Client::coreConnection();
-    connect(connection, SIGNAL(connectToInternalCore(InternalConnection*)), core, SLOT(setupInternalClientSession(InternalConnection*)));
-    connect(core, SIGNAL(sessionState(QVariant)), connection, SLOT(internalSessionStateReceived(QVariant)));
+
+    // Start internal core in a separate thread, so it doesn't block the UI
+    _core = new Core{};
+    _core->moveToThread(&_coreThread);
+    connect(&_coreThread, SIGNAL(started()), _core, SLOT(initAsync()));
+    connect(&_coreThread, SIGNAL(finished()), _core, SLOT(deleteLater()));
+
+    connect(this, SIGNAL(connectInternalPeer(QPointer<InternalPeer>)), _core, SLOT(connectInternalPeer(QPointer<InternalPeer>)));
+    connect(_core, SIGNAL(sessionState(Protocol::SessionState)), Client::coreConnection(), SLOT(internalSessionStateReceived(Protocol::SessionState)));
+
+    connect(_core, SIGNAL(dbUpgradeInProgress(bool)), Client::instance(), SLOT(onDbUpgradeInProgress(bool)));
+    connect(_core, SIGNAL(exitRequested(int,QString)), Client::instance(), SLOT(onExitRequested(int,QString)));
+
+    _coreThread.start();
+}
+
+
+void MonolithicApplication::onConnectionRequest(QPointer<InternalPeer> peer)
+{
+    if (!_core) {
+        startInternalCore();
+    }
+
+    // While starting the core may take a while, the object itself is instantiated synchronously and the connections
+    // established, so it's safe to emit this immediately. The core will take care of queueing the request until
+    // initialization is complete.
+    emit connectInternalPeer(peer);
 }