/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "monoapplication.h"
#include "coreapplication.h"
#include "client.h"
-#include "clientsyncer.h"
#include "core.h"
+#include "internalpeer.h"
#include "qtui.h"
+class InternalPeer;
+
MonolithicApplication::MonolithicApplication(int &argc, char **argv)
- : QtUiApplication(argc, argv),
- _internalInitDone(false)
+ : QtUiApplication(argc, argv)
{
- _internal = new CoreApplicationInternal(); // needed for parser options
- setRunMode(Monolithic);
+#if defined(HAVE_KDE4) || defined(Q_OS_MAC)
+ Quassel::disableCrashHandler();
+#endif /* HAVE_KDE4 || Q_OS_MAC */
+
+ Quassel::setRunMode(Quassel::Monolithic);
}
-bool MonolithicApplication::init() {
- if(!Quassel::init()) // parse args
- return false;
- if(isOptionSet("port")) {
- _internal->init();
- _internalInitDone = true;
- }
+bool MonolithicApplication::init()
+{
+ if (!QtUiApplication::init())
+ return false;
+
+ connect(Client::coreConnection(), SIGNAL(connectToInternalCore(QPointer<InternalPeer>)), this, SLOT(onConnectionRequest(QPointer<InternalPeer>)));
+
+ // 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();
+ }
- connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
- return QtUiApplication::init();
+ return true;
}
-MonolithicApplication::~MonolithicApplication() {
- // Client needs to be destroyed first
- Client::destroy();
- delete _internal;
+
+MonolithicApplication::~MonolithicApplication()
+{
+ // Client needs to be destroyed first
+ Client::destroy();
+ _coreThread.quit();
+ _coreThread.wait();
+ Quassel::destroy();
}
-void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) {
- connect(syncer, SIGNAL(startInternalCore()), this, SLOT(startInternalCore()));
+
+void MonolithicApplication::startInternalCore()
+{
+ if (_core) {
+ // Already started
+ return;
+ }
+
+ // 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(init()));
+ 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)));
+
+ _coreThread.start();
}
-void MonolithicApplication::startInternalCore() {
- if(!_internalInitDone) {
- _internal->init();
- _internalInitDone = true;
- }
- Core *core = Core::instance();
- ClientSyncer *syncer = static_cast<ClientSyncer *>(sender());
- connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
- connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &)));
+
+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);
}