X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebuffersyncer.h;h=3f031cf10829b21d1a53d36b6a946541c0824226;hp=05ddd6adb9b3b4219d3f0414c3dd2ea5d98126d2;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=921e54680da16fcf2adb7a90506875aceb6633a4

diff --git a/src/core/corebuffersyncer.h b/src/core/corebuffersyncer.h
index 05ddd6ad..3f031cf1 100644
--- a/src/core/corebuffersyncer.h
+++ b/src/core/corebuffersyncer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREBUFFERSYNCER_H
-#define COREBUFFERSYNCER_H
+#pragma once
 
 #include "buffersyncer.h"
 
@@ -27,43 +26,67 @@ class CoreSession;
 
 class CoreBufferSyncer : public BufferSyncer
 {
-    SYNCABLE_OBJECT
-        Q_OBJECT
+    Q_OBJECT
 
 public:
-    CoreBufferSyncer(CoreSession *parent);
+    explicit CoreBufferSyncer(CoreSession* parent);
 
 public slots:
-    virtual void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId);
-    virtual void requestSetMarkerLine(BufferId buffer, const MsgId &msgId);
+    void requestSetLastSeenMsg(BufferId buffer, const MsgId& msgId) override;
+    void requestSetMarkerLine(BufferId buffer, const MsgId& msgId) override;
 
-    virtual inline void requestRemoveBuffer(BufferId buffer) { removeBuffer(buffer); }
-    virtual void removeBuffer(BufferId bufferId);
+    inline void requestRemoveBuffer(BufferId buffer) override { removeBuffer(buffer); }
+    void removeBuffer(BufferId bufferId) override;
 
-    virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { renameBuffer(buffer, newName); }
-    virtual void renameBuffer(BufferId buffer, QString newName);
+    void addBufferActivity(const Message& message)
+    {
+        auto oldActivity = activity(message.bufferId());
+        if (!oldActivity.testFlag(message.type())) {
+            setBufferActivity(message.bufferId(), (int)(oldActivity | message.type()));
+        }
+    }
 
-    virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { mergeBuffersPermanently(buffer1, buffer2); }
-    virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2);
+    void addCoreHighlight(const Message& message)
+    {
+        auto oldHighlightCount = highlightCount(message.bufferId());
+        if (message.flags().testFlag(Message::Flag::Highlight) && !message.flags().testFlag(Message::Flag::Self)) {
+            setHighlightCount(message.bufferId(), oldHighlightCount + 1);
+        }
+    }
 
-    virtual void requestPurgeBufferIds();
+    void setBufferActivity(BufferId buffer, int activity) override;
 
-    virtual inline void requestMarkBufferAsRead(BufferId buffer) { markBufferAsRead(buffer); }
+    void setHighlightCount(BufferId buffer, int highlightCount) override;
+
+    inline void requestRenameBuffer(BufferId buffer, QString newName) override { renameBuffer(buffer, newName); }
+    void renameBuffer(BufferId buffer, QString newName) override;
+
+    inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) override { mergeBuffersPermanently(buffer1, buffer2); }
+    void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2) override;
+
+    void requestPurgeBufferIds() override;
+
+    inline void requestMarkBufferAsRead(BufferId buffer) override
+    {
+        int activity = Message::Types();
+        setBufferActivity(buffer, activity);
+        setHighlightCount(buffer, 0);
+        markBufferAsRead(buffer);
+    }
 
     void storeDirtyIds();
 
 protected:
-    virtual void customEvent(QEvent *event);
+    void customEvent(QEvent* event) override;
 
 private:
-    CoreSession *_coreSession;
+    CoreSession* _coreSession;
     bool _purgeBuffers;
 
     QSet<BufferId> dirtyLastSeenBuffers;
     QSet<BufferId> dirtyMarkerLineBuffers;
+    QSet<BufferId> dirtyActivities;
+    QSet<BufferId> dirtyHighlights;
 
     void purgeBufferIds();
 };
-
-
-#endif //COREBUFFERSYNCER_H