Post-merge cleanups, remove the old message handling

[quassel.git] / src / client / buffer.cpp

diff --git a/src/client/buffer.cpp b/src/client/buffer.cpp
index 10f395c..df78639 100644 (file)
--- a/src/client/buffer.cpp
+++ b/src/client/buffer.cpp
@@ -21,47 +21,70 @@
 
 #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 {
-  return layoutedMsgs;
-}
-
-void Buffer::appendMsg(const Message &msg) {
-  AbstractUiMsg *m = Client::layoutMsg(msg);
-  layoutedMsgs.append(m);
-  emit msgAppended(m);
+void Buffer::setVisible(bool visible) {
+  _isVisible = visible;
+  setActivityLevel(NoActivity);
+  if(_lastRcvdMsg.msgId() > 0) setLastSeenMsg(_lastRcvdMsg.msgId());
 }
 
-void Buffer::prependMsg(const Message &msg) {
-  layoutQueue.append(msg);
+void Buffer::setLastSeenMsg(const MsgId &msgId) {
+  const MsgId oldLastSeen = lastSeenMsg();
+  if(!oldLastSeen.isValid() || (msgId.isValid() && msgId > oldLastSeen)) {
+    _lastSeenMsg = msgId;
+    Client::setBufferLastSeenMsg(bufferInfo().bufferId(), msgId);
+    setActivityLevel(NoActivity);
+  }
 }
 
-bool Buffer::layoutMsg() {
-  if(layoutQueue.count()) {
-    AbstractUiMsg *m = Client::layoutMsg(layoutQueue.takeFirst());
-    layoutedMsgs.prepend(m);
-    emit msgPrepended(m);
+void Buffer::setActivityLevel(ActivityLevel level) {
+  _activityLevel = level;
+  if(bufferInfo().bufferId() > 0) {
+    Client::networkModel()->setBufferActivity(bufferInfo(), level);
   }
-  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::updateActivityLevel(const Message &msg) {
+  // FIXME dirty hack to allow the lastSeen stuff to continue to work
+  //       will be made much nicer once Buffer dies, I hope...
+  if(msg.msgId() > _lastRcvdMsg.msgId()) _lastRcvdMsg = 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);
+}