X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=e276cd8032f5706eb3597420bcaeeae8bac61e17;hp=1d44fd603f663619d729f7387b0a3a5d6b5a6559;hb=8ec76e512d20ce5d1dc76de556bb98a06b75d695;hpb=b30780406eabbcfdc313721e961ef063ab06c8d4 diff --git a/src/client/client.cpp b/src/client/client.cpp index 1d44fd60..e276cd80 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,24 +20,27 @@ #include "client.h" -#include "networkinfo.h" -#include "ircuser.h" +#include "bufferinfo.h" +#include "buffersyncer.h" +#include "clientbacklogmanager.h" +#include "global.h" +#include "identity.h" #include "ircchannel.h" - +#include "ircuser.h" #include "message.h" - -#include "bufferinfo.h" -#include "buffertreemodel.h" +#include "network.h" +#include "networkmodel.h" +#include "buffermodel.h" #include "quasselui.h" #include "signalproxy.h" -#include "synchronizer.h" #include "util.h" +#include "buffersettings.h" QPointer Client::instanceptr = 0; +AccountId Client::_currentCoreAccount = 0; + +/*** Initialization/destruction ***/ -// ============================== -// public Static Methods -// ============================== Client *Client::instance() { if(!instanceptr) instanceptr = new Client(); @@ -45,7 +48,8 @@ Client *Client::instance() { } void Client::destroy() { - delete instanceptr; + //delete instanceptr; + instanceptr->deleteLater(); } void Client::init(AbstractUi *ui) { @@ -53,15 +57,80 @@ void Client::init(AbstractUi *ui) { instance()->init(); } -QList Client::networkInfos() { - return instance()->_networkInfo.values(); +Client::Client(QObject *parent) + : QObject(parent), + socket(0), + _signalProxy(new SignalProxy(SignalProxy::Client, this)), + mainUi(0), + _networkModel(0), + _bufferModel(0), + _bufferSyncer(0), + _backlogManager(new ClientBacklogManager(this)), + _connectedToCore(false), + _syncedToCore(false) +{ + _monitorBuffer = new Buffer(BufferInfo(), this); + connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)), + this, SLOT(receiveBacklog(BufferId, const QVariantList &))); } -NetworkInfo *Client::networkInfo(uint networkid) { - if(instance()->_networkInfo.contains(networkid)) - return instance()->_networkInfo[networkid]; - else - return 0; +Client::~Client() { + disconnectFromCore(); +} + +void Client::init() { + _currentCoreAccount = 0; + _networkModel = new NetworkModel(this); + connect(this, SIGNAL(bufferUpdated(BufferInfo)), + _networkModel, SLOT(bufferUpdated(BufferInfo))); + connect(this, SIGNAL(networkRemoved(NetworkId)), + _networkModel, SLOT(networkRemoved(NetworkId))); + + _bufferModel = new BufferModel(_networkModel); + + SignalProxy *p = signalProxy(); + + 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)), this, SLOT(updateBufferInfo(BufferInfo))); + p->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString))); + p->attachSignal(this, SIGNAL(requestNetworkStates())); + + p->attachSignal(this, SIGNAL(requestCreateIdentity(const Identity &)), SIGNAL(createIdentity(const Identity &))); + p->attachSignal(this, SIGNAL(requestUpdateIdentity(const Identity &)), SIGNAL(updateIdentity(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(requestUpdateNetwork(const NetworkInfo &)), SIGNAL(updateNetwork(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(disconnectFromCore())); + + //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())); + +} + +/*** public static methods ***/ + +AccountId Client::currentCoreAccount() { + return _currentCoreAccount; +} + +void Client::setCurrentCoreAccount(AccountId id) { + _currentCoreAccount = id; } QList Client::allBufferInfos() { @@ -76,442 +145,449 @@ QList Client::buffers() { return instance()->_buffers.values(); } -Buffer *Client::buffer(uint bufferUid) { - if(instance()->_buffers.contains(bufferUid)) - return instance()->_buffers[bufferUid]; + +Buffer *Client::statusBuffer(const NetworkId &networkId) const { + if(_statusBuffers.contains(networkId)) + return _statusBuffers[networkId]; + else + return 0; +} + +Buffer *Client::buffer(BufferId bufferId) { + if(instance()->_buffers.contains(bufferId)) + return instance()->_buffers[bufferId]; else return 0; } -Buffer *Client::buffer(BufferInfo id) { - Buffer *buff = buffer(id.uid()); +Buffer *Client::buffer(BufferInfo bufferInfo) { + Buffer *buff = buffer(bufferInfo.bufferId()); 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); + buff = new Buffer(bufferInfo, client); + connect(buff, SIGNAL(destroyed()), client, SLOT(bufferDestroyed())); + client->_buffers[bufferInfo.bufferId()] = buff; + if(bufferInfo.type() == BufferInfo::StatusBuffer) + client->_statusBuffers[bufferInfo.networkId()] = buff; + + emit client->bufferUpdated(bufferInfo); + + // I don't like this: but currently there isn't really a prettier way: + if(isSynced()) { // this slows down syncing a lot, so disable it during sync + QModelIndex bufferIdx = networkModel()->bufferIndex(bufferInfo.bufferId()); + bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(bufferIdx)); + } } Q_ASSERT(buff); return buff; } -// FIXME switch to netids! -// WHEN IS THIS NEEDED ANYHOW!? -BufferInfo Client::bufferInfo(QString net, QString buf) { - foreach(Buffer *buffer_, buffers()) { - BufferInfo bufferInfo = buffer_->bufferInfo(); - if(bufferInfo.network() == net && bufferInfo.buffer() == buf) - return bufferInfo; - } - Q_ASSERT(false); // should never happen! - return BufferInfo(); +bool Client::isConnected() { + return instance()->_connectedToCore; } -BufferInfo Client::statusBufferInfo(QString net) { - return bufferInfo(net, ""); +bool Client::isSynced() { + return instance()->_syncedToCore; } -BufferTreeModel *Client::bufferModel() { - return instance()->_bufferModel; +/*** Network handling ***/ + +QList Client::networkIds() { + return instance()->_networks.keys(); } -SignalProxy *Client::signalProxy() { - return instance()->_signalProxy; +const Network * Client::network(NetworkId networkid) { + if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid]; + else return 0; } -// ============================== -// Constructor / Decon -// ============================== -Client::Client(QObject *parent) - : QObject(parent), - socket(0), - _signalProxy(new SignalProxy(SignalProxy::Client, this)), - mainUi(0), - _bufferModel(0), - connectedToCore(false) -{ +void Client::createNetwork(const NetworkInfo &info) { + emit instance()->requestCreateNetwork(info); } -Client::~Client() { +void Client::updateNetwork(const NetworkInfo &info) { + emit instance()->requestUpdateNetwork(info); } -void Client::init() { - blockSize = 0; +void Client::removeNetwork(NetworkId id) { + emit instance()->requestRemoveNetwork(id); +} - _bufferModel = new BufferTreeModel(this); +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()); +} - 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 *))); +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); +} - 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->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString))); - p->attachSignal(this, SIGNAL(requestNetworkStates())); +void Client::coreNetworkRemoved(NetworkId id) { + if(!_networks.contains(id)) return; + Network *net = _networks.take(id); + emit networkRemoved(net->networkId()); + net->deleteLater(); +} - 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())); +/*** Identity handling ***/ - layoutTimer = new QTimer(this); - layoutTimer->setInterval(0); - layoutTimer->setSingleShot(false); - connect(layoutTimer, SIGNAL(timeout()), this, SLOT(layoutMsg())); +QList Client::identityIds() { + return instance()->_identities.keys(); +} +const Identity * Client::identity(IdentityId id) { + if(instance()->_identities.contains(id)) return instance()->_identities[id]; + else return 0; } -bool Client::isConnected() { - return instance()->connectedToCore; +void Client::createIdentity(const Identity &id) { + emit instance()->requestCreateIdentity(id); } -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); +void Client::updateIdentity(const Identity &id) { + emit instance()->requestUpdateIdentity(id); } -void Client::fakeInput(BufferInfo bufferInfo, QString message) { - fakeInput(bufferInfo, message); +void Client::removeIdentity(IdentityId id) { + emit instance()->requestRemoveIdentity(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(); +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 { - 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(disconnected()), 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()); + qWarning() << tr("Identity already exists in client!"); } } -void Client::disconnectFromCore() { - socket->close(); - if(clientMode == LocalCore) { - coreSocketDisconnected(); +void Client::coreIdentityRemoved(IdentityId id) { + if(_identities.contains(id)) { + emit identityRemoved(id); + Identity *i = _identities.take(id); + i->deleteLater(); } } -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); +/*** ***/ +void Client::userInput(BufferInfo bufferInfo, QString message) { + emit instance()->sendInput(bufferInfo, message); } -void Client::coreSocketDisconnected() { - instance()->connectedToCore = false; - emit disconnected(); - socket->deleteLater(); - blockSize = 0; - - /* Clear internal data. Hopefully nothing relies on it at this point. */ - _bufferModel->clear(); - foreach(Buffer *buffer, _buffers.values()) { - buffer->deleteLater(); - } - _buffers.clear(); - - foreach(NetworkInfo *networkinfo, _networkInfo.values()) { - networkinfo->deleteLater(); - } - _networkInfo.clear(); +/*** core connection stuff ***/ - coreConnectionInfo.clear(); - sessionData.clear(); - layoutQueue.clear(); - layoutTimer->stop(); +void Client::setConnectedToCore(QIODevice *sock, AccountId id) { + socket = sock; + signalProxy()->addPeer(socket); + _connectedToCore = true; + setCurrentCoreAccount(id); } -void Client::coreSocketStateChanged(QAbstractSocket::SocketState state) { - if(state == QAbstractSocket::UnconnectedState) coreSocketDisconnected(); -} +void Client::setSyncedToCore() { + // create buffersyncer + Q_ASSERT(!_bufferSyncer); + _bufferSyncer = new BufferSyncer(this); + connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), this, SLOT(updateLastSeenMsg(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()); -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); + // attach backlog manager + signalProxy()->synchronize(backlogManager()); + + _syncedToCore = true; + emit connected(); + emit coreConnectionStateChanged(true); } -// 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::disconnectFromCore() { + if(!isConnected()) return; + + if(socket) { + socket->close(); + socket->deleteLater(); } + _connectedToCore = false; + _syncedToCore = false; + setCurrentCoreAccount(0); + emit disconnected(); + emit coreConnectionStateChanged(false); - 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 + // Clear internal data. Hopefully nothing relies on it at this point. + if(_bufferSyncer) { + _bufferSyncer->deleteLater(); + _bufferSyncer = 0; } + _networkModel->clear(); - // create networkInfo objects - QVariantList networkids = sessionState["Networks"].toList(); - foreach(QVariant networkid, networkids) { - networkConnected(networkid.toUInt()); + 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(); } - - instance()->connectedToCore = true; - updateCoreConnectionProgress(); -} + Q_ASSERT(_buffers.isEmpty()); -void Client::updateCoreConnectionProgress() { - // we'll do this in three steps: - // 1.) networks - // 2.) channels - // 3.) ircusers + _statusBuffers.clear(); - int numNets = networkInfos().count(); - int numNetsWaiting = 0; + 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()); - int numIrcUsers = 0; - int numIrcUsersWaiting = 0; + layoutQueue.clear(); + layoutTimer->stop(); +} - int numChannels = 0; - int numChannelsWaiting = 0; +void Client::setCoreConfiguration(const QVariantMap &settings) { + SignalProxy::writeDataToDevice(socket, settings); +} - foreach(NetworkInfo *net, networkInfos()) { - if(! net->initialized()) - numNetsWaiting++; +/*** ***/ - numIrcUsers += net->ircUsers().count(); - foreach(IrcUser *user, net->ircUsers()) { - if(! user->initialized()) - numIrcUsersWaiting++; - } +void Client::updateBufferInfo(BufferInfo id) { + emit bufferUpdated(id); +} - numChannels += net->ircChannels().count(); - foreach(IrcChannel *channel, net->ircChannels()) { - if(! channel->initialized()) - numChannelsWaiting++; +void Client::bufferDestroyed() { + Buffer *buffer = static_cast(sender()); + QHash::iterator iter = _buffers.begin(); + while(iter != _buffers.end()) { + if(iter.value() == buffer) { + iter = _buffers.erase(iter); + break; } - + iter++; } - if(numNetsWaiting > 0) { - emit coreConnectionMsg(tr("Requesting network states...")); - emit coreConnectionProgress(numNets - numNetsWaiting, numNets); - return; + QHash::iterator statusIter = _statusBuffers.begin(); + while(statusIter != _statusBuffers.end()) { + if(statusIter.value() == buffer) { + statusIter = _statusBuffers.erase(statusIter); + break; + } + statusIter++; } +} - if(numIrcUsersWaiting > 0) { - emit coreConnectionMsg(tr("Requesting User states...")); - emit coreConnectionProgress(numIrcUsers - numIrcUsersWaiting, numIrcUsers); - return; +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++; + } } +} - if(numChannelsWaiting > 0) { - emit coreConnectionMsg(tr("Requesting Channel states...")); - emit coreConnectionProgress(numChannels - numChannelsWaiting, numChannels); - return; - } +void Client::recvMessage(const Message &message) { + Message msg = message; + Buffer *b; - emit coreConnectionProgress(1,1); - emit connected(); -} + checkForHighlight(msg); -void Client::recvSessionData(const QString &key, const QVariant &data) { - sessionData[key] = data; - emit sessionDataChanged(key, data); - emit sessionDataChanged(key); -} + if(msg.flags() & Message::Redirected) { + BufferSettings bufferSettings; + bool inStatus = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)).toBool(); + bool inQuery = bufferSettings.value("UserMessagesInQueryBuffer", QVariant(false)).toBool(); + bool inCurrent = bufferSettings.value("UserMessagesInCurrentBuffer", QVariant(false)).toBool(); -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); -} + if(inStatus) { + b = statusBuffer(msg.bufferInfo().networkId()); + if(b) { + b->appendMsg(msg); + } else if(!inQuery && !inCurrent) { // make sure the message get's shown somewhere + b = buffer(msg.bufferInfo()); + b->appendMsg(msg); + } + } -QVariant Client::retrieveSessionData(const QString &key, const QVariant &def) { - if(instance()->sessionData.contains(key)) return instance()->sessionData[key]; - else return def; -} + if(inQuery) { + b = buffer(msg.bufferInfo().bufferId()); + if(b) { + b->appendMsg(msg); + } else if(!inStatus && !inCurrent) { // make sure the message get's shown somewhere + b = statusBuffer(msg.bufferInfo().networkId()); + if(!b) + b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... + b->appendMsg(msg); + } + } -QStringList Client::sessionDataKeys() { - return instance()->sessionData.keys(); + if(inCurrent) { + BufferId currentId = bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value(); + b = buffer(currentId); + if(b && currentId != msg.bufferInfo().bufferId() && !inQuery) { + b->appendMsg(msg); + } else if(!inStatus && !inQuery) { // make sure the message get's shown somewhere + b = statusBuffer(msg.bufferInfo().networkId()); + if(!b) + b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... + b->appendMsg(msg); + } + } + } else { + // the regular case: we can deliver where it was supposed to go + b = buffer(msg.bufferInfo()); + b->appendMsg(msg); + } + + //bufferModel()->updateBufferActivity(msg); + + if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) { + const Network *net = network(msg.bufferInfo().networkId()); + QString networkName = net != 0 + ? net->networkName() + ":" + : QString(); + QString sender = networkName + msg.bufferInfo().bufferName() + ":" + msg.sender(); + Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags()); + monitorBuffer()->appendMsg(mmsg); + } } -void Client::coreSocketError(QAbstractSocket::SocketError) { - emit coreConnectionError(socket->errorString()); - socket->deleteLater(); +void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) { + //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg))); } -void Client::coreHasData() { - QVariant item; - if(readDataFromDevice(socket, blockSize, item)) { - emit recvPartialItem(1,1); - recvCoreState(item); - blockSize = 0; +void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) { + Buffer *buffer_ = buffer(bufferId); + if(!buffer_) { + qWarning() << "Client::recvBacklogData(): received Backlog for unknown Buffer:" << bufferId; return; } - if(blockSize > 0) { - emit recvPartialItem(socket->bytesAvailable(), blockSize); + + if(msgs.isEmpty()) + return; // no work to be done... + + QVariantList::const_iterator msgIter = msgs.constBegin(); + QVariantList::const_iterator msgIterEnd = msgs.constEnd(); + Message msg; + while(msgIter != msgIterEnd) { + msg = (*msgIter).value(); + buffer_->prependMsg(msg); + msgIter++; } -} -void Client::networkConnected(uint netid) { - // TODO: create statusBuffer / switch to networkids - //BufferInfo id = statusBufferInfo(net); - //Buffer *b = buffer(id); - //b->setActive(true); + if(!layoutQueue.contains(buffer_)) + layoutQueue.append(buffer_); - NetworkInfo *netinfo = new NetworkInfo(netid, signalProxy(), this); - connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress())); - connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkInfoDestroyed())); - _networkInfo[netid] = netinfo; + if(!layoutTimer->isActive()) { + layoutTimer->start(); + } } -void Client::networkDisconnected(uint networkid) { - foreach(Buffer *buffer, buffers()) { - if(buffer->bufferInfo().networkId() != networkid) - continue; - - //buffer->displayMsg(Message(bufferid, Message::Server, tr("Server disconnected."))); FIXME - buffer->setActive(false); +void Client::layoutMsg() { + if(layoutQueue.isEmpty()) { + layoutTimer->stop(); + return; } - Q_ASSERT(networkInfo(networkid)); - if(!networkInfo(networkid)->initialized()) { - qDebug() << "Network" << networkid << "disconnected while not yet initialized!"; - updateCoreConnectionProgress(); - } -} + Buffer *buffer = layoutQueue.takeFirst(); + if(buffer->layoutMsg()) { + layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin + return; + } -void Client::updateBufferInfo(BufferInfo id) { - buffer(id)->updateBufferInfo(id); + if(layoutQueue.isEmpty()) + layoutTimer->stop(); } -void Client::bufferDestroyed() { - Buffer *buffer = static_cast(sender()); - uint bufferUid = buffer->uid(); - if(_buffers.contains(bufferUid)) - _buffers.remove(bufferUid); +AbstractUiMsg *Client::layoutMsg(const Message &msg) { + return instance()->mainUi->layoutMsg(msg); } -void Client::networkInfoDestroyed() { - NetworkInfo *netinfo = static_cast(sender()); - uint networkId = netinfo->networkId(); - if(_networkInfo.contains(networkId)) - _networkInfo.remove(networkId); +void Client::checkForHighlight(Message &msg) { + const Network *net = network(msg.bufferInfo().networkId()); + if(net && !net->myNick().isEmpty()) { + QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(net->myNick()) + "(\\W.*)?$"); + if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self) && nickRegExp.exactMatch(msg.text())) + msg.setFlags(msg.flags() | Message::Highlight); + } } -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::updateLastSeenMsg(BufferId id, const MsgId &msgId) { + Buffer *b = buffer(id); + if(!b) { + qWarning() << "Client::updateLastSeen(): Unknown buffer" << id; + return; } - emit bufferActivity(level, b); + b->setLastSeenMsg(msgId); +} - b->appendMsg(msg); +void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) { + if(!bufferSyncer()) + return; + bufferSyncer()->requestSetLastSeenMsg(id, msgId); } -void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) { - //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg))); +void Client::removeBuffer(BufferId id) { + if(!bufferSyncer()) return; + bufferSyncer()->requestRemoveBuffer(id); } -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); +void Client::bufferRemoved(BufferId bufferId) { + // first remove the buffer from has. this prohibits further lastSeenUpdates + Buffer *buff = 0; + if(_buffers.contains(bufferId)) { + buff = _buffers.take(bufferId); + disconnect(buff, 0, this, 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 + // then we 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); + if(buff) + buff->deleteLater(); } +void Client::bufferRenamed(BufferId bufferId, const QString &newName) { + QModelIndex bufferIndex = networkModel()->bufferIndex(bufferId); + if(bufferIndex.isValid()) { + networkModel()->setData(bufferIndex, newName, Qt::DisplayRole); + } +}