X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorebuffersyncer.h;h=c490419a95bd7363fd241cdb43dd4e817eb32b5e;hp=89694bf654e1ef4adb04848f3e473c38459a61a5;hb=fd16e241d2fd1f33f4625b3255956f025a67273b;hpb=541013790cdbd0c32d81debf8f42ac6b5183a4aa diff --git a/src/core/corebuffersyncer.h b/src/core/corebuffersyncer.h index 89694bf6..c490419a 100644 --- a/src/core/corebuffersyncer.h +++ b/src/core/corebuffersyncer.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-09 by the Quassel Project * + * Copyright (C) 2005-2016 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -15,7 +15,7 @@ * 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 COREBUFFERSYNCER_H @@ -25,41 +25,58 @@ class CoreSession; -class CoreBufferSyncer : public BufferSyncer { - SYNCABLE_OBJECT - Q_OBJECT +class CoreBufferSyncer : public BufferSyncer +{ + SYNCABLE_OBJECT + Q_OBJECT public: - CoreBufferSyncer(CoreSession *parent); + CoreBufferSyncer(CoreSession *parent); public slots: - virtual void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId); - virtual void requestSetMarkerLine(BufferId buffer, const MsgId &msgId); + virtual void requestSetLastSeenMsg(BufferId buffer, const MsgId &msgId); + virtual void requestSetMarkerLine(BufferId buffer, const MsgId &msgId); - virtual inline void requestRemoveBuffer(BufferId buffer) { removeBuffer(buffer); } - virtual void removeBuffer(BufferId bufferId); + virtual inline void requestRemoveBuffer(BufferId buffer) { removeBuffer(buffer); } + virtual void removeBuffer(BufferId bufferId); - virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { renameBuffer(buffer, newName); } - virtual void renameBuffer(BufferId buffer, QString newName); + void addBufferActivity(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 setBufferActivity(BufferId buffer, const int &activity) override; - virtual void requestPurgeBufferIds(); + virtual inline void requestRenameBuffer(BufferId buffer, QString newName) { renameBuffer(buffer, newName); } + virtual void renameBuffer(BufferId buffer, QString newName); - void storeDirtyIds(); + virtual inline void requestMergeBuffersPermanently(BufferId buffer1, BufferId buffer2) { mergeBuffersPermanently(buffer1, buffer2); } + virtual void mergeBuffersPermanently(BufferId buffer1, BufferId buffer2); + + virtual void requestPurgeBufferIds(); + + virtual inline void requestMarkBufferAsRead(BufferId buffer) { + setLastSeenMsg(buffer, (int) Message::Types()); + markBufferAsRead(buffer); + } + + void storeDirtyIds(); protected: - virtual void customEvent(QEvent *event); + virtual void customEvent(QEvent *event); private: - CoreSession *_coreSession; - bool _purgeBuffers; + CoreSession *_coreSession; + bool _purgeBuffers; - QSet dirtyLastSeenBuffers; - QSet dirtyMarkerLineBuffers; + QSet dirtyLastSeenBuffers; + QSet dirtyMarkerLineBuffers; + QSet dirtyActivities; - void purgeBufferIds(); + void purgeBufferIds(); }; + #endif //COREBUFFERSYNCER_H