X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=b17fa28ae0fc8a230984b02b31aea896264e8b9d;hp=8cc87e417bad358f562765cb78a71bdc9055eb1d;hb=0d49f7e83bd1055711e66aa880f3a0d62f7eefc9;hpb=08aac67d4dc813ed541a81d06fb83d9c4fec5834

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 8cc87e41..b17fa28a 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -20,21 +20,27 @@
 
 #include "client.h"
 
+#include "abstractmessageprocessor.h"
 #include "bufferinfo.h"
-#include "global.h"
+#include "buffermodel.h"
+#include "buffersettings.h"
+#include "buffersyncer.h"
+#include "bufferviewmanager.h"
+#include "clientbacklogmanager.h"
+#include "clientirclisthelper.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 "nickmodel.h"
 #include "quasselui.h"
 #include "signalproxy.h"
 #include "util.h"
 
 QPointer<Client> Client::instanceptr = 0;
+AccountId Client::_currentCoreAccount = 0;
 
 /*** Initialization/destruction ***/
 
@@ -45,8 +51,11 @@ Client *Client::instance() {
 }
 
 void Client::destroy() {
-  //delete instanceptr;
-  instanceptr->deleteLater();
+  if(instanceptr) {
+    delete instanceptr->mainUi;
+    instanceptr->deleteLater();
+    instanceptr = 0;
+  }
 }
 
 void Client::init(AbstractUi *ui) {
@@ -56,15 +65,20 @@ void Client::init(AbstractUi *ui) {
 
 Client::Client(QObject *parent)
   : QObject(parent),
-    socket(0),
     _signalProxy(new SignalProxy(SignalProxy::Client, this)),
     mainUi(0),
     _networkModel(0),
     _bufferModel(0),
-    _nickModel(0),
+    _bufferSyncer(0),
+    _backlogManager(new ClientBacklogManager(this)),
+    _bufferViewManager(0),
+    _ircListHelper(new ClientIrcListHelper(this)),
+    _messageModel(0),
+    _messageProcessor(0),
     _connectedToCore(false),
     _syncedToCore(false)
 {
+  _signalProxy->synchronize(_ircListHelper);
 }
 
 Client::~Client() {
@@ -72,128 +86,114 @@ 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)));
 
   _bufferModel = new BufferModel(_networkModel);
-  _nickModel = new NickModel(_networkModel);
+  _messageModel = mainUi->createMessageModel(this);
+  _messageProcessor = mainUi->createMessageProcessor(this);
 
   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->attachSlot(SIGNAL(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &)));
+  p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
+
+  p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), _networkModel, SLOT(bufferUpdated(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)));
 
