X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=c24933a280fdf0f41bc07ad5ed5f842553422655;hp=10ef5d8f7069c143e0b45d47840153097dba77a2;hb=954b1a6f53da55f9713fb4e75a2fb46dae7d9df8;hpb=46ddb293c61aeb90295fa1a14be71e8896f34ade

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 10ef5d8f..c24933a2 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -22,6 +22,7 @@
 #include <QClipboard>
 #include <QGraphicsSceneMouseEvent>
 #include <QPersistentModelIndex>
+#include <QWebView>
 
 #include "chatitem.h"
 #include "chatline.h"
@@ -44,6 +45,7 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
     _model(model),
     _singleBufferScene(false),
     _sceneRect(0, 0, width, 0),
+    _firstLineRow(-1),
     _viewportHeight(0),
     _selectingItem(0),
     _selectionStart(-1),
@@ -60,20 +62,20 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
   int defaultSecondColHandlePos = defaultSettings.value("SecondColumnHandlePos", 200).toInt();
 
   ChatViewSettings viewSettings(this);
-  firstColHandlePos = viewSettings.value("FirstColumnHandlePos", defaultFirstColHandlePos).toInt();
-  secondColHandlePos = viewSettings.value("SecondColumnHandlePos", defaultSecondColHandlePos).toInt();
+  _firstColHandlePos = viewSettings.value("FirstColumnHandlePos", defaultFirstColHandlePos).toInt();
+  _secondColHandlePos = viewSettings.value("SecondColumnHandlePos", defaultSecondColHandlePos).toInt();
 
-  firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator());
-  addItem(firstColHandle);
-  firstColHandle->setXPos(firstColHandlePos);
-  connect(firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
-  connect(this, SIGNAL(sceneRectChanged(const QRectF &)), firstColHandle, SLOT(sceneRectChanged(const QRectF &)));
+  _firstColHandle = new ColumnHandleItem(QtUi::style()->firstColumnSeparator());
+  addItem(_firstColHandle);
+  _firstColHandle->setXPos(_firstColHandlePos);
+  connect(_firstColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(firstHandlePositionChanged(qreal)));
+  connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _firstColHandle, SLOT(sceneRectChanged(const QRectF &)));
 
-  secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator());
-  addItem(secondColHandle);
-  secondColHandle->setXPos(secondColHandlePos);
-  connect(secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(handlePositionChanged(qreal)));
-  connect(this, SIGNAL(sceneRectChanged(const QRectF &)), secondColHandle, SLOT(sceneRectChanged(const QRectF &)));
+  _secondColHandle = new ColumnHandleItem(QtUi::style()->secondColumnSeparator());
+  addItem(_secondColHandle);
+  _secondColHandle->setXPos(_secondColHandlePos);
+  connect(_secondColHandle, SIGNAL(positionChanged(qreal)), this, SLOT(secondHandlePositionChanged(qreal)));
+  connect(this, SIGNAL(sceneRectChanged(const QRectF &)), _secondColHandle, SLOT(sceneRectChanged(const QRectF &)));
 
   setHandleXLimits();
 
@@ -84,6 +86,15 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, qreal w
 
   if(model->rowCount() > 0)
     rowsInserted(QModelIndex(), 0, model->rowCount() - 1);
