/***************************************************************************
- * Copyright (C) 2005-07 by The Quassel Team *
+ * Copyright (C) 2005-08 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
+ * (at your option) version 3. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
#include "client.h"
-#include "buffer.h"
-#include "buffertreemodel.h"
-#include "clientproxy.h"
+#include "bufferinfo.h"
+#include "global.h"
+#include "identity.h"
+#include "ircchannel.h"
+#include "ircuser.h"
+#include "message.h"
+#include "network.h"
+#include "networkmodel.h"
+#include "buffermodel.h"
+#include "nickmodel.h"
#include "quasselui.h"
+#include "signalproxy.h"
#include "util.h"
-Client * Client::instanceptr = 0;
+QPointer<Client> Client::instanceptr = 0;
-bool Client::connectedToCore = false;
-Client::ClientMode Client::clientMode;
-VarMap Client::coreConnectionInfo;
-QHash<BufferId, Buffer *> Client::buffers;
-QHash<uint, BufferId> Client::bufferIds;
-QHash<QString, QHash<QString, VarMap> > Client::nicks;
-QHash<QString, bool> Client::netConnected;
-QStringList Client::netsAwaitingInit;
-QHash<QString, QString> Client::ownNick;
+/*** Initialization/destruction ***/
Client *Client::instance() {
- if(instanceptr) return instanceptr;
- instanceptr = new Client();
+ if(!instanceptr)
+ instanceptr = new Client();
return instanceptr;
}
void Client::destroy() {
- delete instanceptr;
- instanceptr = 0;
-}
-
-Client::Client() {
- clientProxy = ClientProxy::instance();
-
- _bufferModel = new BufferTreeModel(this);
-
- connect(this, SIGNAL(bufferSelected(Buffer *)), _bufferModel, SLOT(selectBuffer(Buffer *)));
- connect(this, SIGNAL(bufferUpdated(Buffer *)), _bufferModel, SLOT(bufferUpdated(Buffer *)));
- connect(this, SIGNAL(bufferActivity(Buffer::ActivityLevel, Buffer *)), _bufferModel, SLOT(bufferActivity(Buffer::ActivityLevel, Buffer *)));
-
- // TODO: make this configurable (allow monolithic client to connect to remote cores)
- if(Global::runMode == Global::Monolithic) clientMode = LocalCore;
- else clientMode = RemoteCore;
- connectedToCore = false;
+ //delete instanceptr;
+ instanceptr->deleteLater();
}
void Client::init(AbstractUi *ui) {
instance()->init();
}
+Client::Client(QObject *parent)
+ : QObject(parent),
+ socket(0),
+ _signalProxy(new SignalProxy(SignalProxy::Client, this)),
+ mainUi(0),
+ _networkModel(0),
+ _bufferModel(0),
+ _nickModel(0),
+ _connectedToCore(false),
+ _syncedToCore(false)
+{
+}
+
+Client::~Client() {
+ disconnectFromCore();
+}
+
void Client::init() {
- blockSize = 0;
-
- connect(&socket, SIGNAL(readyRead()), this, SLOT(serverHasData()));
- connect(&socket, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
- connect(&socket, SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
- connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(serverError(QAbstractSocket::SocketError)));
-
- connect(this, SIGNAL(sendSessionData(const QString &, const QVariant &)), clientProxy, SLOT(gsSessionDataChanged(const QString &, const QVariant &)));
- connect(clientProxy, SIGNAL(csSessionDataChanged(const QString &, const QVariant &)), this, SLOT(recvSessionData(const QString &, const QVariant &)));
-
- connect(clientProxy, SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), this, SLOT(recvProxySignal(ClientSignal, QVariant, QVariant, QVariant)));
- connect(clientProxy, SIGNAL(csCoreState(QVariant)), this, SLOT(recvCoreState(const QVariant &)));
- connect(clientProxy, SIGNAL(csServerState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant)));
- connect(clientProxy, SIGNAL(csServerConnected(QString)), this, SLOT(networkConnected(QString)));
- connect(clientProxy, SIGNAL(csServerDisconnected(QString)), this, SLOT(networkDisconnected(QString)));
- connect(clientProxy, SIGNAL(csDisplayMsg(Message)), this, SLOT(recvMessage(const Message &)));
- connect(clientProxy, SIGNAL(csDisplayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
- connect(clientProxy, SIGNAL(csTopicSet(QString, QString, QString)), this, SLOT(setTopic(QString, QString, QString)));
- connect(clientProxy, SIGNAL(csNickAdded(QString, QString, VarMap)), this, SLOT(addNick(QString, QString, VarMap)));
- connect(clientProxy, SIGNAL(csNickRemoved(QString, QString)), this, SLOT(removeNick(QString, QString)));
- connect(clientProxy, SIGNAL(csNickRenamed(QString, QString, QString)), this, SLOT(renameNick(QString, QString, QString)));
- connect(clientProxy, SIGNAL(csNickUpdated(QString, QString, VarMap)), this, SLOT(updateNick(QString, QString, VarMap)));
- connect(clientProxy, SIGNAL(csOwnNickSet(QString, QString)), this, SLOT(setOwnNick(QString, QString)));
- connect(clientProxy, SIGNAL(csBacklogData(BufferId, const QList<QVariant> &, bool)), this, SLOT(recvBacklogData(BufferId, QList<QVariant>, bool)));
- connect(clientProxy, SIGNAL(csUpdateBufferId(BufferId)), this, SLOT(updateBufferId(BufferId)));
- connect(this, SIGNAL(sendInput(BufferId, QString)), clientProxy, SLOT(gsUserInput(BufferId, QString)));
- connect(this, SIGNAL(requestBacklog(BufferId, QVariant, QVariant)), clientProxy, SLOT(gsRequestBacklog(BufferId, QVariant, QVariant)));
- connect(this, SIGNAL(requestNetworkStates()), clientProxy, SLOT(gsRequestNetworkStates()));
-
- connect(mainUi, SIGNAL(connectToCore(const VarMap &)), this, SLOT(connectToCore(const VarMap &)));
+
+ _networkModel = new NetworkModel(this);
+ connect(this, SIGNAL(bufferUpdated(BufferInfo)),
+ _networkModel, SLOT(bufferUpdated(BufferInfo)));
+
+ _bufferModel = new BufferModel(_networkModel);
+ _nickModel = new NickModel(_networkModel);
+
+ SignalProxy *p = signalProxy();
+ p->attachSignal(this, SIGNAL(sendSessionData(const QString &, const QVariant &)),
+ SIGNAL(clientSessionDataChanged(const QString &, const QVariant &)));
+ p->attachSlot(SIGNAL(coreSessionDataChanged(const QString &, const QVariant &)),
+ this, SLOT(recvSessionData(const QString &, const QVariant &)));
+ //p->attachSlot(SIGNAL(networkConnected(uint)),
+ //FIXME this, SLOT(networkConnected(uint)));
+ //p->attachSlot(SIGNAL(networkDisconnected(uint)),
+ //FIXME this, SLOT(networkDisconnected(uint)));
+ 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(const NetworkInfo &)), this, SLOT(coreNetworkCreated(const NetworkInfo &)));
+ p->attachSlot(SIGNAL(networkRemoved(NetworkId)), this, SLOT(coreNetworkRemoved(NetworkId)));
+*/
+ connect(p, SIGNAL(disconnected()), this, SLOT(disconnectFromCore()));
+
+ //connect(mainUi, SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
connect(mainUi, SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore()));
connect(this, SIGNAL(connected()), mainUi, SLOT(connectedToCore()));
connect(this, SIGNAL(disconnected()), mainUi, SLOT(disconnectedFromCore()));
}
-Client::~Client() {
- //delete mainUi;
- //delete _bufferModel;
- foreach(Buffer *buf, buffers.values()) delete buf;
- ClientProxy::destroy();
+/*** public static methods ***/
+QList<BufferInfo> Client::allBufferInfos() {
+ QList<BufferInfo> bufferids;
+ foreach(Buffer *buffer, buffers()) {
+ bufferids << buffer->bufferInfo();
+ }
+ return bufferids;
}
-BufferTreeModel *Client::bufferModel() {
- return instance()->_bufferModel;
+QList<Buffer *> Client::buffers() {
+ return instance()->_buffers.values();
}
-bool Client::isConnected() { return connectedToCore; }
-void Client::connectToCore(const VarMap &conn) {
- // TODO implement SSL
- coreConnectionInfo = conn;
- if(isConnected()) {
- emit coreConnectionError(tr("Already connected to Core!"));
- return;
- }
- if(conn["Host"].toString().isEmpty()) {
- clientMode = LocalCore;
- QVariant state = connectToLocalCore(coreConnectionInfo["User"].toString(), coreConnectionInfo["Password"].toString());
- syncToCore(state);
- } else {
- clientMode = RemoteCore;
- emit coreConnectionMsg(tr("Connecting..."));
- socket.connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
+// FIXME remove
+Buffer *Client::buffer(BufferId bufferUid) {
+ if(instance()->_buffers.contains(bufferUid))
+ return instance()->_buffers[bufferUid];
+ else
+ return 0;
+}
+
+// FIXME remove
+Buffer *Client::buffer(BufferInfo id) {
+ Buffer *buff = buffer(id.uid());
+
+ if(!buff) {
+ Client *client = Client::instance();
+ buff = new Buffer(id, client);
+ connect(buff, SIGNAL(destroyed()),
+ client, SLOT(bufferDestroyed()));
+ client->_buffers[id.uid()] = buff;
+ emit client->bufferUpdated(id);
}
+ Q_ASSERT(buff);
+ return buff;
}
-void Client::disconnectFromCore() {
- if(clientMode == RemoteCore) {
- socket.close();
+
+NetworkModel *Client::networkModel() {
+ return instance()->_networkModel;
+}
+
+BufferModel *Client::bufferModel() {
+ return instance()->_bufferModel;
+}
+
+NickModel *Client::nickModel() {
+ return instance()->_nickModel;
+}
+
+
+SignalProxy *Client::signalProxy() {
+ return instance()->_signalProxy;
+}
+
+bool Client::isConnected() {
+ return instance()->_connectedToCore;
+}
+
+bool Client::isSynced() {
+ return instance()->_syncedToCore;
+}
+
+/*** Network handling ***/
+
+QList<NetworkId> Client::networkIds() {
+ return instance()->_networks.keys();
+}
+
+const Network * Client::network(NetworkId networkid) {
+ if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
+ else return 0;
+}
+
+/*** Identity handling ***/
+
+QList<IdentityId> Client::identityIds() {
+ return instance()->_identities.keys();
+}
+
+const Identity * Client::identity(IdentityId id) {
+ if(instance()->_identities.contains(id)) return instance()->_identities[id];
+ else return 0;
+}
+
+void Client::createIdentity(const Identity &id) {
+ emit instance()->requestCreateIdentity(id);
+}
+
+void Client::updateIdentity(const Identity &id) {
+ emit instance()->requestUpdateIdentity(id);
+}
+
+void Client::removeIdentity(IdentityId id) {
+ emit instance()->requestRemoveIdentity(id);
+}
+
+void Client::coreIdentityCreated(const Identity &other) {
+ if(!_identities.contains(other.id())) {
+ Identity *identity = new Identity(other, this);
+ _identities[other.id()] = identity;
+ identity->setInitialized();
+ signalProxy()->synchronize(identity);
+ emit identityCreated(other.id());
} else {
- disconnectFromLocalCore();
- coreSocketDisconnected();
+ qWarning() << tr("Identity already exists in client!");
}
- /* Clear internal data. Hopefully nothing relies on it at this point. */
- coreConnectionInfo.clear();
- sessionData.clear();
- //foreach(Buffer *buf, buffers.values()) delete buf;
- qDebug() << "barfoo";
- _bufferModel->clear();
- //qDeleteAll(buffers);
- qDebug() << "foobar";
}
-void Client::coreSocketConnected() {
- connect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(coreConnectionProgress(uint, uint)));
- emit coreConnectionMsg(tr("Synchronizing to core..."));
- VarMap clientInit;
- clientInit["GuiProtocol"] = GUI_PROTOCOL;
- clientInit["User"] = coreConnectionInfo["User"].toString();
- clientInit["Password"] = coreConnectionInfo["Password"].toString();
- writeDataToDevice(&socket, clientInit);
+void Client::coreIdentityRemoved(IdentityId id) {
+ if(_identities.contains(id)) {
+ emit identityRemoved(id);
+ Identity *i = _identities.take(id);
+ i->deleteLater();
+ }
}
-void Client::coreSocketDisconnected() {
- connectedToCore = false;
- emit disconnected();
+/*** ***/
+void Client::userInput(BufferInfo bufferInfo, QString message) {
+ emit instance()->sendInput(bufferInfo, message);
}
-void Client::recvCoreState(const QVariant &state) {
- disconnect(this, SIGNAL(recvPartialItem(quint32, quint32)), this, SIGNAL(coreConnectionProgress(uint, uint)));
- syncToCore(state);
+/*** core connection stuff ***/
+void Client::setConnectedToCore(QIODevice *sock) {
+ socket = sock;
+ signalProxy()->addPeer(socket);
+ _connectedToCore = true;
}
-void Client::syncToCore(const QVariant &coreState) {
- VarMap sessionState = coreState.toMap()["SessionState"].toMap();
- VarMap sessData = sessionState["SessionData"].toMap();
+void Client::setSyncedToCore() {
+ _syncedToCore = true;
+ emit connected();
+ emit coreConnectionStateChanged(true);
+}
- foreach(QString key, sessData.keys()) {
- recvSessionData(key, sessData[key]);
+void Client::disconnectFromCore() {
+ if(socket) {
+ socket->close();
+ socket->deleteLater();
}
- QList<QVariant> coreBuffers = sessionState["Buffers"].toList();
- /* make lookups by id faster */
- foreach(QVariant vid, coreBuffers) {
- BufferId id = vid.value<BufferId>();
- bufferIds[id.uid()] = id; // make lookups by id faster
- buffer(id); // create all buffers, so we see them in the network views
+ _connectedToCore = false;
+ _syncedToCore = false;
+ emit disconnected();
+ emit coreConnectionStateChanged(false);
+
+ // Clear internal data. Hopefully nothing relies on it at this point.
+ _networkModel->clear();
+
+ QHash<NetworkId, Network*>::iterator netIter = _networks.begin();
+ while(netIter != _networks.end()) {
+ Network *net = netIter.value();
+ disconnect(net, SIGNAL(destroyed()), this, 0);
+ netIter = _networks.erase(netIter);
+ net->deleteLater();
}
- netsAwaitingInit = sessionState["Networks"].toStringList();
- connectedToCore = true;
- if(netsAwaitingInit.count()) {
- emit coreConnectionMsg(tr("Requesting network states..."));
- emit coreConnectionProgress(0, netsAwaitingInit.count());
- emit requestNetworkStates();
+ Q_ASSERT(_networks.isEmpty());
+
+ QHash<BufferId, Buffer *>::iterator bufferIter = _buffers.begin();
+ while(bufferIter != _buffers.end()) {
+ Buffer *buffer = bufferIter.value();
+ disconnect(buffer, SIGNAL(destroyed()), this, 0);
+ bufferIter = _buffers.erase(bufferIter);
+ buffer->deleteLater();
}
- else {
- emit coreConnectionProgress(1, 1);
- emit connected();
+ Q_ASSERT(_buffers.isEmpty());
+
+ QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
+ while(idIter != _identities.end()) {
+ Identity *id = idIter.value();
+ emit identityRemoved(id->id());
+ idIter = _identities.erase(idIter);
+ id->deleteLater();
}
+ Q_ASSERT(_identities.isEmpty());
+
+ sessionData.clear();
+ layoutQueue.clear();
+ layoutTimer->stop();
+}
+
+void Client::setCoreConfiguration(const QVariantMap &settings) {
+ SignalProxy::writeDataToDevice(socket, settings);
}
+/*** Session data ***/
+
void Client::recvSessionData(const QString &key, const QVariant &data) {
sessionData[key] = data;
emit sessionDataChanged(key, data);
return instance()->sessionData.keys();
}
-void Client::recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
- if(clientMode == LocalCore) return;
- QList<QVariant> sigdata;
- sigdata.append(sig); sigdata.append(arg1); sigdata.append(arg2); sigdata.append(arg3);
- //qDebug() << "Sending signal: " << sigdata;
- writeDataToDevice(&socket, QVariant(sigdata));
-}
+/*** ***/
-void Client::serverError(QAbstractSocket::SocketError) {
- emit coreConnectionError(socket.errorString());
+// FIXME
+void Client::disconnectFromNetwork(NetworkId id) {
+ if(!instance()->_networks.contains(id)) return;
+ Network *net = instance()->_networks[id];
+ net->requestDisconnect();
}
-void Client::serverHasData() {
- QVariant item;
- while(readDataFromDevice(&socket, blockSize, item)) {
- emit recvPartialItem(1,1);
- QList<QVariant> sigdata = item.toList();
- Q_ASSERT(sigdata.size() == 4);
- ClientProxy::instance()->recv((CoreSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]);
- blockSize = 0;
- }
- if(blockSize > 0) {
- emit recvPartialItem(socket.bytesAvailable(), blockSize);
- }
-}
+/*
+void Client::networkConnected(uint netid) {
+ // TODO: create statusBuffer / switch to networkids
+ //BufferInfo id = statusBufferInfo(net);
+ //Buffer *b = buffer(id);
+ //b->setActive(true);
-void Client::networkConnected(QString net) {
- Q_ASSERT(!netsAwaitingInit.contains(net));
- netConnected[net] = true;
- BufferId id = statusBufferId(net);
- Buffer *b = buffer(id);
- b->setActive(true);
- //b->displayMsg(Message(id, Message::Server, tr("Connected.")));
- // TODO buffersUpdated();
+ Network *netinfo = new Network(netid, this);
+ netinfo->setProxy(signalProxy());
+ networkModel()->attachNetwork(netinfo);
+ connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkDestroyed()));
+ _networks[netid] = netinfo;
}
-void Client::networkDisconnected(QString net) {
- foreach(BufferId id, buffers.keys()) {
- if(id.network() != net) continue;
- Buffer *b = buffer(id);
- //b->displayMsg(Message(id, Message::Server, tr("Server disconnected."))); FIXME
- b->setActive(false);
+void Client::networkDisconnected(NetworkId networkid) {
+ if(!_networks.contains(networkid)) {
+ qWarning() << "Client::networkDisconnected(uint): unknown Network" << networkid;
+ return;
}
- netConnected[net] = false;
- if(netsAwaitingInit.contains(net)) {
- qDebug() << "Network" << net << "disconnected while not yet initialized!";
- netsAwaitingInit.removeAll(net);
- emit coreConnectionProgress(netConnected.count(), netConnected.count() + netsAwaitingInit.count());
- if(!netsAwaitingInit.count()) emit connected();
+
+ Network *net = _networks.take(networkid);
+ if(!net->isInitialized()) {
+ qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
+ updateCoreConnectionProgress();
}
+ net->deleteLater();
}
+*/
-void Client::updateBufferId(BufferId id) {
- bufferIds[id.uid()] = id; // make lookups by id faster
- buffer(id);
+void Client::addNetwork(Network *net) {
+ net->setProxy(signalProxy());
+ signalProxy()->synchronize(net);
+ networkModel()->attachNetwork(net);
+ connect(net, SIGNAL(destroyed()), instance(), SLOT(networkDestroyed()));
+ instance()->_networks[net->networkId()] = net;
+ emit instance()->networkCreated(net->networkId());
}
-BufferId Client::bufferId(QString net, QString buf) {
- foreach(BufferId id, buffers.keys()) {
- if(id.network() == net && id.buffer() == buf) return id;
- }
- Q_ASSERT(false); // should never happen!
- return BufferId();
-}
+void Client::createNetwork(const NetworkInfo &info) {
+
-BufferId Client::statusBufferId(QString net) {
- return bufferId(net, "");
}
+/*** ***/
-Buffer * Client::buffer(BufferId id) {
- Client *client = Client::instance();
- if(!buffers.contains(id)) {
- Buffer *b = new Buffer(id);
- b->setOwnNick(ownNick[id.network()]);
- connect(b, SIGNAL(userInput(BufferId, QString)), client, SLOT(userInput(BufferId, QString)));
- connect(b, SIGNAL(bufferUpdated(Buffer *)), client, SIGNAL(bufferUpdated(Buffer *)));
- connect(b, SIGNAL(bufferDestroyed(Buffer *)), client, SIGNAL(bufferDestroyed(Buffer *)));
- buffers[id] = b;
- emit client->bufferUpdated(b);
- }
- return buffers[id];
+void Client::updateBufferInfo(BufferInfo id) {
+ emit bufferUpdated(id);
}
-QList<BufferId> Client::allBufferIds() {
- return buffers.keys();
+void Client::bufferDestroyed() {
+ Buffer *buffer = static_cast<Buffer *>(sender());
+ QHash<BufferId, Buffer *>::iterator iter = _buffers.begin();
+ while(iter != _buffers.end()) {
+ if(iter.value() == buffer) {
+ iter = _buffers.erase(iter);
+ break;
+ }
+ iter++;
+ }
}
-void Client::recvNetworkState(QString net, QVariant state) {
- netsAwaitingInit.removeAll(net);
- netConnected[net] = true;
- setOwnNick(net, state.toMap()["OwnNick"].toString());
- buffer(statusBufferId(net))->setActive(true);
- VarMap t = state.toMap()["Topics"].toMap();
- VarMap n = state.toMap()["Nicks"].toMap();
- foreach(QVariant v, t.keys()) {
- QString buf = v.toString();
- BufferId id = bufferId(net, buf);
- buffer(id)->setActive(true);
- setTopic(net, buf, t[buf].toString());
- }
- foreach(QString nick, n.keys()) {
- addNick(net, nick, n[nick].toMap());
- }
- emit coreConnectionProgress(netConnected.count(), netConnected.count() + netsAwaitingInit.count());
- if(!netsAwaitingInit.count()) emit connected();
+void Client::networkDestroyed() {
+ // FIXME this is not gonna work, net is a QObject here already!
+ Network *net = static_cast<Network *>(sender());
+ NetworkId networkId = net->networkId();
+ if(_networks.contains(networkId))
+ _networks.remove(networkId);
}
void Client::recvMessage(const Message &msg) {
- Buffer *b = buffer(msg.buffer);
-
- Buffer::ActivityLevel level = Buffer::OtherActivity;
- if(msg.type == Message::Plain || msg.type == Message::Notice){
- level |= Buffer::NewMessage;
- }
- if(msg.flags & Message::Highlight){
- level |= Buffer::Highlight;
- }
- emit bufferActivity(level, b);
-
+ Buffer *b = buffer(msg.buffer());
b->appendMsg(msg);
+ networkModel()->updateBufferActivity(msg);
}
void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
//recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
-
}
-void Client::recvBacklogData(BufferId id, const QList<QVariant> &msgs, bool /*done*/) {
+void Client::recvBacklogData(BufferInfo id, QVariantList msgs, bool /*done*/) {
Buffer *b = buffer(id);
foreach(QVariant v, msgs) {
Message msg = v.value<Message>();
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(b->layoutMsg())
+ layoutQueue.append(b); // Buffer has more messages in its queue --> Round Robin
}
- if(!layoutQueue.count()) layoutTimer->stop();
+
+ if(!layoutQueue.count())
+ layoutTimer->stop();
}
AbstractUiMsg *Client::layoutMsg(const Message &msg) {
return instance()->mainUi->layoutMsg(msg);
}
-void Client::userInput(BufferId id, QString msg) {
- emit sendInput(id, msg);
-}
-
-void Client::setTopic(QString net, QString buf, QString topic) {
- BufferId id = bufferId(net, buf);
- if(!netConnected[id.network()]) return;
- Buffer *b = buffer(id);
- b->setTopic(topic);
- //if(!b->isActive()) {
- // b->setActive(true);
- // buffersUpdated();
- //}
-}
-
-void Client::addNick(QString net, QString nick, VarMap props) {
- if(!netConnected[net]) return;
- nicks[net][nick] = props;
- VarMap chans = props["Channels"].toMap();
- QStringList c = chans.keys();
- foreach(QString bufname, c) {
- buffer(bufferId(net, bufname))->addNick(nick, props);
- }
-}
-
-void Client::renameNick(QString net, QString oldnick, QString newnick) {
- if(!netConnected[net]) return;
- QStringList chans = nicks[net][oldnick]["Channels"].toMap().keys();
- foreach(QString c, chans) {
- buffer(bufferId(net, c))->renameNick(oldnick, newnick);
- }
- nicks[net][newnick] = nicks[net].take(oldnick);
-}
-
-void Client::updateNick(QString net, QString nick, VarMap props) {
- if(!netConnected[net]) return;
- QStringList oldchans = nicks[net][nick]["Channels"].toMap().keys();
- QStringList newchans = props["Channels"].toMap().keys();
- foreach(QString c, newchans) {
- if(oldchans.contains(c)) buffer(bufferId(net, c))->updateNick(nick, props);
- else buffer(bufferId(net, c))->addNick(nick, props);
- }
- foreach(QString c, oldchans) {
- if(!newchans.contains(c)) buffer(bufferId(net, c))->removeNick(nick);
- }
- nicks[net][nick] = props;
-}
-
-void Client::removeNick(QString net, QString nick) {
- if(!netConnected[net]) return;
- VarMap chans = nicks[net][nick]["Channels"].toMap();
- foreach(QString bufname, chans.keys()) {
- buffer(bufferId(net, bufname))->removeNick(nick);
- }
- nicks[net].remove(nick);
-}
-
-void Client::setOwnNick(QString net, QString nick) {
- if(!netConnected[net]) return;
- ownNick[net] = nick;
- foreach(BufferId id, buffers.keys()) {
- if(id.network() == net) {
- buffers[id]->setOwnNick(nick);
- }
- }
-}
-