X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=e276cd8032f5706eb3597420bcaeeae8bac61e17;hp=70f8735e87aafc1ab856b5ec6be846f95de05e4b;hb=8ec76e512d20ce5d1dc76de556bb98a06b75d695;hpb=c19a8e707391d74a80e9e7d4ef46f496284d9f49 diff --git a/src/client/client.cpp b/src/client/client.cpp index 70f8735e..e276cd80 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -22,6 +22,7 @@ #include "bufferinfo.h" #include "buffersyncer.h" +#include "clientbacklogmanager.h" #include "global.h" #include "identity.h" #include "ircchannel.h" @@ -33,6 +34,7 @@ #include "quasselui.h" #include "signalproxy.h" #include "util.h" +#include "buffersettings.h" QPointer Client::instanceptr = 0; AccountId Client::_currentCoreAccount = 0; @@ -63,10 +65,13 @@ Client::Client(QObject *parent) _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 &))); } Client::~Client() { @@ -88,7 +93,6 @@ void Client::init() { 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())); @@ -142,7 +146,13 @@ QList Client::buffers() { } -// FIXME remove +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]; @@ -150,17 +160,24 @@ Buffer *Client::buffer(BufferId bufferId) { return 0; } -// FIXME remove Buffer *Client::buffer(BufferInfo bufferInfo) { Buffer *buff = buffer(bufferInfo.bufferId()); if(!buff) { Client *client = Client::instance(); buff = new Buffer(bufferInfo, client); - connect(buff, SIGNAL(destroyed()), - client, SLOT(bufferDestroyed())); + 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; @@ -283,11 +300,14 @@ void Client::setSyncedToCore() { // create buffersyncer Q_ASSERT(!_bufferSyncer); _bufferSyncer = new BufferSyncer(this); - connect(bufferSyncer(), SIGNAL(lastSeenSet(BufferId, const QDateTime &)), this, SLOT(updateLastSeen(BufferId, const QDateTime &))); + 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()); + // attach backlog manager + signalProxy()->synchronize(backlogManager()); + _syncedToCore = true; emit connected(); emit coreConnectionStateChanged(true); @@ -323,6 +343,8 @@ void Client::disconnectFromCore() { } Q_ASSERT(_buffers.isEmpty()); + _statusBuffers.clear(); + QHash::iterator netIter = _networks.begin(); while(netIter != _networks.end()) { Network *net = netIter.value(); @@ -366,6 +388,15 @@ void Client::bufferDestroyed() { } iter++; } + + QHash::iterator statusIter = _statusBuffers.begin(); + while(statusIter != _statusBuffers.end()) { + if(statusIter.value() == buffer) { + statusIter = _statusBuffers.erase(statusIter); + break; + } + statusIter++; + } } void Client::networkDestroyed() { @@ -384,19 +415,55 @@ void Client::networkDestroyed() { void Client::recvMessage(const Message &message) { Message msg = message; Buffer *b; - - if(msg.type() == Message::Error) { - b = buffer(msg.bufferInfo().bufferId()); - if(!b) { - // FIXME: if buffer doesn't exist, forward the message to the status or current buffer - b = buffer(msg.bufferInfo()); + + checkForHighlight(msg); + + 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(); + + 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); + } + } + + 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); + } + } + + 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); } - - checkForHighlight(msg); - b->appendMsg(msg); + //bufferModel()->updateBufferActivity(msg); if(msg.type() == Message::Plain || msg.type() == Message::Notice || msg.type() == Message::Action) { @@ -414,26 +481,46 @@ 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(); - checkForHighlight(msg); - b->prependMsg(msg); - //networkModel()->updateBufferActivity(msg); - if(!layoutQueue.contains(b)) layoutQueue.append(b); +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(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++; + } + + if(!layoutQueue.contains(buffer_)) + layoutQueue.append(buffer_); + + if(!layoutTimer->isActive()) { + layoutTimer->start(); } - 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(layoutQueue.isEmpty()) { + layoutTimer->stop(); + return; } - if(!layoutQueue.count()) + Buffer *buffer = layoutQueue.takeFirst(); + if(buffer->layoutMsg()) { + layoutQueue.append(buffer); // Buffer has more messages in its queue --> Round Robin + return; + } + + if(layoutQueue.isEmpty()) layoutTimer->stop(); } @@ -445,23 +532,24 @@ 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)) && nickRegExp.exactMatch(msg.text())) + 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::updateLastSeen(BufferId id, const QDateTime &lastSeen) { +void Client::updateLastSeenMsg(BufferId id, const MsgId &msgId) { Buffer *b = buffer(id); if(!b) { qWarning() << "Client::updateLastSeen(): Unknown buffer" << id; return; } - b->setLastSeen(lastSeen); + b->setLastSeenMsg(msgId); } -void Client::setBufferLastSeen(BufferId id, const QDateTime &lastSeen) { - if(!bufferSyncer()) return; - bufferSyncer()->requestSetLastSeen(id, lastSeen); +void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) { + if(!bufferSyncer()) + return; + bufferSyncer()->requestSetLastSeenMsg(id, msgId); } void Client::removeBuffer(BufferId id) { @@ -470,18 +558,31 @@ void Client::removeBuffer(BufferId id) { } 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); + } + + // 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) { - // select the status buffer if the currently displayed buffer is about to be removed bufferModel()->setCurrentIndex(current.sibling(0,0)); } - + + // and remove it from the model networkModel()->removeBuffer(bufferId); - if(_buffers.contains(bufferId)) { - Buffer *buff = _buffers.take(bufferId); - disconnect(buff, 0, this, 0); + + if(buff) buff->deleteLater(); - } } void Client::bufferRenamed(BufferId bufferId, const QString &newName) {