X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fchatscene.cpp;h=05d26c5ea69ccbe7d6154e197eeb54d59cd2b6f2;hp=8f36e1d27446547e0bd11be24db9ba95bdbafa5d;hb=756158351d58ce25857f52589f5f8c42236a1c27;hpb=e222870b3f53c90a735d44f98c76b0f884f52287 diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp index 8f36e1d2..05d26c5e 100644 --- a/src/qtui/chatscene.cpp +++ b/src/qtui/chatscene.cpp @@ -23,11 +23,14 @@ #include #include -#include "buffer.h" #include "chatitem.h" +#include "chatline.h" #include "chatlinemodelitem.h" #include "chatscene.h" +#include "client.h" +#include "clientbacklogmanager.h" #include "columnhandleitem.h" +#include "messagefilter.h" #include "qtui.h" #include "qtuisettings.h" @@ -35,19 +38,30 @@ const qreal minContentsWidth = 200; ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject *parent) : QGraphicsScene(parent), - _idString(idString), - _model(model) + _idString(idString), + _width(0), + _height(0), + _model(model), + _singleBufferScene(false), + _selectingItem(0), + _selectionStart(-1), + _isSelecting(false), + _lastBacklogSize(0) { - _width = 0; - _selectingItem = 0; - _isSelecting = false; - _selectionStart = -1; + MessageFilter *filter = qobject_cast(model); + if(filter) { + _singleBufferScene = filter->isSingleBufferFilter(); + } + 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(model->index(i, 0)); + ChatLine *line = new ChatLine(i, model); _lines.append(line); addItem(line); } @@ -76,7 +90,6 @@ ChatScene::ChatScene(QAbstractItemModel *model, const QString &idString, QObject } ChatScene::~ChatScene() { - } void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { @@ -86,9 +99,11 @@ 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(model()->index(i, 0)); + ChatLine *line = new ChatLine(i, model()); _lines.insert(i, line); addItem(line); if(_width > 0) { @@ -96,23 +111,73 @@ void ChatScene::rowsInserted(const QModelIndex &index, int start, int end) { h += line->setGeometry(_width, firstColHandlePos, secondColHandlePos); } } + // update existing items + for(int i = end+1; i < _lines.count(); i++) { + _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); } } -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::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) { @@ -160,8 +225,8 @@ void ChatScene::setSelectingItem(ChatItem *item) { } void ChatScene::startGlobalSelection(ChatItem *item, const QPointF &itemPos) { - _selectionStart = _selectionEnd = item->index().row(); - _selectionStartCol = _selectionMinCol = item->index().column(); + _selectionStart = _selectionEnd = _lastSelectionRow = _firstSelectionRow = item->row(); + _selectionStartCol = _selectionMinCol = item->column(); _isSelecting = true; _lines[_selectionStart]->setSelected(true, (ChatLineModel::ColumnType)_selectionMinCol); updateSelection(item->mapToScene(itemPos)); @@ -173,7 +238,7 @@ void ChatScene::updateSelection(const QPointF &pos) { ChatItem *contentItem = static_cast(itemAt(QPointF(secondColHandlePos + secondColHandle->width()/2, pos.y()))); if(!contentItem) return; - int curRow = contentItem->index().row(); + int curRow = contentItem->row(); int curColumn; if(pos.x() > secondColHandlePos + secondColHandle->width()/2) curColumn = ChatLineModel::ContentsColumn; else if(pos.x() > firstColHandlePos) curColumn = ChatLineModel::SenderColumn; @@ -186,35 +251,40 @@ 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)); } } void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { - if(_isSelecting && event->buttons() & Qt::LeftButton) { + if(_isSelecting && event->buttons() == Qt::LeftButton) { updateSelection(event->scenePos()); event->accept(); } else { @@ -223,7 +293,7 @@ void ChatScene::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { } void ChatScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { - if(event->buttons() & Qt::LeftButton && _selectionStart >= 0) { + if(event->buttons() == Qt::LeftButton && _selectionStart >= 0) { for(int l = qMin(_selectionStart, _selectionEnd); l <= qMax(_selectionStart, _selectionEnd); l++) { _lines[l]->setSelected(false); } @@ -235,13 +305,8 @@ void ChatScene::mousePressEvent(QGraphicsSceneMouseEvent *event) { } void ChatScene::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { - if(_isSelecting) { -# 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 { @@ -249,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! @@ -262,10 +337,31 @@ QString ChatScene::selectionToString() const { QString result; for(int l = start; l <= end; l++) { if(_selectionMinCol == ChatLineModel::TimestampColumn) - result += _lines[l]->item(ChatLineModel::TimestampColumn)->data(MessageModel::DisplayRole).toString() + " "; + result += _lines[l]->item(ChatLineModel::TimestampColumn).data(MessageModel::DisplayRole).toString() + " "; if(_selectionMinCol <= ChatLineModel::SenderColumn) - result += _lines[l]->item(ChatLineModel::SenderColumn)->data(MessageModel::DisplayRole).toString() + " "; - result += _lines[l]->item(ChatLineModel::ContentsColumn)->data(MessageModel::DisplayRole).toString() + "\n"; + result += _lines[l]->item(ChatLineModel::SenderColumn).data(MessageModel::DisplayRole).toString() + " "; + result += _lines[l]->item(ChatLineModel::ContentsColumn).data(MessageModel::DisplayRole).toString() + "\n"; } return result; } + +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(); + BufferId bufferId = model()->data(msgIdx, ChatLineModel::BufferIdRole).value(); + _lastBacklogSize = backlogSize; + Client::backlogManager()->requestBacklog(bufferId, REQUEST_COUNT, msgId.toInt()); + } +} + +int ChatScene::sectionByScenePos(int x) { + if(x < firstColHandlePos) + return ChatLineModel::TimestampColumn; + if(x < secondColHandlePos) + return ChatLineModel::SenderColumn; + + return ChatLineModel::ContentsColumn; +}