X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.cpp;h=e39435e690dae168de744d8153ce193a371c1897;hp=49c45f4cd7597df83840fbfae2ee6c41a94aeab4;hb=df0846fca1b6a8427498a125b32f4da6d236a7fc;hpb=50706d89d4d60e258ebb6873d3778383621898e4

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 49c45f4c..e39435e6 100644
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -21,19 +21,26 @@
 #include "client.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"
 
 QPointer<Client> Client::instanceptr = 0;
+AccountId Client::_currentCoreAccount = 0;
 
 /*** Initialization/destruction ***/
 
@@ -44,7 +51,8 @@ Client *Client::instance() {
 }
 
 void Client::destroy() {
-  delete instanceptr;
+  //delete instanceptr;
+  instanceptr->deleteLater();
 }
 
 void Client::init(AbstractUi *ui) {
@@ -59,40 +67,42 @@ Client::Client(QObject *parent)
     mainUi(0),
     _networkModel(0),
     _bufferModel(0),
-    connectedToCore(false)
+    _bufferSyncer(0),
+    _backlogManager(new ClientBacklogManager(this)),
+    _bufferViewManager(0),
+    _ircListHelper(new ClientIrcListHelper(this)),
+    _messageModel(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() {
+  disconnectFromCore();
 }
 
 void Client::init() {
-  blockSize = 0;
-
+  _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);
+  _messageModel = mainUi->createMessageModel(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(coreState(const QVariant &)),
-                this, SLOT(recvCoreState(const QVariant &)));
-  p->attachSlot(SIGNAL(networkConnected(uint)),
-                this, SLOT(networkConnected(uint)));
-  p->attachSlot(SIGNAL(networkDisconnected(uint)),
-                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(displayMsg(const Message &)), this, SLOT(recvMessage(const Message &)));
+  p->attachSlot(SIGNAL(displayStatusMsg(QString, QString)), this, SLOT(recvStatusMsg(QString, QString)));
+
   p->attachSlot(SIGNAL(bufferInfoUpdated(BufferInfo)), this, SLOT(updateBufferInfo(BufferInfo)));
   p->attachSignal(this, SIGNAL(sendInput(BufferInfo, QString)));
   p->attachSignal(this, SIGNAL(requestNetworkStates()));
@@ -103,7 +113,15 @@ void Client::init() {
   p->attachSlot(SIGNAL(identityCreated(const Identity &)), this, SLOT(coreIdentityCreated(const Identity &)));
   p->attachSlot(SIGNAL(identityRemoved(IdentityId)), this, SLOT(coreIdentityRemoved(IdentityId)));
 
-  connect(mainUi, SIGNAL(connectToCore(const QVariantMap &)), this, SLOT(connectToCore(const QVariantMap &)));
+  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(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()));
@@ -117,16 +135,12 @@ void Client::init() {
 
 /*** public static methods ***/
 
-
-QList<Network *> Client::networks() {
-  return instance()->_network.values();
+AccountId Client::currentCoreAccount() {
+  return _currentCoreAccount;
 }
 
-Network *Client::network(uint networkid) {
-  if(instance()->_network.contains(networkid))
-    return instance()->_network[networkid];
-  else
-    return 0;
+void Client::setCurrentCoreAccount(AccountId id) {
+  _currentCoreAccount = id;
 }
 
 QList<BufferInfo> Client::allBufferInfos() {
@@ -141,44 +155,100 @@ QList<Buffer *> Client::buffers() {
   return instance()->_buffers.values();
 }
 
-Buffer *Client::buffer(uint bufferUid) {
-  if(instance()->_buffers.contains(bufferUid))
-    return instance()->_buffers[bufferUid];
+
+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];
   else
     return 0;
 }
 
-Buffer *Client::buffer(BufferInfo id) {
-  Buffer *buff = buffer(id.uid());
+Buffer *Client::buffer(BufferInfo bufferInfo) {
+  Buffer *buff = buffer(bufferInfo.bufferId());
 
   if(!buff) {
     Client *client = Client::instance();
-    buff = new Buffer(id, client);
-
-    connect(buff, SIGNAL(userInput(BufferInfo, QString)),
-	    client, SLOT(userInput(BufferInfo, QString)));
-    connect(buff, SIGNAL(destroyed()),
-	    client, SLOT(bufferDestroyed()));
-    client->_buffers[id.uid()] = buff;
-    emit client->bufferUpdated(id);
+    buff = new Buffer(bufferInfo, client);
+    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;
 }
 
-NetworkModel *Client::networkModel() {
-  return instance()->_networkModel;
+bool Client::isConnected() {
+  return instance()->_connectedToCore;
 }
 
-BufferModel *Client::bufferModel() {
-  return instance()->_bufferModel;
+bool Client::isSynced() {
+  return instance()->_syncedToCore;
 }
 
+/*** Network handling ***/
 
-SignalProxy *Client::signalProxy() {
-  return instance()->_signalProxy;
+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;
+}
+
+void Client::createNetwork(const NetworkInfo &info) {
+  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::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());
+}
+
+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);
+}
+
+void Client::coreNetworkRemoved(NetworkId id) {
+  if(!_networks.contains(id))
+    return;
+  Network *net = _networks.take(id);
+  emit networkRemoved(net->networkId());
+  net->deleteLater();
+}
 
 /*** Identity handling ***/
 
@@ -191,7 +261,6 @@ const Identity * Client::identity(IdentityId id) {
   else return 0;
 }
 
-
 void Client::createIdentity(const Identity &id) {
   emit instance()->requestCreateIdentity(id);
 }
@@ -225,83 +294,69 @@ void Client::coreIdentityRemoved(IdentityId id) {
 }
 
 /***  ***/
+void Client::userInput(BufferInfo bufferInfo, QString message) {
+  emit instance()->sendInput(bufferInfo, message);
+}
 
+/*** core connection stuff ***/
 
-bool Client::isConnected() {
-  return instance()->connectedToCore;
+void Client::setConnectedToCore(QIODevice *sock, AccountId id) {
+  socket = sock;
+  signalProxy()->addPeer(socket);
+  _connectedToCore = true;
+  setCurrentCoreAccount(id);
 }
 
-void Client::fakeInput(uint bufferUid, QString message) {
-  Buffer *buff = buffer(bufferUid);
-  if(!buff)
-    qWarning() << "No Buffer with uid" << bufferUid << "can't send Input" << message;
-  else
-    emit instance()->sendInput(buff->bufferInfo(), message);
-}
+void Client::setSyncedToCore() {
+  // create buffersyncer
+  Q_ASSERT(!_bufferSyncer);
+  _bufferSyncer = new BufferSyncer(this);
+  connect(bufferSyncer(), SIGNAL(lastSeenMsgSet(BufferId, MsgId)), this, SLOT(updateLastSeenMsg(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());
 
-void Client::fakeInput(BufferInfo bufferInfo, QString message) {
-  fakeInput(bufferInfo, message);
-}
+  // attach backlog manager
+  signalProxy()->synchronize(backlogManager());
 
-void Client::connectToCore(const QVariantMap &conn) {
-  // TODO implement SSL
-  coreConnectionInfo = conn;
-  if(isConnected()) {
-    emit coreConnectionError(tr("Already connected to Core!"));
-    return;
-  }
-  
-  if(socket != 0)
-    socket->deleteLater();
-  
-  if(conn["Host"].toString().isEmpty()) {
-    clientMode = LocalCore;
-    socket = new QBuffer(this);
-    connect(socket, SIGNAL(readyRead()), this, SLOT(coreHasData()));
-    socket->open(QIODevice::ReadWrite);
-    //QVariant state = connectToLocalCore(coreConnectionInfo["User"].toString(), coreConnectionInfo["Password"].toString());
-    //syncToCore(state);
-    coreSocketConnected();
-  } else {
-    clientMode = RemoteCore;
-    emit coreConnectionMsg(tr("Connecting..."));
-    Q_ASSERT(!socket);
-    QTcpSocket *sock = new QTcpSocket(this);
-    socket = sock;
-    connect(sock, SIGNAL(readyRead()), this, SLOT(coreHasData()));
-    connect(sock, SIGNAL(connected()), this, SLOT(coreSocketConnected()));
-    connect(signalProxy(), SIGNAL(disconnected()), this, SLOT(coreSocketDisconnected()));
-    connect(sock, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(coreSocketError(QAbstractSocket::SocketError)));
-    sock->connectToHost(conn["Host"].toString(), conn["Port"].toUInt());
-  }
-}
+  // create a new BufferViewManager
+  _bufferViewManager = new BufferViewManager(signalProxy(), this);
 
-void Client::disconnectFromCore() {
-  socket->close();
+  _syncedToCore = true;
+  emit connected();
+  emit coreConnectionStateChanged(true);
 }
 
-void Client::setCoreConfiguration(const QVariantMap &settings) {
-  SignalProxy::writeDataToDevice(socket, settings);
+void Client::setSecuredConnection() {
+  emit securedConnection();
 }
 
-void Client::coreSocketConnected() {
-  connect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint)));
-  emit coreConnectionMsg(tr("Synchronizing to core..."));
-  QVariantMap clientInit;
-  clientInit["GuiProtocol"] = GUI_PROTOCOL;
-  clientInit["User"] = coreConnectionInfo["User"].toString();
-  clientInit["Password"] = coreConnectionInfo["Password"].toString();
-  SignalProxy::writeDataToDevice(socket, clientInit);
-}
+void Client::disconnectFromCore() {
+  if(!isConnected())
+    return;
+  _connectedToCore = false;
 
-void Client::coreSocketDisconnected() {
-  instance()->connectedToCore = false;
+  if(socket) {
+    socket->close();
+    socket->deleteLater();
+  }
+  _syncedToCore = false;
   emit disconnected();
   emit coreConnectionStateChanged(false);
-  socket->deleteLater();
-  blockSize = 0;
 
-  /* Clear internal data. Hopefully nothing relies on it at this point. */
+  // 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;
+  }
+
   _networkModel->clear();
 
   QHash<BufferId, Buffer *>::iterator bufferIter =  _buffers.begin();
@@ -313,15 +368,17 @@ void Client::coreSocketDisconnected() {
   }
   Q_ASSERT(_buffers.isEmpty());
 
+  _statusBuffers.clear();
 
-  QHash<NetworkId, Network*>::iterator netIter = _network.begin();
-  while(netIter != _network.end()) {
+  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 = _network.erase(netIter);
+    netIter = _networks.erase(netIter);
     net->deleteLater();
   }
-  Q_ASSERT(_network.isEmpty());
+  Q_ASSERT(_networks.isEmpty());
 
   QHash<IdentityId, Identity*>::iterator idIter = _identities.begin();
   while(idIter != _identities.end()) {
@@ -332,265 +389,192 @@ void Client::coreSocketDisconnected() {
   }
   Q_ASSERT(_identities.isEmpty());
 
-  coreConnectionInfo.clear();
-  sessionData.clear();
   layoutQueue.clear();
   layoutTimer->stop();
 }
 
-void Client::recvCoreState(const QVariant &state) {
-  disconnect(this, SIGNAL(recvPartialItem(uint, uint)), this, SIGNAL(coreConnectionProgress(uint, uint)));
-  disconnect(socket, 0, this, 0);  // rest of communication happens through SignalProxy
-  signalProxy()->addPeer(socket);
-  syncToCore(state);
+void Client::setCoreConfiguration(const QVariantMap &settings) {
+  SignalProxy::writeDataToDevice(socket, settings);
 }
 
-// TODO: auth errors
-void Client::syncToCore(const QVariant &coreState) {
-  if(!coreState.toMap().contains("SessionState")) {
-    emit coreConnectionError(tr("Invalid data received from core!"));
-    disconnectFromCore();
-    return;
-  }
+/*** ***/
 
-  QVariantMap sessionState = coreState.toMap()["SessionState"].toMap();
-
-  // store sessionData
-  QVariantMap sessData = sessionState["SessionData"].toMap();
-  foreach(QString key, sessData.keys())
-    recvSessionData(key, sessData[key]);
+void Client::updateBufferInfo(BufferInfo id) {
+  emit bufferUpdated(id);
+}
 
-  // create identities
-  foreach(QVariant vid, sessionState["Identities"].toList()) {
-    coreIdentityCreated(vid.value<Identity>());
+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++;
   }
 
-  // store Buffer details
-  QVariantList coreBuffers = sessionState["Buffers"].toList();
-  /* make lookups by id faster */
-  foreach(QVariant vid, coreBuffers) {
-    buffer(vid.value<BufferInfo>()); // create all buffers, so we see them in the network views
+  QHash<NetworkId, Buffer *>::iterator statusIter = _statusBuffers.begin();
+  while(statusIter != _statusBuffers.end()) {
+    if(statusIter.value() == buffer) {
+      statusIter = _statusBuffers.erase(statusIter);
+      break;
+    }
+    statusIter++;
   }
+}
 
-  // create network objects
-  QVariantList networkids = sessionState["Networks"].toList();
-  foreach(QVariant networkid, networkids) {
-    networkConnected(networkid.toUInt());
+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++;
+    }
   }
-
-  instance()->connectedToCore = true;
-  updateCoreConnectionProgress();
-
 }
 
-void Client::updateCoreConnectionProgress() {
-  // we'll do this in three steps:
-  // 1.) networks
-  // 2.) channels
-  // 3.) ircusers
-
-  int numNets = networks().count();
-  int numNetsWaiting = 0;
-
-  int numIrcUsers = 0;
-  int numIrcUsersWaiting = 0;
-
-  int numChannels = 0;
-  int numChannelsWaiting = 0;
-
-  foreach(Network *net, networks()) {
-    if(! net->initialized())
-      numNetsWaiting++;
-
-    numIrcUsers += net->ircUsers().count();
-    foreach(IrcUser *user, net->ircUsers()) {
-      if(! user->initialized())
-	numIrcUsersWaiting++;
-    }
+void Client::recvMessage(const Message &msg_) {
+  Message msg = msg_;
+  checkForHighlight(msg);
+  _messageModel->insertMessage(msg);
+  buffer(msg.bufferInfo())->updateActivityLevel(msg);
+}
 
-    numChannels += net->ircChannels().count();
-    foreach(IrcChannel *channel, net->ircChannels()) {
-      if(! channel->initialized())
-	numChannelsWaiting++;
-    }
-  }
+void Client::recvStatusMsg(QString /*net*/, QString /*msg*/) {
+  //recvMessage(net, Message::server("", QString("[STATUS] %1").arg(msg)));
+}
 
-  if(numNetsWaiting > 0) {
-    emit coreConnectionMsg(tr("Requesting network states..."));
-    emit coreConnectionProgress(numNets - numNetsWaiting, numNets);
-    return;
+void Client::receiveBacklog(BufferId bufferId, const QVariantList &msgs) {
+  //QTime start = QTime::currentTime();
+  foreach(QVariant v, msgs) {
+    Message msg = v.value<Message>();
+    checkForHighlight(msg);
+    _messageModel->insertMessage(msg);
+    buffer(msg.bufferInfo())->updateActivityLevel(msg);
   }
+  //qDebug() << "processed" << msgs.count() << "backlog lines in" << start.msecsTo(QTime::currentTime());
+}
 
-  if(numIrcUsersWaiting > 0) {
-    emit coreConnectionMsg(tr("Requesting User states..."));
-    emit coreConnectionProgress(numIrcUsers - numIrcUsersWaiting, numIrcUsers);
+void Client::layoutMsg() {
+  if(layoutQueue.isEmpty()) {
+    layoutTimer->stop();
     return;
   }
 
-  if(numChannelsWaiting > 0) {
-    emit coreConnectionMsg(tr("Requesting Channel states..."));
-    emit coreConnectionProgress(numChannels - numChannelsWaiting, numChannels);
+  Buffer *buffer = layoutQueue.takeFirst();
+  if(buffer->layoutMsg()) {
+    layoutQueue.append(buffer);  // Buffer has more messages in its queue --> Round Robin
     return;
   }
 
-  emit coreConnectionProgress(1,1);
-  emit connected();
-  emit coreConnectionStateChanged(true);
-  foreach(Network *net, networks()) {
-    disconnect(net, 0, this, SLOT(updateCoreConnectionProgress()));
-  }
-
-  // signalProxy()->dumpProxyStats();
-}
-
-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);
+  if(layoutQueue.isEmpty())
+    layoutTimer->stop();
 }
 
-QVariant Client::retrieveSessionData(const QString &key, const QVariant &def) {
-  if(instance()->sessionData.contains(key)) return instance()->sessionData[key];
-  else return def;
+AbstractUiMsg *Client::layoutMsg(const Message &msg) {
+  return instance()->mainUi->layoutMsg(msg);
 }
 
-QStringList Client::sessionDataKeys() {
-  return instance()->sessionData.keys();
-}
+// TODO optimize checkForHighlight
+void Client::checkForHighlight(Message &msg) {
+  if(!((msg.type() & (Message::Plain | Message::Notice | Message::Action)) && !(msg.flags() & Message::Self)))
+    return;
 
-void Client::coreSocketError(QAbstractSocket::SocketError) {
-  emit coreConnectionError(socket->errorString());
-  socket->deleteLater();
-}
+  NotificationSettings notificationSettings;
+  const Network *net = network(msg.bufferInfo().networkId());
+  if(net && !net->myNick().isEmpty()) {
+    QStringList nickList;
+    if(notificationSettings.highlightNick() == NotificationSettings::CurrentNick) {
+      nickList << net->myNick();
+    } else if(notificationSettings.highlightNick() == NotificationSettings::AllNicks) {
+      const Identity *myIdentity = identity(net->identity());
+      if(myIdentity)
+	nickList = myIdentity->nicks();
+    }
+    foreach(QString nickname, nickList) {
+      QRegExp nickRegExp("^(.*\\W)?" + QRegExp::escape(nickname) + "(\\W.*)?$");
+      if(nickRegExp.exactMatch(msg.contents())) {
+        msg.setFlags(msg.flags() | Message::Highlight);
+        return;
+      }
+    }
 
-void Client::coreHasData() {
-  QVariant item;
-  if(SignalProxy::readDataFromDevice(socket, blockSize, item)) {
-    emit recvPartialItem(1,1);
-    QVariantMap msg = item.toMap();
-    if (!msg["StartWizard"].toBool()) {
-      recvCoreState(msg["Reply"]);
-    } else {
-      qWarning("Core not configured!");
-      qDebug() << "Available storage providers: " << msg["StorageProviders"].toStringList();
-      emit showConfigWizard(msg);
+    foreach(QVariant highlight, notificationSettings.highlightList()) {
+      QVariantMap highlightRule = highlight.toMap();
+      if(!highlightRule["enable"].toBool())
+        continue;
+      Qt::CaseSensitivity caseSensitivity = highlightRule["cs"].toBool() ? Qt::CaseSensitive : Qt::CaseInsensitive;
+      QString name = highlightRule["name"].toString();
+      QRegExp userRegExp;
+      if(highlightRule["regex"].toBool()) {
+        userRegExp = QRegExp(name, caseSensitivity);
+      } else {
+        userRegExp = QRegExp("^(.*\\W)?" + QRegExp::escape(name) + "(\\W.*)?$", caseSensitivity);
+      }
+      if(userRegExp.exactMatch(msg.contents())) {
+        msg.setFlags(msg.flags() | Message::Highlight);
+        return;
+      }
     }
-    blockSize = 0;
-    return;
-  }
-  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);
-
-  Network *netinfo = new Network(netid, this);
-  netinfo->setProxy(signalProxy());
-  networkModel()->attachNetwork(netinfo);
-  
-  if(!isConnected()) {
-    connect(netinfo, SIGNAL(initDone()), this, SLOT(updateCoreConnectionProgress()));
-    connect(netinfo, SIGNAL(ircUserInitDone()), this, SLOT(updateCoreConnectionProgress()));
-    connect(netinfo, SIGNAL(ircChannelInitDone()), this, SLOT(updateCoreConnectionProgress()));
+void Client::updateLastSeenMsg(BufferId id, const MsgId &msgId) {
+  Buffer *b = buffer(id);
+  if(!b) {
+    qWarning() << "Client::updateLastSeen(): Unknown buffer" << id;
+    return;
   }
-  connect(netinfo, SIGNAL(destroyed()), this, SLOT(networkDestroyed()));
-  _network[netid] = netinfo;
+  b->setLastSeenMsg(msgId);
 }
 
-void Client::networkDisconnected(uint networkid) {
-  if(!_network.contains(networkid)) {
-    qWarning() << "Client::networkDisconnected(uint): unknown Network" << networkid;
+void Client::setBufferLastSeenMsg(BufferId id, const MsgId &msgId) {
+  if(!bufferSyncer())
     return;
-  }
-
-  Network *net = _network.take(networkid);
-  if(!net->initialized()) {
-    qDebug() << "Network" << networkid << "disconnected while not yet initialized!";
-    updateCoreConnectionProgress();
-  }
-  net->deleteLater();
+  bufferSyncer()->requestSetLastSeenMsg(id, msgId);
 }
 
-void Client::updateBufferInfo(BufferInfo id) {
-  emit bufferUpdated(id);
+void Client::removeBuffer(BufferId id) {
+  if(!bufferSyncer()) return;
+  bufferSyncer()->requestRemoveBuffer(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);
-      break;
-    }
-    iter++;
+void Client::bufferRemoved(BufferId bufferId) {
+  // first remove the buffer from hash. this prohibits further lastSeenUpdates
+  Buffer *buff = 0;
+  if(_buffers.contains(bufferId)) {
+    buff = _buffers.take(bufferId);
+    layoutQueue.removeAll(buff);
+    disconnect(buff, 0, this, 0);
   }
-}
-
-void Client::networkDestroyed() {
-  Network *netinfo = static_cast<Network *>(sender());
-  uint networkId = netinfo->networkId();
-  if(_network.contains(networkId))
-    _network.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);
-}
-
-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);
+  // 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>() == bufferId) {
+    bufferModel()->setCurrentIndex(current.sibling(0,0));
   }
-  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();
-}
+  // and remove it from the model
+  networkModel()->removeBuffer(bufferId);
 
-AbstractUiMsg *Client::layoutMsg(const Message &msg) {
-  return instance()->mainUi->layoutMsg(msg);
+  if(buff)
+    buff->deleteLater();
 }
 
-void Client::userInput(BufferInfo id, QString msg) {
-  emit sendInput(id, msg);
+void Client::bufferRenamed(BufferId bufferId, const QString &newName) {
+  QModelIndex bufferIndex = networkModel()->bufferIndex(bufferId);
+  if(bufferIndex.isValid()) {
+    networkModel()->setData(bufferIndex, newName, Qt::DisplayRole);
+  }
 }
-