X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=f77ab6c4ae38cc474e97f7e73d4d207eec68f704;hp=8ee2f39519275b3e5f8e280c980f897014e21aed;hb=f7e987956ef7e469a493a669e2f0c0901f5a7ead;hpb=ec9528b2997470953e3c4e456271e696026e9717 diff --git a/src/client/client.cpp b/src/client/client.cpp index 8ee2f395..16437570 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1,11 +1,11 @@ /*************************************************************************** - * Copyright (C) 2005-07 by The Quassel Team * + * Copyright (C) 2005-08 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * + * (at your option) version 3. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * @@ -20,40 +20,46 @@ #include "client.h" -#include "buffer.h" -#include "buffertreemodel.h" +#include "abstractmessageprocessor.h" +#include "bufferinfo.h" +#include "buffermodel.h" +#include "buffersettings.h" +#include "buffersyncer.h" +#include "bufferviewmanager.h" +#include "clientbacklogmanager.h" +#include "clientirclisthelper.h" +#include "identity.h" +#include "ircchannel.h" +#include "ircuser.h" +#include "message.h" +#include "messagemodel.h" +#include "network.h" +#include "networkmodel.h" +#include "quassel.h" #include "quasselui.h" #include "signalproxy.h" #include "util.h" -Client * Client::instanceptr = 0; +#include +#include -bool Client::connectedToCore = false; -Client::ClientMode Client::clientMode; -QVariantMap Client::coreConnectionInfo; -QHash Client::buffers; -QHash Client::bufferIds; -QHash > Client::nicks; -QHash Client::netConnected; -QStringList Client::netsAwaitingInit; -QHash Client::ownNick; +QPointer Client::instanceptr = 0; +AccountId Client::_currentCoreAccount = 0; + +/*** Initialization/destruction ***/ Client *Client::instance() { - if(instanceptr) return instanceptr; - instanceptr = new Client(); + if(!instanceptr) + instanceptr = new Client(); return instanceptr; } void Client::destroy() { - delete instanceptr; - instanceptr = 0; -} - -Client::Client() { - _signalProxy = new SignalProxy(SignalProxy::Client, 0, this); - - connectedToCore = false; - socket = 0; + if(instanceptr) { + delete instanceptr->mainUi; + instanceptr->deleteLater(); + instanceptr = 0; + } } void Client::init(AbstractUi *ui) { @@ -61,419 +67,362 @@ void Client::init(AbstractUi *ui) { instance()->init(); } +Client::Client(QObject *parent) + : QObject(parent), + _signalProxy(new SignalProxy(SignalProxy::Client, this)), + mainUi(0), + _networkModel(0), + _bufferModel(0), + _bufferSyncer(0), + _backlogManager(new ClientBacklogManager(this)), + _bufferViewManager(0), + _ircListHelper(new ClientIrcListHelper(this)), + _messageModel(0), + _messageProcessor(0), + _connectedToCore(false), + _syncedToCore(false), + _debugLog(&_debugLogBuffer) +{ + _signalProxy->synchronize(_ircListHelper); +} + +Client::~Client() { + disconnectFromCore(); +} + void Client::init() { - blockSize = 0; + _currentCoreAccount = 0; + _networkModel = new NetworkModel(this); - _bufferModel = new BufferTreeModel(this); + connect(this, SIGNAL(networkRemoved(NetworkId)), + _networkModel, SLOT(networkRemoved(NetworkId))); - connect(this, SIGNAL(bufferSelected(Buffer *)), _bufferModel, SLOT(selectBuffer(Buffer *))); - connect(this, SIGNAL(bufferUpdated(Buffer *)), _bufferModel, SLOT(bufferUpdated(Buffer *))); - connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)), _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *))); + _bufferModel = new BufferModel(_networkModel); + _messageModel = mainUi->createMessageModel(this); + _messageProcessor = mainUi->createMessageProcessor(this); SignalProxy *p = signalProxy(); - p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)), SIGNAL(clientSessionDataChanged(const QString &, const QVariant &))); - p->attachSlot(SIGNAL(coreSessionDataChanged(const QString &, const QVariant &)), this, SLOT(recvSessionData(const QString &, const QVariant &))); - p->attachSlot(SIGNAL(coreState(const QVariant &)), this, SLOT(recvCoreState(const QVariant &))); - p->attachSlot(SIGNAL(networkState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant))); - p->attachSlot(SIGNAL(networkConnected(QString)), this, SLOT(networkConnected(QString))); - p->attachSlot(SIGNAL(networkDisconnected(QString)), this, SLOT(networkDisconnected(QString))); + p->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &))); p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString))); - p->attachSlot(SIGNAL(topicSet(QString, QString, QString)), this, SLOT(setTopic(QString, QString, QString))); - p->attachSlot(SIGNAL(nickAdded(QString, QString, QVariantMap)), this, SLOT(addNick(QString, QString, QVariantMap))); - p->attachSlot(SIGNAL(nickRemoved(QString, QString)), this, SLOT(removeNick(QString, QString))); - p->attachSlot(SIGNAL(nickRenamed(QString, QString, QString)), this, SLOT(renameNick(QString, QString, QString))); - p->attachSlot(SIGNAL(nickUpdated(QString, QString, QVariantMap)), this, SLOT(updateNick(QString, QString, QVariantMap))); - p->attachSlot(SIGNAL(ownNickSet(QString, QString)), this, SLOT(setOwnNick(QString, QString))); - p->attachSlot(SIGNAL(backlogData(BufferId, const QVariantList &, bool)), this, SLOT(recvBacklogData(BufferId, const QVariantList &, bool))); - p->attachSlot(SIGNAL(bufferIdUpdated(BufferId)), this, SLOT(updateBufferId(BufferId))); - p->attachSignal(this, SIGNAL(sendInput(BufferId, QString))); + + p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), _networkModel, SLOT(bufferUpdated(BufferInfo))); + p->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString))); p->attachSignal(this, SIGNAL(requestNetworkStates())); - connect(mainUi, SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &))); + p->attachSignal(this, SIGNAL(requestCreateIdentity(const Identity &)), SIGNAL(createIdentity(const Identity &))); + p->attachSignal(this, SIGNAL(requestRemoveIdentity(IdentityId)), SIGNAL(removeIdentity(IdentityId))); + p->attachSlot(SIGNAL(identityCreated(const Identity &)), this, SLOT(coreIdentityCreated(const Identity &))); + p->attachSlot(SIGNAL(identityRemoved(IdentityId)), this, SLOT(coreIdentityRemoved(IdentityId))); + + p->attachSignal(this, SIGNAL(requestCreateNetwork(const NetworkInfo &)), SIGNAL(createNetwork(const NetworkInfo &))); + p->attachSignal(this, SIGNAL(requestRemoveNetwork(NetworkId)), SIGNAL(removeNetwork(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())); connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore())); - layoutTimer = new QTimer(this); - layoutTimer->setInterval(0); - layoutTimer->setSingleShot(false); - connect(layoutTimer, SIGNAL(timeout()), this, SLOT(layoutMsg())); + // attach backlog manager + p->synchronize(backlogManager()); + connect(backlogManager(), SIGNAL(messagesReceived(BufferId, int)), _messageModel, SLOT(messagesReceived(BufferId, int))); } -Client::~Client() { - foreach(Buffer *buf, buffers.values()) delete buf; // this is done by disconnectFromCore()! FIXME? - Q_ASSERT(!buffers.count()); -} +/*** public static methods ***/ -BufferTreeModel *Client::bufferModel() { - return instance()->_bufferModel; +AccountId Client::currentCoreAccount() { + return _currentCoreAccount; } -SignalProxy *Client::signalProxy() { - return instance()->_signalProxy; +void Client::setCurrentCoreAccount(AccountId id) { + _currentCoreAccount = id; } bool Client::isConnected() { - return connectedToCore; + return instance()->_connectedToCore; } -void Client::connectToCore(const QVariantMap &conn) { - // TODO implement SSL - coreConnectionInfo = conn; - if(isConnected()) { - emit coreConnectionError(tr("Already connected to Core!")); - return; - } - if(socket != 0) socket->deleteLater(); - if(conn["Host"].toString().isEmpty()) { - clientMode = LocalCore; - socket = new QBuffer(this); - connect(socket, SIGNAL(readyRead()), this, SLOT(coreHasData())); - socket->open(QIODevice::ReadWrite); - //QVariant state = connectToLocalCore(coreConnectionInfo["User"].toString(), coreConnectionInfo["Password"].toString()); - //syncToCore(state); - coreSocketConnected(); - } else { - clientMode = RemoteCore; - emit coreConnectionMsg(tr("Connecting...")); - Q_ASSERT(!socket); - QTcpSocket *sock = new QTcpSocket(this); - socket = sock; - connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData())); - connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected())); - connect(sock, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected())); - connect(signalProxy(), SIGNAL(peerDisconnected()), this, SLOT(coreSocketDisconnected())); - //connect(sock, SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(coreSocketStateChanged(QAbstractSocket::SocketState))); - connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError))); - sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt()); - } +bool Client::isSynced() { + return instance()->_syncedToCore; } -void Client::disconnectFromCore() { - if(clientMode == RemoteCore) { - socket->close(); - //QAbstractSocket *sock = qobject_cast(socket); - //Q_ASSERT(sock); - //sock->disconnectFromHost(); - } else { - socket->close(); - //disconnectFromLocalCore(); - coreSocketDisconnected(); - } +/*** Network handling ***/ + +QList Client::networkIds() { + return instance()->_networks.keys(); } -void Client::coreSocketConnected() { - connect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint))); - emit coreConnectionMsg(tr("Synchronizing to core...")); - QVariantMap clientInit; - clientInit["GuiProtocol"] = GUI_PROTOCOL; - clientInit["User"] = coreConnectionInfo["User"].toString(); - clientInit["Password"] = coreConnectionInfo["Password"].toString(); - writeDataToDevice(socket, clientInit); +const Network * Client::network(NetworkId networkid) { + if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid]; + else return 0; } -void Client::coreSocketDisconnected() { - connectedToCore = false; - emit disconnected(); - socket->deleteLater(); - blockSize = 0; - - /* Clear internal data. Hopefully nothing relies on it at this point. */ - _bufferModel->clear(); - // Buffers, if deleted, send a signal that causes their removal from buffers and bufferIds. - // So we cannot simply go through the array in a loop (or use qDeleteAll) for deletion... - while(buffers.count()) { delete buffers.take(buffers.keys()[0]); } - Q_ASSERT(!buffers.count()); // should be empty now! - Q_ASSERT(!bufferIds.count()); - coreConnectionInfo.clear(); - sessionData.clear(); - nicks.clear(); - netConnected.clear(); - netsAwaitingInit.clear(); - ownNick.clear(); - layoutQueue.clear(); - layoutTimer->stop(); -} - -void Client::coreSocketStateChanged(QAbstractSocket::SocketState state) { qDebug() << state; - if(state == QAbstractSocket::UnconnectedState) coreSocketDisconnected(); -} - -void Client::recvCoreState(const QVariant &state) { - disconnect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint))); - disconnect(socket, 0, this, 0); // rest of communication happens through SignalProxy - signalProxy()->addPeer(socket); - syncToCore(state); -} - -// TODO: auth errors -void Client::syncToCore(const QVariant &coreState) { - if(!coreState.toMap().contains("SessionState")) { - emit coreConnectionError(tr("Invalid data received from core!")); - disconnectFromCore(); +void Client::createNetwork(const NetworkInfo &info) { + emit instance()->requestCreateNetwork(info); +} + +void Client::removeNetwork(NetworkId id) { + emit instance()->requestRemoveNetwork(id); +} + +void Client::updateNetwork(const NetworkInfo &info) { + Network *netptr = instance()->_networks.value(info.networkId, 0); + if(!netptr) { + qWarning() << "Update for unknown network requested:" << info; return; } - QVariantMap sessionState = coreState.toMap()["SessionState"].toMap(); - QVariantMap sessData = sessionState["SessionData"].toMap(); + netptr->requestSetNetworkInfo(info); +} - foreach(QString key, sessData.keys()) { - recvSessionData(key, sessData[key]); - } - QList coreBuffers = sessionState["Buffers"].toList(); - /* make lookups by id faster */ - foreach(QVariant vid, coreBuffers) { - BufferId id = vid.value(); - bufferIds[id.uid()] = id; // make lookups by id faster - buffer(id); // create all buffers, so we see them in the network views - } - netsAwaitingInit = sessionState["Networks"].toStringList(); - connectedToCore = true; - if(netsAwaitingInit.count()) { - emit coreConnectionMsg(tr("Requesting network states...")); - emit coreConnectionProgress(0, netsAwaitingInit.count()); - emit requestNetworkStates(); - } - else { - emit coreConnectionProgress(1, 1); - emit connected(); - } +void Client::addNetwork(Network *net) { + net->setProxy(signalProxy()); + signalProxy()->synchronize(net); + networkModel()->attachNetwork(net); + connect(net, SIGNAL(destroyed()), instance(), SLOT(networkDestroyed())); + instance()->_networks[net->networkId()] = net; + emit instance()->networkCreated(net->networkId()); } -void Client::recvSessionData(const QString &key, const QVariant &data) { - sessionData[key] = data; - emit sessionDataChanged(key, data); - emit sessionDataChanged(key); +void Client::coreNetworkCreated(NetworkId id) { + if(_networks.contains(id)) { + qWarning() << "Creation of already existing network requested!"; + return; + } + Network *net = new Network(id, this); + addNetwork(net); } -void Client::storeSessionData(const QString &key, const QVariant &data) { - // Not sure if this is a good idea, but we'll try it anyway: - // Calling this function only sends a signal to core. Data is stored upon reception of the update signal, - // rather than immediately. - emit instance()->sendSessionData(key, data); +void Client::coreNetworkRemoved(NetworkId id) { + if(!_networks.contains(id)) + return; + Network *net = _networks.take(id); + emit networkRemoved(net->networkId()); + net->deleteLater(); } -QVariant Client::retrieveSessionData(const QString &key, const QVariant &def) { - if(instance()->sessionData.contains(key)) return instance()->sessionData[key]; - else return def; +/*** Identity handling ***/ + +QList Client::identityIds() { + return instance()->_identities.keys(); } -QStringList Client::sessionDataKeys() { - return instance()->sessionData.keys(); +const Identity * Client::identity(IdentityId id) { + if(instance()->_identities.contains(id)) return instance()->_identities[id]; + else return 0; } -void Client::coreSocketError(QAbstractSocket::SocketError) { - emit coreConnectionError(socket->errorString()); - socket->deleteLater(); +void Client::createIdentity(const Identity &id) { + emit instance()->requestCreateIdentity(id); } -void Client::coreHasData() { - QVariant item; - if(readDataFromDevice(socket, blockSize, item)) { - emit recvPartialItem(1,1); - recvCoreState(item); - blockSize = 0; +void Client::updateIdentity(IdentityId id, const QVariantMap &ser) { + Identity *idptr = instance()->_identities.value(id, 0); + if(!idptr) { + qWarning() << "Update for unknown identity requested:" << id; return; } - if(blockSize > 0) { - emit recvPartialItem(socket->bytesAvailable(), blockSize); - } + idptr->requestUpdate(ser); } -void Client::networkConnected(QString net) { - Q_ASSERT(!netsAwaitingInit.contains(net)); - netConnected[net] = true; - BufferId id = statusBufferId(net); - Buffer *b = buffer(id); - b->setActive(true); - //b->displayMsg(Message(id, Message::Server, tr("Connected."))); - // TODO buffersUpdated(); +void Client::removeIdentity(IdentityId id) { + emit instance()->requestRemoveIdentity(id); } -void Client::networkDisconnected(QString net) { - foreach(BufferId id, buffers.keys()) { - if(id.network() != net) continue; - Buffer *b = buffer(id); - //b->displayMsg(Message(id, Message::Server, tr("Server disconnected."))); FIXME - b->setActive(false); - } - netConnected[net] = false; - if(netsAwaitingInit.contains(net)) { - qDebug() << "Network" << net << "disconnected while not yet initialized!"; - netsAwaitingInit.removeAll(net); - emit coreConnectionProgress(netConnected.count(), netConnected.count() + netsAwaitingInit.count()); - if(!netsAwaitingInit.count()) emit connected(); +void Client::coreIdentityCreated(const Identity &other) { + if(!_identities.contains(other.id())) { + Identity *identity = new Identity(other, this); + _identities[other.id()] = identity; + identity->setInitialized(); + signalProxy()->synchronize(identity); + emit identityCreated(other.id()); + } else { + qWarning() << tr("Identity already exists in client!"); } } -void Client::updateBufferId(BufferId id) { - bufferIds[id.uid()] = id; // make lookups by id faster - buffer(id); -} - -BufferId Client::bufferId(QString net, QString buf) { - foreach(BufferId id, buffers.keys()) { - if(id.network() == net && id.buffer() == buf) return id; +void Client::coreIdentityRemoved(IdentityId id) { + if(_identities.contains(id)) { + emit identityRemoved(id); + Identity *i = _identities.take(id); + i->deleteLater(); } - Q_ASSERT(false); // should never happen! - return BufferId(); } -BufferId Client::statusBufferId(QString net) { - return bufferId(net, ""); +/*** ***/ +void Client::userInput(BufferInfo bufferInfo, QString message) { + emit instance()->sendInput(bufferInfo, message); } +/*** core connection stuff ***/ -Buffer * Client::buffer(BufferId id) { - Client *client = Client::instance(); - if(!buffers.contains(id)) { - Buffer *b = new Buffer(id); - b->setOwnNick(ownNick[id.network()]); - connect(b, SIGNAL(userInput(BufferId, QString)), client, SLOT(userInput(BufferId, QString))); - connect(b, SIGNAL(bufferUpdated(Buffer *)), client, SIGNAL(bufferUpdated(Buffer *))); - connect(b, SIGNAL(bufferDestroyed(Buffer *)), client, SIGNAL(bufferDestroyed(Buffer *))); - connect(b, SIGNAL(bufferDestroyed(Buffer *)), client, SLOT(removeBuffer(Buffer *))); - buffers[id] = b; - emit client->bufferUpdated(b); +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); } - return buffers[id]; + _connectedToCore = true; + setCurrentCoreAccount(id); } -QList Client::allBufferIds() { - return buffers.keys(); -} +void Client::setSyncedToCore() { + // create buffersyncer + Q_ASSERT(!_bufferSyncer); + _bufferSyncer = new BufferSyncer(this); + connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), _networkModel, SLOT(setLastSeenMsgId(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(initDone()), this, SLOT(requestInitialBacklog())); + connect(networkModel(), SIGNAL(setLastSeenMsg(BufferId, MsgId)), bufferSyncer(), SLOT(requestSetLastSeenMsg(BufferId, const MsgId &))); + signalProxy()->synchronize(bufferSyncer()); + + // create a new BufferViewManager + Q_ASSERT(!_bufferViewManager); + _bufferViewManager = new BufferViewManager(signalProxy(), this); + connect(bufferViewManager(), SIGNAL(initDone()), this, SLOT(requestInitialBacklog())); -void Client::removeBuffer(Buffer *b) { - buffers.remove(b->bufferId()); - bufferIds.remove(b->bufferId().uid()); + _syncedToCore = true; + emit connected(); + emit coreConnectionStateChanged(true); } -void Client::recvNetworkState(QString net, QVariant state) { - netsAwaitingInit.removeAll(net); - netConnected[net] = true; - setOwnNick(net, state.toMap()["OwnNick"].toString()); - buffer(statusBufferId(net))->setActive(true); - QVariantMap t = state.toMap()["Topics"].toMap(); - QVariantMap n = state.toMap()["Nicks"].toMap(); - foreach(QVariant v, t.keys()) { - QString buf = v.toString(); - BufferId id = bufferId(net, buf); - buffer(id)->setActive(true); - setTopic(net, buf, t[buf].toString()); - } - foreach(QString nick, n.keys()) { - addNick(net, nick, n[nick].toMap()); - } - emit coreConnectionProgress(netConnected.count(), netConnected.count() + netsAwaitingInit.count()); - if(!netsAwaitingInit.count()) emit connected(); +void Client::requestInitialBacklog() { + if(bufferViewManager()->isInitialized() && bufferSyncer()->isInitialized()) + Client::backlogManager()->requestInitialBacklog(); } -void Client::recvMessage(const Message &msg) { - Buffer *b = buffer(msg.buffer); +void Client::setSecuredConnection() { + emit securedConnection(); +} - Buffer::ActivityLevel level = Buffer::OtherActivity; - if(msg.type == Message::Plain || msg.type == Message::Notice){ - level |= Buffer::NewMessage; - } - if(msg.flags & Message::Highlight){ - level |= Buffer::Highlight; - } - emit bufferActivity(level, b); +void Client::disconnectFromCore() { + if(!isConnected()) + return; - b->appendMsg(msg); + signalProxy()->removeAllPeers(); } -void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) { - //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg))); +void Client::disconnectedFromCore() { + _connectedToCore = false; + _syncedToCore = false; + emit disconnected(); + emit coreConnectionStateChanged(false); -} + backlogManager()->reset(); + messageProcessor()->reset(); + + // Clear internal data. Hopefully nothing relies on it at this point. + setCurrentCoreAccount(0); -void Client::recvBacklogData(BufferId id, QVariantList msgs, bool /*done*/) { - Buffer *b = buffer(id); - foreach(QVariant v, msgs) { - Message msg = v.value(); - b->prependMsg(msg); - if(!layoutQueue.contains(b)) layoutQueue.append(b); + if(_bufferSyncer) { + _bufferSyncer->deleteLater(); + _bufferSyncer = 0; } - if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start(); -} -void Client::layoutMsg() { - if(layoutQueue.count()) { - Buffer *b = layoutQueue.takeFirst(); // TODO make this the current buffer - if(b->layoutMsg()) layoutQueue.append(b); // Buffer has more messages in its queue --> Round Robin + if(_bufferViewManager) { + _bufferViewManager->deleteLater(); + _bufferViewManager = 0; } - if(!layoutQueue.count()) layoutTimer->stop(); -} -AbstractUiMsg *Client::layoutMsg(const Message &msg) { - return instance()->mainUi->layoutMsg(msg); -} + _messageModel->clear(); + _networkModel->clear(); -void Client::userInput(BufferId id, QString msg) { - emit sendInput(id, msg); -} + QHash::iterator netIter = _networks.begin(); + while(netIter != _networks.end()) { + Network *net = netIter.value(); + emit networkRemoved(net->networkId()); + disconnect(net, SIGNAL(destroyed()), this, 0); + netIter = _networks.erase(netIter); + net->deleteLater(); + } + Q_ASSERT(_networks.isEmpty()); + + QHash::iterator idIter = _identities.begin(); + while(idIter != _identities.end()) { + Identity *id = idIter.value(); + emit identityRemoved(id->id()); + idIter = _identities.erase(idIter); + id->deleteLater(); + } + Q_ASSERT(_identities.isEmpty()); -void Client::setTopic(QString net, QString buf, QString topic) { - BufferId id = bufferId(net, buf); - if(!netConnected[id.network()]) return; - Buffer *b = buffer(id); - b->setTopic(topic); - //if(!b->isActive()) { - // b->setActive(true); - // buffersUpdated(); - //} } -void Client::addNick(QString net, QString nick, QVariantMap props) { - if(!netConnected[net]) return; - nicks[net][nick] = props; - QVariantMap chans = props["Channels"].toMap(); - QStringList c = chans.keys(); - foreach(QString bufname, c) { - buffer(bufferId(net, bufname))->addNick(nick, props); +/*** ***/ + +void Client::networkDestroyed() { + Network *net = static_cast(sender()); + QHash::iterator netIter = _networks.begin(); + while(netIter != _networks.end()) { + if(*netIter == net) { + netIter = _networks.erase(netIter); + break; + } else { + netIter++; + } } } -void Client::renameNick(QString net, QString oldnick, QString newnick) { - if(!netConnected[net]) return; - QStringList chans = nicks[net][oldnick]["Channels"].toMap().keys(); - foreach(QString c, chans) { - buffer(bufferId(net, c))->renameNick(oldnick, newnick); - } - nicks[net][newnick] = nicks[net].take(oldnick); +// Hmm... we never used this... +void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) { + //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg))); } -void Client::updateNick(QString net, QString nick, QVariantMap props) { - if(!netConnected[net]) return; - QStringList oldchans = nicks[net][nick]["Channels"].toMap().keys(); - QStringList newchans = props["Channels"].toMap().keys(); - foreach(QString c, newchans) { - if(oldchans.contains(c)) buffer(bufferId(net, c))->updateNick(nick, props); - else buffer(bufferId(net, c))->addNick(nick, props); - } - foreach(QString c, oldchans) { - if(!newchans.contains(c)) buffer(bufferId(net, c))->removeNick(nick); +void Client::recvMessage(const Message &msg) { + Message msg_ = msg; + messageProcessor()->process(msg_); +} + +void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) { + if(!bufferSyncer()) + return; + bufferSyncer()->requestSetLastSeenMsg(id, msgId); +} + +void Client::removeBuffer(BufferId id) { + if(!bufferSyncer()) return; + bufferSyncer()->requestRemoveBuffer(id); +} + +void Client::bufferRemoved(BufferId bufferId) { + // select a sane buffer (status buffer) + /* we have to manually select a buffer because otherwise inconsitent changes + * to the model might occur: + * the result of a buffer removal triggers a change in the selection model. + * the newly selected buffer might be a channel that hasn't been selected yet + * and a new nickview would be created (which never heard of the "rowsAboutToBeRemoved"). + * this new view (and/or) its sort filter will then only receive a "rowsRemoved" signal. + */ + QModelIndex current = bufferModel()->currentIndex(); + if(current.data(NetworkModel::BufferIdRole).value() == bufferId) { + bufferModel()->setCurrentIndex(current.sibling(0,0)); } - nicks[net][nick] = props; + + // and remove it from the model + networkModel()->removeBuffer(bufferId); } -void Client::removeNick(QString net, QString nick) { - if(!netConnected[net]) return; - QVariantMap chans = nicks[net][nick]["Channels"].toMap(); - foreach(QString bufname, chans.keys()) { - buffer(bufferId(net, bufname))->removeNick(nick); +void Client::bufferRenamed(BufferId bufferId, const QString &newName) { + QModelIndex bufferIndex = networkModel()->bufferIndex(bufferId); + if(bufferIndex.isValid()) { + networkModel()->setData(bufferIndex, newName, Qt::DisplayRole); } - nicks[net].remove(nick); } -void Client::setOwnNick(QString net, QString nick) { - if(!netConnected[net]) return; - ownNick[net] = nick; - foreach(BufferId id, buffers.keys()) { - if(id.network() == net) { - buffers[id]->setOwnNick(nick); - } +void Client::logMessage(QtMsgType type, const char *msg) { + fprintf(stderr, "%s\n", msg); + fflush(stderr); + if(type == QtFatalMsg) { + Quassel::logFatalMessage(msg); + } else { + QString msgString = QString("%1\n").arg(msg); + instance()->_debugLog << msgString; + emit instance()->logUpdated(msgString); } }