X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=69ffbfc787396f59d9267e27ae7fd97123e16d09;hp=24f1726c7e7598df19253d32b127c03bfaeb870c;hb=278aef059d7652b2a4e1359d72bb4028524246d4;hpb=e9189ebd5af607385629d3aa74dc9fc15bb642f4 diff --git a/src/client/client.cpp b/src/client/client.cpp index 24f1726c..69ffbfc7 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -22,6 +22,8 @@ #include "bufferinfo.h" #include "buffersyncer.h" +#include "clientbacklogmanager.h" +#include "bufferviewmanager.h" #include "global.h" #include "identity.h" #include "ircchannel.h" @@ -64,10 +66,14 @@ Client::Client(QObject *parent) _networkModel(0), _bufferModel(0), _bufferSyncer(0), + _backlogManager(new ClientBacklogManager(this)), + _bufferViewManager(0), _connectedToCore(false), _syncedToCore(false) { _monitorBuffer = new Buffer(BufferInfo(), this); + connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)), + this, SLOT(receiveBacklog(BufferId, const QVariantList &))); } Client::~Client() { @@ -89,7 +95,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())); @@ -171,8 +176,10 @@ Buffer *Client::buffer(BufferInfo bufferInfo) { emit client->bufferUpdated(bufferInfo); // I don't like this: but currently there isn't really a prettier way: - QModelIndex bufferIdx = networkModel()->bufferIndex(bufferInfo.bufferId()); - bufferModel()->setCurrentIndex(bufferModel()->mapFromSource(bufferIdx)); + 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; @@ -295,11 +302,17 @@ 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()); + + // create a new BufferViewManager + _bufferViewManager = new BufferViewManager(signalProxy(), this); + _syncedToCore = true; emit connected(); emit coreConnectionStateChanged(true); @@ -324,6 +337,12 @@ void Client::disconnectFromCore() { _bufferSyncer->deleteLater(); _bufferSyncer = 0; } + + if(_bufferViewManager) { + _bufferViewManager->deleteLater(); + _bufferViewManager = 0; + } + _networkModel->clear(); QHash::iterator bufferIter = _buffers.begin(); @@ -410,6 +429,8 @@ void Client::recvMessage(const Message &message) { checkForHighlight(msg); + // FIXME clean up code! (dup) + if(msg.flags() & Message::Redirected) { BufferSettings bufferSettings; bool inStatus = bufferSettings.value("UserMessagesInStatusBuffer", QVariant(true)).toBool(); @@ -419,22 +440,21 @@ void Client::recvMessage(const Message &message) { if(inStatus) { b = statusBuffer(msg.bufferInfo().networkId()); if(b) { - b->appendMsg(msg); + b->appendMsg(msg); } else if(!inQuery && !inCurrent) { // make sure the message get's shown somewhere - b = buffer(msg.bufferInfo()); - b->appendMsg(msg); + 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); + 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); } } @@ -442,12 +462,11 @@ void Client::recvMessage(const Message &message) { BufferId currentId = bufferModel()->currentIndex().data(NetworkModel::BufferIdRole).value(); b = buffer(currentId); if(b && currentId != msg.bufferInfo().bufferId() && !inQuery) { - b->appendMsg(msg); + 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); + b = statusBuffer(msg.bufferInfo().networkId()); + if(!b) b = buffer(msg.bufferInfo()); // seems like we have to create the buffer anyways... + b->appendMsg(msg); } } } else { @@ -467,37 +486,55 @@ void Client::recvMessage(const Message &message) { Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags()); monitorBuffer()->appendMsg(mmsg); } + + emit messageReceived(msg); } 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); - if(!b) { - qWarning() << "Client::recvBacklogData(): received Backlog for unknown Buffer:" << id; +void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) { + Buffer *buffer_ = buffer(bufferId); + if(!buffer_) { + qWarning() << "Client::recvBacklogData(): received Backlog for unknown Buffer:" << bufferId; return; } - - foreach(QVariant v, msgs) { - Message msg = v.value(); + + 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(); checkForHighlight(msg); - b->prependMsg(msg); - //networkModel()->updateBufferActivity(msg); - if(!layoutQueue.contains(b)) layoutQueue.append(b); + 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(); } @@ -506,26 +543,52 @@ AbstractUiMsg *Client::layoutMsg(const Message &msg) { } void Client::checkForHighlight(Message &msg) { + NotificationSettings notificationSettings; 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())) - msg.setFlags(msg.flags() | Message::Highlight); + if(notificationSettings.highlightCurrentNick()) { + 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); + return; + } + } + foreach(QVariant highlight, notificationSettings.highlightList()) { + QVariantMap highlightRule = highlight.toMap(); + if(!highlightRule["enable"].toBool()) + continue; + QString name = highlightRule["name"].toString(); + QRegExp userRegExp; + if(highlightRule["regex"].toBool()) { + userRegExp = QRegExp(name); + } else { + userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$"); + } + if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) + && !(msg.flags() & Message::Self) + && userRegExp.exactMatch(msg.text())) { + msg.setFlags(msg.flags() | Message::Highlight); + return; + } + } } } -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) { @@ -534,18 +597,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) {