X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fbuffer.cpp;h=de3bfcf6d7bbb686a4a5ee672936a65395232575;hp=023263bbb98ab0f84d3b61fd1d0029c3e20f1a81;hb=df0846fca1b6a8427498a125b32f4da6d236a7fc;hpb=e9772bbd46ac2006b3f283bfc9f06b013d174ae3

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 023263bb..de3bfcf6 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -1,11 +1,11 @@
 /***************************************************************************
- *   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        *
@@ -21,187 +21,103 @@
 
 #include "buffer.h"
 
+#include "buffersyncer.h"
 #include "client.h"
-#include "ircchannel.h"
-#include "nickmodel.h"
+#include "networkmodel.h"
+#include "quasselui.h"
 #include "util.h"
 
 
 Buffer::Buffer(BufferInfo bufferid, QObject *parent)
   : QObject(parent),
     _bufferInfo(bufferid),
-    _active(false),
-    _ircChannel(0), _nickModel(0)
+    _isVisible(false),
+    _activityLevel(NoActivity)
 {
-  if(bufferid.buffer().isEmpty())
-    _type = StatusType;
-  else if(isChannelName(bufferid.buffer()))
-    _type = ChannelType;
-  else
-    _type = QueryType;
-
-  _nickModel = new NickModel(0, this);
-/*
-  QSettings s;
-  s.beginGroup(QString("GUI/BufferStates/%1/%2").arg(netname).arg(bufname));
-  state->splitterState = s.value("Splitter").toByteArray();
-  s.endGroup();
-  */
-  emit bufferUpdated(this);
-}
-
-Buffer::~Buffer() {
-  //delete widget;
-  /*
-  QSettings s;
-  s.beginGroup(QString("GUI/BufferStates/%1/%2").arg(networkName).arg(bufferName));
-  s.setValue("Splitter", state->splitterState);
-  s.endGroup();
-*/
-  //delete state;
-}
-
-Buffer::Type Buffer::bufferType() const {
-  return _type;
-}
 
-bool Buffer::isActive() const {
-  // FIXME determine status by checking for a networkInfo objekt
-  return true;
 }
 
 BufferInfo Buffer::bufferInfo() const {
-   return _bufferInfo;
+  // still needed by the gui *sigh* to request the backlogs *sigh*
+  return _bufferInfo;
 }
 