+
+#ifdef HAVE_WEBKIT
+  webPreview.delayTimer.setSingleShot(true);
+  connect(&webPreview.delayTimer, SIGNAL(timeout()), this, SLOT(showWebPreviewEvent()));
+  webPreview.deleteTimer.setInterval(600000);
+  connect(&webPreview.deleteTimer, SIGNAL(timeout()), this, SLOT(deleteWebPreviewEvent()));
+#endif
+
+  setItemIndexMethod(QGraphicsScene::NoIndex);
 }
 
 ChatScene::~ChatScene() {
@@ -91,9 +102,6 @@ ChatScene::~ChatScene() {
 
 void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   Q_UNUSED(index);
-
-  clearWebPreview();
-
 //   QModelIndex sidx = model()->index(start, 0);
 //   QModelIndex eidx = model()->index(end, 0);
 //   qDebug() << "rowsInserted" << start << end << "-" << sidx.data(MessageModel::MsgIdRole).value<MsgId>() << eidx.data(MessageModel::MsgIdRole).value<MsgId>();
@@ -121,15 +129,28 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   QPointF contentsPos(secondColumnHandle()->sceneRight(), 0);
   QPointF senderPos(firstColumnHandle()->sceneRight(), 0);
 
-  for(int i = start; i <= end; i++) {
-    ChatLine *line = new ChatLine(i, model(),
-				  width,
-				  timestampWidth, senderWidth, contentsWidth,
-				  senderPos, contentsPos);
-    line->setPos(0, y+h);
-    h += line->height();
-    _lines.insert(i, line);
-    addItem(line);
+  if(atTop) {
+    for(int i = end; i >= start; i--) {
+      ChatLine *line = new ChatLine(i, model(),
+				    width,
+				    timestampWidth, senderWidth, contentsWidth,
+				    senderPos, contentsPos);
+      h += line->height();
+      line->setPos(0, y-h);
+      _lines.insert(start, line);
+      addItem(line);
+    }
+  } else {
+    for(int i = start; i <= end; i++) {
+      ChatLine *line = new ChatLine(i, model(),
+				    width,
+				    timestampWidth, senderWidth, contentsWidth,
+				    senderPos, contentsPos);
+      line->setPos(0, y+h);
+      h += line->height();
+      _lines.insert(i, line);
+      addItem(line);
+    }
   }
 
   // update existing items
@@ -160,7 +181,7 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
       moveEnd = end;
     } else {
       // move bottom part
-      moveStart = start;
+      moveStart = end + 1;
     }
     ChatLine *line = 0;
     for(int i = moveStart; i <= moveEnd; i++) {
@@ -169,21 +190,29 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
     }
   }
 
-  // update sceneRect
-  if(atTop || moveTop) {
-    updateSceneRect(_sceneRect.adjusted(0, -h, 0, 0));
-  } else {
-    updateSceneRect(_sceneRect.adjusted(0, 0, 0, h));
-    emit lastLineChanged(_lines.last());
-  }
+  // check if all went right
+  Q_ASSERT(start == 0 || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y());
+  Q_ASSERT(end + 1 == _lines.count() || _lines.at(end)->pos().y() + _lines.at(end)->height() == _lines.at(end + 1)->pos().y());
 
+  if(!atBottom) {
+    if(start < _firstLineRow) {
+      int prevFirstLineRow = _firstLineRow + (end - start + 1);
+      for(int i = end + 1; i < prevFirstLineRow; i++) {
+	_lines.at(i)->show();
+      }
+    }
+    // force new search for first proper line
+    _firstLineRow = -1;
+  }
+  updateSceneRect();
+  if(atBottom || (!atTop && !moveTop)) {
+    emit lastLineChanged(_lines.last(), h);
+  }
 }
 
 void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
   Q_UNUSED(parent);
 
-  clearWebPreview();
-
   qreal h = 0; // total height of removed items;
 
   bool atTop = (start == 0);
@@ -239,12 +268,27 @@ void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e
     }
   }
 
+  Q_ASSERT(start == 0 || start >= _lines.count() || _lines.at(start - 1)->pos().y() + _lines.at(start - 1)->height() == _lines.at(start)->pos().y());
+
   // update sceneRect
