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

equal deleted inserted replaced

-:93b982ccede2
+:5daf16870df6
 #define PMDEBUG if(0) qDebug
 // The VxWorks DIAB compiler crashes when initializing the anonymouse union with { a7 }
 #if !defined(Q_CC_DIAB)
 #  define QT_INIT_TEXTUNDOCOMMAND(c, a1, a2, a3, a4, a5, a6, a7, a8) \
-QTextUndoCommand c = { a1, a2, 0, 0, a3, a4, a5, a6, { a7 }, a8 }
+QTextUndoCommand c = { a1, a2, 0, 0, quint8(a3), a4, a5, a6, { a7 }, a8 }
 #else
 #  define QT_INIT_TEXTUNDOCOMMAND(c, a1, a2, a3, a4, a5, a6, a7, a8) \
 QTextUndoCommand c = { a1, a2, 0, 0, a3, a4, a5, a6 }; c.blockFormat = a7; c.revision = a8
 #endif
 // also clear out the remaining root frame pointer
 // (we're going to delete the object further down)
 objects.clear();
 title.clear();
-undoState = 0;
+clearUndoRedoStacks(QTextDocument::UndoAndRedoStacks);
-truncateUndoStack();
 text = QString();
 unreachableCharacterCount = 0;
 modifiedState = 0;
 modified = false;
 formats = QTextFormatCollection();
 for (int i = 0; i < cursors.count(); ++i)
 cursors.at(i)->priv = 0;
 cursors.clear();
 undoState = 0;
 undoEnabled = true;
-truncateUndoStack();
+clearUndoRedoStacks(QTextDocument::RedoStack);
 }
 void QTextDocumentPrivate::setLayout(QAbstractTextDocumentLayout *layout)
 {
 Q_Q(QTextDocument);
 return -1;
 undoEnabled = false;
 beginEditBlock();
 int editPos = -1;
+int editLength = -1;
 while (1) {
 if (undo)
 --undoState;
 QTextUndoCommand &c = undoStack[undoState];
 int resetBlockRevision = c.pos;
 case QTextUndoCommand::Inserted:
 remove(c.pos, c.length, (QTextUndoCommand::Operation)c.operation);
 PMDEBUG("   erase: from %d, length %d", c.pos, c.length);
 c.command = QTextUndoCommand::Removed;
 editPos = c.pos;
+editLength = 0;
 	    break;
 case QTextUndoCommand::Removed:
 PMDEBUG("   insert: format %d (from %d, length %d, strpos=%d)", c.format, c.pos, c.length, c.strPos);
 insert_string(c.pos, c.strPos, c.length, c.format, (QTextUndoCommand::Operation)c.operation);
 c.command = QTextUndoCommand::Inserted;
-editPos = c.pos + c.length;
+if (editPos != (int)c.pos)
+editLength = 0;
+editPos = c.pos;
+editLength += c.length;
 	    break;
 	case QTextUndoCommand::BlockInserted:
 	case QTextUndoCommand::BlockAdded:
 remove_block(c.pos, &c.blockFormat, c.command, (QTextUndoCommand::Operation)c.operation);
 PMDEBUG("   blockremove: from %d", c.pos);
 	    if (c.command == QTextUndoCommand::BlockInserted)
 		c.command = QTextUndoCommand::BlockRemoved;
 	    else
 		c.command = QTextUndoCommand::BlockDeleted;
 editPos = c.pos;
+editLength = 0;
 	    break;
 	case QTextUndoCommand::BlockRemoved:
 	case QTextUndoCommand::BlockDeleted:
 PMDEBUG("   blockinsert: charformat %d blockformat %d (pos %d, strpos=%d)", c.format, c.blockFormat, c.pos, c.strPos);
 insert_block(c.pos, c.strPos, c.format, c.blockFormat, (QTextUndoCommand::Operation)c.operation, c.command);
 resetBlockRevision += 1;
 	    if (c.command == QTextUndoCommand::BlockRemoved)
 		c.command = QTextUndoCommand::BlockInserted;
 	    else
 		c.command = QTextUndoCommand::BlockAdded;
-editPos = c.pos + 1;
+if (editPos != (int)c.pos)
+editLength = 0;
+editPos = c.pos;
+editLength += 1;
 	    break;
 	case QTextUndoCommand::CharFormatChanged: {
 resetBlockRevision = -1; // ## TODO
 PMDEBUG("   charFormat: format %d (from %d, length %d)", c.format, c.pos, c.length);
 FragmentIterator it = find(c.pos);
 Q_ASSERT(!it.atEnd());
 int oldFormat = it.value()->format;
 setCharFormat(c.pos, c.length, formats.charFormat(c.format));
 c.format = oldFormat;
-editPos = c.pos + c.length;
+if (editPos != (int)c.pos)
+editLength = 0;
+editPos = c.pos;
+editLength += c.length;
 	    break;
 	}
 	case QTextUndoCommand::BlockFormatChanged: {
 resetBlockRevision = -1; // ## TODO
 PMDEBUG("   blockformat: format %d pos %d", c.format, c.pos);
 );
 if (!inBlock)
 break;
 }
 undoEnabled = true;
-if (editPos < 0 && docChangeFrom >= 0) {
-editPos = qMin(docChangeFrom + docChangeLength, length() - 1);
+int newCursorPos = -1;
-}
+if (editPos >=0)
+newCursorPos = editPos + editLength;
+else if (docChangeFrom >= 0)
+newCursorPos= qMin(docChangeFrom + docChangeLength, length() - 1);
 endEditBlock();
 emitUndoAvailable(isUndoAvailable());
 emitRedoAvailable(isRedoAvailable());
-return editPos;
+return newCursorPos;
 }
 /*!
 Appends a custom undo \a item to the undo stack.
 */
 {
 PMDEBUG("appendUndoItem, command=%d enabled=%d", c.command, undoEnabled);
 if (!undoEnabled)
 return;
 if (undoState < undoStack.size())
-truncateUndoStack();
+clearUndoRedoStacks(QTextDocument::RedoStack);
 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 (!c.block_part)
 emit document()->undoCommandAdded();
 }