-void Buffer::updateBufferInfo(BufferInfo bufferid) {
-  _bufferInfo = bufferid;
-}
-
-uint Buffer::uid() const {
-  return bufferInfo().uid();
-}
-
-uint Buffer::networkId() const {
-  return bufferInfo().networkId();
-}
-
-QString Buffer::networkName() const {
-  return bufferInfo().network();
-}
-
-QString Buffer::name() const {
-  if(bufferType() == StatusType)
-    return tr("Status Buffer");
-  else
-    return bufferInfo().buffer();
-}
-
-QList<AbstractUiMsg *> Buffer::contents() const {
+const QList<AbstractUiMsg *> &Buffer::contents() const {
   return layoutedMsgs;
 }
 
-QVariantMap Buffer::nickList() const {
-  // FIXME should return a Map or List of IrcUsers in the future
-  return QVariantMap();
-}
-
-QString Buffer::topic() const {
-  // FIXME check if we got a networkInfo() object
-  return QString();
-}
-
-QString Buffer::ownNick() const {
-  // FIXME check if we got a networkInfo() object
-  return QString();
-}
-
-bool Buffer::isStatusBuffer() const {
-   return bufferType() == StatusType;
-}
-
-void Buffer::setActive(bool a) {
-//   if(a != active) {
-//     active = a;
-//     emit bufferUpdated(this);
-//  }
-}
-
 void Buffer::appendMsg(const Message &msg) {
+  updateActivityLevel(msg);
   AbstractUiMsg *m = Client::layoutMsg(msg);
   layoutedMsgs.append(m);
   emit msgAppended(m);
 }
 
 void Buffer::prependMsg(const Message &msg) {
+  // check for duplicate first
+  if(!layoutedMsgs.isEmpty()  && msg.msgId() >= layoutedMsgs.first()->msgId()) {
+    return;
+  }
+  updateActivityLevel(msg);
   layoutQueue.append(msg);
 }
 
 bool Buffer::layoutMsg() {
-  if(layoutQueue.count()) {
-    AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
-    layoutedMsgs.prepend(m);
-    emit msgPrepended(m);
-  }
-  return layoutQueue.count();
-}
+  if(layoutQueue.isEmpty())
+    return false;
 
-void Buffer::processUserInput(QString msg) {
-  // TODO User Input processing (plugins) -> well, this goes through MainWin into Core for processing... so...
-  emit userInput(_bufferInfo, msg);
-}
+  AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
+  layoutedMsgs.prepend(m);
+  emit msgPrepended(m);
 
-NickModel *Buffer::nickModel() const {
-  return _nickModel;
+  return !layoutQueue.isEmpty();
 }
 
-IrcChannel *Buffer::ircChannel() const {
-  return _ircChannel;
+void Buffer::setVisible(bool visible) {
+  _isVisible = visible;
+  setActivityLevel(NoActivity);
+  if(layoutedMsgs.isEmpty())
+    return;
+  setLastSeenMsg(layoutedMsgs.last()->msgId());
 }
 
-void Buffer::setIrcChannel(IrcChannel *ircchan) {
-  if(_ircChannel) {
-    disconnect(_ircChannel, 0, this, 0);
+void Buffer::setLastSeenMsg(const MsgId &msgId) {
+  // qDebug() << "want to set lastSeen:" << bufferInfo() << seen << lastSeen();
+  const MsgId oldLastSeen = lastSeenMsg();
+  if(!oldLastSeen.isValid() || (msgId.isValid() && msgId > oldLastSeen)) {
+    //qDebug() << "setting:" << bufferInfo().bufferName() << seen;
+    _lastSeenMsg = msgId;
+    Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId);
+    //qDebug() << "setting lastSeen:" << bufferInfo() << lastSeen();
+    setActivityLevel(NoActivity);
   }
-  _ircChannel = ircchan;
-  if(_ircChannel) {
-    connect(_ircChannel, SIGNAL(destroyed()), this, SLOT(setIrcChannel()));
+}
+
+void Buffer::setActivityLevel(ActivityLevel level) {
+  _activityLevel = level;
+  if(bufferInfo().bufferId() > 0) {
+    Client::networkModel()->setBufferActivity(bufferInfo(), level);
+    //qDebug() << "setting level:" << bufferInfo() << lastSeen() << level;
   }
-  _nickModel->setIrcChannel(ircChannel());
 }
 
-// no longer needed
-// back reference:
-// void Buffer::setTopic(QString t) {
-//   _topic = t;
-//   emit topicSet(t);
-//   emit bufferUpdated(this);
-// }
-
-// void Buffer::addNick(QString nick, QVariantMap props) {
-//   if(nick == ownNick()) setActive(true);
-//   nicks[nick] = props;
-//   emit nickListChanged(nicks);
-// }
-
-// void Buffer::updateNick(QString nick, QVariantMap props) {
-//   nicks[nick] = props;
-//   emit nickListChanged(nicks);
-// }
-
-// void Buffer::renameNick(QString oldnick, QString newnick) {
-//   QVariant v = nicks.take(oldnick);
-//   nicks[newnick] = v;
-//   emit nickListChanged(nicks);
-// }
-
-// void Buffer::removeNick(QString nick) {
-//   if(nick == ownNick()) setActive(false);
-//   nicks.remove(nick);
-//   emit nickListChanged(nicks);
-// }
-
-// void Buffer::setOwnNick(QString nick) {
-//   _ownNick = nick;
-//   emit ownNickSet(nick);
-// }
+void Buffer::updateActivityLevel(const Message &msg) {
+  if(isVisible())
+    return;
+
+  if(msg.flags() & Message::Self)	// don't update activity for our own messages
+    return;
+
+  if(lastSeenMsg().isValid() && lastSeenMsg() >= msg.msgId())
+    return;
+
+  ActivityLevel level = activityLevel() | OtherActivity;
+  if(msg.type() & (Message::Plain | Message::Notice | Message::Action))
+    level |= NewMessage;
+
+  if(msg.flags() & Message::Highlight)
+    level |= Highlight;
+
+  if(level != activityLevel())
+    setActivityLevel(level);
+}