X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=3326b79d508bb74140b2c0bcdcffc47afdd38720;hp=e65006ecf989c0cef3c5731d6015de9418ffa969;hb=1f7cffc751c022ddea816db471f7870a60dc0d1c;hpb=6261af690fbf7f3aca06acc8f1268488cdfb566f diff --git a/src/client/client.cpp b/src/client/client.cpp index e65006ec..3326b79d 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -21,6 +21,7 @@ #include "client.h" #include "bufferinfo.h" +#include "buffersyncer.h" #include "global.h" #include "identity.h" #include "ircchannel.h" @@ -32,6 +33,7 @@ #include "quasselui.h" #include "signalproxy.h" #include "util.h" +#include "buffersettings.h" QPointer Client::instanceptr = 0; AccountId Client::_currentCoreAccount = 0; @@ -61,6 +63,7 @@ Client::Client(QObject *parent) mainUi(0), _networkModel(0), _bufferModel(0), + _bufferSyncer(0), _connectedToCore(false), _syncedToCore(false) { @@ -76,12 +79,14 @@ void Client::init() { _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(Message &))); + 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))); @@ -138,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]; @@ -146,39 +157,29 @@ 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; } -Buffer *Client::monitorBuffer() { - return instance()->_monitorBuffer; -} - - -NetworkModel *Client::networkModel() { - return instance()->_networkModel; -} - -BufferModel *Client::bufferModel() { - return instance()->_bufferModel; -} - -SignalProxy *Client::signalProxy() { - return instance()->_signalProxy; -} - bool Client::isConnected() { return instance()->_connectedToCore; } @@ -293,12 +294,23 @@ void Client::setConnectedToCore(QIODevice *sock, AccountId id) { } 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(bufferRemoved(BufferId)), this, SLOT(bufferRemoved(BufferId))); + connect(bufferSyncer(), SIGNAL(bufferRenamed(BufferId, QString)), this, SLOT(bufferRenamed(BufferId, QString))); + signalProxy()->synchronize(bufferSyncer()); + _syncedToCore = true; emit connected(); emit coreConnectionStateChanged(true); } void Client::disconnectFromCore() { + if(!isConnected()) + return; + if(socket) { socket->close(); socket->deleteLater(); @@ -310,8 +322,23 @@ void Client::disconnectFromCore() { emit coreConnectionStateChanged(false); // Clear internal data. Hopefully nothing relies on it at this point. + if(_bufferSyncer) { + _bufferSyncer->deleteLater(); + _bufferSyncer = 0; + } _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()); + + _statusBuffers.clear(); + QHash::iterator netIter = _networks.begin(); while(netIter != _networks.end()) { Network *net = netIter.value(); @@ -322,15 +349,6 @@ void Client::disconnectFromCore() { } Q_ASSERT(_networks.isEmpty()); - 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 idIter = _identities.begin(); while(idIter != _identities.end()) { Identity *id = idIter.value(); @@ -364,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() { @@ -379,23 +406,60 @@ void Client::networkDestroyed() { } } -void Client::recvMessage(Message &msg) { +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); - networkModel()->updateBufferActivity(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 @@ -405,7 +469,6 @@ void Client::recvMessage(Message &msg) { Message mmsg = Message(msg.timestamp(), msg.bufferInfo(), msg.type(), msg.text(), sender, msg.flags()); monitorBuffer()->appendMsg(mmsg); } - } void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) { @@ -414,11 +477,16 @@ 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); b->prependMsg(msg); - networkModel()->updateBufferActivity(msg); + //networkModel()->updateBufferActivity(msg); if(!layoutQueue.contains(b)) layoutQueue.append(b); } if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start(); @@ -439,11 +507,65 @@ AbstractUiMsg *Client::layoutMsg(const Message &msg) { return instance()->mainUi->layoutMsg(msg); } -void Client::checkForHighlight(Message &msg) const { +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 || msg.type() == Message::Notice || msg.type() == Message::Action) && nickRegExp.exactMatch(msg.text())) + if((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && nickRegExp.exactMatch(msg.text())) msg.setFlags(msg.flags() | Message::Highlight); } } + +void Client::updateLastSeen(BufferId id, const QDateTime &lastSeen) { + Buffer *b = buffer(id); + if(!b) { + qWarning() << "Client::updateLastSeen(): Unknown buffer" << id; + return; + } + b->setLastSeen(lastSeen); +} + +void Client::setBufferLastSeen(BufferId id, const QDateTime &lastSeen) { + if(!bufferSyncer()) return; + bufferSyncer()->requestSetLastSeen(id, lastSeen); +} + +void Client::removeBuffer(BufferId id) { + if(!bufferSyncer()) return; + bufferSyncer()->requestRemoveBuffer(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) { + 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); + } +}