Changeset 561 for trunk/src/gui/text/qtextdocument_p.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qtextdocument_p.cpp (modified) (37 diffs)

trunk/src/gui/text/qtextdocument_p.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -61 +61 @@
 #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 }
+#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
+
 /*
   Structure of a document:
@@ -180 +189 @@
     docChangeLength(0),
     framesDirty(true),
+    rtFrame(0),
     initialBlockCharFormatIndex(-1) // set correctly later in init()
 {
@@ -186 +196 @@
 
     undoState = 0;
+    revision = -1; // init() inserts a block, bringing it to 0
 
     lout = 0;
@@ -194 +205 @@
     undoEnabled = true;
     inContentsChange = false;
+
     defaultTextOption.setTabStop(80); // same as in qtextengine.cpp
     defaultTextOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
@@ -208 +220 @@
 void QTextDocumentPrivate::init()
 {
-    rtFrame = 0;
     framesDirty = false;
 
@@ -231 +242 @@
 
     QList<QTextCursorPrivate *>oldCursors = cursors;
-    cursors.clear();
-    changedCursors.clear();
-
-    QMap<int, QTextObject *>::Iterator objectIt = objects.begin();
-    while (objectIt != objects.end()) {
-        if (*objectIt != rtFrame) {
-            delete *objectIt;
-            objectIt = objects.erase(objectIt);
-        } else {
-            ++objectIt;
+    QT_TRY{
+        cursors.clear();
+        changedCursors.clear();
+
+        QMap<int, QTextObject *>::Iterator objectIt = objects.begin();
+        while (objectIt != objects.end()) {
+            if (*objectIt != rtFrame) {
+                delete *objectIt;
+                objectIt = objects.erase(objectIt);
+            } else {
+                ++objectIt;
+            }
         }
-    }
-    // also clear out the remaining root frame pointer
-    // (we're going to delete the object further down)
-    objects.clear();
-
-    title.clear();
-    undoState = 0;
-    truncateUndoStack();
-    text = QString();
-    unreachableCharacterCount = 0;
-    modifiedState = 0;
-    modified = false;
-    formats = QTextFormatCollection();
-    int len = fragments.length();
-    fragments.clear();
-    blocks.clear();
-    cachedResources.clear();
-    delete rtFrame;
-    init();
-    cursors = oldCursors;
-    inContentsChange = true;
-    q->contentsChange(0, len, 0);
-    inContentsChange = false;
-    if (lout)
-        lout->documentChanged(0, len, 0);
+        // also clear out the remaining root frame pointer
+        // (we're going to delete the object further down)
+        objects.clear();
+
+        title.clear();
+        undoState = 0;
+        truncateUndoStack();
+        text = QString();
+        unreachableCharacterCount = 0;
+        modifiedState = 0;
+        modified = false;
+        formats = QTextFormatCollection();
+        int len = fragments.length();
+        fragments.clear();
+        blocks.clear();
+        cachedResources.clear();
+        delete rtFrame;
+        rtFrame = 0;
+        init();
+        cursors = oldCursors;
+        inContentsChange = true;
+        q->contentsChange(0, len, 0);
+        inContentsChange = false;
+        if (lout)
+            lout->documentChanged(0, len, 0);
+    } QT_CATCH(...) {
+        cursors = oldCursors; // at least recover the cursors
+        QT_RETHROW;
+    }
 }
 
@@ -405 +422 @@
     QTextBlockData *B = blocks.fragment(b);
 
-    QTextUndoCommand c = { QTextUndoCommand::BlockInserted, true,
-                           op, charFormat, strPos, pos, { blockFormat },
-                           B->revision };
+    QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::BlockInserted, (editBlock != 0),
+                            op, charFormat, strPos, pos, blockFormat,
+                            B->revision);
 
     appendUndoItem(c);
@@ -413 +430 @@
 
     // update revision numbers of the modified blocks.
-    B->revision = (atBlockEnd && !atBlockStart)? oldRevision : undoState;
+    B->revision = (atBlockEnd && !atBlockStart)? oldRevision : revision;
     b = blocks.next(b);
     if (b) {
         B = blocks.fragment(b);
-        B->revision = atBlockStart ? oldRevision : undoState;
+        B->revision = atBlockStart ? oldRevision : revision;
     }
 
@@ -440 +457 @@
     Q_ASSERT(formats.format(format).isCharFormat());
 
-    beginEditBlock();
     insert_string(pos, strPos, strLength, format, QTextUndoCommand::MoveCursor);
     if (undoEnabled) {
@@ -446 +462 @@
         QTextBlockData *B = blocks.fragment(b);
 
-        QTextUndoCommand c = { QTextUndoCommand::Inserted, true,
-                               QTextUndoCommand::MoveCursor, format, strPos, pos, { strLength },
-                               B->revision };
+        QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::Inserted, (editBlock != 0),
+                                QTextUndoCommand::MoveCursor, format, strPos, pos, strLength,
+                                B->revision);
         appendUndoItem(c);
-        B->revision = undoState;
+        B->revision = revision;
         Q_ASSERT(undoState == undoStack.size());
     }
-    endEditBlock();
+    finishEdit();
 }
 
@@ -585 +601 @@
 #endif
 
-    beginEditBlock();
-
     split(pos);
     split(pos+length);
@@ -606 +620 @@
 
         QTextFragmentData *X = fragments.fragment(x);
-        QTextUndoCommand c = { QTextUndoCommand::Removed, true,
-                               op, X->format, X->stringPosition, key, { X->size_array[0] },
-                               blockRevision };
-        QTextUndoCommand cInsert = { QTextUndoCommand::Inserted, true,
-                                     op, X->format, X->stringPosition, dstKey, { X->size_array[0] },
-                                     blockRevision };
+        QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::Removed, (editBlock != 0),
+                                op, X->format, X->stringPosition, key, X->size_array[0],
+                                blockRevision);
+        QT_INIT_TEXTUNDOCOMMAND(cInsert, QTextUndoCommand::Inserted, (editBlock != 0),
+                                op, X->format, X->stringPosition, dstKey, X->size_array[0],
+                                blockRevision);
 
         if (key+1 != blocks.position(b)) {
@@ -638 +652 @@
         appendUndoItem(c);
         if (B)
-            B->revision = undoState;
+            B->revision = revision;
         x = n;
 
@@ -649 +663 @@
     Q_ASSERT(blocks.length() == fragments.length());
 
-    endEditBlock();
+    finishEdit();
 }
 
@@ -723 +737 @@
         }
 
-        QTextUndoCommand c = { QTextUndoCommand::CharFormatChanged, true, QTextUndoCommand::MoveCursor, oldFormat,
-                               0, pos, { length }, 0 };
+        QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::CharFormatChanged, true, QTextUndoCommand::MoveCursor, oldFormat,
+                                0, pos, length, 0);
         appendUndoItem(c);
 
@@ -783 +797 @@
         block(it)->invalidate();
 
-        QTextUndoCommand c = { QTextUndoCommand::BlockFormatChanged, true, QTextUndoCommand::MoveCursor, oldFormat,
-                               0, it.position(), { 1 }, 0 };
+        QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::BlockFormatChanged, true, QTextUndoCommand::MoveCursor, oldFormat,
+                                0, it.position(), 1, 0);
         appendUndoItem(c);
 
@@ -857 +871 @@
     undoEnabled = false;
     beginEditBlock();
+    int editPos = -1;
     while (1) {
         if (undo)
@@ -868 +883 @@
             PMDEBUG("   erase: from %d, length %d", c.pos, c.length);
             c.command = QTextUndoCommand::Removed;
+            editPos = c.pos;
             break;
         case QTextUndoCommand::Removed:
@@ -873 +889 @@
             insert_string(c.pos, c.strPos, c.length, c.format, (QTextUndoCommand::Operation)c.operation);
             c.command = QTextUndoCommand::Inserted;
+            editPos = c.pos + c.length;
             break;
         case QTextUndoCommand::BlockInserted:
@@ -882 +899 @@
             else
                 c.command = QTextUndoCommand::BlockDeleted;
+            editPos = c.pos;
             break;
         case QTextUndoCommand::BlockRemoved:
@@ -892 +910 @@
             else
                 c.command = QTextUndoCommand::BlockAdded;
+            editPos = c.pos + 1;
             break;
         case QTextUndoCommand::CharFormatChanged: {
@@ -902 +921 @@
             setCharFormat(c.pos, c.length, formats.charFormat(c.format));
             c.format = oldFormat;
+            editPos = c.pos + c.length;
             break;
         }
@@ -924 +944 @@
             }
             documentChange(it.position(), it.length());
+            editPos = -1;
             break;
         }
@@ -933 +954 @@
             changeObjectFormat(object, c.format);
             c.format = oldFormat;
+            editPos = -1;
             break;
         }
@@ -941 +963 @@
             else
                 c.custom->redo();
+            editPos = -1;
             break;
         default:
@@ -952 +975 @@
         }
 
-        if (undo) {
-            if (undoState == 0 || !undoStack[undoState-1].block)
-                break;
-        } else {
+        if (!undo)
             ++undoState;
-            if (undoState == undoStack.size() || !undoStack[undoState-1].block)
-                break;
-        }
+
+        bool inBlock = (
+                undoState > 0
+                && undoState < undoStack.size()
+                && undoStack[undoState].block_part
+                && undoStack[undoState-1].block_part
+                && !undoStack[undoState-1].block_end
+                );
+        if (!inBlock)
+            break;
     }
     undoEnabled = true;
-    int editPos = -1;
-    if (docChangeFrom >= 0) {
+    if (editPos < 0 && docChangeFrom >= 0) {
         editPos = qMin(docChangeFrom + docChangeLength, length() - 1);
     }
@@ -984 +1010 @@
     QTextUndoCommand c;
     c.command = QTextUndoCommand::Custom;
-    c.block = editBlock != 0;
+    c.block_part = editBlock != 0;
+    c.block_end = 0;
     c.operation = QTextUndoCommand::MoveCursor;
     c.format = 0;
@@ -1005 +1032 @@
     if (!undoStack.isEmpty() && modified) {
         QTextUndoCommand &last = undoStack[undoState - 1];
-        if (last.tryMerge(c))
-            return;
+
+        if ( (last.block_part && c.block_part && !last.block_end) // part of the same block => can merge
+            || (!c.block_part && !last.block_part)) {  // two single undo items => can merge
+
+            if (last.tryMerge(c))
+                return;
+        }
     }
     if (modifiedState > undoState)
@@ -1014 +1046 @@
     emitUndoAvailable(true);
     emitRedoAvailable(false);
+
+    if (!c.block_part)
+        emit document()->undoCommandAdded();
 }
 
@@ -1078 +1113 @@
 
     if (undoEnabled && undoState)
-        undoStack[undoState - 1].block = true;
+        undoStack[undoState - 1].block_end = false;
 }
 
 void QTextDocumentPrivate::endEditBlock()
 {
+    Q_ASSERT(editBlock > 0);
+    if (--editBlock)
+        return;
+
+    if (undoEnabled && undoState > 0) {
+        const bool wasBlocking = !undoStack[undoState - 1].block_end;
+        if (undoStack[undoState - 1].block_part) {
+            undoStack[undoState - 1].block_end = true;
+            if (wasBlocking)
+                emit document()->undoCommandAdded();
+        }
+    }
+
+    finishEdit();
+}
+
+void QTextDocumentPrivate::finishEdit()
+{
     Q_Q(QTextDocument);
-    if (--editBlock)
-        return;
-
-    if (undoEnabled && undoState > 0) {
-        const bool wasBlocking = undoStack[undoState - 1].block;
-        undoStack[undoState - 1].block = false;
-        if (wasBlocking)
-            emit document()->undoCommandAdded();
-    }
+
+    if (editBlock)
+        return;
 
     if (framesDirty)
@@ -1156 +1203 @@
     param from is the cursor position in the document
     param addedOrRemoved is the amount of characters added or removed.  A negative number means characters are removed.
+
+    The function stores information to be emitted when finishEdit() is called.
 */
 void QTextDocumentPrivate::adjustDocumentChangesAndCursors(int from, int addedOrRemoved, QTextUndoCommand::Operation op)
 {
-    Q_Q(QTextDocument);
+    if (!editBlock)
+        ++revision;
+
     for (int i = 0; i < cursors.size(); ++i) {
         QTextCursorPrivate *curs = cursors.at(i);
         if (curs->adjustPosition(from, addedOrRemoved, op) == QTextCursorPrivate::CursorMoved) {
-            if (editBlock) {
-                if (!changedCursors.contains(curs))
-                    changedCursors.append(curs);
-            } else {
-                emit q->cursorPositionChanged(QTextCursor(curs));
-            }
+            if (!changedCursors.contains(curs))
+                changedCursors.append(curs);
         }
     }
@@ -1184 +1231 @@
 //         qDebug("adjustDocumentChanges:");
 //         qDebug("    -> %d %d %d", docChangeFrom, docChangeOldLength, docChangeLength);
-        contentsChanged();
         return;
     }
@@ -1209 +1255 @@
 //     qDebug("    -> %d %d %d", docChangeFrom, docChangeOldLength, docChangeLength);
 
-    contentsChanged();
 }
 
@@ -1280 +1325 @@
         documentChange(f->firstPosition(), f->lastPosition() - f->firstPosition());
 
-    QTextUndoCommand c = { QTextUndoCommand::GroupFormatChange, true, QTextUndoCommand::MoveCursor, oldFormatIndex,
-                           0, 0, { obj->d_func()->objectIndex }, 0 };
+    QT_INIT_TEXTUNDOCOMMAND(c, QTextUndoCommand::GroupFormatChange, (editBlock != 0), QTextUndoCommand::MoveCursor, oldFormatIndex,
+                            0, 0, obj->d_func()->objectIndex, 0);
     appendUndoItem(c);