X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=19f0c5e039777edf55e1b136394bbd62d74df527;hp=f42e2a4ac088f62d666832419cb722bb2efa6c24;hb=8f0946673bc3edc84b6f13e16cbe8ece912b4a3b;hpb=788fd0058595c815dc42597e9956c02aea45261f diff --git a/src/client/client.cpp b/src/client/client.cpp index f42e2a4a..19f0c5e0 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-07 by the Quassel IRC 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 * @@ -20,22 +20,30 @@ #include "client.h" +#include "abstractmessageprocessor.h" #include "bufferinfo.h" -#include "buffertreemodel.h" -#include "global.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 "networkinfo.h" +#include "messagemodel.h" +#include "network.h" +#include "networkmodel.h" #include "quasselui.h" #include "signalproxy.h" #include "util.h" QPointer Client::instanceptr = 0; +AccountId Client::_currentCoreAccount = 0; + +/*** Initialization/destruction ***/ -// ============================== -// public Static Methods -// ============================== Client *Client::instance() { if(!instanceptr) instanceptr = new Client(); @@ -43,7 +51,11 @@ Client *Client::instance() { } void Client::destroy() { - delete instanceptr; + if(instanceptr) { + delete instanceptr->mainUi; + instanceptr->deleteLater(); + instanceptr = 0; + } } void Client::init(AbstractUi *ui) { @@ -51,499 +63,341 @@ void Client::init(AbstractUi *ui) { instance()->init(); } -QList Client::networkInfos() { - return instance()->_networkInfo.values(); -} - -NetworkInfo *Client::networkInfo(uint networkid) { - if(instance()->_networkInfo.contains(networkid)) - return instance()->_networkInfo[networkid]; - else - return 0; -} - -QList Client::allBufferInfos() { - QList bufferids; - foreach(Buffer *buffer, buffers()) { - bufferids << buffer->bufferInfo(); - } - return bufferids; -} - -QList Client::buffers() { - return instance()->_buffers.values(); -} - -Buffer *Client::buffer(uint bufferUid) { - if(instance()->_buffers.contains(bufferUid)) - return instance()->_buffers[bufferUid]; - else - return 0; -} - -Buffer *Client::buffer(BufferInfo id) { - Buffer *buff = buffer(id.uid()); - - if(!buff) { - Client *client = Client::instance(); - buff = new Buffer(id, client); - - connect(buff, SIGNAL(userInput(BufferInfo, QString)), - client, SLOT(userInput(BufferInfo, QString))); - connect(buff, SIGNAL(bufferUpdated(Buffer *)), - client, SIGNAL(bufferUpdated(Buffer *))); - connect(buff, SIGNAL(destroyed()), - client, SLOT(bufferDestroyed())); - client->_buffers[id.uid()] = buff; - emit client->bufferUpdated(buff); - } - Q_ASSERT(buff); - return buff; -} - -// FIXME switch to netids! -// WHEN IS THIS NEEDED ANYHOW!? -// ...only for finding the Buffer for a channel, I guess... -BufferInfo Client::bufferInfo(QString net, QString buf) { - foreach(Buffer *buffer_, buffers()) { - BufferInfo bufferInfo = buffer_->bufferInfo(); - if(!bufferInfo.network().compare(net, Qt::CaseInsensitive) && !bufferInfo.buffer().compare(buf, Qt::CaseInsensitive)) - return bufferInfo; - } - Q_ASSERT(false); // should never happen! - return BufferInfo(); -} - -BufferInfo Client::statusBufferInfo(QString net) { - return bufferInfo(net, ""); -} - -NetworkModel *Client::networkModel() { - return instance()->_networkModel; -} - -SignalProxy *Client::signalProxy() { - return instance()->_signalProxy; -} - -// ============================== -// Constructor / Decon -// ============================== Client::Client(QObject *parent) : QObject(parent), - socket(0), _signalProxy(new SignalProxy(SignalProxy::Client, this)), mainUi(0), _networkModel(0), - connectedToCore(false) + _bufferModel(0), + _bufferSyncer(0), + _backlogManager(new ClientBacklogManager(this)), + _bufferViewManager(0), + _ircListHelper(new ClientIrcListHelper(this)), + _messageModel(0), + _messageProcessor(0), + _connectedToCore(false), + _syncedToCore(false) { + _signalProxy->synchronize(_ircListHelper); } Client::~Client() { - + disconnectFromCore(); } void Client::init() { - blockSize = 0; - + _currentCoreAccount = 0; _networkModel = new NetworkModel(this); - connect(this, SIGNAL(bufferSelected(Buffer *)), - _networkModel, SLOT(selectBuffer(Buffer *))); - connect(this, SIGNAL(bufferUpdated(Buffer *)), - _networkModel, SLOT(bufferUpdated(Buffer *))); - connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)), - _networkModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *))); + connect(this, SIGNAL(networkRemoved(NetworkId)), + _networkModel, SLOT(networkRemoved(NetworkId))); + + _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(networkConnected(uint)), - this, SLOT(networkConnected(uint))); - p->attachSlot(SIGNAL(networkDisconnected(uint)), - this, SLOT(networkDisconnected(uint))); - 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(backlogData(BufferInfo, const QVariantList &, bool)), this, SLOT(recvBacklogData(BufferInfo, const QVariantList &, bool))); - p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), this, SLOT(updateBufferInfo(BufferInfo))); + + 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(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())); - } -bool Client::isConnected() { - return instance()->connectedToCore; -} +/*** public static methods ***/ -void Client::fakeInput(uint bufferUid, QString message) { - Buffer *buff = buffer(bufferUid); - if(!buff) - qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message; - else - emit instance()->sendInput(buff->bufferInfo(), message); +AccountId Client::currentCoreAccount() { + return _currentCoreAccount; } -void Client::fakeInput(BufferInfo bufferInfo, QString message) { - fakeInput(bufferInfo, message); +void Client::setCurrentCoreAccount(AccountId id) { + _currentCoreAccount = id; } -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(signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected())); - connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError))); - sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt()); - } +bool Client::isConnected() { + return instance()->_connectedToCore; } -void Client::disconnectFromCore() { - socket->close(); +bool Client::isSynced() { + return instance()->_syncedToCore; } -void Client::setCoreConfiguration(const QVariantMap &settings) { - SignalProxy::writeDataToDevice(socket, settings); -} +/*** Network handling ***/ -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(); - SignalProxy::writeDataToDevice(socket, clientInit); +QList Client::networkIds() { + return instance()->_networks.keys(); } -void Client::coreSocketDisconnected() { - instance()->connectedToCore = false; - emit disconnected(); - socket->deleteLater(); - blockSize = 0; - - /* Clear internal data. Hopefully nothing relies on it at this point. */ - _networkModel->clear(); - - QHash::iterator bufferIter = _buffers.begin(); - while(bufferIter != _buffers.end()) { - Buffer *buffer = bufferIter.value(); - disconnect(buffer, SIGNAL(destroyed()), this, 0); - bufferIter = _buffers.erase(bufferIter); - buffer->deleteLater(); - } - Q_ASSERT(_buffers.isEmpty()); - - - QHash::iterator netIter = _networkInfo.begin(); - while(netIter != _networkInfo.end()) { - NetworkInfo *net = netIter.value(); - disconnect(net, SIGNAL(destroyed()), this, 0); - netIter = _networkInfo.erase(netIter); - net->deleteLater(); - } - Q_ASSERT(_networkInfo.isEmpty()); +const Network * Client::network(NetworkId networkid) { + if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid]; + else return 0; +} - coreConnectionInfo.clear(); - sessionData.clear(); - layoutQueue.clear(); - layoutTimer->stop(); +void Client::createNetwork(const NetworkInfo &info) { + emit instance()->requestCreateNetwork(info); } -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); +void Client::removeNetwork(NetworkId id) { + emit instance()->requestRemoveNetwork(id); } -// 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::updateNetwork(const NetworkInfo &info) { + Network *netptr = instance()->_networks.value(info.networkId, 0); + if(!netptr) { + qWarning() << "Update for unknown network requested:" << info; return; } + netptr->requestSetNetworkInfo(info); +} - QVariantMap sessionState = coreState.toMap()["SessionState"].toMap(); - - // store sessionData - QVariantMap sessData = sessionState["SessionData"].toMap(); - foreach(QString key, sessData.keys()) - recvSessionData(key, sessData[key]); - - // store Buffer details - QVariantList coreBuffers = sessionState["Buffers"].toList(); - /* make lookups by id faster */ - foreach(QVariant vid, coreBuffers) { - buffer(vid.value()); // create all buffers, so we see them in the network views - } +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()); +} - // create networkInfo objects - QVariantList networkids = sessionState["Networks"].toList(); - foreach(QVariant networkid, networkids) { - networkConnected(networkid.toUInt()); +void Client::coreNetworkCreated(NetworkId id) { + if(_networks.contains(id)) { + qWarning() << "Creation of already existing network requested!"; + return; } - - instance()->connectedToCore = true; - updateCoreConnectionProgress(); - + Network *net = new Network(id, this); + addNetwork(net); } -void Client::updateCoreConnectionProgress() { - // we'll do this in three steps: - // 1.) networks - // 2.) channels - // 3.) ircusers - - int numNets = networkInfos().count(); - int numNetsWaiting = 0; - - int numIrcUsers = 0; - int numIrcUsersWaiting = 0; +void Client::coreNetworkRemoved(NetworkId id) { + if(!_networks.contains(id)) + return; + Network *net = _networks.take(id); + emit networkRemoved(net->networkId()); + net->deleteLater(); +} - int numChannels = 0; - int numChannelsWaiting = 0; +/*** Identity handling ***/ - foreach(NetworkInfo *net, networkInfos()) { - if(! net->initialized()) - numNetsWaiting++; +QList Client::identityIds() { + return instance()->_identities.keys(); +} - numIrcUsers += net->ircUsers().count(); - foreach(IrcUser *user, net->ircUsers()) { - if(! user->initialized()) - numIrcUsersWaiting++; - } +const Identity * Client::identity(IdentityId id) { + if(instance()->_identities.contains(id)) return instance()->_identities[id]; + else return 0; +} - numChannels += net->ircChannels().count(); - foreach(IrcChannel *channel, net->ircChannels()) { - if(! channel->initialized()) - numChannelsWaiting++; - } - } +void Client::createIdentity(const Identity &id) { + emit instance()->requestCreateIdentity(id); +} - if(numNetsWaiting > 0) { - emit coreConnectionMsg(tr("Requesting network states...")); - emit coreConnectionProgress(numNets - numNetsWaiting, numNets); +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; } + idptr->requestUpdate(ser); +} - if(numIrcUsersWaiting > 0) { - emit coreConnectionMsg(tr("Requesting User states...")); - emit coreConnectionProgress(numIrcUsers - numIrcUsersWaiting, numIrcUsers); - return; - } +void Client::removeIdentity(IdentityId id) { + emit instance()->requestRemoveIdentity(id); +} - if(numChannelsWaiting > 0) { - emit coreConnectionMsg(tr("Requesting Channel states...")); - emit coreConnectionProgress(numChannels - numChannelsWaiting, numChannels); - return; +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!"); } +} - emit coreConnectionProgress(1,1); - emit connected(); - foreach(NetworkInfo *net, networkInfos()) { - disconnect(net, 0, this, SLOT(updateCoreConnectionProgress())); +void Client::coreIdentityRemoved(IdentityId id) { + if(_identities.contains(id)) { + emit identityRemoved(id); + Identity *i = _identities.take(id); + i->deleteLater(); } - - // signalProxy()->dumpProxyStats(); } -void Client::recvSessionData(const QString &key, const QVariant &data) { - sessionData[key] = data; - emit sessionDataChanged(key, data); - emit sessionDataChanged(key); +/*** ***/ +void Client::userInput(BufferInfo bufferInfo, QString message) { + emit instance()->sendInput(bufferInfo, message); } -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); +/*** core connection stuff ***/ + +void Client::setConnectedToCore(QIODevice *socket, AccountId id) { + // 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); + _connectedToCore = true; + setCurrentCoreAccount(id); } -QVariant Client::retrieveSessionData(const QString &key, const QVariant &def) { - if(instance()->sessionData.contains(key)) return instance()->sessionData[key]; - else return def; +void Client::setConnectedToInternalCore() { + _connectedToCore = true; + setCurrentCoreAccount(AccountId()); } -QStringList Client::sessionDataKeys() { - return instance()->sessionData.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))); + signalProxy()->synchronize(bufferSyncer()); + + // attach backlog manager + signalProxy()->synchronize(backlogManager()); + + // create a new BufferViewManager + _bufferViewManager = new BufferViewManager(signalProxy(), this); + + _syncedToCore = true; + emit connected(); + emit coreConnectionStateChanged(true); } -void Client::coreSocketError(QAbstractSocket::SocketError) { - emit coreConnectionError(socket->errorString()); - socket->deleteLater(); +void Client::setSecuredConnection() { + emit securedConnection(); } -void Client::coreHasData() { - QVariant item; - if(SignalProxy::readDataFromDevice(socket, blockSize, item)) { - emit recvPartialItem(1,1); - QVariantMap msg = item.toMap(); - if (!msg["StartWizard"].toBool()) { - recvCoreState(msg["Reply"]); - } else { - qWarning("Core not configured!"); - qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList(); - emit showConfigWizard(msg); - } - blockSize = 0; +void Client::disconnectFromCore() { + if(!isConnected()) return; - } - if(blockSize > 0) { - emit recvPartialItem(socket->bytesAvailable(), blockSize); - } -} -void Client::networkConnected(uint netid) { - // TODO: create statusBuffer / switch to networkids - //BufferInfo id = statusBufferInfo(net); - //Buffer *b = buffer(id); - //b->setActive(true); - - NetworkInfo *netinfo = new NetworkInfo(netid, this); - netinfo->setProxy(signalProxy()); - networkModel()->attachNetworkInfo(netinfo); - - if(!isConnected()) { - connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress())); - } - connect(netinfo, SIGNAL(ircChannelAdded(QString)), this, SLOT(ircChannelAdded(QString))); - connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed())); - _networkInfo[netid] = netinfo; + signalProxy()->removeAllPeers(); } -void Client::networkDisconnected(uint networkid) { - foreach(Buffer *buffer, buffers()) { - if(buffer->bufferInfo().networkId() != networkid) - continue; +void Client::disconnectedFromCore() { + _connectedToCore = false; + _syncedToCore = false; + emit disconnected(); + emit coreConnectionStateChanged(false); - //buffer->displayMsg(Message(bufferid, Message::Server, tr("Server disconnected."))); FIXME - buffer->setActive(false); - } + messageProcessor()->reset(); - Q_ASSERT(networkInfo(networkid)); - if(!networkInfo(networkid)->initialized()) { - qDebug() << "Network" << networkid << "disconnected while not yet initialized!"; - updateCoreConnectionProgress(); - } -} + // Clear internal data. Hopefully nothing relies on it at this point. + setCurrentCoreAccount(0); -void Client::ircChannelAdded(QString chanName) { - NetworkInfo *netInfo = qobject_cast(sender()); - Q_ASSERT(netInfo); - Buffer *buf = buffer(bufferInfo(netInfo->networkName(), chanName)); - Q_ASSERT(buf); - buf->setIrcChannel(netInfo->ircChannel(chanName)); + if(_bufferSyncer) { + _bufferSyncer->deleteLater(); + _bufferSyncer = 0; + } -} + if(_bufferViewManager) { + _bufferViewManager->deleteLater(); + _bufferViewManager = 0; + } -void Client::updateBufferInfo(BufferInfo id) { - buffer(id)->updateBufferInfo(id); -} + _messageModel->clear(); + _networkModel->clear(); -void Client::bufferDestroyed() { - Buffer *buffer = static_cast(sender()); - uint bufferUid = buffer->uid(); - if(_buffers.contains(bufferUid)) - _buffers.remove(bufferUid); -} + 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::networkInfoDestroyed() { - NetworkInfo *netinfo = static_cast(sender()); - uint networkId = netinfo->networkId(); - if(_networkInfo.contains(networkId)) - _networkInfo.remove(networkId); } -void Client::recvMessage(const Message &msg) { - Buffer *b = buffer(msg.buffer()); +/*** ***/ - 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; +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++; + } } - emit bufferActivity(level, b); - - b->appendMsg(msg); } +// Hmm... we never used this... void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) { //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg))); } -void Client::recvBacklogData(BufferInfo 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(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start(); +void Client::recvMessage(const Message &msg_) { + Message msg = msg_; + messageProcessor()->process(msg); } -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 +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)); } - - if(!layoutQueue.count()) - layoutTimer->stop(); -} -AbstractUiMsg *Client::layoutMsg(const Message &msg) { - return instance()->mainUi->layoutMsg(msg); + // and remove it from the model + networkModel()->removeBuffer(bufferId); } -void Client::userInput(BufferInfo id, QString msg) { - emit sendInput(id, msg); +void Client::bufferRenamed(BufferId bufferId, const QString &newName) { + QModelIndex bufferIndex = networkModel()->bufferIndex(bufferId); + if(bufferIndex.isValid()) { + networkModel()->setData(bufferIndex, newName, Qt::DisplayRole); + } } -