X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=05d26c5ea69ccbe7d6154e197eeb54d59cd2b6f2;hp=1af7e850f40d37295056d5d44812a66b7dac4a73;hb=756158351d58ce25857f52589f5f8c42236a1c27;hpb=298137f6626526961b6644cc1eb8b0ae3d60ae8d

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index 1af7e850..05d26c5e 100644
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -44,10 +44,9 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject
     _model(model),
     _singleBufferScene(false),
     _selectingItem(0),
-    _lastItem(0),
     _selectionStart(-1),
     _isSelecting(false),
-    _fetchingBacklog(false)
+    _lastBacklogSize(0)
 {
   MessageFilter *filter = qobject_cast<MessageFilter*>(model);
   if(filter) {
@@ -56,8 +55,11 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject
 
   connect(this, SIGNAL(sceneRectChanged(const QRectF &)), this, SLOT(rectChanged(const QRectF &)));
 
-  connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SLOT(rowsInserted(const QModelIndex &, int, int)));
-  connect(model, SIGNAL(modelAboutToBeReset()), this, SLOT(modelReset()));
+  connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
+	  this, SLOT(rowsInserted(const QModelIndex &, int, int)));
+  connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
+	  this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int)));
+  
   for(int i = 0; i < model->rowCount(); i++) {
     ChatLine *line = new ChatLine(i, model);
     _lines.append(line);
@@ -88,7 +90,6 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject
 }
 
 ChatScene::~ChatScene() {
-
 }
 
 void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
@@ -98,7 +99,9 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
   // TODO bulk inserts, iterators
   qreal h = 0;
   qreal y = 0;
-  if(_width && start > 0) y = _lines.value(start - 1)->y() + _lines.value(start - 1)->height();
+  if(_width && start > 0)
+    y = _lines.value(start - 1)->y() + _lines.value(start - 1)->height();
+
   for(int i = start; i <= end; i++) {
     ChatLine *line = new ChatLine(i, model());
     _lines.insert(i, line);
@@ -113,25 +116,68 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) {
     _lines[i]->setRow(i);
   }
 
+  // update selection
+  if(_selectionStart >= 0) {
+    int offset = end - start + 1;
+    if(_selectionStart >= start) _selectionStart += offset;
+    if(_selectionEnd >= start) _selectionEnd += offset;
+    if(_firstSelectionRow >= start) _firstSelectionRow += offset;
+    if(_lastSelectionRow >= start) _lastSelectionRow += offset;
+  }
+
   if(h > 0) {
     _height += h;
     for(int i = end+1; i < _lines.count(); i++) {
-      _lines.value(i)->moveBy(0, h);
+      _lines.at(i)->moveBy(0, h);
     }
     setSceneRect(QRectF(0, 0, _width, _height));
     emit heightChanged(_height);
   }
-
-  requestBacklogIfNeeded();
 }
 
