X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fbuffersyncer.h;h=6d9160cd066174c9f106a0cfe24e8e4a7d8b630f;hp=f847093dcef12a11a8d5c05bdcff7768b5fd4abe;hb=3a3e844f9fcfd12235a0086af75ecd503b621ef4;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/common/buffersyncer.h b/src/common/buffersyncer.h
index f847093d..6d9160cd 100644
--- a/src/common/buffersyncer.h
+++ b/src/common/buffersyncer.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 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  *
@@ -15,59 +15,108 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef BUFFERSYNCER_H_
-#define BUFFERSYNCER_H_
+#pragma once
+
+#include "common-export.h"
 
 #include "syncableobject.h"
 #include "types.h"
+#include "message.h"
 
-class BufferSyncer : public SyncableObject {
-  Q_OBJECT
+class COMMON_EXPORT BufferSyncer : public SyncableObject
+{
+    Q_OBJECT
+    SYNCABLE_OBJECT
 
 public:
-  explicit BufferSyncer(QObject *parent);
-  explicit BufferSyncer(const QHash<BufferId, MsgId> &lastSeenMsg, QObject *parent);
+    explicit BufferSyncer(QObject *parent);
+    explicit BufferSyncer(QHash<BufferId, MsgId> lastSeenMsg, QHash<BufferId, MsgId> markerLines, QHash<BufferId, Message::Types> activities, QHash<BufferId, int> highlightCounts, QObject *parent);
+
+    MsgId lastSeenMsg(BufferId buffer) const;
+    MsgId markerLine(BufferId buffer) const;
+    Message::Types activity(BufferId buffer) const;
+    int highlightCount(BufferId buffer) const;
+
+    void markActivitiesChanged() {
+        for (auto buffer : _bufferActivities.keys()) {
+            emit bufferActivityChanged(buffer, activity(buffer));
+        }
+    }
+
+    void markHighlightCountsChanged() {
+        for (auto buffer : _highlightCounts.keys()) {
+            emit highlightCountChanged(buffer, highlightCount(buffer));
+        }
+    }
 
-  inline virtual const QMetaObject *syncMetaObject() const { return &staticMetaObject; }
+public slots:
+    QVariantList initLastSeenMsg() const;
+    void initSetLastSeenMsg(const QVariantList &);
 
-  MsgId lastSeenMsg(BufferId buffer) const;
+    QVariantList initMarkerLines() const;
+    void initSetMarkerLines(const QVariantList &);
 
-public slots:
-  QVariantList initLastSeenMsg() const;
-  void initSetLastSeenMsg(const QVariantList &);
+    QVariantList initActivities() const;
+    void initSetActivities(const QVariantList &);
 
-  virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { emit setLastSeenMsgRequested(buffer, msgId); }
+    QVariantList initHighlightCounts() const;
+    void initSetHighlightCounts(const QVariantList &);
 
-  virtual inline void requestRemoveBuffer(BufferId buffer) { emit removeBufferRequested(buffer); }
-  virtual void removeBuffer(BufferId buffer);
+    virtual inline void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) }
+    virtual inline void requestSetMarkerLine(BufferId buffer, const MsgId &msgId) { REQUEST(ARG(buffer), ARG(msgId)) setMarkerLine(buffer, msgId); }
 
-  virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { emit renameBufferRequested(buffer, newName); }
-  virtual inline void renameBuffer(BufferId buffer, QString newName) { emit bufferRenamed(buffer, newName); }
+    virtual inline void setBufferActivity(BufferId buffer, int activity) {
+        auto flags = Message::Types(activity);
+        SYNC(ARG(buffer), ARG(activity));
+        _bufferActivities[buffer] = flags;
+        emit bufferActivityChanged(buffer, flags);
+    }
 
-  virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { emit mergeBuffersPermanentlyRequested(buffer1, buffer2); }
-  virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2);
+    virtual inline void setHighlightCount(BufferId buffer, int count) {
+        SYNC(ARG(buffer), ARG(count));
+        _highlightCounts[buffer] = count;
+        emit highlightCountChanged(buffer, count);
+    }
 
-signals:
-  void lastSeenMsgSet(BufferId buffer, const MsgId &msgId);
-  void setLastSeenMsgRequested(BufferId buffer, const MsgId &msgId);
+    virtual inline void requestRemoveBuffer(BufferId buffer) { REQUEST(ARG(buffer)) }
+    virtual void removeBuffer(BufferId buffer);
+
+    virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { REQUEST(ARG(buffer), ARG(newName)) }
+    virtual inline void renameBuffer(BufferId buffer, QString newName) { SYNC(ARG(buffer), ARG(newName)) emit bufferRenamed(buffer, newName); }
 
-  void removeBufferRequested(BufferId buffer);
-  void bufferRemoved(BufferId buffer);
+    virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { emit REQUEST(ARG(buffer1), ARG(buffer2)) }
+    virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2);
 
-  void renameBufferRequested(BufferId buffer, QString newName);
-  void bufferRenamed(BufferId buffer, QString newName);
+    virtual inline void requestPurgeBufferIds() { REQUEST(NO_ARG); }
 
-  void mergeBuffersPermanentlyRequested(BufferId buffer1, BufferId buffer2);
-  void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
+    virtual inline void requestMarkBufferAsRead(BufferId buffer) { REQUEST(ARG(buffer)) emit bufferMarkedAsRead(buffer); }
+    virtual inline void markBufferAsRead(BufferId buffer) { SYNC(ARG(buffer)) emit bufferMarkedAsRead(buffer); }
+
+signals:
+    void lastSeenMsgSet(BufferId buffer, const MsgId &msgId);
+    void markerLineSet(BufferId buffer, const MsgId &msgId);
+    void bufferRemoved(BufferId buffer);
+    void bufferRenamed(BufferId buffer, QString newName);
+    void buffersPermanentlyMerged(BufferId buffer1, BufferId buffer2);
+    void bufferMarkedAsRead(BufferId buffer);
+    void bufferActivityChanged(BufferId, Message::Types);
+    void highlightCountChanged(BufferId, int);
 
 protected slots:
-  bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
+    bool setLastSeenMsg(BufferId buffer, const MsgId &msgId);
+    bool setMarkerLine(BufferId buffer, const MsgId &msgId);
+
+protected:
+    inline QList<BufferId> lastSeenBufferIds() const { return _lastSeenMsg.keys(); }
+    inline QList<BufferId> markerLineBufferIds() const { return _markerLines.keys(); }
+    inline QHash<BufferId, MsgId> markerLines() const { return _markerLines; }
 
 private:
-  QHash<BufferId, MsgId> _lastSeenMsg;
+    QHash<BufferId, MsgId> _lastSeenMsg;
+    QHash<BufferId, MsgId> _markerLines;
+    QHash<BufferId, Message::Types> _bufferActivities;
+    QHash<BufferId, int> _highlightCounts;
 };
-
-#endif