#include "client.h"
+#include "abstractmessageprocessor.h"
#include "bufferinfo.h"
+#include "buffermodel.h"
+#include "buffersettings.h"
#include "buffersyncer.h"
+#include "bufferviewmanager.h"
+#include "clientbacklogmanager.h"
+#include "clientirclisthelper.h"
#include "global.h"
#include "identity.h"
#include "ircchannel.h"
#include "ircuser.h"
#include "message.h"
+#include "messagemodel.h"
#include "network.h"
#include "networkmodel.h"
-#include "buffermodel.h"
#include "quasselui.h"
#include "signalproxy.h"
#include "util.h"
-#include "buffersettings.h"
QPointer<Client> Client::instanceptr = 0;
AccountId Client::_currentCoreAccount = 0;
_networkModel(0),
_bufferModel(0),
_bufferSyncer(0),
+ _backlogManager(new ClientBacklogManager(this)),
+ _bufferViewManager(0),
+ _ircListHelper(new ClientIrcListHelper(this)),
+ _messageModel(0),
+ _messageProcessor(0),
_connectedToCore(false),
_syncedToCore(false)
{
- _monitorBuffer = new Buffer(BufferInfo(), this);
+ _signalProxy->synchronize(_ircListHelper);
+
+ connect(_backlogManager, SIGNAL(backlog(BufferId, const QVariantList &)),
+ this, SLOT(receiveBacklog(BufferId, const QVariantList &)));
}
Client::~Client() {
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)));
+ _networkModel, SLOT(networkRemoved(NetworkId)));
_bufferModel = new BufferModel(_networkModel);
+ _messageModel = mainUi->createMessageModel(this);
+ _messageProcessor = mainUi->createMessageProcessor(this);
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(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()));
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(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 ***/
return 0;
}
-Buffer *Client::buffer(BufferId bufferId) {
- if(instance()->_buffers.contains(bufferId))
- return instance()->_buffers[bufferId];
- else
- return 0;
-}
-
Buffer *Client::buffer(BufferInfo bufferInfo) {
- Buffer *buff = buffer(bufferInfo.bufferId());
+ Buffer *buff = 0;
+ if(instance()->_buffers.contains(bufferInfo.bufferId()))
+ buff = instance()->_buffers[bufferInfo.bufferId()];
if(!buff) {
Client *client = Client::instance();
emit instance()->requestCreateNetwork(info);
}
-void Client::updateNetwork(const NetworkInfo &info) {
- emit instance()->requestUpdateNetwork(info);
-}
-
void Client::removeNetwork(NetworkId id) {
emit instance()->requestRemoveNetwork(id);
}
+void Client::updateNetwork(const NetworkInfo &info) {
+ Network *netptr = instance()->_networks.value(info.networkId, 0);
+ if(!netptr) {
+ qWarning() << "Update for unknown network requested:" << info;
+ return;
+ }
+ netptr->requestSetNetworkInfo(info);
+}
+
void Client::addNetwork(Network *net) {
net->setProxy(signalProxy());
signalProxy()->synchronize(net);
}
void Client::coreNetworkRemoved(NetworkId id) {
- if(!_networks.contains(id)) return;
+ if(!_networks.contains(id))
+ return;
Network *net = _networks.take(id);
emit networkRemoved(net->networkId());
net->deleteLater();
emit instance()->requestCreateIdentity(id);
}
-void Client::updateIdentity(const Identity &id) {
- emit instance()->requestUpdateIdentity(id);
+void Client::updateIdentity(IdentityId id, const QVariantMap &ser) {
+ Identity *idptr = instance()->_identities.value(id, 0);
+ if(!idptr) {
+ qWarning() << "Update for unknown identity requested:" << id;
+ return;
+ }
+ idptr->requestUpdate(ser);
}
void Client::removeIdentity(IdentityId id) {
// 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)), _networkModel, SLOT(setLastSeenMsgId(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);
}
+void Client::setSecuredConnection() {
+ emit securedConnection();
+}
+
void Client::disconnectFromCore() {
if(!isConnected())
return;
-
+ _connectedToCore = false;
+
if(socket) {
socket->close();
socket->deleteLater();
}
- _connectedToCore = false;
_syncedToCore = false;
- setCurrentCoreAccount(0);
emit disconnected();
emit coreConnectionStateChanged(false);
+ messageProcessor()->reset();
+
// Clear internal data. Hopefully nothing relies on it at this point.
+ setCurrentCoreAccount(0);
+
if(_bufferSyncer) {
_bufferSyncer->deleteLater();
_bufferSyncer = 0;
}
+
+ if(_bufferViewManager) {
+ _bufferViewManager->deleteLater();
+ _bufferViewManager = 0;
+ }
+
+ _messageModel->clear();
_networkModel->clear();
QHash<BufferId, Buffer *>::iterator bufferIter = _buffers.begin();
}
Q_ASSERT(_identities.isEmpty());
- layoutQueue.clear();
- layoutTimer->stop();
}
void Client::setCoreConfiguration(const QVariantMap &settings) {
}
}
-void Client::recvMessage(const Message &message) {
- Message msg = message;
- Buffer *b;
-
- 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<BufferId>();
- 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);
- }
-}
-
+// Hmm... we never used this...
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;
- return;
- }
-
- foreach(QVariant v, msgs) {
- Message msg = v.value<Message>();
- checkForHighlight(msg);
- b->prependMsg(msg);
- //networkModel()->updateBufferActivity(msg);
- if(!layoutQueue.contains(b)) layoutQueue.append(b);
- }
- 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.count())
- layoutTimer->stop();
+void Client::recvMessage(const Message &msg_) {
+ Message msg = msg_;
+ messageProcessor()->process(msg);
}
-AbstractUiMsg *Client::layoutMsg(const Message &msg) {
- return instance()->mainUi->layoutMsg(msg);
-}
-
-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()))
- msg.setFlags(msg.flags() | Message::Highlight);
+void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
+ //QTime start = QTime::currentTime();
+ QList<Message> msglist;
+ foreach(QVariant v, msgs) {
+ Message msg = v.value<Message>();
+ msg.setFlags(msg.flags() | Message::Backlog);
+ msglist << msg;
}
+ messageProcessor()->process(msglist);
+ //qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime());
}
-void Client::updateLastSeen(BufferId id, const QDateTime &lastSeen) {
- Buffer *b = buffer(id);
- if(!b) {
- qWarning() << "Client::updateLastSeen(): Unknown buffer" << id;
+void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
+ if(!bufferSyncer())
return;
- }
- b->setLastSeen(lastSeen);
-}
-
-void Client::setBufferLastSeen(BufferId id, const QDateTime &lastSeen) {
- if(!bufferSyncer()) return;
- bufferSyncer()->requestSetLastSeen(id, lastSeen);
+ bufferSyncer()->requestSetLastSeenMsg(id, msgId);
}
void Client::removeBuffer(BufferId id) {
}
void Client::bufferRemoved(BufferId bufferId) {
- // first remove the buffer from has. this prohibits further lastSeenUpdates
+ // first remove the buffer from hash. this prohibits further lastSeenUpdates
Buffer *buff = 0;
if(_buffers.contains(bufferId)) {
buff = _buffers.take(bufferId);
projects / quassel.git / blobdiff