-void ChatScene::modelReset() {
-  foreach(ChatLine *line, _lines) {
-    removeItem(line);
-    delete line;
+void ChatScene::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) {
+  Q_UNUSED(parent);
+
+  qreal h = 0; // total height of removed items;
+
+  // remove items from scene
+  QList<ChatLine *>::iterator lineIter = _lines.begin() + start;
+  int lineCount = start;
+  while(lineIter != _lines.end() && lineCount <= end) {
+    h += (*lineIter)->height();
+    delete *lineIter;
+    lineIter = _lines.erase(lineIter);
+    lineCount++;
+  }
+
+  // update rows of remaining chatlines
+  for(int i = start; i < _lines.count(); i++) {
+    _lines.at(i)->setRow(i);
+  }
+
+  // update selection
+  if(_selectionStart >= 0) {
+    int offset = end - start + 1;
+    if(_selectionStart >= start)
+      _selectionStart -= offset;
+    if(_selectionEnd >= start)
+      _selectionEnd -= offset;
+    if(_firstSelectionRow >= start)
+      _firstSelectionRow -= offset;
+    if(_lastSelectionRow >= start)
+      _lastSelectionRow -= offset;
+  }
+
+  // reposition remaining chatlines
+  if(h > 0) {
+    Q_ASSERT(_height >= h);
+    _height -= h;
+    for(int i = start; i < _lines.count(); i++) {
+      _lines.at(i)->moveBy(0, -h);
+    }
+    setSceneRect(QRectF(0, 0, _width, _height));
+    emit heightChanged(_height);
   }
-  _lines.clear();
-  setSceneRect(QRectF(0, 0, _width, 0));
 }
 
 void ChatScene::setWidth(qreal w) {
@@ -179,7 +225,7 @@ void ChatScene::setSelectingItem(ChatItem *item) {
 }
 
 void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) {
-  _selectionStart = _selectionEnd = item->row();
+  _selectionStart = _selectionEnd = _lastSelectionRow = _firstSelectionRow = item->row();
   _selectionStartCol = _selectionMinCol = item->column();
   _isSelecting = true;
   _lines[_selectionStart]->setSelected(true, (ChatLineModel::ColumnType)_selectionMinCol);
@@ -205,29 +251,34 @@ void ChatScene::updateSelection(const QPointF &pos) {
       _lines[l]->setSelected(true, minColumn);
     }
   }
-
-  if(curRow > _selectionEnd && curRow > _selectionStart) {  // select further towards bottom
-    for(int l = _selectionEnd + 1; l <= curRow; l++) {
+  int newstart = qMin(curRow, _firstSelectionRow);
+  int newend = qMax(curRow, _firstSelectionRow);
+  if(newstart < _selectionStart) {
+    for(int l = newstart; l < _selectionStart; l++)
       _lines[l]->setSelected(true, minColumn);
-    }
-  } else if(curRow > _selectionEnd && curRow <= _selectionStart) { // deselect towards bottom
-    for(int l = _selectionEnd; l < curRow; l++) {
-      _lines[l]->setSelected(false);
-    }
-  } else if(curRow < _selectionEnd && curRow >= _selectionStart) {
-    for(int l = _selectionEnd; l > curRow; l--) {
+  }
+  if(newstart > _selectionStart) {
+    for(int l = _selectionStart; l < newstart; l++)
       _lines[l]->setSelected(false);
-    }
-  } else if(curRow < _selectionEnd && curRow < _selectionStart) {
-    for(int l = _selectionEnd - 1; l >= curRow; l--) {
+  }
+  if(newend > _selectionEnd) {
+    for(int l = _selectionEnd+1; l <= newend; l++)
       _lines[l]->setSelected(true, minColumn);
-    }
   }
-  _selectionEnd = curRow;
+  if(newend < _selectionEnd) {
+    for(int l = newend+1; l <= _selectionEnd; l++)
+      _lines[l]->setSelected(false);
+  }
+
+  _selectionStart = newstart;
+  _selectionEnd = newend;
+  _lastSelectionRow = curRow;
 
-  if(curRow == _selectionStart && minColumn == ChatLineModel::ContentsColumn) {
+  if(newstart == newend && minColumn == ChatLineModel::ContentsColumn) {
     _lines[curRow]->setSelected(false);
     _isSelecting = false;
+    Q_ASSERT(_selectingItem); // this seems to not always be true, but I have no idea why
+                              // adding this assert to make sure the occasional segfault is caused by this
     _selectingItem->continueSelecting(_selectingItem->mapFromScene(pos));
   }
 }
@@ -254,13 +305,8 @@ void ChatScene::mousePressEvent(QGraphicsSceneMouseEvent *event) {
 }
 
 void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
-  if(_isSelecting && event->buttons() == Qt::LeftButton) {
-#   ifdef Q_WS_X11
-      QApplication::clipboard()->setText(selectionToString(), QClipboard::Selection);
-#   endif
-//# else
-      QApplication::clipboard()->setText(selectionToString());
-//# endif
+  if(_isSelecting && !event->buttons() & Qt::LeftButton) {
+    putToClipboard(selectionToString());
     _isSelecting = false;
     event->accept();
   } else {
@@ -268,6 +314,16 @@ void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
   }
 }
 
+void ChatScene::putToClipboard(const QString &selection) {
+  // TODO Configure clipboards
+#   ifdef Q_WS_X11
+  QApplication::clipboard()->setText(selection, QClipboard::Selection);
+#   endif
+//# else
+  QApplication::clipboard()->setText(selection);
+//# endif
+}
+
 //!\brief Convert current selection to human-readable string.
 QString ChatScene::selectionToString() const {
   //TODO Make selection format configurable!
@@ -289,27 +345,15 @@ QString ChatScene::selectionToString() const {
   return result;
 }
 
-void ChatScene::setIsFetchingBacklog(bool fetch) {
-  if(!isBacklogFetchingEnabled()) return;
-
-  if(!fetch) {
-    _fetchingBacklog = false;
-  } else {
-    _fetchingBacklog = true;
-    requestBacklogIfNeeded();
-  }
-}
-
-void ChatScene::requestBacklogIfNeeded() {
-  const int REQUEST_COUNT = 50;
-
-  if(!isBacklogFetchingEnabled() || !isFetchingBacklog() || !model()->rowCount()) return;
-
-  MsgId msgId = model()->data(model()->index(0, 0), ChatLineModel::MsgIdRole).value<MsgId>();
-  if(!_lastBacklogOffset.isValid() || (msgId < _lastBacklogOffset && _lastBacklogSize + REQUEST_COUNT <= model()->rowCount())) {
-    Client::backlogManager()->requestBacklog(bufferForBacklogFetching(), REQUEST_COUNT, msgId.toInt());
-    _lastBacklogOffset = msgId;
-    _lastBacklogSize = model()->rowCount();
+void ChatScene::requestBacklog() {
+  static const int REQUEST_COUNT = 50;
+  int backlogSize = model()->rowCount();
+  if(isSingleBufferScene() && backlogSize != 0 && _lastBacklogSize + REQUEST_COUNT <= backlogSize) {
+    QModelIndex msgIdx = model()->index(0, 0);
+    MsgId msgId = model()->data(msgIdx, ChatLineModel::MsgIdRole).value<MsgId>();
+    BufferId bufferId = model()->data(msgIdx, ChatLineModel::BufferIdRole).value<BufferId>();
+    _lastBacklogSize = backlogSize;
+    Client::backlogManager()->requestBacklog(bufferId, REQUEST_COUNT, msgId.toInt());
   }
 }