#include "buffersettings.h"
#include "buffersyncer.h"
#include "bufferviewconfig.h"
+#include "bufferviewoverlay.h"
+#include "clientaliasmanager.h"
#include "clientbacklogmanager.h"
#include "clientbufferviewmanager.h"
#include "clientirclisthelper.h"
#include "clientidentity.h"
+#include "clientignorelistmanager.h"
#include "clientuserinputhandler.h"
+#include "coreaccountmodel.h"
+#include "coreconnection.h"
#include "ircchannel.h"
#include "ircuser.h"
#include "message.h"
#include "messagemodel.h"
#include "network.h"
+#include "networkconfig.h"
#include "networkmodel.h"
#include "quassel.h"
#include "signalproxy.h"
#include <stdlib.h>
QPointer<Client> Client::instanceptr = 0;
-AccountId Client::_currentCoreAccount = 0;
+Quassel::Features Client::_coreFeatures = 0;
/*** Initialization/destruction ***/
+bool Client::instanceExists()
+{
+ return instanceptr;
+}
+
Client *Client::instance() {
if(!instanceptr)
instanceptr = new Client();
_networkModel(0),
_bufferModel(0),
_bufferSyncer(0),
+ _aliasManager(0),
_backlogManager(new ClientBacklogManager(this)),
_bufferViewManager(0),
+ _bufferViewOverlay(new BufferViewOverlay(this)),
_ircListHelper(new ClientIrcListHelper(this)),
_inputHandler(0),
+ _networkConfig(0),
+ _ignoreListManager(0),
_messageModel(0),
_messageProcessor(0),
- _connectedToCore(false),
- _syncedToCore(false),
- _internalCore(false),
+ _coreAccountModel(new CoreAccountModel(this)),
+ _coreConnection(new CoreConnection(_coreAccountModel, this)),
+ _connected(false),
_debugLog(&_debugLogBuffer)
{
_signalProxy->synchronize(_ircListHelper);
}
void Client::init() {
- _currentCoreAccount = 0;
_networkModel = new NetworkModel(this);
connect(this, SIGNAL(networkRemoved(NetworkId)),
p->attachSlot(SIGNAL(networkCreated(NetworkId)), this, SLOT(coreNetworkCreated(NetworkId)));
p->attachSlot(SIGNAL(networkRemoved(NetworkId)), this, SLOT(coreNetworkRemoved(NetworkId)));
- connect(p, SIGNAL(disconnected()), this, SLOT(disconnectedFromCore()));
-
//connect(mainUi(), SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
connect(mainUi(), SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore()));
connect(this, SIGNAL(connected()), mainUi(), SLOT(connectedToCore()));
// attach backlog manager
p->synchronize(backlogManager());
connect(backlogManager(), SIGNAL(messagesReceived(BufferId, int)), _messageModel, SLOT(messagesReceived(BufferId, int)));
+
+ coreAccountModel()->load();
+
+ connect(coreConnection(), SIGNAL(stateChanged(CoreConnection::ConnectionState)), SLOT(connectionStateChanged(CoreConnection::ConnectionState)));
+ coreConnection()->init();
}
/*** public static methods ***/
return instance()->_mainUi;
}
-AccountId Client::currentCoreAccount() {
- return _currentCoreAccount;
-}
-
-void Client::setCurrentCoreAccount(AccountId id) {
- _currentCoreAccount = id;
+void Client::setCoreFeatures(Quassel::Features features) {
+ _coreFeatures = features;
}
bool Client::isConnected() {
- return instance()->_connectedToCore;
+ return instance()->_connected;
}
-bool Client::isSynced() {
- return instance()->_syncedToCore;
+bool Client::internalCore() {
+ return currentCoreAccount().isInternal();
}
/*** Network handling ***/
}
}
-/*** ***/
+/*** User input handling ***/
+
void Client::userInput(const BufferInfo &bufferInfo, const QString &message) {
- inputHandler()->handleUserInput(bufferInfo, message);
+ // we need to make sure that AliasManager is ready before processing input
+ if(aliasManager() && aliasManager()->isInitialized())
+ inputHandler()->handleUserInput(bufferInfo, message);
+ else
+ instance()-> _userInputBuffer.append(qMakePair(bufferInfo, message));
+}
+
+void Client::sendBufferedUserInput() {
+ for(int i = 0; i < _userInputBuffer.count(); i++)
+ userInput(_userInputBuffer.at(i).first, _userInputBuffer.at(i).second);
+
+ _userInputBuffer.clear();
}
/*** core connection stuff ***/
-void Client::setConnectedToCore(AccountId id, QIODevice *socket) {
- if(socket) { // external core
- // if the socket is an orphan, the signalProxy adopts it.
- // -> we don't need to care about it anymore
- socket->setParent(0);
- signalProxy()->addPeer(socket);
+void Client::connectionStateChanged(CoreConnection::ConnectionState state) {
+ switch(state) {
+ case CoreConnection::Disconnected:
+ setDisconnectedFromCore();
+ break;
+ case CoreConnection::Synchronized:
+ setSyncedToCore();
+ break;
+ default:
+ break;
}
- _internalCore = !socket;
- _connectedToCore = true;
- setCurrentCoreAccount(id);
}
void Client::setSyncedToCore() {
Q_ASSERT(!_bufferSyncer);
_bufferSyncer = new BufferSyncer(this);
connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), _networkModel, SLOT(setLastSeenMsgId(BufferId, MsgId)));
+ connect(bufferSyncer(), SIGNAL(markerLineSet(BufferId,MsgId)), _networkModel, SLOT(setMarkerLineMsgId(BufferId,MsgId)));
connect(bufferSyncer(), SIGNAL(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId)));
connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString)));
connect(bufferSyncer(), SIGNAL(buffersPermanentlyMerged(BufferId, BufferId)), this, SLOT(buffersPermanentlyMerged(BufferId, BufferId)));
connect(bufferSyncer(), SIGNAL(buffersPermanentlyMerged(BufferId, BufferId)), _messageModel, SLOT(buffersPermanentlyMerged(BufferId, BufferId)));
- connect(bufferSyncer(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
+ connect(bufferSyncer(), SIGNAL(bufferMarkedAsRead(BufferId)), SIGNAL(bufferMarkedAsRead(BufferId)));
connect(networkModel(), SIGNAL(setLastSeenMsg(BufferId, MsgId)), bufferSyncer(), SLOT(requestSetLastSeenMsg(BufferId, const MsgId &)));
signalProxy()->synchronize(bufferSyncer());
// create a new BufferViewManager
Q_ASSERT(!_bufferViewManager);
_bufferViewManager = new ClientBufferViewManager(signalProxy(), this);
- connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(createDefaultBufferView()));
- _syncedToCore = true;
+ // create AliasManager
+ Q_ASSERT(!_aliasManager);
+ _aliasManager = new ClientAliasManager(this);
+ connect(aliasManager(), SIGNAL(initDone()), SLOT(sendBufferedUserInput()));
+ signalProxy()->synchronize(aliasManager());
+
+ // create NetworkConfig
+ Q_ASSERT(!_networkConfig);
+ _networkConfig = new NetworkConfig("GlobalNetworkConfig", this);
+ signalProxy()->synchronize(networkConfig());
+
+ // create IgnoreListManager
+ Q_ASSERT(!_ignoreListManager);
+ _ignoreListManager = new ClientIgnoreListManager(this);
+ signalProxy()->synchronize(ignoreListManager());
+
+ // trigger backlog request once all active bufferviews are initialized
+ connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
+
+ _connected = true;
emit connected();
emit coreConnectionStateChanged(true);
}
void Client::requestInitialBacklog() {
- if(bufferViewManager()->isInitialized() && bufferSyncer()->isInitialized())
- Client::backlogManager()->requestInitialBacklog();
+ // usually it _should_ take longer until the bufferViews are initialized, so that's what
+ // triggers this slot. But we have to make sure that we know all buffers yet.
+ // so we check the BufferSyncer and in case it wasn't initialized we wait for that instead
+ if(!bufferSyncer()->isInitialized()) {
+ connect(bufferViewOverlay(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
+ connect(bufferSyncer(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog()));
+ return;
+ }
+ _backlogManager->requestInitialBacklog();
}
void Client::createDefaultBufferView() {
if(bufferViewManager()->bufferViewConfigs().isEmpty()) {
BufferViewConfig config(-1);
- config.setBufferViewName(tr("All Buffers"));
+ config.setBufferViewName(tr("All Chats"));
config.initSetBufferList(networkModel()->allBufferIdsSorted());
bufferViewManager()->requestCreateBufferView(config.toVariantMap());
}
}
void Client::disconnectFromCore() {
- if(!isConnected())
+ if(!coreConnection()->isConnected())
return;
- signalProxy()->removeAllPeers();
+ coreConnection()->disconnectFromCore();
}
-void Client::disconnectedFromCore() {
- _connectedToCore = false;
- _syncedToCore = false;
+void Client::setDisconnectedFromCore() {
+ _connected = false;
+ _coreFeatures = 0;
+
emit disconnected();
emit coreConnectionStateChanged(false);
messageProcessor()->reset();
// Clear internal data. Hopefully nothing relies on it at this point.
- setCurrentCoreAccount(0);
if(_bufferSyncer) {
_bufferSyncer->deleteLater();
_bufferViewManager = 0;
}
+ if(_aliasManager) {
+ _aliasManager->deleteLater();
+ _aliasManager = 0;
+ }
+
+ if(_ignoreListManager) {
+ _ignoreListManager->deleteLater();
+ _ignoreListManager = 0;
+ }
+ // we probably don't want to save pending input for reconnect
+ _userInputBuffer.clear();
+
_messageModel->clear();
_networkModel->clear();
}
Q_ASSERT(_identities.isEmpty());
+ if(_networkConfig) {
+ _networkConfig->deleteLater();
+ _networkConfig = 0;
+ }
}
/*** ***/
}
void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
- if(!bufferSyncer())
- return;
- bufferSyncer()->requestSetLastSeenMsg(id, msgId);
+ if(bufferSyncer())
+ bufferSyncer()->requestSetLastSeenMsg(id, msgId);
+}
+
+void Client::setBufferMarkerLine(BufferId id, const MsgId &msgId) {
+ if(bufferSyncer())
+ bufferSyncer()->requestSetMarkerLine(id, msgId);
}
void Client::removeBuffer(BufferId id) {
networkModel()->removeBuffer(bufferId2);
}
+void Client::markBufferAsRead(BufferId id) {
+ if(bufferSyncer() && id.isValid())
+ bufferSyncer()->requestMarkBufferAsRead(id);
+}
+
void Client::logMessage(QtMsgType type, const char *msg) {
fprintf(stderr, "%s\n", msg);
fflush(stderr);
Quassel::logFatalMessage(msg);
} else {
QString msgString = QString("%1\n").arg(msg);
+
+ //Check to see if there is an instance around, else we risk recursions
+ //when calling instance() and creating new ones.
+ if (!instanceExists())
+ return;
+
instance()->_debugLog << msgString;
emit instance()->logUpdated(msgString);
}
}
-
projects / quassel.git / blobdiff