-void QTextDocumentPrivate::truncateUndoStack()
+void QTextDocumentPrivate::clearUndoRedoStacks(QTextDocument::Stacks stacksToClear,
-{
+bool emitSignals)
-if (undoState == undoStack.size())
+{
-return;
+bool undoCommandsAvailable = undoState != 0;
+bool redoCommandsAvailable = undoState != undoStack.size();
-for (int i = undoState; i < undoStack.size(); ++i) {
+if (stacksToClear == QTextDocument::UndoStack && undoCommandsAvailable) {
-QTextUndoCommand c = undoStack[i];
+for (int i = 0; i < undoState; ++i) {
-if (c.command & QTextUndoCommand::Removed) {
+QTextUndoCommand c = undoStack[undoState];
-// ########
+if (c.command & QTextUndoCommand::Custom)
-//             QTextFragment *f = c.fragment_list;
+delete c.custom;
-//             while (f) {
+}
-//                 QTextFragment *n = f->right;
+undoStack.remove(0, undoState);
-//                 delete f;
+undoStack.resize(undoStack.size() - undoState);
-//                 f = n;
+undoState = 0;
-//             }
+if (emitSignals)
-} else if (c.command & QTextUndoCommand::Custom) {
+emitUndoAvailable(false);
-delete c.custom;
+} else if (stacksToClear == QTextDocument::RedoStack
-}
+&& redoCommandsAvailable) {
-}
+for (int i = undoState; i < undoStack.size(); ++i) {
-undoStack.resize(undoState);
+QTextUndoCommand c = undoStack[i];
+if (c.command & QTextUndoCommand::Custom)
+delete c.custom;
+}
+undoStack.resize(undoState);
+if (emitSignals)
+emitRedoAvailable(false);
+} else if (stacksToClear == QTextDocument::UndoAndRedoStacks
+&& !undoStack.isEmpty()) {
+for (int i = 0; i < undoStack.size(); ++i) {
+QTextUndoCommand c = undoStack[i];
+if (c.command & QTextUndoCommand::Custom)
+delete c.custom;
+}
+undoState = 0;
+undoStack.resize(0);
+if (emitSignals && undoCommandsAvailable)
+emitUndoAvailable(false);
+if (emitSignals && redoCommandsAvailable)
+emitRedoAvailable(false);
+}
 }
 void QTextDocumentPrivate::emitUndoAvailable(bool available)
 {
 if (available != wasUndoAvailable) {
 if (enable && maximumBlockCount > 0)
 return;
 if (!enable) {
 undoState = 0;
-truncateUndoStack();
+clearUndoRedoStacks(QTextDocument::RedoStack);
 emitUndoAvailable(false);
 emitRedoAvailable(false);
 }
 modifiedState = modified ? -1 : undoState;
 undoEnabled = enable;

branch	GCC_SURGE
changeset 31	5daf16870df6
parent 30	5dc02b23752f
child 33	3e2da88830cd