FCL/sf/mw/qt: comparison src/gui/text/qtextdocument

equal deleted inserted replaced

-:5dc02b23752f
+:3e2da88830cd
 framesDirty(true),
 rtFrame(0),
 initialBlockCharFormatIndex(-1) // set correctly later in init()
 {
 editBlock = 0;
+editBlockCursorPosition = -1;
 docChangeFrom = -1;
 undoState = 0;
 revision = -1; // init() inserts a block, bringing it to 0
 modified = false;
 modifiedState = 0;
 undoEnabled = true;
 inContentsChange = false;
+blockCursorAdjustment = false;
 defaultTextOption.setTabStop(80); // same as in qtextengine.cpp
 defaultTextOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 indentWidth = 40;
 }
 void QTextDocumentPrivate::clear()
 {
 Q_Q(QTextDocument);
-for (int i = 0; i < cursors.count(); ++i) {
-cursors.at(i)->setPosition(0);
+foreach (QTextCursorPrivate *curs, cursors) {
-cursors.at(i)->currentCharFormat = -1;
+curs->setPosition(0);
-cursors.at(i)->anchor = 0;
+curs->currentCharFormat = -1;
-cursors.at(i)->adjusted_anchor = 0;
+curs->anchor = 0;
+curs->adjusted_anchor = 0;
 }
 QList<QTextCursorPrivate *>oldCursors = cursors;
 QT_TRY{
 cursors.clear();
-changedCursors.clear();
 QMap<int, QTextObject *>::Iterator objectIt = objects.begin();
 while (objectIt != objects.end()) {
 if (*objectIt != rtFrame) {
 delete *objectIt;
 }
 }
 QTextDocumentPrivate::~QTextDocumentPrivate()
 {
-for (int i = 0; i < cursors.count(); ++i)
+foreach (QTextCursorPrivate *curs, cursors)
-cursors.at(i)->priv = 0;
+curs->priv = 0;
 cursors.clear();
 undoState = 0;
 undoEnabled = true;
 clearUndoRedoStacks(QTextDocument::RedoStack);
 }
 void QTextDocumentPrivate::remove(int pos, int length, QTextUndoCommand::Operation op)
 {
 if (length == 0)
 return;
+blockCursorAdjustment = true;
 move(pos, -1, length, op);
+blockCursorAdjustment = false;
+foreach (QTextCursorPrivate *curs, cursors) {
+if (curs->adjustPosition(pos, -length, op) == QTextCursorPrivate::CursorMoved) {
+curs->changed = true;
+}
+}
 }
 void QTextDocumentPrivate::setCharFormat(int pos, int length, const QTextCharFormat &newFormat, FormatChangeMode mode)
 {
 beginEditBlock();
 changeObjectFormat(object, c.format);
 c.format = oldFormat;
 editPos = -1;
 	    break;
 	}
+case QTextUndoCommand::CursorMoved:
+editPos = c.pos;
+editLength = 0;
+break;
 	case QTextUndoCommand::Custom:
 resetBlockRevision = -1; // ## TODO
 if (undo)
 c.custom->undo();
 else
 PMDEBUG("appendUndoItem, command=%d enabled=%d", c.command, undoEnabled);
 if (!undoEnabled)
 return;
 if (undoState < undoStack.size())
 clearUndoRedoStacks(QTextDocument::RedoStack);
+if (editBlock != 0 && editBlockCursorPosition >= 0) { // we had a beginEditBlock() with a cursor position
+if (c.pos != (quint32) editBlockCursorPosition) { // and that cursor position is different from the command
+// generate a CursorMoved undo item
+QT_INIT_TEXTUNDOCOMMAND(cc, QTextUndoCommand::CursorMoved, true, QTextUndoCommand::MoveCursor,
+0, 0, editBlockCursorPosition, 0, 0);
+undoStack.append(cc);
+undoState++;
+editBlockCursorPosition = -1;
+}
+}
 if (!undoStack.isEmpty() && modified) {
 QTextUndoCommand &last = undoStack[undoState - 1];
 if ( (last.block_part && c.block_part && !last.block_end) // part of the same block => can merge
 if (wasBlocking)
 emit document()->undoCommandAdded();
 }
 }
+editBlockCursorPosition = -1;
 finishEdit();
 }
 void QTextDocumentPrivate::finishEdit()
 {
 // to prevent getting two contentsChanged emits
 return;
 }
 }
-while (!changedCursors.isEmpty()) {
+QList<QTextCursor> changedCursors;
-QTextCursorPrivate *curs = changedCursors.takeFirst();
+foreach (QTextCursorPrivate *curs, cursors) {
-emit q->cursorPositionChanged(QTextCursor(curs));
+if (curs->changed) {
-}
+curs->changed = false;
+changedCursors.append(QTextCursor(curs));
+}
+}
+foreach (const QTextCursor &cursor, changedCursors)
+emit q->cursorPositionChanged(cursor);
 contentsChanged();
 if (blocks.numNodes() != lastBlockCount) {
 lastBlockCount = blocks.numNodes();
 void QTextDocumentPrivate::adjustDocumentChangesAndCursors(int from, int addedOrRemoved, QTextUndoCommand::Operation op)
 {
 if (!editBlock)
 ++revision;
-for (int i = 0; i < cursors.size(); ++i) {
+if (blockCursorAdjustment)  {
-QTextCursorPrivate *curs = cursors.at(i);
+; // postpone, will be called again from QTextDocumentPrivate::remove()
-if (curs->adjustPosition(from, addedOrRemoved, op) == QTextCursorPrivate::CursorMoved) {
+} else {
-if (!changedCursors.contains(curs))
+foreach (QTextCursorPrivate *curs, cursors) {
-changedCursors.append(curs);
+if (curs->adjustPosition(from, addedOrRemoved, op) == QTextCursorPrivate::CursorMoved) {
+curs->changed = true;
+}
 }
 }
 //     qDebug("QTextDocumentPrivate::adjustDocumentChanges: from=%d,addedOrRemoved=%d", from, addedOrRemoved);
 if (docChangeFrom < 0) {
 newText.resize(text.size());
 QChar *newTextPtr = newText.data();
 int newLen = 0;
 for (FragmentMap::Iterator it = fragments.begin(); !it.atEnd(); ++it) {
-qMemCopy(newTextPtr, text.constData() + it->stringPosition, it->size_array[0] * sizeof(QChar));
+memcpy(newTextPtr, text.constData() + it->stringPosition, it->size_array[0] * sizeof(QChar));
 it->stringPosition = newLen;
 newTextPtr += it->size_array[0];
 newLen += it->size_array[0];
 }
 /// This method is called from QTextTable when it is about to remove a table-cell to allow cursors to update their selection.
 void QTextDocumentPrivate::aboutToRemoveCell(int from, int to)
 {
 Q_ASSERT(from <= to);
-for (int i = 0; i < cursors.size(); ++i)
+foreach (QTextCursorPrivate *curs, cursors)
-cursors.at(i)->aboutToRemoveCell(from, to);
+curs->aboutToRemoveCell(from, to);
 }
 QT_END_NAMESPACE

changeset 33	3e2da88830cd
parent 30	5dc02b23752f