X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fmessagemodel.cpp;h=21e396534e1ee7d05ea88ab62bb45a4d49059fa0;hp=245a787090f4828be72445ca44ea05e63d343115;hb=3d0af34c02d84199ce680b3460151d02e0ef6d2e;hpb=ea372dac8dda146255c7232922904e9f90a0d7f9

diff --git a/src/client/messagemodel.cpp b/src/client/messagemodel.cpp
index 245a7870..21e39653 100644
--- a/src/client/messagemodel.cpp
+++ b/src/client/messagemodel.cpp
@@ -22,6 +22,13 @@
 
 #include "message.h"
 
+#include <QEvent>
+
+class ProcessBufferEvent : public QEvent {
+public:
+  inline ProcessBufferEvent() : QEvent(QEvent::User) {}
+};
+
 MessageModel::MessageModel(QObject *parent)
   : QAbstractItemModel(parent)
 {
@@ -68,10 +75,29 @@ bool MessageModel::insertMessage(const Message &msg, bool fakeMsg) {
   return true;
 }
 
+void MessageModel::insertMessages(const QList<Message> &msglist) {
+  if(msglist.isEmpty())
+    return;
 
-void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
-  if(msglist.isEmpty()) return;
+  if(_messageList.isEmpty()) {
+    insertMessageGroup(msglist);
+  } else {
+    int processedMsgs = insertMessagesGracefully(msglist);
+    int remainingMsgs = msglist.count() - processedMsgs;
+    if(remainingMsgs > 0) {
+      if(msglist.first().msgId() < msglist.last().msgId()) {
+	// in Order
+	_messageBuffer << msglist.mid(0, remainingMsgs);
+      } else {
+	_messageBuffer << msglist.mid(processedMsgs);
+      }
+      qSort(_messageBuffer);
+      QCoreApplication::postEvent(this, new ProcessBufferEvent());
+    }
+  }
+}
 
+void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
   int idx = indexForId(msglist.first().msgId());
   beginInsertRows(QModelIndex(), idx, idx+msglist.count()-1);
 
@@ -83,42 +109,14 @@ void MessageModel::insertMessageGroup(const QList<Message> &msglist) {
   endInsertRows();
 }
 
-
-void MessageModel::insertMessages(const QList<Message> &msglist) {
-  if(msglist.isEmpty())
-    return;
-
-  if(_messageList.isEmpty()) {
-    insertMessageGroup(msglist);
-    return;
-  }
-
+int MessageModel::insertMessagesGracefully(const QList<Message> &msglist) {
   bool inOrder = (msglist.first().msgId() < msglist.last().msgId());
-  
-  // check if the whole bunch fits in at one position
-  if(indexForId(msglist.first().msgId()) == indexForId(msglist.last().msgId())) {
-    if(inOrder) {
-      insertMessageGroup(msglist);
-    } else {
-      QList<Message> messages = msglist;
-      qSort(messages);
-      insertMessageGroup(messages);
-    }
-    return;
-  }
-
   // depending on the order we have to traverse from the front to the back or vice versa
-  // for the sake of performance we have a little code duplication here
-  // if you need to do some changes here you'll probably need to change them at all
-  // places marked DUPE
-
 
-  // FIXME: keep scrollbars from jumping
-  // the somewhat bulk insert leads to a jumpy scrollbar when the user requests further backlog.
-  // it would probably be the best to stop processing each time we actually insert a messagegroup
-  // and give back controll to the eventloop (similar to what the QtUiMessageProcessor used to do)
   QList<Message> grouplist;
   MsgId id;
+  MsgId dupeId;
+  int dupeCount = 0;
   bool fastForward = false;
   QList<Message>::const_iterator iter;
   if(inOrder) {
@@ -128,15 +126,21 @@ void MessageModel::insertMessages(const QList<Message> &msglist) {
     iter = msglist.constBegin();
   }
 
-  // DUPE (1 / 3)
   int idx = indexForId((*iter).msgId());
+  if(idx >= 0)
+    dupeId = _messageList[idx]->msgId();
+
   // we always compare to the previous entry...
   // if there isn't, we can fastforward to the top
-  if(idx - 1 >= 0) // also safe as we've passed another empty check
+  if(idx - 1 >= 0)
     id = _messageList[idx - 1]->msgId();
   else
     fastForward = true;
-  grouplist << *iter;
+
+  if((*iter).msgId() != dupeId)
+    grouplist << *iter;
+  else
+    dupeCount++;
 
   if(!inOrder)
     iter++;
@@ -144,46 +148,52 @@ void MessageModel::insertMessages(const QList<Message> &msglist) {
   if(inOrder) {
     while(iter != msglist.constBegin()) {
       iter--;
-      // DUPE (2 / 3)
-      if(!fastForward && (*iter).msgId() < id) {
-	insertMessageGroup(grouplist);
-	grouplist.clear();
-	
-	// build new group
-	int idx = indexForId((*iter).msgId());
-	if(idx - 1 >= 0)
-	  id = _messageList[idx - 1]->msgId();
-	else
-	  fastForward = true;
-      }
-      grouplist.prepend(*iter);
+
+      if(!fastForward && (*iter).msgId() < id)
+	break;
+
+      if((*iter).msgId() != dupeId)
+	grouplist.prepend(*iter);
+      else
+	dupeCount++;
     }
   } else {
     while(iter != msglist.constEnd()) {
-      // DUPE (3 / 3)
-      if(!fastForward && (*iter).msgId() < id) {
-	insertMessageGroup(grouplist);
-	grouplist.clear();
-	
-	// build new group
-	int idx = indexForId((*iter).msgId());
-	if(idx - 1 >= 0)
-	  id = _messageList[idx - 1]->msgId();
-	else
-	  fastForward = true;
-      }
-      grouplist.prepend(*iter);
+      if(!fastForward && (*iter).msgId() < id)
+	break;
+
+      if((*iter).msgId() != dupeId)
+	grouplist.prepend(*iter);
+      else
+	dupeCount++;
+
       iter++;
     }
   }
 
-  if(!grouplist.isEmpty()) {
-    insertMessageGroup(grouplist);
-  }
-    
-  return;
+  insertMessageGroup(grouplist);
+  return grouplist.count() + dupeCount;
 }
 
+void MessageModel::customEvent(QEvent *event) {
+  if(event->type() != QEvent::User)
+    return;
+
+  event->accept();
+
+  if(_messageBuffer.isEmpty())
+    return;
+
+  int processedMsgs = insertMessagesGracefully(_messageBuffer);
+  int remainingMsgs = _messageBuffer.count() - processedMsgs;
+
+  QList<Message>::iterator removeStart = _messageBuffer.begin() + remainingMsgs;
+  QList<Message>::iterator removeEnd = _messageBuffer.end();
+  _messageBuffer.erase(removeStart, removeEnd);
+
+  if(!_messageBuffer.isEmpty())
+    QCoreApplication::postEvent(this, new ProcessBufferEvent());
+}
 
 void MessageModel::clear() {
   beginRemoveRows(QModelIndex(), 0, rowCount() - 1);
@@ -193,6 +203,7 @@ void MessageModel::clear() {
 }
 
 
+
 // returns index of msg with given Id or of the next message after that (i.e., the index where we'd insert this msg)
 int MessageModel::indexForId(MsgId id) {
   if(_messageList.isEmpty() || id <= _messageList.value(0)->data(0, MsgIdRole).value<MsgId>()) return 0;
@@ -234,7 +245,7 @@ QVariant MessageModelItem::data(int column, int role) const {
 
 
 // Stuff for later
-bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){ 
+bool MessageModelItem::lessThan(const MessageModelItem *m1, const MessageModelItem *m2){
   return (*m1) < (*m2);
 }