X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=3326b79d508bb74140b2c0bcdcffc47afdd38720;hp=e3a92819f77bf17a439e84b6966e3f4d3aa0f28a;hb=1f7cffc751c022ddea816db471f7870a60dc0d1c;hpb=04754cf669dd295205226b744bc769b94693866a diff --git a/src/client/client.cpp b/src/client/client.cpp index e3a92819..3326b79d 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -33,6 +33,7 @@ #include "quasselui.h" #include "signalproxy.h" #include "util.h" +#include "buffersettings.h" QPointer Client::instanceptr = 0; AccountId Client::_currentCoreAccount = 0; @@ -142,7 +143,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 +157,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; @@ -280,11 +294,12 @@ void Client::setConnectedToCore(QIODevice *sock, AccountId id) { } void Client::setSyncedToCore() { - // create buffersyncer + // 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(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId))); + connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString))); signalProxy()->synchronize(bufferSyncer()); _syncedToCore = true; @@ -293,6 +308,9 @@ void Client::setSyncedToCore() { } void Client::disconnectFromCore() { + if(!isConnected()) + return; + if(socket) { socket->close(); socket->deleteLater(); @@ -304,8 +322,10 @@ void Client::disconnectFromCore() { emit coreConnectionStateChanged(false); // Clear internal data. Hopefully nothing relies on it at this point. - _bufferSyncer->deleteLater(); - _bufferSyncer = 0; + if(_bufferSyncer) { + _bufferSyncer->deleteLater(); + _bufferSyncer = 0; + } _networkModel->clear(); QHash::iterator bufferIter = _buffers.begin(); @@ -317,6 +337,8 @@ void Client::disconnectFromCore() { } Q_ASSERT(_buffers.isEmpty()); + _statusBuffers.clear(); + QHash::iterator netIter = _networks.begin(); while(netIter != _networks.end()) { Network *net = netIter.value(); @@ -360,6 +382,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() { @@ -378,19 +409,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) { @@ -410,6 +477,11 @@ void Client::recvStatusMsg(QString /*net*/, QString /*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; + return; + } + foreach(QVariant v, msgs) { Message msg = v.value(); checkForHighlight(msg); @@ -458,11 +530,42 @@ void Client::setBufferLastSeen(BufferId id, const QDateTime &lastSeen) { bufferSyncer()->requestSetLastSeen(id, lastSeen); } +void Client::removeBuffer(BufferId id) { + if(!bufferSyncer()) return; + bufferSyncer()->requestRemoveBuffer(id); +} + void Client::bufferRemoved(BufferId bufferId) { - networkModel()->removeBuffer(bufferId); + // first remove the buffer from has. this prohibits further lastSeenUpdates + Buffer *buff = 0; if(_buffers.contains(bufferId)) { - Buffer *buff = _buffers.take(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) { + bufferModel()->setCurrentIndex(current.sibling(0,0)); + } + + // and remove it from the model + networkModel()->removeBuffer(bufferId); + + 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); } }