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

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 10f395cf..de3bfcf6 100644
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -21,47 +21,103 @@
 
 #include "buffer.h"
 
+#include "buffersyncer.h"
 #include "client.h"
+#include "networkmodel.h"
+#include "quasselui.h"
 #include "util.h"
 
 
 Buffer::Buffer(BufferInfo bufferid, QObject *parent)
   : QObject(parent),
-    _bufferInfo(bufferid)
+    _bufferInfo(bufferid),
+    _isVisible(false),
+    _activityLevel(NoActivity)
 {
+
 }
 
 BufferInfo Buffer::bufferInfo() const {
-  // still needed to process user input... *sigh*
-  // ... and for the gui *sigh* to request the backlogs *sigh*
+  // still needed by the gui *sigh* to request the backlogs *sigh*
   return _bufferInfo;
 }
 
-QList<AbstractUiMsg *> Buffer::contents() const {
+const QList<AbstractUiMsg *> &Buffer::contents() const {
   return layoutedMsgs;
 }
 
 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);
+  if(layoutQueue.isEmpty())
+    return false;
+
+  AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
+  layoutedMsgs.prepend(m);
+  emit msgPrepended(m);
+
+  return !layoutQueue.isEmpty();
+}
+
+void Buffer::setVisible(bool visible) {
+  _isVisible = visible;
+  setActivityLevel(NoActivity);
+  if(layoutedMsgs.isEmpty())
+    return;
+  setLastSeenMsg(layoutedMsgs.last()->msgId());
+}
+
+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);
   }
-  return layoutQueue.count();
 }
 
-void Buffer::processUserInput(QString msg) {
-  // TODO User Input processing (plugins) -> well, this goes through MainWin into Core for processing... so...
-  emit userInput(_bufferInfo, msg);
+void Buffer::setActivityLevel(ActivityLevel level) {
+  _activityLevel = level;
+  if(bufferInfo().bufferId() > 0) {
+    Client::networkModel()->setBufferActivity(bufferInfo(), level);
+    //qDebug() << "setting level:" << bufferInfo() << lastSeen() << level;
+  }
 }
 
+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);
+}