X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=6be7e0778efc9f634831ee2ec7cbf26562c24925;hp=a04361cc4a8535bc3ea3c497da5c5ff2a9dce04d;hb=8c3b7e4773e9f20ad9ea264cbaafaa52485bdf86;hpb=e7e564dcf469faa4c47383368a58cedbe3a204e6 diff --git a/src/client/client.cpp b/src/client/client.cpp index a04361cc..6be7e077 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -19,26 +19,26 @@ ***************************************************************************/ #include "client.h" -#include "clientproxy.h" -#include "mainwin.h" + #include "buffer.h" +#include "buffertreemodel.h" +#include "clientproxy.h" +#include "quasselui.h" #include "util.h" Client * Client::instanceptr = 0; +bool Client::connectedToCore = false; Client::ClientMode Client::clientMode; QHash Client::buffers; QHash Client::bufferIds; QHash > Client::nicks; -QHash Client::connected; +QHash Client::netConnected; QHash Client::ownNick; -QList Client::coreBuffers; - Client *Client::instance() { if(instanceptr) return instanceptr; instanceptr = new Client(); - instanceptr->init(); return instanceptr; } @@ -50,8 +50,7 @@ void Client::destroy() { Client::Client() { clientProxy = ClientProxy::instance(); - //mainWin = new MainWin(); - _bufferModel = new BufferTreeModel(0); // FIXME + _bufferModel = new BufferTreeModel(this); connect(this, SIGNAL(bufferSelected(Buffer *)), _bufferModel, SLOT(selectBuffer(Buffer *))); connect(this, SIGNAL(bufferUpdated(Buffer *)), _bufferModel, SLOT(bufferUpdated(Buffer *))); @@ -60,6 +59,12 @@ Client::Client() { // TODO: make this configurable (allow monolithic client to connect to remote cores) if(Global::runMode == Global::Monolithic) clientMode = LocalCore; else clientMode = RemoteCore; + connectedToCore = false; +} + +void Client::init(AbstractUi *ui) { + instance()->mainUi = ui; + instance()->init(); } void Client::init() { @@ -77,7 +82,7 @@ void Client::init() { 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(Message))); + 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))); @@ -85,33 +90,27 @@ void Client::init() { 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, QList, bool)), this, SLOT(recvBacklogData(BufferId, QList, bool))); + connect(clientProxy, SIGNAL(csBacklogData(BufferId, const QList &, bool)), this, SLOT(recvBacklogData(BufferId, QList, 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())); - syncToCore(); + connect(mainUi, SIGNAL(connectToCore(const VarMap &)), this, SLOT(connectToCore(const VarMap &))); + connect(mainUi, SIGNAL(disconnectFromCore()), this, SLOT(disconnectFromCore())); + 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())); - /* make lookups by id faster */ - foreach(BufferId id, coreBuffers) { - bufferIds[id.uid()] = id; // make lookups by id faster - buffer(id); // create all buffers, so we see them in the network views - emit requestBacklog(id, -1, -1); // TODO: use custom settings for backlog request - } - - mainWin = new MainWin(); - mainWin->init(); - } Client::~Client() { - delete mainWin; - delete _bufferModel; + //delete mainUi; + //delete _bufferModel; foreach(Buffer *buf, buffers.values()) delete buf; ClientProxy::destroy(); @@ -121,12 +120,70 @@ BufferTreeModel *Client::bufferModel() { return instance()->_bufferModel; } +bool Client::isConnected() { return connectedToCore; } + +void Client::connectToCore(const VarMap &conn) { + // TODO implement SSL + if(isConnected()) { + qDebug() << "Already connected to core!"; + return; + } + if(conn["Host"].toString().isEmpty()) { + clientMode = LocalCore; + syncToCore(); // TODO send user and pw from conn info + } else { + clientMode = RemoteCore; + socket.connectToHost(conn["Host"].toString(), conn["Port"].toUInt()); + } +} + +void Client::disconnectFromCore() { + if(clientMode == RemoteCore) { + socket.close(); + } else { + disconnectFromLocalCore(); + coreDisconnected(); + } + // TODO clear internal data +} + void Client::coreConnected() { + syncToCore(); } void Client::coreDisconnected() { + connectedToCore = false; + emit disconnected(); +} +void Client::syncToCore() { + VarMap state; + if(clientMode == LocalCore) { + state = connectToLocalCore("Default", "password").toMap(); // TODO make this configurable + } else { + + } + + VarMap data = state["CoreData"].toMap(); + foreach(QString key, data.keys()) { + Global::updateData(key, data[key]); + } + //if(!Global::data("CoreReady").toBool()) { + // qFatal("Something is wrong, getting invalid data from core!"); + //} + + VarMap sessionState = state["SessionState"].toMap(); + QList coreBuffers = sessionState["Buffers"].toList(); + /* make lookups by id faster */ + foreach(QVariant vid, coreBuffers) { + BufferId id = vid.value(); + bufferIds[id.uid()] = id; // make lookups by id faster + buffer(id); // create all buffers, so we see them in the network views + } + connectedToCore = true; + emit connected(); + emit requestNetworkStates(); } void Client::updateCoreData(UserId, QString key) { @@ -147,15 +204,6 @@ void Client::recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVa writeDataToDevice(&socket, QVariant(sigdata)); } -void Client::connectToCore(QString host, quint16 port) { - // TODO implement SSL - socket.connectToHost(host, port); -} - -void Client::disconnectFromCore() { - socket.close(); -} - void Client::serverError(QAbstractSocket::SocketError) { emit coreConnectionError(socket.errorString()); } @@ -174,10 +222,8 @@ void Client::serverHasData() { } } -/*******************************************************************************************************************/ - void Client::networkConnected(QString net) { - connected[net] = true; + netConnected[net] = true; BufferId id = statusBufferId(net); Buffer *b = buffer(id); b->setActive(true); @@ -192,7 +238,7 @@ void Client::networkDisconnected(QString net) { //b->displayMsg(Message(id, Message::Server, tr("Server disconnected."))); FIXME b->setActive(false); } - connected[net] = false; + netConnected[net] = false; } void Client::updateBufferId(BufferId id) { @@ -227,8 +273,12 @@ Buffer * Client::buffer(BufferId id) { return buffers[id]; } +QList Client::allBufferIds() { + return buffers.keys(); +} + void Client::recvNetworkState(QString net, QVariant state) { - connected[net] = true; + netConnected[net] = true; setOwnNick(net, state.toMap()["OwnNick"].toString()); buffer(statusBufferId(net))->setActive(true); VarMap t = state.toMap()["Topics"].toMap(); @@ -244,7 +294,7 @@ void Client::recvNetworkState(QString net, QVariant state) { } } -void Client::recvMessage(Message msg) { +void Client::recvMessage(const Message &msg) { Buffer *b = buffer(msg.buffer); Buffer::ActivityLevel level = Buffer::OtherActivity; @@ -256,38 +306,43 @@ void Client::recvMessage(Message msg) { } emit bufferActivity(level, b); - //b->displayMsg(msg); - b->appendChatLine(new ChatLine(msg)); + b->appendMsg(msg); } -void Client::recvStatusMsg(QString net, QString msg) { +void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) { //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg))); } -void Client::recvBacklogData(BufferId id, QList msgs, bool done) { +void Client::recvBacklogData(BufferId id, const QList &msgs, bool /*done*/) { + Buffer *b = buffer(id); foreach(QVariant v, msgs) { - layoutQueue.append(v.value()); + Message msg = v.value(); + b->prependMsg(msg); + if(!layoutQueue.contains(b)) layoutQueue.append(b); } - if(!layoutTimer->isActive()) layoutTimer->start(); + if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start(); } - void Client::layoutMsg() { if(layoutQueue.count()) { - ChatLine *line = new ChatLine(layoutQueue.takeFirst()); - buffer(line->bufferId())->prependChatLine(line); + 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(); } +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(!connected[id.network()]) return; + if(!netConnected[id.network()]) return; Buffer *b = buffer(id); b->setTopic(topic); //if(!b->isActive()) { @@ -297,7 +352,7 @@ void Client::setTopic(QString net, QString buf, QString topic) { } void Client::addNick(QString net, QString nick, VarMap props) { - if(!connected[net]) return; + if(!netConnected[net]) return; nicks[net][nick] = props; VarMap chans = props["Channels"].toMap(); QStringList c = chans.keys(); @@ -307,7 +362,7 @@ void Client::addNick(QString net, QString nick, VarMap props) { } void Client::renameNick(QString net, QString oldnick, QString newnick) { - if(!connected[net]) return; + if(!netConnected[net]) return; QStringList chans = nicks[net][oldnick]["Channels"].toMap().keys(); foreach(QString c, chans) { buffer(bufferId(net, c))->renameNick(oldnick, newnick); @@ -316,7 +371,7 @@ void Client::renameNick(QString net, QString oldnick, QString newnick) { } void Client::updateNick(QString net, QString nick, VarMap props) { - if(!connected[net]) return; + if(!netConnected[net]) return; QStringList oldchans = nicks[net][nick]["Channels"].toMap().keys(); QStringList newchans = props["Channels"].toMap().keys(); foreach(QString c, newchans) { @@ -330,7 +385,7 @@ void Client::updateNick(QString net, QString nick, VarMap props) { } void Client::removeNick(QString net, QString nick) { - if(!connected[net]) return; + if(!netConnected[net]) return; VarMap chans = nicks[net][nick]["Channels"].toMap(); foreach(QString bufname, chans.keys()) { buffer(bufferId(net, bufname))->removeNick(nick); @@ -339,7 +394,7 @@ void Client::removeNick(QString net, QString nick) { } void Client::setOwnNick(QString net, QString nick) { - if(!connected[net]) return; + if(!netConnected[net]) return; ownNick[net] = nick; foreach(BufferId id, buffers.keys()) { if(id.network() == net) { @@ -348,4 +403,3 @@ void Client::setOwnNick(QString net, QString nick) { } } -