-  connect(p, SIGNAL(disconnected()), this, SLOT(disconnectFromCore()));
+  p->attachSignal(this, SIGNAL(requestCreateNetwork(const NetworkInfo &)), SIGNAL(createNetwork(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(p, SIGNAL(disconnected()), this, SLOT(disconnectedFromCore()));
 
   //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()));
 
-  layoutTimer = new QTimer(this);
-  layoutTimer->setInterval(0);
-  layoutTimer->setSingleShot(false);
-  connect(layoutTimer, SIGNAL(timeout()), this, SLOT(layoutMsg()));
-
 }
 
 /*** public static methods ***/
 
-QList<BufferInfo> Client::allBufferInfos() {
-  QList<BufferInfo> bufferids;
-  foreach(Buffer *buffer, buffers()) {
-    bufferids << buffer->bufferInfo();
-  }
-  return bufferids;
+AccountId Client::currentCoreAccount() {
+  return _currentCoreAccount;
 }
 
-QList<Buffer *> Client::buffers() {
-  return instance()->_buffers.values();
+void Client::setCurrentCoreAccount(AccountId id) {
+  _currentCoreAccount = id;
 }
 
-
-// FIXME remove
-Buffer *Client::buffer(BufferId bufferUid) {
-  if(instance()->_buffers.contains(bufferUid))
-    return instance()->_buffers[bufferUid];
-  else
-    return 0;
+bool Client::isConnected() {
+  return instance()->_connectedToCore;
 }
 
-// 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;
+bool Client::isSynced() {
+  return instance()->_syncedToCore;
 }
 
+/*** Network handling ***/
 
-NetworkModel *Client::networkModel() {
-  return instance()->_networkModel;
+QList<NetworkId> Client::networkIds() {
+  return instance()->_networks.keys();
 }
 
-BufferModel *Client::bufferModel() {
-  return instance()->_bufferModel;
+const Network * Client::network(NetworkId networkid) {
+  if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
+  else return 0;
 }
 
-NickModel *Client::nickModel() {
-  return instance()->_nickModel;
+void Client::createNetwork(const NetworkInfo &info) {
+  emit instance()->requestCreateNetwork(info);
 }
 
-
-SignalProxy *Client::signalProxy() {
-  return instance()->_signalProxy;
+void Client::removeNetwork(NetworkId id) {
+  emit instance()->requestRemoveNetwork(id);
 }
 
-bool Client::isConnected() {
-  return instance()->_connectedToCore;
+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);
 }
 
-bool Client::isSynced() {
-  return instance()->_syncedToCore;
+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());
 }
 
-/*** Network handling ***/
-
-QList<NetworkId> Client::networkIds() {
-  return instance()->_networks.keys();
+void Client::coreNetworkCreated(NetworkId id) {
+  if(_networks.contains(id)) {
+    qWarning() << "Creation of already existing network requested!";
+    return;
+  }
+  Network *net = new Network(id, this);
+  addNetwork(net);
 }
 
-const Network * Client::network(NetworkId networkid) {
-  if(instance()->_networks.contains(networkid)) return instance()->_networks[networkid];
-  else return 0;
+void Client::coreNetworkRemoved(NetworkId id) {
+  if(!_networks.contains(id))
+    return;
+  Network *net = _networks.take(id);
+  emit networkRemoved(net->networkId());
+  net->deleteLater();
 }
 
 /*** Identity handling ***/
@@ -211,8 +211,13 @@ void Client::createIdentity(const Identity &id) {
   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) {
@@ -246,49 +251,86 @@ void Client::userInput(BufferInfo bufferInfo, QString message) {
 
 /*** core connection stuff ***/
 
-void Client::setConnectedToCore(QIODevice *sock) {
-  socket = sock;
+void Client::setConnectedToCore(QIODevice *socket, AccountId id) {
+  // if the socket is an orphan, the signalProxy adopts it.
+  // -> we don't need to care about it anymore
+  socket->setParent(0);
   signalProxy()->addPeer(socket);
   _connectedToCore = true;
+  setCurrentCoreAccount(id);
+}
+
+void Client::setConnectedToInternalCore() {
+  _connectedToCore = true;
+  setCurrentCoreAccount(AccountId());
 }
 
 void Client::setSyncedToCore() {
+  // create buffersyncer
+  Q_ASSERT(!_bufferSyncer);
+  _bufferSyncer = new BufferSyncer(this);
+  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(socket) {
-    socket->close();
-    socket->deleteLater();
-  }
+  if(!isConnected())
+    return;
+
+  signalProxy()->removeAllPeers();
+}
+
+void Client::disconnectedFromCore() {
   _connectedToCore = false;
   _syncedToCore = false;
   emit disconnected();
   emit coreConnectionStateChanged(false);
 
+  backlogManager()->reset();
+  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<NetworkId, Network*>::iterator netIter = _networks.begin();
   while(netIter != _networks.end()) {
     Network *net = netIter.value();
+    emit networkRemoved(net->networkId());
     disconnect(net, SIGNAL(destroyed()), this, 0);
     netIter = _networks.erase(netIter);
     net->deleteLater();
   }
   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();
-  }
-  Q_ASSERT(_buffers.isEmpty());
-
   QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
   while(idIter != _identities.end()) {
     Identity *id = idIter.value();
@@ -298,151 +340,65 @@ void Client::disconnectFromCore() {
   }
   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);
-  emit sessionDataChanged(key);
-}
-
-void Client::storeSessionData(const QString &key, const QVariant &data) {
-  // Not sure if this is a good idea, but we'll try it anyway:
-  // Calling this function only sends a signal to core. Data is stored upon reception of the update signal,
-  // rather than immediately.
-  emit instance()->sendSessionData(key, data);
-}
-
-QVariant Client::retrieveSessionData(const QString &key, const QVariant &def) {
-  if(instance()->sessionData.contains(key)) return instance()->sessionData[key];
-  else return def;
-}
-
-QStringList Client::sessionDataKeys() {
-  return instance()->sessionData.keys();
-}
-
-/*** ***/
-
-/*
-void Client::networkConnected(uint netid) {
-  // TODO: create statusBuffer / switch to networkids
-  //BufferInfo id = statusBufferInfo(net);
-  //Buffer *b = buffer(id);
-  //b->setActive(true);
-
-  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(NetworkId networkid) {
-  if(!_networks.contains(networkid)) {
-    qWarning() << "Client::networkDisconnected(uint): unknown Network" << networkid;
-    return;
-  }
-
-  Network *net = _networks.take(networkid);
-  if(!net->isInitialized()) {
-    qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
-    updateCoreConnectionProgress();
-  }
-  net->deleteLater();
-}
-*/
-
-void Client::addNetwork(NetworkId netid) {
-  Network *net = new Network(netid, instance());
-  addNetwork(net);
-}
-
-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()->networkAdded(net->networkId());
-  //if(net->networkId() == 1) net->requestConnect(); // FIXME
 }
 
 /*** ***/
 
-void Client::updateBufferInfo(BufferInfo id) {
-  emit bufferUpdated(id);
-}
-
-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);
+void Client::networkDestroyed() {
+  Network *net = static_cast<Network *>(sender());
+  QHash<NetworkId, Network *>::iterator netIter = _networks.begin();
+  while(netIter != _networks.end()) {
+    if(*netIter == net) {
+      netIter = _networks.erase(netIter);
       break;
+    } else {
+      netIter++;
     }
-    iter++;
   }
 }
 
-void Client::networkDestroyed() {
-  Network *netinfo = static_cast<Network *>(sender());
-  NetworkId networkId = netinfo->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);
-
-  b->appendMsg(msg);
-}
-
+// 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);
-  foreach(QVariant v, msgs) {
-    Message msg = v.value<Message>();
-    b->prependMsg(msg);
-    if(!layoutQueue.contains(b)) layoutQueue.append(b);
-  }
-  if(layoutQueue.count() && !layoutTimer->isActive()) layoutTimer->start();
+void Client::recvMessage(const Message &msg_) {
+  Message msg = msg_;
+  messageProcessor()->process(msg);
 }
 
-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
+void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
+  if(!bufferSyncer())
+    return;
+  bufferSyncer()->requestSetLastSeenMsg(id, msgId);
+}
+
+void Client::removeBuffer(BufferId id) {
+  if(!bufferSyncer()) return;
+  bufferSyncer()->requestRemoveBuffer(id);
+}
+
+void Client::bufferRemoved(BufferId bufferId) {
+  // 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>() == bufferId) {
+    bufferModel()->setCurrentIndex(current.sibling(0,0));
   }
-  
-  if(!layoutQueue.count())
-    layoutTimer->stop();
-}
 
-AbstractUiMsg *Client::layoutMsg(const Message &msg) {
-  return instance()->mainUi->layoutMsg(msg);
+  // and remove it from the model
+  networkModel()->removeBuffer(bufferId);
 }
 
+void Client::bufferRenamed(BufferId bufferId, const QString &newName) {
+  QModelIndex bufferIndex = networkModel()->bufferIndex(bufferId);
+  if(bufferIndex.isValid()) {
+    networkModel()->setData(bufferIndex, newName, Qt::DisplayRole);
+  }
+}