-  if(atTop || moveTop) {
-    updateSceneRect(_sceneRect.adjusted(0, h, 0, 0));
-  } else {
-    updateSceneRect(_sceneRect.adjusted(0, 0, 0, -h));
-  }
+  // when searching for the first non-date-line we have to take into account that our
+  // model still contains the just removed lines so we cannot simply call updateSceneRect()
+  int numRows = model()->rowCount();
+  QModelIndex firstLineIdx;
+  _firstLineRow = -1;
+  bool needOffset = false;
+  do {
+    _firstLineRow++;
+    if(_firstLineRow >= start && _firstLineRow <= end) {
+      _firstLineRow = end + 1;
+      needOffset = true;
+    }
+    firstLineIdx = model()->index(_firstLineRow, 0);
+  } while((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) == Message::DayChange && _firstLineRow < numRows);
+
+  if(needOffset)
+    _firstLineRow -= end - start + 1;
+  updateSceneRect();
 }
 
 void ChatScene::updateForViewport(qreal width, qreal height) {
@@ -252,82 +296,104 @@ void ChatScene::updateForViewport(qreal width, qreal height) {
   setWidth(width);
 }
 
-// setWidth is used for 2 things:
-//  a) updating the scene to fit the width of the corresponding view
-//  b) to update the positions of the items if a columhandle has changed it's position
-// forceReposition is true in the second case
-// this method features some codeduplication for the sake of performance
-void ChatScene::setWidth(qreal width, bool forceReposition) {
-  if(width == _sceneRect.width() && !forceReposition)
+void ChatScene::setWidth(qreal width) {
+  if(width == _sceneRect.width())
     return;
 
-//   clock_t startT = clock();
+  // clock_t startT = clock();
+
+  // disabling the index while doing this complex updates is about
+  // 2 to 10 times faster!
+  //setItemIndexMethod(QGraphicsScene::NoIndex);
 
-  qreal linePos = _sceneRect.y() + _sceneRect.height();
-  qreal yBottom = linePos;
   QList<ChatLine *>::iterator lineIter = _lines.end();
   QList<ChatLine *>::iterator lineIterBegin = _lines.begin();
-  ChatLine *line = 0;
-  qreal lineHeight = 0;
+  qreal linePos = _sceneRect.y() + _sceneRect.height();
   qreal contentsWidth = width - secondColumnHandle()->sceneRight();
-
-  if(forceReposition) {
-    qreal timestampWidth = firstColumnHandle()->sceneLeft();
-    qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight();
-    QPointF senderPos(firstColumnHandle()->sceneRight(), 0);
-    QPointF contentsPos(secondColumnHandle()->sceneRight(), 0);
-    while(lineIter != lineIterBegin) {
-      lineIter--;
-      line = *lineIter;
-      lineHeight = line->setColumns(timestampWidth, senderWidth, contentsWidth, senderPos, contentsPos);
-      linePos -= lineHeight;
-      line->setPos(0, linePos);
-    }
-  } else {
-    while(lineIter != lineIterBegin) {
-      lineIter--;
-      line = *lineIter;
-      lineHeight = line->setGeometryByWidth(width, contentsWidth);
-      linePos -= lineHeight;
-      line->setPos(0, linePos);
-    }
+  while(lineIter != lineIterBegin) {
+    lineIter--;
+    (*lineIter)->setGeometryByWidth(width, contentsWidth, linePos);
   }
+  //setItemIndexMethod(QGraphicsScene::BspTreeIndex);
 
-  updateSceneRect(QRectF(0, linePos, width, yBottom - linePos));
+  updateSceneRect(width);
   setHandleXLimits();
 
 //   clock_t endT = clock();
 //   qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec";
 }
 
-void ChatScene::handlePositionChanged(qreal xpos) {
-  bool first = (sender() == firstColHandle);
-  qreal oldx;
-  if(first) {
-    oldx = firstColHandlePos;
-    firstColHandlePos = xpos;
-  } else {
-    oldx = secondColHandlePos;
-    secondColHandlePos = xpos;
-  }
+void ChatScene::firstHandlePositionChanged(qreal xpos) {
+  if(_firstColHandlePos == xpos)
+    return;
 
+  _firstColHandlePos = xpos;
   ChatViewSettings viewSettings(this);
-  viewSettings.setValue("FirstColumnHandlePos", firstColHandlePos);
-  viewSettings.setValue("SecondColumnHandlePos", secondColHandlePos);
+  viewSettings.setValue("FirstColumnHandlePos", _firstColHandlePos);
+  ChatViewSettings defaultSettings;
+  defaultSettings.setValue("FirstColumnHandlePos", _firstColHandlePos);
+
+  // clock_t startT = clock();
+
+  // disabling the index while doing this complex updates is about
+  // 2 to 10 times faster!
+  //setItemIndexMethod(QGraphicsScene::NoIndex);
+
+  QList<ChatLine *>::iterator lineIter = _lines.end();
+  QList<ChatLine *>::iterator lineIterBegin = _lines.begin();
+  qreal timestampWidth = firstColumnHandle()->sceneLeft();
+  qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight();
+  QPointF senderPos(firstColumnHandle()->sceneRight(), 0);
+
+  while(lineIter != lineIterBegin) {
+    lineIter--;
+    (*lineIter)->setFirstColumn(timestampWidth, senderWidth, senderPos);
+  }
+  //setItemIndexMethod(QGraphicsScene::BspTreeIndex);
+
+  setHandleXLimits();
 
+//   clock_t endT = clock();
+//   qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec";
+}
+
+void ChatScene::secondHandlePositionChanged(qreal xpos) {
+  if(_secondColHandlePos == xpos)
+    return;
+
+  _secondColHandlePos = xpos;
+  ChatViewSettings viewSettings(this);
+  viewSettings.setValue("SecondColumnHandlePos", _secondColHandlePos);
   ChatViewSettings defaultSettings;
-  defaultSettings.setValue("FirstColumnHandlePos", firstColHandlePos);
-  defaultSettings.setValue("SecondColumnHandlePos", secondColHandlePos);
+  defaultSettings.setValue("SecondColumnHandlePos", _secondColHandlePos);
+
+  // clock_t startT = clock();
+
+  // disabling the index while doing this complex updates is about
+  // 2 to 10 times faster!
+  //setItemIndexMethod(QGraphicsScene::NoIndex);
+
+  QList<ChatLine *>::iterator lineIter = _lines.end();
+  QList<ChatLine *>::iterator lineIterBegin = _lines.begin();
+  qreal linePos = _sceneRect.y() + _sceneRect.height();
+  qreal senderWidth = secondColumnHandle()->sceneLeft() - firstColumnHandle()->sceneRight();
+  qreal contentsWidth = _sceneRect.width() - secondColumnHandle()->sceneRight();
+  QPointF contentsPos(secondColumnHandle()->sceneRight(), 0);
+  while(lineIter != lineIterBegin) {
+    lineIter--;
+    (*lineIter)->setSecondColumn(senderWidth, contentsWidth, contentsPos, linePos);
+  }
+  //setItemIndexMethod(QGraphicsScene::BspTreeIndex);
 
-  setWidth(width(), true);  // readjust all chatlines
-  // we get ugly redraw errors if we don't update this explicitly... :(
-  // width() should be the same for both handles, so just use firstColHandle regardless
-  //update(qMin(oldx, xpos), 0, qMax(oldx, xpos) + firstColHandle->width(), height());
+  setHandleXLimits();
+
+//   clock_t endT = clock();
+//   qDebug() << "resized" << _lines.count() << "in" << (float)(endT - startT) / CLOCKS_PER_SEC << "sec";
 }
 
 void ChatScene::setHandleXLimits() {
-  firstColHandle->setXLimits(0, secondColHandle->sceneLeft());
-  secondColHandle->setXLimits(firstColHandle->sceneRight(), width() - minContentsWidth);
+  _firstColHandle->setXLimits(0, _secondColHandle->sceneLeft());
+  _secondColHandle->setXLimits(_firstColHandle->sceneRight(), width() - minContentsWidth);
 }
 
 void ChatScene::setSelectingItem(ChatItem *item) {
@@ -346,13 +412,13 @@ void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) {
 void ChatScene::updateSelection(const QPointF &pos) {
   // This is somewhat hacky... we look at the contents item that is at the cursor's y position (ignoring x), since
   // it has the full height. From this item, we can then determine the row index and hence the ChatLine.
-  ChatItem *contentItem = static_cast<ChatItem *>(itemAt(QPointF(secondColHandle->sceneRight() + 1, pos.y())));
+  ChatItem *contentItem = static_cast<ChatItem *>(itemAt(QPointF(_secondColHandle->sceneRight() + 1, pos.y())));
   if(!contentItem) return;
 
   int curRow = contentItem->row();
   int curColumn;
-  if(pos.x() > secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn;
-  else if(pos.x() > firstColHandlePos) curColumn = ChatLineModel::SenderColumn;
+  if(pos.x() > _secondColHandle->sceneRight()) curColumn = ChatLineModel::ContentsColumn;
+  else if(pos.x() > _firstColHandlePos) curColumn = ChatLineModel::SenderColumn;
   else curColumn = ChatLineModel::TimestampColumn;
 
   ChatLineModel::ColumnType minColumn = (ChatLineModel::ColumnType)qMin(curColumn, _selectionStartCol);
@@ -463,6 +529,9 @@ void ChatScene::requestBacklog() {
   int backlogSize = model()->rowCount();
   if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) {
     QModelIndex msgIdx = model()->index(0, 0);
+    while((Message::Type)(model()->data(msgIdx, ChatLineModel::TypeRole).toInt()) == Message::DayChange) {
+      msgIdx = msgIdx.sibling(msgIdx.row() + 1, 0);
+    }
     MsgId msgId = model()->data(msgIdx, ChatLineModel::MsgIdRole).value<MsgId>();
     BufferId bufferId = model()->data(msgIdx, ChatLineModel::BufferIdRole).value<BufferId>();
     _lastBacklogSize = backlogSize;
@@ -471,19 +540,61 @@ void ChatScene::requestBacklog() {
 }
 
 int ChatScene::sectionByScenePos(int x) {
-  if(x < firstColHandle->x())
+  if(x < _firstColHandle->x())
     return ChatLineModel::TimestampColumn;
-  if(x < secondColHandle->x())
+  if(x < _secondColHandle->x())
     return ChatLineModel::SenderColumn;
 
   return ChatLineModel::ContentsColumn;
 }
 
+void ChatScene::updateSceneRect(qreal width) {
+  if(_lines.isEmpty()) {
+    updateSceneRect(QRectF(0, 0, width, 0));
+    return;
+  }
+
+  // we hide day change messages at the top by making the scene rect smaller
+  // and by calling QGraphicsItem::hide() on all leading day change messages
+  // the first one is needed to ensure proper scrollbar ranges
+  // the second for cases where the viewport is larger then the set scenerect
+  //  (in this case the items are shown anyways)
+  if(_firstLineRow == -1) {
+    int numRows = model()->rowCount();
+    _firstLineRow = 0;
+    QModelIndex firstLineIdx;
+    while(_firstLineRow < numRows) {
+      firstLineIdx = model()->index(_firstLineRow, 0);
+      if((Message::Type)(model()->data(firstLineIdx, MessageModel::TypeRole).toInt()) != Message::DayChange)
+	break;
+      _lines.at(_firstLineRow)->hide();
+      _firstLineRow++;
+    }
+  }
+
+  // the following call should be safe. If it crashes something went wrong during insert/remove
+  if(_firstLineRow < _lines.count()) {
+    ChatLine *firstLine = _lines.at(_firstLineRow);
+    ChatLine *lastLine = _lines.last();
+    updateSceneRect(QRectF(0, firstLine->pos().y(), width, lastLine->pos().y() + lastLine->height() - firstLine->pos().y()));
+  } else {
+    // empty scene rect
+    updateSceneRect(QRectF(0, 0, width, 0));
+  }
+}
+
 void ChatScene::updateSceneRect(const QRectF &rect) {
   _sceneRect = rect;
   setSceneRect(rect);
+  update();
 }
 
+void ChatScene::customEvent(QEvent *event) {
+  switch(event->type()) {
+  default:
+    return;
+  }
+}
 
 void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
 #ifndef HAVE_WEBKIT
@@ -497,12 +608,17 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
   if(webPreview.url != url) {
     webPreview.url = url;
     // load a new web view and delete the old one (if exists)
-    if(webPreview.previewItem) {
+    if(webPreview.previewItem && webPreview.previewItem->scene()) {
       removeItem(webPreview.previewItem);
       delete webPreview.previewItem;
     }
     webPreview.previewItem = new WebPreviewItem(url);
-    addItem(webPreview.previewItem);
+    webPreview.delayTimer.start(2000);
+    webPreview.deleteTimer.stop();
+  } else if(webPreview.previewItem && !webPreview.previewItem->scene()) {
+      // we just have to readd the item to the scene
+      webPreview.delayTimer.start(2000);
+      webPreview.deleteTimer.stop();
   }
   if(webPreview.urlRect != urlRect) {
     webPreview.urlRect = urlRect;
@@ -519,19 +635,35 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
 #endif
 }
 
+void ChatScene::showWebPreviewEvent() {
+#ifdef HAVE_WEBKIT
+  if(webPreview.previewItem)
+    addItem(webPreview.previewItem);
+#endif
+}
+
 void ChatScene::clearWebPreview(ChatItem *parentItem) {
 #ifndef HAVE_WEBKIT
   Q_UNUSED(parentItem)
 #else
   if(parentItem == 0 || webPreview.parentItem == parentItem) {
-    if(webPreview.previewItem) {
+    if(webPreview.previewItem && webPreview.previewItem->scene()) {
       removeItem(webPreview.previewItem);
-      delete webPreview.previewItem;
-      webPreview.previewItem = 0;
+      webPreview.deleteTimer.start();
     }
-    webPreview.parentItem = 0;
-    webPreview.url = QString();
-    webPreview.urlRect = QRectF();
+    webPreview.delayTimer.stop();
+  }
+#endif
+}
+
+void ChatScene::deleteWebPreviewEvent() {
+#ifdef HAVE_WEBKIT
+  if(webPreview.previewItem) {
+    delete webPreview.previewItem;
+    webPreview.previewItem = 0;
   }
+  webPreview.parentItem = 0;
+  webPreview.url = QString();
+  webPreview.urlRect = QRectF();
 #endif
 }