Diffstat (limited to 'noncore/apps/opie-write/qtextedit.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/apps/opie-write/qtextedit.cpp | 1375 |
1 files changed, 727 insertions, 648 deletions
diff --git a/noncore/apps/opie-write/qtextedit.cpp b/noncore/apps/opie-write/qtextedit.cpp index 9c5ea79..82401c6 100644 --- a/noncore/apps/opie-write/qtextedit.cpp +++ b/noncore/apps/opie-write/qtextedit.cpp @@ -57,150 +57,179 @@ #include "qfontdialog.h" #include "qstylesheet.h" #include "qdragobject.h" #include "qurl.h" #include "qcursor.h" #include "qregexp.h" #include "qpopupmenu.h" #define ACCEL_KEY(k) "\t" + QString("Ctrl+" #k) using namespace Qt3; +static bool qt_enable_richtext_copy = FALSE; + struct QUndoRedoInfoPrivate { QTextString text; }; namespace Qt3 { class QTextEditPrivate { public: QTextEditPrivate() - :preeditStart(-1),preeditLength(-1),ensureCursorVisibleInShowEvent(FALSE) {} + :preeditStart(-1),preeditLength(-1),ensureCursorVisibleInShowEvent(FALSE) + { + for ( int i=0; i<7; i++ ) + id[i] = 0; + } int id[ 7 ]; int preeditStart; int preeditLength; bool ensureCursorVisibleInShowEvent; + QString scrollToAnchor; // used to deferr scrollToAnchor() until the show event when we are resized }; } static bool block_set_alignment = FALSE; /*! \class QTextEdit qtextedit.h - \brief The QTextEdit widget provides a sophisticated single-page rich text editor. + \brief The QTextEdit widget provides a powerful single-page rich text editor. \ingroup basic \ingroup text \mainclass - QTextEdit is an advanced WYSIWYG editor supporting rich text - formatting. It is optimized to handle large documents and to - respond quickly to user input. + \tableofcontents + + \section1 Introduction and Concepts + + QTextEdit is an advanced WYSIWYG viewer/editor supporting rich + text formatting using HTML-style tags. It is optimized to handle + large documents and to respond quickly to user input. + + QTextEdit has three modes of operation: + \table + \header \i Mode \i Command \i Notes + \row \i Plain Text Editor \i setTextFormat(PlainText) + \i Set text with setText(); text() returns plain text. Text + attributes (e.g. colors) can be set, but plain text is always + returned.<sup>1.</sup> + \row \i Rich Text Editor \i setTextFormat(RichText) + \i Set text with setText(); text() returns rich text. Rich + text editing is fairly limited. You can't set margins or + insert images for example (although you can read and + correctly display files that have margins set and that + include images). This mode is mostly useful for editing small + amounts of rich text. <sup>2.</sup> + \row \i Text Viewer<sup>3.</sup> \i setReadOnly(TRUE) + \i Set text with setText() or append() (which has no undo + history so is faster and uses less memory); text() returns + plain or rich text depending on the textFormat(). This mode + can correctly display a large subset of HTML tags. + \endtable + + <sup>1.</sup><small>We do \e not recommend using QTextEdit to + create syntax highlighting editors because the current API is + insufficient for this purpose. We hope to release a more complete + API that will support syntax highlighting in a later + release.</small> + + <sup>2.</sup><small>A more complete API that supports setting + margins, images, etc., is planned for a later Qt release.</small> + + <sup>3.</sup><small>Qt 3.1 will provide a Log Viewer mode which is + optimised for the fast and memory efficient display of large + amounts of read only text.</small> + + We recommend that you always call setTextFormat() to set the mode + you want to use. If you use \c AutoText then setText() and + append() will try to determine whether the text they are given is + plain text or rich text. If you use \c RichText then setText() and + append() will assume that the text they are given is rich text. + insert() simply inserts the text it is given. QTextEdit works on paragraphs and characters. A paragraph is a formatted string which is word-wrapped to fit into the width of - the widget. A document consists of zero or more paragraphs, - indexed from 0. Characters are indexed on a per-paragraph basis, - also indexed from 0. The words in the paragraph are aligned in - accordance with the paragraph's alignment(). Paragraphs are - separated by hard line breaks. Each character within a paragraph - has its own attributes, for example, font and color. + the widget. By default when reading plain text, two newlines + signify a paragraph. A document consists of zero or more + paragraphs, indexed from 0. Characters are indexed on a + per-paragraph basis, also indexed from 0. The words in the + paragraph are aligned in accordance with the paragraph's + alignment(). Paragraphs are separated by hard line breaks. Each + character within a paragraph has its own attributes, for example, + font and color. + + The text edit documentation uses the following concepts: + \list + \i \e{current format} -- + this is the format at the current cursor position, \e and it + is the format of the selected text if any. + \i \e{current paragraph} -- the paragraph which contains the + cursor. + \endlist QTextEdit can display images (using QMimeSourceFactory), lists and tables. If the text is too large to view within the text edit's viewport, scrollbars will appear. The text edit can load both plain text and HTML files (a subset of HTML 3.2 and 4). The rendering style and the set of valid tags are defined by a - styleSheet(). Change the style sheet with \l{setStyleSheet()}; see + styleSheet(). Custom tags can be created and placed in a custom + style sheet. Change the style sheet with \l{setStyleSheet()}; see QStyleSheet for details. The images identified by image tags are displayed if they can be interpreted using the text edit's \l{QMimeSourceFactory}; see setMimeSourceFactory(). If you want a text browser with more navigation use QTextBrowser. If you just need to display a small piece of rich text use QLabel or QSimpleRichText. If you create a new QTextEdit, and want to allow the user to edit rich text, call setTextFormat(Qt::RichText) to ensure that the text is treated as rich text. (Rich text uses HTML tags to set text formatting attributes. See QStyleSheet for information on the HTML tags that are supported.). If you don't call setTextFormat() explicitly the text edit will guess from the text itself whether it is rich text or plain text. This means that if the text looks like HTML or XML it will probably be interpreted as rich text, so you should call setTextFormat(Qt::PlainText) to preserve such text. - The text edit documentation uses the following concepts: - \list - \i <i>current format</i> -- - this is the format at the current cursor position, \e and it - is the format of the selected text if any. - \i <i>current paragraph</i> -- the paragraph which contains the - cursor. - \endlist + Note that we do not intend to add a full-featured web browser + widget to Qt (because that would easily double Qt's size and only + a few applications would benefit from it). The rich + text support in Qt is designed to provide a fast, portable and + efficient way to add reasonable online help facilities to + applications, and to provide a basis for rich text editors. + \section1 Using QTextEdit as a Display Widget + + QTextEdit can display a large HTML subset, including tables and + images. The text is set or replaced using setText() which deletes any existing text and replaces it with the text passed in the - setText() call. Text can be inserted with insert(), paste() and - pasteSubType(). Text can also be cut(). The entire text is deleted - with clear() and the selected text is deleted with - removeSelectedText(). Selected (marked) text can also be deleted - with del() (which will delete the character to the right of the - cursor if no text is selected). - - The current format's attributes are set with setItalic(), - setBold(), setUnderline(), setFamily() (font family), - setPointSize(), setColor() and setCurrentFont(). The current - paragraph's style is set with setParagType() and its alignment is - set with setAlignment(). - - Use setSelection() to select text. The setSelectionAttributes() - function is used to indicate how selected text should be - displayed. Use hasSelectedText() to find out if any text is - selected. The currently selected text's position is available - using getSelection() and the selected text itself is returned by - selectedText(). The selection can be copied to the clipboard with - copy(), or cut to the clipboard with cut(). It can be deleted with - removeSelectedText(). The entire text can be selected (or - unselected) using selectAll(). QTextEdit supports multiple - selections. Most of the selection functions operate on the default - selection, selection 0. If the user presses a non-selecting key, - e.g. a cursor key without also holding down Shift, all selections - are cleared. - - Set and get the position of the cursor with setCursorPosition() - and getCursorPosition() respectively. When the cursor is moved, - the signals currentFontChanged(), currentColorChanged() and - currentAlignmentChanged() are emitted to reflect the font, color - and alignment at the new cursor position. - - If the text changes, the textChanged() signal is emitted, and if - the user inserts a new line by pressing Return or Enter, - returnPressed() is emitted. The isModified() function will return - TRUE if the text has been modified. - - QTextEdit provides command-based undo and redo. To set the depth - of the command history use setUndoDepth() which defaults to 100 - steps. To undo or redo the last operation call undo() or redo(). - The signals undoAvailable() and redoAvailable() indicate whether - the undo and redo operations can be executed. - - The indent() function is used to reindent a paragraph. It is - useful for code editors, for example in <em>Qt Designer</em>'s - code editor \e{Ctrl+I} invokes the indent() function. + setText() call. If you call setText() with legacy HTML (with + setTextFormat(RichText) in force), and then call text(), the text + that is returned may have different markup, but will render the + same. Text can be inserted with insert(), paste(), pasteSubType() + and append(). Text that is appended does not go into the undo + history; this makes append() faster and consumes less memory. Text + can also be cut(). The entire text is deleted with clear() and the + selected text is deleted with removeSelectedText(). Selected + (marked) text can also be deleted with del() (which will delete + the character to the right of the cursor if no text is selected). Loading and saving text is achieved using setText() and text(), for example: \code QFile file( fileName ); // Read the text from a file if ( file.open( IO_ReadOnly ) ) { QTextStream ts( &file ); textEdit->setText( ts.read() ); } \endcode \code QFile file( fileName ); // Write the text to a file @@ -234,24 +263,103 @@ static bool block_set_alignment = FALSE; Images are not affected by the zoom functions. The lines() function returns the number of lines in the text and paragraphs() returns the number of paragraphs. The number of lines within a particular paragraph is returned by linesOfParagraph(). The length of the entire text in characters is returned by length(). You can scroll to an anchor in the text, e.g. \c{<a name="anchor">} with scrollToAnchor(). The find() function can be used to find and select a given string within the text. + A read-only QTextEdit provides the same functionality as the + (obsolete) QTextView. (QTextView is still supplied for + compatibility with old code.) + + \section2 Read-only key bindings + + When QTextEdit is used read-only the key-bindings are limited to + navigation, and text may only be selected with the mouse: + \table + \header \i Keypresses \i Action + \row \i \e{UpArrow} \i Move one line up + \row \i \e{DownArrow} \i Move one line down + \row \i \e{LeftArrow} \i Move one character left + \row \i \e{RightArrow} \i Move one character right + \row \i \e{PageUp} \i Move one (viewport) page up + \row \i \e{PageDown} \i Move one (viewport) page down + \row \i \e{Home} \i Move to the beginning of the text + \row \i \e{End} \i Move to the end of the text + \row \i \e{Shift+Wheel} \i Scroll the page horizontally (the Wheel is the mouse wheel) + \row \i \e{Ctrl+Wheel} \i Zoom the text + \endtable + + The text edit may be able to provide some meta-information. For + example, the documentTitle() function will return the text from + within HTML \c{<title>} tags. + + The text displayed in a text edit has a \e context. The context is + a path which the text edit's QMimeSourceFactory uses to resolve + the locations of files and images. It is passed to the + mimeSourceFactory() when quering data. (See QTextEdit() and + \l{context()}.) + + \section1 Using QTextEdit as an Editor + + All the information about using QTextEdit as a display widget also + applies here. + + The current format's attributes are set with setItalic(), + setBold(), setUnderline(), setFamily() (font family), + setPointSize(), setColor() and setCurrentFont(). The current + paragraph's alignment is set with setAlignment(). + + Use setSelection() to select text. The setSelectionAttributes() + function is used to indicate how selected text should be + displayed. Use hasSelectedText() to find out if any text is + selected. The currently selected text's position is available + using getSelection() and the selected text itself is returned by + selectedText(). The selection can be copied to the clipboard with + copy(), or cut to the clipboard with cut(). It can be deleted with + removeSelectedText(). The entire text can be selected (or + unselected) using selectAll(). QTextEdit supports multiple + selections. Most of the selection functions operate on the default + selection, selection 0. If the user presses a non-selecting key, + e.g. a cursor key without also holding down Shift, all selections + are cleared. + + Set and get the position of the cursor with setCursorPosition() + and getCursorPosition() respectively. When the cursor is moved, + the signals currentFontChanged(), currentColorChanged() and + currentAlignmentChanged() are emitted to reflect the font, color + and alignment at the new cursor position. + + If the text changes, the textChanged() signal is emitted, and if + the user inserts a new line by pressing Return or Enter, + returnPressed() is emitted. The isModified() function will return + TRUE if the text has been modified. + + QTextEdit provides command-based undo and redo. To set the depth + of the command history use setUndoDepth() which defaults to 100 + steps. To undo or redo the last operation call undo() or redo(). + The signals undoAvailable() and redoAvailable() indicate whether + the undo and redo operations can be executed. + + The indent() function is used to reindent a paragraph. It is + useful for code editors, for example in <em>Qt Designer</em>'s + code editor \e{Ctrl+I} invokes the indent() function. + + \section2 Editing key bindings + The list of key-bindings which are implemented for editing: \table \header \i Keypresses \i Action \row \i \e{Backspace} \i Delete the character to the left of the cursor \row \i \e{Delete} \i Delete the character to the right of the cursor \row \i \e{Ctrl+A} \i Move the cursor to the beginning of the line \row \i \e{Ctrl+B} \i Move the cursor one character left \row \i \e{Ctrl+C} \i Copy the marked text to the clipboard (also \e{Ctrl+Insert} under Windows) \row \i \e{Ctrl+D} \i Delete the character to the right of the cursor \row \i \e{Ctrl+E} \i Move the cursor to the end of the line \row \i \e{Ctrl+F} \i Move the cursor one character right @@ -286,61 +394,24 @@ static bool block_set_alignment = FALSE; To select (mark) text hold down the Shift key whilst pressing one of the movement keystrokes, for example, <i>Shift+Right Arrow</i> will select the character to the right, and <i>Shift+Ctrl+Right Arrow</i> will select the word to the right, etc. By default the text edit widget operates in insert mode so all text that the user enters is inserted into the text edit and any text to the right of the cursor is moved out of the way. The mode can be changed to overwrite, where new text overwrites any text to the right of the cursor, using setOverwriteMode(). - QTextEdit can also be used as read-only text viewer. Call - setReadOnly( TRUE ) to disable editing. A read-only QTextEdit - provides the same functionality as the (obsolete) QTextView. - (QTextView is still supplied for compatibility with old code.) - - When QTextEdit is used read-only the key-bindings are limited to - navigation, and text may only be selected with the mouse: - \table - \header \i Keypresses \i Action - \row \i \e{UpArrow} \i Move one line up - \row \i \e{DownArrow} \i Move one line down - \row \i \e{LeftArrow} \i Move one character left - \row \i \e{RightArrow} \i Move one character right - \row \i \e{PageUp} \i Move one (viewport) page up - \row \i \e{PageDown} \i Move one (viewport) page down - \row \i \e{Home} \i Move to the beginning of the text - \row \i \e{End} \i Move to the end of the text - \row \i \e{Shift+Wheel} \i Scroll the page horizontally (the Wheel is the mouse wheel) - \row \i \e{Ctrl+Wheel} \i Zoom the text - \endtable - - The text edit may be able to provide some meta-information. For - example, the documentTitle() function will return the text from - within HTML \c{<title>} tags. - - The text displayed in a text edit has a \e context. The context is - a path which the text edit's QMimeSourceFactory uses to resolve - the locations of files and images. It is passed to the - mimeSourceFactory() when quering data. (See QTextEdit() and - \l{context()}.) - - Note that we do not intend to add a full-featured web browser - widget to Qt (because that would easily double Qt's size and only - a few applications would benefit from it). The rich - text support in Qt is designed to provide a fast, portable and - efficient way to add reasonable online help facilities to - applications, and to provide a basis for rich text editors. */ /*! \enum QTextEdit::KeyboardAction This enum is used by doKeyboardAction() to specify which action should be executed: \value ActionBackspace Delete the character to the left of the cursor. \value ActionDelete Delete the character to the right of the cursor. @@ -631,43 +702,45 @@ void QTextEdit::init() mousePressed = FALSE; inDoubleClick = FALSE; modified = FALSE; onLink = QString::null; overWrite = FALSE; wrapMode = WidgetWidth; wrapWidth = -1; wPolicy = AtWhiteSpace; inDnD = FALSE; doc->setFormatter( new QTextFormatterBreakWords ); + doc->formatCollection()->defaultFormat()->setFont( QScrollView::font() ); + doc->formatCollection()->defaultFormat()->setColor( colorGroup().color( QColorGroup::Text ) ); currentFormat = doc->formatCollection()->defaultFormat(); currentAlignment = Qt3::AlignAuto; viewport()->setBackgroundMode( PaletteBase ); viewport()->setAcceptDrops( TRUE ); - resizeContents( 0, doc->lastParag() ? - ( doc->lastParag()->paragId() + 1 ) * doc->formatCollection()->defaultFormat()->height() : 0 ); + resizeContents( 0, doc->lastParagraph() ? + ( doc->lastParagraph()->paragId() + 1 ) * doc->formatCollection()->defaultFormat()->height() : 0 ); setKeyCompression( TRUE ); viewport()->setMouseTracking( TRUE ); #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif cursor = new QTextCursor( doc ); formatTimer = new QTimer( this ); connect( formatTimer, SIGNAL( timeout() ), this, SLOT( formatMore() ) ); - lastFormatted = doc->firstParag(); + lastFormatted = doc->firstParagraph(); scrollTimer = new QTimer( this ); connect( scrollTimer, SIGNAL( timeout() ), this, SLOT( autoScrollTimerDone() ) ); interval = 0; changeIntervalTimer = new QTimer( this ); connect( changeIntervalTimer, SIGNAL( timeout() ), this, SLOT( doChangeInterval() ) ); cursorVisible = TRUE; blinkTimer = new QTimer( this ); @@ -704,28 +777,28 @@ void QTextEdit::paintDocument( bool drawAll, QPainter *p, int cx, int cy, int cw p->fillRect( contentsX(), contentsY(), visibleWidth(), doc->y(), g.brush( QColorGroup::Base ) ); } if ( drawAll && doc->width() - contentsX() < cx + cw ) { p->fillRect( doc->width() - contentsX(), cy, cx + cw - doc->width() + contentsX(), ch, g.brush( QColorGroup::Base ) ); } p->setBrushOrigin( -contentsX(), -contentsY() ); lastFormatted = doc->draw( p, cx, cy, cw, ch, g, !drawAll, drawCur, cursor ); - if ( lastFormatted == doc->lastParag() ) + if ( lastFormatted == doc->lastParagraph() ) resizeContents( contentsWidth(), doc->height() ); - if ( contentsHeight() < visibleHeight() && ( !doc->lastParag() || doc->lastParag()->isValid() ) && drawAll ) + if ( contentsHeight() < visibleHeight() && ( !doc->lastParagraph() || doc->lastParagraph()->isValid() ) && drawAll ) p->fillRect( 0, contentsHeight(), visibleWidth(), visibleHeight() - contentsHeight(), g.brush( QColorGroup::Base ) ); } /*! \reimp */ void QTextEdit::drawContents( QPainter *p, int cx, int cy, int cw, int ch ) { paintDocument( TRUE, p, cx, cy, cw, ch ); int v; p->setPen( foregroundColor() ); if ( document()->isPageBreakEnabled() && ( v = document()->flow()->pageSize() ) > 0 ) { @@ -804,29 +877,35 @@ bool QTextEdit::event( QEvent *e ) } else { switch ( ke->key() ) { #if defined (Q_WS_WIN) case Key_Insert: ke->accept(); #endif default: break; } } } - if ( e->type() == QEvent::Show && d->ensureCursorVisibleInShowEvent ) { + if ( e->type() == QEvent::Show ) { + if ( d->ensureCursorVisibleInShowEvent ) { sync(); ensureCursorVisible(); d->ensureCursorVisibleInShowEvent = FALSE; } + if ( !d->scrollToAnchor.isEmpty() ) { + scrollToAnchor( d->scrollToAnchor ); + d->scrollToAnchor = QString::null; + } + } return QWidget::event( e ); } /*! Processes the key event, \a e. By default key events are used to provide keyboard navigation and text editing. */ void QTextEdit::keyPressEvent( QKeyEvent *e ) { changeIntervalTimer->stop(); @@ -836,38 +915,38 @@ void QTextEdit::keyPressEvent( QKeyEvent *e ) if ( !handleReadOnlyKeyEvent( e ) ) QScrollView::keyPressEvent( e ); changeIntervalTimer->start( 100, TRUE ); return; } bool selChanged = FALSE; for ( int i = 1; i < doc->numSelections(); ++i ) // start with 1 as we don't want to remove the Standard-Selection selChanged = doc->removeSelection( i ) || selChanged; if ( selChanged ) { - cursor->parag()->document()->nextDoubleBuffered = TRUE; + cursor->paragraph()->document()->nextDoubleBuffered = TRUE; repaintChanged(); } bool clearUndoRedoInfo = TRUE; switch ( e->key() ) { case Key_Left: case Key_Right: { // a bit hacky, but can't change this without introducing new enum values for move and keeping the // correct semantics and movement for BiDi and non BiDi text. CursorAction a; - if ( cursor->parag()->string()->isRightToLeft() == (e->key() == Key_Right) ) + if ( cursor->paragraph()->string()->isRightToLeft() == (e->key() == Key_Right) ) a = e->state() & ControlButton ? MoveWordBackward : MoveBackward; else a = e->state() & ControlButton ? MoveWordForward : MoveForward; moveCursor( a, e->state() & ShiftButton ); break; } case Key_Up: moveCursor( e->state() & ControlButton ? MovePgUp : MoveUp, e->state() & ShiftButton ); break; case Key_Down: moveCursor( e->state() & ControlButton ? MovePgDown : MoveDown, e->state() & ShiftButton ); break; @@ -877,116 +956,130 @@ void QTextEdit::keyPressEvent( QKeyEvent *e ) case Key_End: moveCursor( e->state() & ControlButton ? MoveEnd : MoveLineEnd, e->state() & ShiftButton ); break; case Key_Prior: moveCursor( MovePgUp, e->state() & ShiftButton ); break; case Key_Next: moveCursor( MovePgDown, e->state() & ShiftButton ); break; case Key_Return: case Key_Enter: if ( doc->hasSelection( QTextDocument::Standard, FALSE ) ) removeSelectedText(); + if ( textFormat() == Qt::RichText && ( e->state() & ControlButton ) ) { + // Ctrl-Enter inserts a line break in rich text mode + insert( QString( QChar( 0x2028) ), TRUE, FALSE, TRUE ); + } else { #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif clearUndoRedoInfo = FALSE; doKeyboardAction( ActionReturn ); emit returnPressed(); + } break; case Key_Delete: #if defined (Q_WS_WIN) if ( e->state() & ShiftButton ) { cut(); break; } else #endif if ( doc->hasSelection( QTextDocument::Standard, TRUE ) ) { removeSelectedText(); break; } doKeyboardAction( ActionDelete ); clearUndoRedoInfo = FALSE; break; case Key_Insert: if ( e->state() & ShiftButton ) paste(); +#if defined (Q_WS_WIN) + else if ( e->state() & ControlButton ) + copy(); +#endif break; case Key_Backspace: if ( doc->hasSelection( QTextDocument::Standard, TRUE ) ) { removeSelectedText(); break; } - if ( !cursor->parag()->prev() && - cursor->atParagStart() ) - break; - doKeyboardAction( ActionBackspace ); clearUndoRedoInfo = FALSE; break; case Key_F16: // Copy key on Sun keyboards copy(); break; case Key_F18: // Paste key on Sun keyboards paste(); break; case Key_F20: // Cut key on Sun keyboards cut(); break; default: { if ( e->text().length() && ( !( e->state() & ControlButton ) && !( e->state() & AltButton ) || ( ( e->state() & ControlButton | AltButton ) == (ControlButton|AltButton) ) ) && ( !e->ascii() || e->ascii() >= 32 || e->text() == "\t" ) ) { clearUndoRedoInfo = FALSE; if ( e->key() == Key_Tab ) { - if ( textFormat() == Qt::RichText && - cursor->index() == 0 && cursor->parag()->style() && - cursor->parag()->style()->displayMode() == - QStyleSheetItem::DisplayListItem ) { - cursor->parag()->incDepth(); + if ( textFormat() == Qt::RichText && cursor->paragraph()->isListItem() ) { + clearUndoRedo(); + undoRedoInfo.type = UndoRedoInfo::Style; + undoRedoInfo.id = cursor->paragraph()->paragId(); + undoRedoInfo.eid = undoRedoInfo.id; + undoRedoInfo.styleInformation = QTextStyleCommand::readStyleInformation( doc, undoRedoInfo.id, undoRedoInfo.eid ); + cursor->paragraph()->setListDepth( cursor->paragraph()->listDepth() +1 ); + clearUndoRedo(); drawCursor( FALSE ); repaintChanged(); drawCursor( TRUE ); break; } } - if ( textFormat() == Qt::RichText && ( !cursor->parag()->style() || - cursor->parag()->style()->displayMode() == QStyleSheetItem::DisplayBlock ) && - cursor->index() == 0 && ( e->text()[0] == '-' || e->text()[0] == '*' ) ) { + + if ( textFormat() == Qt::RichText && !cursor->paragraph()->isListItem() ) { + if ( cursor->index() == 0 && ( e->text()[0] == '-' || e->text()[0] == '*' ) ) { + clearUndoRedo(); + undoRedoInfo.type = UndoRedoInfo::Style; + undoRedoInfo.id = cursor->paragraph()->paragId(); + undoRedoInfo.eid = undoRedoInfo.id; + undoRedoInfo.styleInformation = QTextStyleCommand::readStyleInformation( doc, undoRedoInfo.id, undoRedoInfo.eid ); setParagType( QStyleSheetItem::DisplayListItem, QStyleSheetItem::ListDisc ); - cursor->parag()->incDepth(); + clearUndoRedo(); drawCursor( FALSE ); repaintChanged(); drawCursor( TRUE ); - } else { + break; + } + } if ( overWrite && !cursor->atParagEnd() ) cursor->remove(); QString t = e->text(); - QTextParag *p = cursor->parag(); + QTextParagraph *p = cursor->paragraph(); if ( p && p->string() && p->string()->isRightToLeft() ) { QChar *c = (QChar *)t.unicode(); int l = t.length(); while( l-- ) { if ( c->mirrored() ) *c = c->mirroredChar(); c++; } } insert( t, TRUE, FALSE, TRUE ); - } break; } else if ( e->state() & ControlButton ) { switch ( e->key() ) { case Key_C: case Key_F16: // Copy key on Sun keyboards copy(); break; case Key_V: paste(); break; case Key_X: cut(); break; @@ -1010,41 +1103,44 @@ void QTextEdit::keyPressEvent( QKeyEvent *e ) if ( doc->hasSelection( QTextDocument::Standard ) ) { removeSelectedText(); break; } doKeyboardAction( ActionDelete ); clearUndoRedoInfo = FALSE; break; case Key_H: if ( doc->hasSelection( QTextDocument::Standard ) ) { removeSelectedText(); break; } - if ( !cursor->parag()->prev() && + if ( !cursor->paragraph()->prev() && cursor->atParagStart() ) break; doKeyboardAction( ActionBackspace ); clearUndoRedoInfo = FALSE; break; case Key_E: moveCursor( MoveLineEnd, e->state() & ShiftButton ); break; case Key_N: moveCursor( MoveDown, e->state() & ShiftButton ); break; case Key_P: moveCursor( MoveUp, e->state() & ShiftButton ); break; case Key_Z: + if(e->state() & ShiftButton) + redo(); + else undo(); break; case Key_Y: redo(); break; case Key_K: doKeyboardAction( ActionKill ); break; #if defined(Q_WS_WIN) case Key_Insert: copy(); break; @@ -1054,226 +1150,176 @@ void QTextEdit::keyPressEvent( QKeyEvent *e ) #endif default: unknown = FALSE; break; } } else { unknown = TRUE; } } } emit cursorPositionChanged( cursor ); - emit cursorPositionChanged( cursor->parag()->paragId(), cursor->index() ); + emit cursorPositionChanged( cursor->paragraph()->paragId(), cursor->index() ); if ( clearUndoRedoInfo ) clearUndoRedo(); changeIntervalTimer->start( 100, TRUE ); if ( unknown ) e->ignore(); } /*! Executes keyboard action \a action. This is normally called by a key event handler. */ void QTextEdit::doKeyboardAction( KeyboardAction action ) { if ( isReadOnly() ) return; if ( cursor->nestedDepth() != 0 ) // #### for 3.0, disable editing of tables as this is not advanced enough return; - lastFormatted = cursor->parag(); + lastFormatted = cursor->paragraph(); drawCursor( FALSE ); bool doUpdateCurrentFormat = TRUE; switch ( action ) { - case ActionDelete: { + case ActionDelete: + if ( !cursor->atParagEnd() ) { checkUndoRedoInfo( UndoRedoInfo::Delete ); if ( !undoRedoInfo.valid() ) { - undoRedoInfo.id = cursor->parag()->paragId(); + undoRedoInfo.id = cursor->paragraph()->paragId(); undoRedoInfo.index = cursor->index(); undoRedoInfo.d->text = QString::null; } - undoRedoInfo.d->text += cursor->parag()->at( cursor->index() )->c; - if ( cursor->parag()->at( cursor->index() )->format() ) { - cursor->parag()->at( cursor->index() )->format()->addRef(); - undoRedoInfo.d->text.at( undoRedoInfo.d->text.length() - 1 ).setFormat( cursor->parag()->at( cursor->index() )->format() ); - } - QTextParag *old = cursor->parag(); - if ( cursor->remove() ) { - if ( old != cursor->parag() && lastFormatted == old ) - lastFormatted = cursor->parag() ? cursor->parag()->prev() : 0; - undoRedoInfo.d->text += "\n"; + undoRedoInfo.d->text.insert( undoRedoInfo.d->text.length(), cursor->paragraph()->at( cursor->index() ), TRUE ); + cursor->remove(); + } else { + clearUndoRedo(); + doc->setSelectionStart( QTextDocument::Temp, *cursor ); + cursor->gotoNextLetter(); + doc->setSelectionEnd( QTextDocument::Temp, *cursor ); + removeSelectedText( QTextDocument::Temp ); } - } break; + break; case ActionBackspace: - if ( textFormat() == Qt::RichText && - cursor->parag()->style() && - cursor->parag()->style()->displayMode() == QStyleSheetItem::DisplayListItem && - cursor->index() == 0 ) { - cursor->parag()->decDepth(); - lastFormatted = cursor->parag(); + if ( textFormat() == Qt::RichText && cursor->paragraph()->isListItem() && cursor->index() == 0 ) { + clearUndoRedo(); + undoRedoInfo.type = UndoRedoInfo::Style; + undoRedoInfo.id = cursor->paragraph()->paragId(); + undoRedoInfo.eid = undoRedoInfo.id; + undoRedoInfo.styleInformation = QTextStyleCommand::readStyleInformation( doc, undoRedoInfo.id, undoRedoInfo.eid ); + int ldepth = cursor->paragraph()->listDepth(); + ldepth = QMAX( ldepth-1, 0 ); + cursor->paragraph()->setListDepth( ldepth ); + if ( ldepth == 0 ) + cursor->paragraph()->setListItem( FALSE ); + clearUndoRedo(); + lastFormatted = cursor->paragraph(); repaintChanged(); drawCursor( TRUE ); return; } + if ( !cursor->atParagStart() ) { checkUndoRedoInfo( UndoRedoInfo::Delete ); if ( !undoRedoInfo.valid() ) { - undoRedoInfo.id = cursor->parag()->paragId(); + undoRedoInfo.id = cursor->paragraph()->paragId(); undoRedoInfo.index = cursor->index(); undoRedoInfo.d->text = QString::null; } cursor->gotoPreviousLetter(); - undoRedoInfo.d->text.prepend( QString( cursor->parag()->at( cursor->index() )->c ) ); - if ( cursor->parag()->at( cursor->index() )->format() ) { - cursor->parag()->at( cursor->index() )->format()->addRef(); - undoRedoInfo.d->text.at( 0 ).setFormat( cursor->parag()->at( cursor->index() )->format() ); - } - undoRedoInfo.index = cursor->index(); - if ( cursor->remove() ) { - undoRedoInfo.d->text.remove( 0, 1 ); - undoRedoInfo.d->text.prepend( "\n" ); + undoRedoInfo.d->text.insert( 0, cursor->paragraph()->at( cursor->index() ), TRUE ); undoRedoInfo.index = cursor->index(); - undoRedoInfo.id = cursor->parag()->paragId(); + cursor->remove(); + lastFormatted = cursor->paragraph(); + } else if ( cursor->paragraph()->prev() ){ + clearUndoRedo(); + doc->setSelectionStart( QTextDocument::Temp, *cursor ); + cursor->gotoPreviousLetter(); + doc->setSelectionEnd( QTextDocument::Temp, *cursor ); + removeSelectedText( QTextDocument::Temp ); } - lastFormatted = cursor->parag(); break; - case ActionReturn: { + case ActionReturn: checkUndoRedoInfo( UndoRedoInfo::Return ); if ( !undoRedoInfo.valid() ) { - undoRedoInfo.id = cursor->parag()->paragId(); + undoRedoInfo.id = cursor->paragraph()->paragId(); undoRedoInfo.index = cursor->index(); undoRedoInfo.d->text = QString::null; } undoRedoInfo.d->text += "\n"; - cursor->splitAndInsertEmptyParag(); - if ( cursor->parag()->prev() ) { - lastFormatted = cursor->parag()->prev(); + cursor->splitAndInsertEmptyParagraph(); + if ( cursor->paragraph()->prev() ) { + lastFormatted = cursor->paragraph()->prev(); lastFormatted->invalidate( 0 ); } doUpdateCurrentFormat = FALSE; - } break; + break; case ActionKill: - checkUndoRedoInfo( UndoRedoInfo::Delete ); - if ( !undoRedoInfo.valid() ) { - undoRedoInfo.id = cursor->parag()->paragId(); - undoRedoInfo.index = cursor->index(); - undoRedoInfo.d->text = QString::null; - } - if ( cursor->atParagEnd() ) { - undoRedoInfo.d->text += cursor->parag()->at( cursor->index() )->c; - if ( cursor->parag()->at( cursor->index() )->format() ) { - cursor->parag()->at( cursor->index() )->format()->addRef(); - undoRedoInfo.d->text.at( undoRedoInfo.d->text.length() - 1 ).setFormat( cursor->parag()->at( cursor->index() )->format() ); - } - QTextParag *old = cursor->parag(); - if ( cursor->remove() ) { - if ( old != cursor->parag() && lastFormatted == old ) - lastFormatted = cursor->parag() ? cursor->parag()->prev() : 0; - undoRedoInfo.d->text += "\n"; - } - } else { - int oldLen = undoRedoInfo.d->text.length(); - undoRedoInfo.d->text += cursor->parag()->string()->toString().mid( cursor->index() ); - for ( int i = cursor->index(); i < cursor->parag()->length(); ++i ) { - if ( cursor->parag()->at( i )->format() ) { - cursor->parag()->at( i )->format()->addRef(); - undoRedoInfo.d->text.at( oldLen + i - cursor->index() ).setFormat( cursor->parag()->at( i )->format() ); - } - } - undoRedoInfo.d->text.remove( undoRedoInfo.d->text.length() - 1, 1 ); - cursor->killLine(); - } + clearUndoRedo(); + doc->setSelectionStart( QTextDocument::Temp, *cursor ); + if ( cursor->atParagEnd() ) + cursor->gotoNextLetter(); + else + cursor->setIndex( cursor->paragraph()->length() - 1 ); + doc->setSelectionEnd( QTextDocument::Temp, *cursor ); + removeSelectedText( QTextDocument::Temp ); break; } formatMore(); repaintChanged(); ensureCursorVisible(); drawCursor( TRUE ); - - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } - + updateMicroFocusHint(); if ( doUpdateCurrentFormat ) updateCurrentFormat(); setModified(); emit textChanged(); } -void QTextEdit::readFormats( QTextCursor &c1, QTextCursor &c2, int oldLen, QTextString &text, bool fillStyles ) +void QTextEdit::readFormats( QTextCursor &c1, QTextCursor &c2, QTextString &text, bool fillStyles ) { + QDataStream styleStream( undoRedoInfo.styleInformation, IO_WriteOnly ); c2.restoreState(); c1.restoreState(); - if ( c1.parag() == c2.parag() ) { - for ( int i = c1.index(); i < c2.index(); ++i ) { - if ( c1.parag()->at( i )->format() ) { - c1.parag()->at( i )->format()->addRef(); - text.at( oldLen + i - c1.index() ).setFormat( c1.parag()->at( i )->format() ); - } - } + int lastIndex = text.length(); + if ( c1.paragraph() == c2.paragraph() ) { + for ( int i = c1.index(); i < c2.index(); ++i ) + text.insert( lastIndex + i - c1.index(), c1.paragraph()->at( i ), TRUE ); if ( fillStyles ) { - undoRedoInfo.oldAligns[ 0 ] = c1.parag()->alignment(); - undoRedoInfo.oldStyles << c1.parag()->styleSheetItems(); - undoRedoInfo.oldListStyles << c1.parag()->listStyle(); + styleStream << (int) 1; + c1.paragraph()->writeStyleInformation( styleStream ); } } else { - int lastIndex = oldLen; int i; - for ( i = c1.index(); i < c1.parag()->length(); ++i ) { - if ( c1.parag()->at( i )->format() ) { - c1.parag()->at( i )->format()->addRef(); - text.at( lastIndex ).setFormat( c1.parag()->at( i )->format() ); - lastIndex++; - } - } - QTextParag *p = c1.parag()->next(); - while ( p && p != c2.parag() ) { - for ( int i = 0; i < p->length(); ++i ) { - if ( p->at( i )->format() ) { - p->at( i )->format()->addRef(); - text.at( i + lastIndex ).setFormat( p->at( i )->format() ); - } - } - lastIndex += p->length(); + for ( i = c1.index(); i < c1.paragraph()->length()-1; ++i ) + text.insert( lastIndex++, c1.paragraph()->at( i ), TRUE ); + int num = 2; // start and end, being different + text += "\n"; lastIndex++; + QTextParagraph *p = c1.paragraph()->next(); + while ( p && p != c2.paragraph() ) { + for ( i = 0; i < p->length()-1; ++i ) + text.insert( lastIndex++ , p->at( i ), TRUE ); + text += "\n"; num++; lastIndex++; p = p->next(); } - for ( i = 0; i < c2.index(); ++i ) { - if ( c2.parag()->at( i )->format() ) { - c2.parag()->at( i )->format()->addRef(); - text.at( i + lastIndex ).setFormat( c2.parag()->at( i )->format() ); - } - } + for ( i = 0; i < c2.index(); ++i ) + text.insert( i + lastIndex, c2.paragraph()->at( i ), TRUE ); if ( fillStyles ) { - QTextParag *p = c1.parag(); - i = 0; - while ( p ) { - if ( i < (int)undoRedoInfo.oldAligns.size() ) - undoRedoInfo.oldAligns[ i ] = p->alignment(); - undoRedoInfo.oldStyles << p->styleSheetItems(); - undoRedoInfo.oldListStyles << p->listStyle(); - if ( p == c2.parag() ) - break; - p = p->next(); - ++i; - } + styleStream << num; + for ( QTextParagraph *p = c1.paragraph(); --num >= 0; p = p->next() ) + p->writeStyleInformation( styleStream ); } } } /*! Removes the selection \a selNum (by default 0). This does not remove the selected text. \sa removeSelectedText() */ void QTextEdit::removeSelection( int selNum ) { @@ -1285,137 +1331,123 @@ void QTextEdit::removeSelection( int selNum ) the selection \a selNum (by default, 0). If there is no selected text nothing happens. \sa selectedText removeSelection() */ void QTextEdit::removeSelectedText( int selNum ) { if ( isReadOnly() ) return; QTextCursor c1 = doc->selectionStartCursor( selNum ); + c1.restoreState(); QTextCursor c2 = doc->selectionEndCursor( selNum ); + c2.restoreState(); - // ### no support for editing tables yet + // ### no support for editing tables yet, plus security for broken selections if ( c1.nestedDepth() || c2.nestedDepth() ) return; for ( int i = 0; i < (int)doc->numSelections(); ++i ) { if ( i == selNum ) continue; doc->removeSelection( i ); } drawCursor( FALSE ); checkUndoRedoInfo( UndoRedoInfo::RemoveSelected ); if ( !undoRedoInfo.valid() ) { doc->selectionStart( selNum, undoRedoInfo.id, undoRedoInfo.index ); undoRedoInfo.d->text = QString::null; } - int oldLen = undoRedoInfo.d->text.length(); - undoRedoInfo.d->text = doc->selectedText( selNum, FALSE ); - undoRedoInfo.oldAligns.resize( undoRedoInfo.oldAligns.size() + QMAX( 0, c2.parag()->paragId() - c1.parag()->paragId() + 1 ) ); - readFormats( c1, c2, oldLen, undoRedoInfo.d->text, TRUE ); + readFormats( c1, c2, undoRedoInfo.d->text, TRUE ); + + doc->removeSelectedText( selNum, cursor ); if ( cursor->isValid() ) { ensureCursorVisible(); - lastFormatted = cursor->parag(); + lastFormatted = cursor->paragraph(); formatMore(); repaintChanged(); ensureCursorVisible(); drawCursor( TRUE ); clearUndoRedo(); #if defined(Q_WS_WIN) // there seems to be a problem with repainting or erasing the area // of the scrollview which is not the contents on windows if ( contentsHeight() < visibleHeight() ) viewport()->repaint( 0, contentsHeight(), visibleWidth(), visibleHeight() - contentsHeight(), TRUE ); #endif #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } + updateMicroFocusHint(); } else { - cursor->setDocument( doc ); - cursor->setParag( doc->firstParag() ); - cursor->setIndex( 0 ); + delete cursor; + cursor = new QTextCursor( doc ); drawCursor( TRUE ); viewport()->repaint( TRUE ); } setModified(); emit textChanged(); emit selectionChanged(); } /*! Moves the text cursor according to \a action. This is normally used by some key event handler. \a select specifies whether the text between the current cursor position and the new position should be selected. */ void QTextEdit::moveCursor( CursorAction action, bool select ) { drawCursor( FALSE ); if ( select ) { if ( !doc->hasSelection( QTextDocument::Standard ) ) - doc->setSelectionStart( QTextDocument::Standard, cursor ); + doc->setSelectionStart( QTextDocument::Standard, *cursor ); moveCursor( action ); - if ( doc->setSelectionEnd( QTextDocument::Standard, cursor ) ) { - cursor->parag()->document()->nextDoubleBuffered = TRUE; + if ( doc->setSelectionEnd( QTextDocument::Standard, *cursor ) ) { + cursor->paragraph()->document()->nextDoubleBuffered = TRUE; repaintChanged(); } else { drawCursor( TRUE ); } ensureCursorVisible(); emit selectionChanged(); emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) ); } else { bool redraw = doc->removeSelection( QTextDocument::Standard ); moveCursor( action ); if ( !redraw ) { ensureCursorVisible(); drawCursor( TRUE ); } else { - cursor->parag()->document()->nextDoubleBuffered = TRUE; + cursor->paragraph()->document()->nextDoubleBuffered = TRUE; repaintChanged(); ensureCursorVisible(); drawCursor( TRUE ); #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } if ( redraw ) { emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) ); emit selectionChanged(); } } drawCursor( TRUE ); updateCurrentFormat(); - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } + updateMicroFocusHint(); } /*! \overload */ void QTextEdit::moveCursor( CursorAction action ) { switch ( action ) { case MoveBackward: cursor->gotoPreviousLetter(); break; case MoveWordBackward: @@ -1440,124 +1472,119 @@ void QTextEdit::moveCursor( CursorAction action ) cursor->gotoPageDown( visibleHeight() ); break; case MoveLineStart: cursor->gotoLineStart(); break; case MoveHome: cursor->gotoHome(); break; case MoveLineEnd: cursor->gotoLineEnd(); break; case MoveEnd: - ensureFormatted( doc->lastParag() ); + ensureFormatted( doc->lastParagraph() ); cursor->gotoEnd(); break; } - - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } + updateMicroFocusHint(); updateCurrentFormat(); } /*! \reimp */ void QTextEdit::resizeEvent( QResizeEvent *e ) { QScrollView::resizeEvent( e ); + if ( doc->visibleWidth() == 0 ) + doResize(); } /*! \reimp */ void QTextEdit::viewportResizeEvent( QResizeEvent *e ) { QScrollView::viewportResizeEvent( e ); - if ( e->oldSize().width() != e->size().width() ) + if ( e->oldSize().width() != e->size().width() ) { + bool stayAtBottom = e->oldSize().height() != e->size().height() && + contentsY() > 0 && contentsY() >= doc->height() - e->oldSize().height(); doResize(); + if ( stayAtBottom ) + scrollToBottom(); + } } - -static bool blockEnsureCursorVisible = FALSE; /*! Ensures that the cursor is visible by scrolling the text edit if necessary. \sa setCursorPosition() */ void QTextEdit::ensureCursorVisible() { - if ( blockEnsureCursorVisible ) - return; if ( !isVisible() ) { d->ensureCursorVisibleInShowEvent = TRUE; return; } - lastFormatted = cursor->parag(); + lastFormatted = cursor->paragraph(); formatMore(); - QTextStringChar *chr = cursor->parag()->at( cursor->index() ); - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - int x = cursor->parag()->rect().x() + chr->x + cursor->offsetX(); + QTextStringChar *chr = cursor->paragraph()->at( cursor->index() ); + int h = cursor->paragraph()->lineHeightOfChar( cursor->index() ); + int x = cursor->paragraph()->rect().x() + chr->x + cursor->offsetX(); int y = 0; int dummy; - cursor->parag()->lineHeightOfChar( cursor->index(), &dummy, &y ); - y += cursor->parag()->rect().y() + cursor->offsetY(); + cursor->paragraph()->lineHeightOfChar( cursor->index(), &dummy, &y ); + y += cursor->paragraph()->rect().y() + cursor->offsetY(); int w = 1; ensureVisible( x, y + h / 2, w, h / 2 + 2 ); } /*! \internal */ void QTextEdit::drawCursor( bool visible ) { if ( !isUpdatesEnabled() || !viewport()->isUpdatesEnabled() || - !cursor->parag() || - !cursor->parag()->isValid() || + !cursor->paragraph() || + !cursor->paragraph()->isValid() || !selectedText().isEmpty() || ( visible && !hasFocus() && !viewport()->hasFocus() && !inDnD ) || isReadOnly() ) return; QPainter p( viewport() ); - QRect r( cursor->topParag()->rect() ); - cursor->parag()->setChanged( TRUE ); + QRect r( cursor->topParagraph()->rect() ); + cursor->paragraph()->setChanged( TRUE ); p.translate( -contentsX() + cursor->totalOffsetX(), -contentsY() + cursor->totalOffsetY() ); QPixmap *pix = 0; QColorGroup cg( colorGroup() ); - if ( cursor->parag()->background() ) - cg.setBrush( QColorGroup::Base, *cursor->parag()->background() ); + if ( cursor->paragraph()->background() ) + cg.setBrush( QColorGroup::Base, *cursor->paragraph()->background() ); else if ( doc->paper() ) cg.setBrush( QColorGroup::Base, *doc->paper() ); p.setBrushOrigin( -contentsX(), -contentsY() ); - cursor->parag()->document()->nextDoubleBuffered = TRUE; + cursor->paragraph()->document()->nextDoubleBuffered = TRUE; if ( !cursor->nestedDepth() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); + int h = cursor->paragraph()->lineHeightOfChar( cursor->index() ); int dist = 5; - if ( ( cursor->parag()->alignment() & Qt3::AlignJustify ) == Qt3::AlignJustify ) + if ( ( cursor->paragraph()->alignment() & Qt3::AlignJustify ) == Qt3::AlignJustify ) dist = 50; int x = r.x() - cursor->totalOffsetX() + cursor->x() - dist; x = QMAX( x, 0 ); p.setClipRect( QRect( x - contentsX(), r.y() - cursor->totalOffsetY() + cursor->y() - contentsY(), 2 * dist, h ) ); - doc->drawParag( &p, cursor->parag(), x, + doc->drawParagraph( &p, cursor->paragraph(), x, r.y() - cursor->totalOffsetY() + cursor->y(), 2 * dist, h, pix, cg, visible, cursor ); } else { - doc->drawParag( &p, cursor->parag(), r.x() - cursor->totalOffsetX(), + doc->drawParagraph( &p, cursor->paragraph(), r.x() - cursor->totalOffsetX(), r.y() - cursor->totalOffsetY(), r.width(), r.height(), pix, cg, visible, cursor ); } cursorVisible = visible; } enum { IdUndo = 0, IdRedo = 1, IdCut = 2, IdCopy = 3, IdPaste = 4, @@ -1593,54 +1620,54 @@ void QTextEdit::contentsMousePressEvent( QMouseEvent *e ) mightStartDrag = FALSE; pressedLink = QString::null; if ( e->button() == LeftButton ) { mousePressed = TRUE; drawCursor( FALSE ); placeCursor( e->pos() ); ensureCursorVisible(); if ( isReadOnly() && linksEnabled() ) { QTextCursor c = *cursor; placeCursor( e->pos(), &c, TRUE ); - if ( c.parag() && c.parag()->at( c.index() ) && - c.parag()->at( c.index() )->isAnchor() ) { - pressedLink = c.parag()->at( c.index() )->anchorHref(); + if ( c.paragraph() && c.paragraph()->at( c.index() ) && + c.paragraph()->at( c.index() )->isAnchor() ) { + pressedLink = c.paragraph()->at( c.index() )->anchorHref(); } } #ifndef QT_NO_DRAGANDDROP if ( doc->inSelection( QTextDocument::Standard, e->pos() ) ) { mightStartDrag = TRUE; drawCursor( TRUE ); dragStartTimer->start( QApplication::startDragTime(), TRUE ); dragStartPos = e->pos(); return; } #endif bool redraw = FALSE; if ( doc->hasSelection( QTextDocument::Standard ) ) { if ( !( e->state() & ShiftButton ) ) { redraw = doc->removeSelection( QTextDocument::Standard ); - doc->setSelectionStart( QTextDocument::Standard, cursor ); + doc->setSelectionStart( QTextDocument::Standard, *cursor ); } else { - redraw = doc->setSelectionEnd( QTextDocument::Standard, cursor ) || redraw; + redraw = doc->setSelectionEnd( QTextDocument::Standard, *cursor ) || redraw; } } else { if ( isReadOnly() || !( e->state() & ShiftButton ) ) { - doc->setSelectionStart( QTextDocument::Standard, cursor ); + doc->setSelectionStart( QTextDocument::Standard, *cursor ); } else { - doc->setSelectionStart( QTextDocument::Standard, &c ); - redraw = doc->setSelectionEnd( QTextDocument::Standard, cursor ) || redraw; + doc->setSelectionStart( QTextDocument::Standard, c ); + redraw = doc->setSelectionEnd( QTextDocument::Standard, *cursor ) || redraw; } } for ( int i = 1; i < doc->numSelections(); ++i ) // start with 1 as we don't want to remove the Standard-Selection redraw = doc->removeSelection( i ) || redraw; if ( !redraw ) { drawCursor( TRUE ); } else { repaintChanged(); #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); @@ -1705,25 +1732,25 @@ void QTextEdit::contentsMouseReleaseEvent( QMouseEvent * e ) #ifndef QT_NO_DRAGANDDROP if ( dragStartTimer->isActive() ) dragStartTimer->stop(); if ( mightStartDrag ) { selectAll( FALSE ); mousePressed = FALSE; } #endif if ( mousePressed ) { mousePressed = FALSE; } emit cursorPositionChanged( cursor ); - emit cursorPositionChanged( cursor->parag()->paragId(), cursor->index() ); + emit cursorPositionChanged( cursor->paragraph()->paragId(), cursor->index() ); if ( oldCursor != *cursor ) updateCurrentFormat(); inDoubleClick = FALSE; #ifndef QT_NO_NETWORKPROTOCOL if ( !onLink.isEmpty() && onLink == pressedLink && linksEnabled() ) { QUrl u( doc->context(), onLink, TRUE ); emitLinkClicked( u.toString( FALSE, FALSE ) ); // emitting linkClicked() may result in that the cursor winds // up hovering over a different valid link - check this and // set the appropriate cursor shape @@ -1735,31 +1762,31 @@ void QTextEdit::contentsMouseReleaseEvent( QMouseEvent * e ) doc->removeSelection( QTextDocument::Standard ); emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) ); emit selectionChanged(); } /*! \reimp */ void QTextEdit::contentsMouseDoubleClickEvent( QMouseEvent * ) { QTextCursor c1 = *cursor; QTextCursor c2 = *cursor; - if ( cursor->index() > 0 && !cursor->parag()->at( cursor->index()-1 )->c.isSpace() ) + if ( cursor->index() > 0 && !cursor->paragraph()->at( cursor->index()-1 )->c.isSpace() ) c1.gotoPreviousWord(); - if ( !cursor->parag()->at( cursor->index() )->c.isSpace() && !cursor->atParagEnd() ) + if ( !cursor->paragraph()->at( cursor->index() )->c.isSpace() && !cursor->atParagEnd() ) c2.gotoNextWord(); - doc->setSelectionStart( QTextDocument::Standard, &c1 ); - doc->setSelectionEnd( QTextDocument::Standard, &c2 ); + doc->setSelectionStart( QTextDocument::Standard, c1 ); + doc->setSelectionEnd( QTextDocument::Standard, c2 ); *cursor = c2; repaintChanged(); inDoubleClick = TRUE; mousePressed = TRUE; } #ifndef QT_NO_DRAGANDDROP /*! \reimp */ @@ -1797,37 +1824,71 @@ void QTextEdit::contentsDragLeaveEvent( QDragLeaveEvent * ) /*! \reimp */ void QTextEdit::contentsDropEvent( QDropEvent *e ) { if ( isReadOnly() ) return; inDnD = FALSE; e->acceptAction(); QString text; bool intern = FALSE; if ( QTextDrag::decode( e, text ) ) { - if ( ( e->source() == this || - e->source() == viewport() ) && - e->action() == QDropEvent::Move ) { + bool hasSel = doc->hasSelection( QTextDocument::Standard ); + bool internalDrag = e->source() == this || e->source() == viewport(); + int dropId, dropIndex; + QTextCursor insertCursor = *cursor; + dropId = cursor->paragraph()->paragId(); + dropIndex = cursor->index(); + if ( hasSel && internalDrag ) { + QTextCursor c1, c2; + int selStartId, selStartIndex; + int selEndId, selEndIndex; + c1 = doc->selectionStartCursor( QTextDocument::Standard ); + c1.restoreState(); + c2 = doc->selectionEndCursor( QTextDocument::Standard ); + c2.restoreState(); + selStartId = c1.paragraph()->paragId(); + selStartIndex = c1.index(); + selEndId = c2.paragraph()->paragId(); + selEndIndex = c2.index(); + if ( ( ( dropId > selStartId ) || + ( dropId == selStartId && dropIndex > selStartIndex ) ) && + ( ( dropId < selEndId ) || + ( dropId == selEndId && dropIndex <= selEndIndex ) ) ) + insertCursor = c1; + if ( dropId == selEndId && dropIndex > selEndIndex ) { + insertCursor = c1; + if ( selStartId == selEndId ) { + insertCursor.setIndex( dropIndex - + ( selEndIndex - selStartIndex ) ); + } else { + insertCursor.setIndex( dropIndex - selEndIndex + + selStartIndex ); + } + } + } + + if ( internalDrag && e->action() == QDropEvent::Move ) { removeSelectedText(); intern = TRUE; } else { doc->removeSelection( QTextDocument::Standard ); #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } drawCursor( FALSE ); - placeCursor( e->pos(), cursor ); + cursor->setParagraph( insertCursor.paragraph() ); + cursor->setIndex( insertCursor.index() ); drawCursor( TRUE ); if ( !cursor->nestedDepth() ) { insert( text, FALSE, TRUE, FALSE ); } else { if ( intern ) undo(); e->ignore(); } } } #endif @@ -1850,340 +1911,341 @@ void QTextEdit::handleMouseMove( const QPoint& pos ) drawCursor( FALSE ); QTextCursor oldCursor = *cursor; placeCursor( pos ); if ( inDoubleClick ) { QTextCursor cl = *cursor; cl.gotoPreviousWord(); QTextCursor cr = *cursor; cr.gotoNextWord(); - int diff = QABS( oldCursor.parag()->at( oldCursor.index() )->x - mousePos.x() ); - int ldiff = QABS( cl.parag()->at( cl.index() )->x - mousePos.x() ); - int rdiff = QABS( cr.parag()->at( cr.index() )->x - mousePos.x() ); + int diff = QABS( oldCursor.paragraph()->at( oldCursor.index() )->x - mousePos.x() ); + int ldiff = QABS( cl.paragraph()->at( cl.index() )->x - mousePos.x() ); + int rdiff = QABS( cr.paragraph()->at( cr.index() )->x - mousePos.x() ); - if ( cursor->parag()->lineStartOfChar( cursor->index() ) != - oldCursor.parag()->lineStartOfChar( oldCursor.index() ) ) + if ( cursor->paragraph()->lineStartOfChar( cursor->index() ) != + oldCursor.paragraph()->lineStartOfChar( oldCursor.index() ) ) diff = 0xFFFFFF; if ( rdiff < diff && rdiff < ldiff ) *cursor = cr; else if ( ldiff < diff && ldiff < rdiff ) *cursor = cl; else *cursor = oldCursor; } ensureCursorVisible(); bool redraw = FALSE; if ( doc->hasSelection( QTextDocument::Standard ) ) { - redraw = doc->setSelectionEnd( QTextDocument::Standard, cursor ) || redraw; + redraw = doc->setSelectionEnd( QTextDocument::Standard, *cursor ) || redraw; } if ( !redraw ) { drawCursor( TRUE ); } else { repaintChanged(); drawCursor( TRUE ); } - if ( currentFormat && currentFormat->key() != cursor->parag()->at( cursor->index() )->format()->key() ) { + if ( currentFormat && currentFormat->key() != cursor->paragraph()->at( cursor->index() )->format()->key() ) { currentFormat->removeRef(); - currentFormat = doc->formatCollection()->format( cursor->parag()->at( cursor->index() )->format() ); + currentFormat = doc->formatCollection()->format( cursor->paragraph()->at( cursor->index() )->format() ); if ( currentFormat->isMisspelled() ) { currentFormat->removeRef(); currentFormat = doc->formatCollection()->format( currentFormat->font(), currentFormat->color() ); } emit currentFontChanged( currentFormat->font() ); emit currentColorChanged( currentFormat->color() ); emit currentVerticalAlignmentChanged( (VerticalAlignment)currentFormat->vAlign() ); } - if ( currentAlignment != cursor->parag()->alignment() ) { - currentAlignment = cursor->parag()->alignment(); + if ( currentAlignment != cursor->paragraph()->alignment() ) { + currentAlignment = cursor->paragraph()->alignment(); block_set_alignment = TRUE; emit currentAlignmentChanged( currentAlignment ); block_set_alignment = FALSE; } } /*! \fn void QTextEdit::placeCursor( const QPoint &pos, QTextCursor *c ) Places the cursor \a c at the character which is closest to position \a pos (in contents coordinates). If \a c is 0, the default text cursor is used. \sa setCursorPosition() */ void QTextEdit::placeCursor( const QPoint &pos, QTextCursor *c, bool link ) { if ( !c ) c = cursor; c->restoreState(); - QTextParag *s = doc->firstParag(); + QTextParagraph *s = doc->firstParagraph(); c->place( pos, s, link ); + updateMicroFocusHint(); +} + + +void QTextEdit::updateMicroFocusHint() +{ + QTextCursor c( *cursor ); + if ( d->preeditStart != -1 ) + c.setIndex( d->preeditStart ); + if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); + int h = c.paragraph()->lineHeightOfChar( cursor->index() ); if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); + QFont f = c.paragraph()->at( c.index() )->format()->font(); + setMicroFocusHint( c.x() - contentsX() + frameWidth(), + c.y() + cursor->paragraph()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); } } } + + void QTextEdit::formatMore() { if ( !lastFormatted ) return; int bottom = contentsHeight(); int lastBottom = -1; - int to = !sender() ? 2 : 20; + int to = 20; bool firstVisible = FALSE; QRect cr( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); for ( int i = 0; ( i < to || firstVisible ) && lastFormatted; ++i ) { lastFormatted->format(); if ( i == 0 ) firstVisible = lastFormatted->rect().intersects( cr ); else if ( firstVisible ) firstVisible = lastFormatted->rect().intersects( cr ); bottom = QMAX( bottom, lastFormatted->rect().top() + lastFormatted->rect().height() ); lastBottom = lastFormatted->rect().top() + lastFormatted->rect().height(); lastFormatted = lastFormatted->next(); if ( lastFormatted ) lastBottom = -1; } - if ( bottom > contentsHeight() ) + if ( bottom > contentsHeight() ) { resizeContents( contentsWidth(), QMAX( doc->height(), bottom ) ); - else if ( lastBottom != -1 && lastBottom < contentsHeight() ) + } else if ( lastBottom != -1 && lastBottom < contentsHeight() ) { resizeContents( contentsWidth(), QMAX( doc->height(), lastBottom ) ); + if ( contentsHeight() < visibleHeight() ) + updateContents( 0, contentsHeight(), visibleWidth(), + visibleHeight() - contentsHeight() ); + } if ( lastFormatted ) formatTimer->start( interval, TRUE ); else interval = QMAX( 0, interval ); } void QTextEdit::doResize() { if ( wrapMode == FixedPixelWidth ) return; doc->setMinimumWidth( -1 ); resizeContents( 0, 0 ); doc->setWidth( visibleWidth() ); doc->invalidate(); - lastFormatted = doc->firstParag(); + lastFormatted = doc->firstParagraph(); interval = 0; formatMore(); repaintContents( contentsX(), contentsY(), visibleWidth(), visibleHeight(), FALSE ); } /*! \internal */ void QTextEdit::doChangeInterval() { interval = 0; } /*! \reimp */ bool QTextEdit::eventFilter( QObject *o, QEvent *e ) { if ( o == this || o == viewport() ) { if ( e->type() == QEvent::FocusIn ) { blinkTimer->start( QApplication::cursorFlashTime() / 2 ); drawCursor( TRUE ); - - if ( !readonly ) { - // make sure the micro focus hint is updated... - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - - contentsY() + frameWidth(), 0, - cursor->parag()->lineHeightOfChar( cursor->index() ), - TRUE ); - } + updateMicroFocusHint(); } else if ( e->type() == QEvent::FocusOut ) { blinkTimer->stop(); drawCursor( FALSE ); } } return QScrollView::eventFilter( o, e ); } -/*! - Inserts \a text at the current cursor position. If \a indent is TRUE, - the paragraph is re-indented. If \a checkNewLine is TRUE, newline - characters in \a text result in hard line breaks (i.e. new - paragraphs). If \a checkNewLine is FALSE the behaviour of the editor - is undefined if the \a text contains newlines. If \a removeSelected is - TRUE, any selected text (in selection 0) is removed before the text is - inserted. +/*! Inserts \a text at the current cursor position. If \a indent is + TRUE, the paragraph is re-indented. If \a checkNewLine is TRUE, + newline characters in \a text result in hard line breaks (i.e. new + paragraphs). If \a checkNewLine is FALSE and there are newlines in + \a text, the behavior is undefined. If \a checkNewLine is FALSE the + behaviour of the editor is undefined if the \a text contains + newlines. If \a removeSelected is TRUE, any selected text (in + selection 0) is removed before the text is inserted. \sa paste() pasteSubType() */ void QTextEdit::insert( const QString &text, bool indent, bool checkNewLine, bool removeSelected ) { if ( cursor->nestedDepth() != 0 ) // #### for 3.0, disable editing of tables as this is not advanced enough return; QString txt( text ); drawCursor( FALSE ); if ( !isReadOnly() && doc->hasSelection( QTextDocument::Standard ) && removeSelected ) removeSelectedText(); QTextCursor c2 = *cursor; int oldLen = 0; if ( undoEnabled && !isReadOnly() ) { checkUndoRedoInfo( UndoRedoInfo::Insert ); if ( !undoRedoInfo.valid() ) { - undoRedoInfo.id = cursor->parag()->paragId(); + undoRedoInfo.id = cursor->paragraph()->paragId(); undoRedoInfo.index = cursor->index(); undoRedoInfo.d->text = QString::null; } oldLen = undoRedoInfo.d->text.length(); } - lastFormatted = checkNewLine && cursor->parag()->prev() ? - cursor->parag()->prev() : cursor->parag(); + lastFormatted = checkNewLine && cursor->paragraph()->prev() ? + cursor->paragraph()->prev() : cursor->paragraph(); QTextCursor oldCursor = *cursor; cursor->insert( txt, checkNewLine ); if ( doc->useFormatCollection() ) { - doc->setSelectionStart( QTextDocument::Temp, &oldCursor ); - doc->setSelectionEnd( QTextDocument::Temp, cursor ); + doc->setSelectionStart( QTextDocument::Temp, oldCursor ); + doc->setSelectionEnd( QTextDocument::Temp, *cursor ); doc->setFormat( QTextDocument::Temp, currentFormat, QTextFormat::Format ); doc->removeSelection( QTextDocument::Temp ); } if ( indent && ( txt == "{" || txt == "}" || txt == ":" || txt == "#" ) ) cursor->indent(); formatMore(); repaintChanged(); ensureCursorVisible(); drawCursor( TRUE ); if ( undoEnabled && !isReadOnly() ) { undoRedoInfo.d->text += txt; if ( !doc->preProcessor() ) { for ( int i = 0; i < (int)txt.length(); ++i ) { - if ( txt[ i ] != '\n' && c2.parag()->at( c2.index() )->format() ) { - c2.parag()->at( c2.index() )->format()->addRef(); - undoRedoInfo.d->text.setFormat( oldLen + i, c2.parag()->at( c2.index() )->format(), TRUE ); + if ( txt[ i ] != '\n' && c2.paragraph()->at( c2.index() )->format() ) { + c2.paragraph()->at( c2.index() )->format()->addRef(); + undoRedoInfo.d->text.setFormat( oldLen + i, c2.paragraph()->at( c2.index() )->format(), TRUE ); } c2.gotoNextLetter(); } } } - setModified(); - emit textChanged(); if ( !removeSelected ) { - doc->setSelectionStart( QTextDocument::Standard, &oldCursor ); - doc->setSelectionEnd( QTextDocument::Standard, cursor ); + doc->setSelectionStart( QTextDocument::Standard, oldCursor ); + doc->setSelectionEnd( QTextDocument::Standard, *cursor ); repaintChanged(); } - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } + updateMicroFocusHint(); + setModified(); + emit textChanged(); } /*! Inserts \a text in the paragraph \a para and position \a index */ void QTextEdit::insertAt( const QString &text, int para, int index ) { - QTextParag *p = doc->paragAt( para ); + removeSelection( QTextDocument::Standard ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return; QTextCursor tmp = *cursor; - cursor->setParag( p ); + cursor->setParagraph( p ); cursor->setIndex( index ); insert( text, FALSE, TRUE, FALSE ); *cursor = tmp; removeSelection( QTextDocument::Standard ); } /*! Inserts \a text as the paragraph at position \a para. If \a para is -1, the text is appended. */ void QTextEdit::insertParagraph( const QString &text, int para ) { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( p ) { QTextCursor tmp( doc ); - tmp.setParag( p ); + tmp.setParagraph( p ); tmp.setIndex( 0 ); tmp.insert( text, TRUE ); - tmp.splitAndInsertEmptyParag(); + tmp.splitAndInsertEmptyParagraph(); repaintChanged(); } else { append( text ); } } /*! Removes the paragraph \a para */ void QTextEdit::removeParagraph( int para ) { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return; for ( int i = 0; i < doc->numSelections(); ++i ) doc->removeSelection( i ); - if ( p == doc->firstParag() && p == doc->lastParag() ) { + if ( p == doc->firstParagraph() && p == doc->lastParagraph() ) { p->remove( 0, p->length() - 1 ); repaintChanged(); return; } drawCursor( FALSE ); - bool resetCursor = cursor->parag() == p; + bool resetCursor = cursor->paragraph() == p; if ( p->prev() ) p->prev()->setNext( p->next() ); else - doc->setFirstParag( p->next() ); + doc->setFirstParagraph( p->next() ); if ( p->next() ) p->next()->setPrev( p->prev() ); else - doc->setLastParag( p->prev() ); - QTextParag *start = p->next(); + doc->setLastParagraph( p->prev() ); + QTextParagraph *start = p->next(); int h = p->rect().height(); delete p; p = start; int dy = -h; while ( p ) { p->setParagId( p->prev() ? p->prev()->paragId() + 1 : 0 ); p->move( dy ); p->invalidate( 0 ); p->setEndState( -1 ); p = p->next(); } if ( resetCursor ) { - cursor->setParag( doc->firstParag() ); + cursor->setParagraph( doc->firstParagraph() ); cursor->setIndex( 0 ); } repaintChanged(); drawCursor( TRUE ); } /*! Undoes the last operation. If there is no operation to undo, e.g. there is no undo step in the undo/redo history, nothing happens. @@ -2208,34 +2270,27 @@ void QTextEdit::undo() clearUndoRedo(); drawCursor( FALSE ); QTextCursor *c = doc->undo( cursor ); if ( !c ) { drawCursor( TRUE ); return; } lastFormatted = 0; ensureCursorVisible(); repaintChanged(); drawCursor( TRUE ); + updateMicroFocusHint(); setModified(); emit textChanged(); - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } } /*! Redoes the last operation. If there is no operation to redo, e.g. there is no redo step in the undo/redo history, nothing happens. \sa redoAvailable() undo() undoDepth() */ void QTextEdit::redo() @@ -2253,59 +2308,45 @@ void QTextEdit::redo() clearUndoRedo(); drawCursor( FALSE ); QTextCursor *c = doc->redo( cursor ); if ( !c ) { drawCursor( TRUE ); return; } lastFormatted = 0; ensureCursorVisible(); repaintChanged(); ensureCursorVisible(); drawCursor( TRUE ); + updateMicroFocusHint(); setModified(); emit textChanged(); - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } } /*! Pastes the text from the clipboard into the text edit at the current cursor position. Only plain text is pasted. If there is no text in the clipboard nothing happens. \sa pasteSubType() cut() QTextEdit::copy() */ void QTextEdit::paste() { #ifndef QT_NO_CLIPBOARD if ( isReadOnly() ) return; pasteSubType( "plain" ); - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } + updateMicroFocusHint(); #endif } void QTextEdit::checkUndoRedoInfo( UndoRedoInfo::Type t ) { if ( undoRedoInfo.valid() && t != undoRedoInfo.type ) { clearUndoRedo(); } undoRedoInfo.type = t; } /*! Repaints any paragraphs that have changed. @@ -2328,47 +2369,44 @@ void QTextEdit::repaintChanged() deletes it from the text edit. If there is no selected text (in selection 0) nothing happens. \sa QTextEdit::copy() paste() pasteSubType() */ void QTextEdit::cut() { if ( isReadOnly() ) return; - if ( doc->hasSelection( QTextDocument::Standard ) ) { - doc->copySelectedText( QTextDocument::Standard ); + QString t; + if ( doc->hasSelection( QTextDocument::Standard ) && + !( t = doc->selectedText( QTextDocument::Standard, qt_enable_richtext_copy ) ).isEmpty() ) { + QApplication::clipboard()->setText( t ); removeSelectedText(); } - if ( hasFocus() || viewport()->hasFocus() ) { - int h = cursor->parag()->lineHeightOfChar( cursor->index() ); - if ( !readonly ) { - QFont f = cursor->parag()->at( cursor->index() )->format()->font(); - setMicroFocusHint( cursor->x() - contentsX() + frameWidth(), - cursor->y() + cursor->parag()->rect().y() - contentsY() + frameWidth(), 0, h, TRUE ); - } - } + updateMicroFocusHint(); } /*! Copies any selected text (from selection 0) to the clipboard. \sa hasSelectedText() copyAvailable() */ void QTextEdit::copy() { - if ( !doc->selectedText( QTextDocument::Standard ).isEmpty() ) - doc->copySelectedText( QTextDocument::Standard ); + QString t = doc->selectedText( QTextDocument::Standard, qt_enable_richtext_copy ); + if ( doc->hasSelection( QTextDocument::Standard ) && + !t.isEmpty() && t.simplifyWhiteSpace() != "<selstart/>" ) + QApplication::clipboard()->setText( t ); } /*! Re-indents the current paragraph. */ void QTextEdit::indent() { if ( isReadOnly() ) return; drawCursor( FALSE ); @@ -2403,229 +2441,200 @@ bool QTextEdit::focusNextPrevChild( bool n ) /*! \internal This functions sets the current format to \a f. Only the fields of \a f which are specified by the \a flags are used. */ void QTextEdit::setFormat( QTextFormat *f, int flags ) { if ( doc->hasSelection( QTextDocument::Standard ) ) { drawCursor( FALSE ); - QString str = doc->selectedText( QTextDocument::Standard ); QTextCursor c1 = doc->selectionStartCursor( QTextDocument::Standard ); + c1.restoreState(); QTextCursor c2 = doc->selectionEndCursor( QTextDocument::Standard ); + c2.restoreState(); clearUndoRedo(); undoRedoInfo.type = UndoRedoInfo::Format; - undoRedoInfo.id = c1.parag()->paragId(); + undoRedoInfo.id = c1.paragraph()->paragId(); undoRedoInfo.index = c1.index(); - undoRedoInfo.eid = c2.parag()->paragId(); + undoRedoInfo.eid = c2.paragraph()->paragId(); undoRedoInfo.eindex = c2.index(); - undoRedoInfo.d->text = str; - readFormats( c1, c2, 0, undoRedoInfo.d->text ); + readFormats( c1, c2, undoRedoInfo.d->text ); undoRedoInfo.format = f; undoRedoInfo.flags = flags; clearUndoRedo(); doc->setFormat( QTextDocument::Standard, f, flags ); repaintChanged(); formatMore(); drawCursor( TRUE ); setModified(); emit textChanged(); } if ( currentFormat && currentFormat->key() != f->key() ) { currentFormat->removeRef(); currentFormat = doc->formatCollection()->format( f ); if ( currentFormat->isMisspelled() ) { currentFormat->removeRef(); currentFormat = doc->formatCollection()->format( currentFormat->font(), currentFormat->color() ); } emit currentFontChanged( currentFormat->font() ); emit currentColorChanged( currentFormat->color() ); emit currentVerticalAlignmentChanged( (VerticalAlignment)currentFormat->vAlign() ); - if ( cursor->index() == cursor->parag()->length() - 1 ) { + if ( cursor->index() == cursor->paragraph()->length() - 1 ) { currentFormat->addRef(); - cursor->parag()->string()->setFormat( cursor->index(), currentFormat, TRUE ); - if ( cursor->parag()->length() == 1 ) { - cursor->parag()->invalidate( 0 ); - cursor->parag()->format(); + cursor->paragraph()->string()->setFormat( cursor->index(), currentFormat, TRUE ); + if ( cursor->paragraph()->length() == 1 ) { + cursor->paragraph()->invalidate( 0 ); + cursor->paragraph()->format(); repaintChanged(); } } } } /*! \reimp */ void QTextEdit::setPalette( const QPalette &p ) { QScrollView::setPalette( p ); if ( textFormat() == PlainText ) { QTextFormat *f = doc->formatCollection()->defaultFormat(); f->setColor( colorGroup().text() ); updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); } } -/*! +/*! \internal + + \warning In Qt 3.1 we will provide a cleaer API for the + functionality which is provided by this function and in Qt 4.0 this + function will go away. + Sets the paragraph style of the current paragraph to \a dm. If \a dm is QStyleSheetItem::DisplayListItem, the type of the list item is set to \a listStyle. \sa setAlignment() */ void QTextEdit::setParagType( QStyleSheetItem::DisplayMode dm, QStyleSheetItem::ListStyle listStyle ) { if ( isReadOnly() ) return; drawCursor( FALSE ); - if ( !doc->hasSelection( QTextDocument::Standard ) ) { - clearUndoRedo(); - undoRedoInfo.type = UndoRedoInfo::ParagType; - QValueList< QPtrVector<QStyleSheetItem> > oldStyles; - undoRedoInfo.oldStyles.clear(); - undoRedoInfo.oldStyles << cursor->parag()->styleSheetItems(); - undoRedoInfo.oldListStyles.clear(); - undoRedoInfo.oldListStyles << cursor->parag()->listStyle(); - undoRedoInfo.list = dm == QStyleSheetItem::DisplayListItem; - undoRedoInfo.listStyle = listStyle; - undoRedoInfo.id = cursor->parag()->paragId(); - undoRedoInfo.eid = cursor->parag()->paragId(); - undoRedoInfo.d->text = " "; - undoRedoInfo.index = 1; - clearUndoRedo(); - cursor->parag()->setList( dm == QStyleSheetItem::DisplayListItem, listStyle ); - repaintChanged(); - } else { - QTextParag *start = doc->selectionStart( QTextDocument::Standard ); - QTextParag *end = doc->selectionEnd( QTextDocument::Standard ); - lastFormatted = start; + QTextParagraph *start = cursor->paragraph(); + QTextParagraph *end = start; + if ( doc->hasSelection( QTextDocument::Standard ) ) { + start = doc->selectionStartCursor( QTextDocument::Standard ).topParagraph(); + end = doc->selectionEndCursor( QTextDocument::Standard ).topParagraph(); + if ( end->paragId() < start->paragId() ) + return; // do not trust our selections + } + clearUndoRedo(); - undoRedoInfo.type = UndoRedoInfo::ParagType; + undoRedoInfo.type = UndoRedoInfo::Style; undoRedoInfo.id = start->paragId(); undoRedoInfo.eid = end->paragId(); - undoRedoInfo.list = dm == QStyleSheetItem::DisplayListItem; - undoRedoInfo.listStyle = listStyle; - undoRedoInfo.oldStyles.clear(); - undoRedoInfo.oldListStyles.clear(); - while ( start ) { - undoRedoInfo.oldStyles << start->styleSheetItems(); - undoRedoInfo.oldListStyles << start->listStyle(); - start->setList( dm == QStyleSheetItem::DisplayListItem, listStyle ); - if ( start == end ) - break; + undoRedoInfo.styleInformation = QTextStyleCommand::readStyleInformation( doc, undoRedoInfo.id, undoRedoInfo.eid ); + + while ( start != end->next() ) { + start->setListStyle( listStyle ); + if ( dm == QStyleSheetItem::DisplayListItem ) { + start->setListItem( TRUE ); + if( start->listDepth() == 0 ) + start->setListDepth( 1 ); + } else if ( start->isListItem() ) { + start->setListItem( FALSE ); + start->setListDepth( QMAX( start->listDepth()-1, 0 ) ); + } start = start->next(); } - undoRedoInfo.d->text = " "; - undoRedoInfo.index = 1; + clearUndoRedo(); repaintChanged(); formatMore(); - } drawCursor( TRUE ); setModified(); emit textChanged(); } /*! Sets the alignment of the current paragraph to \a a. Valid alignments are \c Qt::AlignLeft, \c Qt::AlignRight, Qt::AlignJustify and Qt::AlignCenter (which centers horizontally). - \sa setParagType() */ void QTextEdit::setAlignment( int a ) { if ( isReadOnly() || block_set_alignment ) return; drawCursor( FALSE ); - if ( !doc->hasSelection( QTextDocument::Standard ) ) { - if ( cursor->parag()->alignment() != a ) { - clearUndoRedo(); - undoRedoInfo.type = UndoRedoInfo::Alignment; - QMemArray<int> oa( 1 ); - oa[ 0 ] = cursor->parag()->alignment(); - undoRedoInfo.oldAligns = oa; - undoRedoInfo.newAlign = a; - undoRedoInfo.id = cursor->parag()->paragId(); - undoRedoInfo.eid = cursor->parag()->paragId(); - undoRedoInfo.d->text = " "; - undoRedoInfo.index = 1; - clearUndoRedo(); - cursor->parag()->setAlignment( a ); - repaintChanged(); + QTextParagraph *start = cursor->paragraph(); + QTextParagraph *end = start; + if ( doc->hasSelection( QTextDocument::Standard ) ) { + start = doc->selectionStartCursor( QTextDocument::Standard ).topParagraph(); + end = doc->selectionEndCursor( QTextDocument::Standard ).topParagraph(); + if ( end->paragId() < start->paragId() ) + return; // do not trust our selections } - } else { - QTextParag *start = doc->selectionStart( QTextDocument::Standard ); - QTextParag *end = doc->selectionEnd( QTextDocument::Standard ); - lastFormatted = start; - int len = end->paragId() - start->paragId() + 1; + clearUndoRedo(); - undoRedoInfo.type = UndoRedoInfo::Alignment; + undoRedoInfo.type = UndoRedoInfo::Style; undoRedoInfo.id = start->paragId(); undoRedoInfo.eid = end->paragId(); - QMemArray<int> oa( QMAX( 0, len ) ); - int i = 0; - while ( start ) { - if ( i < (int)oa.size() ) - oa[ i ] = start->alignment(); + undoRedoInfo.styleInformation = QTextStyleCommand::readStyleInformation( doc, undoRedoInfo.id, undoRedoInfo.eid ); + + while ( start != end->next() ) { start->setAlignment( a ); - if ( start == end ) - break; start = start->next(); - ++i; } - undoRedoInfo.oldAligns = oa; - undoRedoInfo.newAlign = a; - undoRedoInfo.d->text = " "; - undoRedoInfo.index = 1; + clearUndoRedo(); repaintChanged(); formatMore(); - } drawCursor( TRUE ); if ( currentAlignment != a ) { currentAlignment = a; emit currentAlignmentChanged( currentAlignment ); } setModified(); emit textChanged(); } void QTextEdit::updateCurrentFormat() { int i = cursor->index(); if ( i > 0 ) --i; if ( doc->useFormatCollection() && - ( !currentFormat || currentFormat->key() != cursor->parag()->at( i )->format()->key() ) ) { + ( !currentFormat || currentFormat->key() != cursor->paragraph()->at( i )->format()->key() ) ) { if ( currentFormat ) currentFormat->removeRef(); - currentFormat = doc->formatCollection()->format( cursor->parag()->at( i )->format() ); + currentFormat = doc->formatCollection()->format( cursor->paragraph()->at( i )->format() ); if ( currentFormat->isMisspelled() ) { currentFormat->removeRef(); currentFormat = doc->formatCollection()->format( currentFormat->font(), currentFormat->color() ); } emit currentFontChanged( currentFormat->font() ); emit currentColorChanged( currentFormat->color() ); emit currentVerticalAlignmentChanged( (VerticalAlignment)currentFormat->vAlign() ); } - if ( currentAlignment != cursor->parag()->alignment() ) { - currentAlignment = cursor->parag()->alignment(); + if ( currentAlignment != cursor->paragraph()->alignment() ) { + currentAlignment = cursor->paragraph()->alignment(); block_set_alignment = TRUE; emit currentAlignmentChanged( currentAlignment ); block_set_alignment = FALSE; } } /*! If \a b is TRUE sets the current format to italic; otherwise sets the current format to non-italic. \sa italic() */ @@ -2769,56 +2778,57 @@ QString QTextEdit::text( int para ) const The optional \a context is a path which the text edit's QMimeSourceFactory uses to resolve the locations of files and images. (See \l{QTextEdit::QTextEdit()}.) It is passed to the text edit's QMimeSourceFactory when quering data. Note that the undo/redo history is cleared by this function. \sa text(), setTextFormat() */ void QTextEdit::setText( const QString &text, const QString &context ) { - if ( !isModified() && this->context() == context && this->text() == text ) + if ( !isModified() && isReadOnly() && + this->context() == context && this->text() == text ) return; emit undoAvailable( FALSE ); emit redoAvailable( FALSE ); undoRedoInfo.clear(); doc->commands()->clear(); lastFormatted = 0; cursor->restoreState(); doc->setText( text, context ); if ( wrapMode == FixedPixelWidth ) { resizeContents( wrapWidth, 0 ); doc->setWidth( wrapWidth ); doc->setMinimumWidth( wrapWidth ); } else { doc->setMinimumWidth( -1 ); resizeContents( 0, 0 ); } - cursor->setDocument( doc ); - lastFormatted = doc->firstParag(); - cursor->setParag( doc->firstParag() ); - cursor->setIndex( 0 ); + lastFormatted = doc->firstParagraph(); + delete cursor; + cursor = new QTextCursor( doc ); updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); if ( isModified() ) setModified( FALSE ); emit textChanged(); formatMore(); updateCurrentFormat(); + d->scrollToAnchor = QString::null; } /*! \property QTextEdit::text \brief the text edit's text There is no default text. On setting, any previous text is deleted. The text may be interpreted either as plain text or as rich text, depending on the textFormat(). The default setting is \c AutoText, @@ -2838,108 +2848,129 @@ void QTextEdit::setText( const QString &text, const QString &context ) In a read-only text edit the user can only navigate through the text and select text; modifying the text is not possible. This property's default is FALSE. */ /*! Finds the next occurrence of the string, \a expr. Returns TRUE if \a expr is found; otherwise returns FALSE. If \a para and \a index are both null the search begins from the - start of the text. If \a para and \a index are both not null, the - search begins from the \e *\a index character position in the \e - *\a para paragraph. + current cursor position. If \a para and \a index are both not + null, the search begins from the \e *\a index character position + in the \e *\a para paragraph. If \a cs is TRUE the search is case sensitive, otherwise it is case insensitive. If \a wo is TRUE the search looks for whole word matches only; otherwise it searches for any matching text. If \a forward is TRUE (the default) the search works forward from the starting position to the end of the text, otherwise it works backwards to the beginning of the text. If \a expr is found the function returns TRUE. If \a index and \a para are not null, the number of the paragraph in which the first character of the match was found is put into \e *\a para, and the index position of that character within the paragraph is put into \e *\a index. If \a expr is not found the function returns FALSE. If \a index and \a para are not null and \a expr is not found, \e *\a index and \e *\a para are undefined. */ bool QTextEdit::find( const QString &expr, bool cs, bool wo, bool forward, int *para, int *index ) { drawCursor( FALSE ); - doc->removeSelection( QTextDocument::Standard ); #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif - bool found = doc->find( expr, cs, wo, forward, para, index, cursor ); + QTextCursor findcur = *cursor; + if ( para && index ) { + if ( doc->paragAt( *para ) ) + findcur.gotoPosition( doc->paragAt(*para), *index ); + else + findcur.gotoEnd(); + } else if ( doc->hasSelection( QTextDocument::Standard ) ){ + // maks sure we do not find the same selection again + if ( forward ) + findcur.gotoNextLetter(); + else + findcur.gotoPreviousLetter(); + } + removeSelection( QTextDocument::Standard ); + bool found = doc->find( findcur, expr, cs, wo, forward ); + if ( found ) { + if ( para ) + *para = findcur.paragraph()->paragId(); + if ( index ) + *index = findcur.index(); + *cursor = findcur; + repaintChanged(); ensureCursorVisible(); + } drawCursor( TRUE ); - repaintChanged(); return found; } void QTextEdit::blinkCursor() { if ( !cursorVisible ) return; bool cv = cursorVisible; blinkCursorVisible = !blinkCursorVisible; drawCursor( blinkCursorVisible ); cursorVisible = cv; } /*! Sets the cursor to position \a index in paragraph \a para. \sa getCursorPosition() */ void QTextEdit::setCursorPosition( int para, int index ) { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return; if ( index > p->length() - 1 ) index = p->length() - 1; drawCursor( FALSE ); - cursor->setParag( p ); + cursor->setParagraph( p ); cursor->setIndex( index ); ensureCursorVisible(); drawCursor( TRUE ); + updateCurrentFormat(); emit cursorPositionChanged( cursor ); - emit cursorPositionChanged( cursor->parag()->paragId(), cursor->index() ); + emit cursorPositionChanged( cursor->paragraph()->paragId(), cursor->index() ); } /*! This function sets the \e *\a para and \e *\a index parameters to the current cursor position. \a para and \a index must be non-null int pointers. \sa setCursorPosition() */ void QTextEdit::getCursorPosition( int *para, int *index ) const { if ( !para || !index ) return; - *para = cursor->parag()->paragId(); + *para = cursor->paragraph()->paragId(); *index = cursor->index(); } /*! Sets a selection which starts at position \a indexFrom in paragraph \a paraFrom and ends at position \a indexTo in paragraph \a paraTo. Existing selections which have a different id (selNum) are not removed, existing selections which have the same id as \a selNum are removed. Uses the selection settings of selection \a selNum. If \a selNum is 0, this is the default selection. @@ -2949,45 +2980,45 @@ void QTextEdit::getCursorPosition( int *para, int *index ) const \sa getSelection() selectedText */ void QTextEdit::setSelection( int paraFrom, int indexFrom, int paraTo, int indexTo, int selNum ) { if ( doc->hasSelection( selNum ) ) { doc->removeSelection( selNum ); repaintChanged(); } if ( selNum > doc->numSelections() - 1 ) doc->addSelection( selNum ); - QTextParag *p1 = doc->paragAt( paraFrom ); + QTextParagraph *p1 = doc->paragAt( paraFrom ); if ( !p1 ) return; - QTextParag *p2 = doc->paragAt( paraTo ); + QTextParagraph *p2 = doc->paragAt( paraTo ); if ( !p2 ) return; if ( indexFrom > p1->length() - 1 ) indexFrom = p1->length() - 1; if ( indexTo > p2->length() - 1 ) indexTo = p2->length() - 1; drawCursor( FALSE ); QTextCursor c = *cursor; QTextCursor oldCursor = *cursor; - c.setParag( p1 ); + c.setParagraph( p1 ); c.setIndex( indexFrom ); - cursor->setParag( p2 ); + cursor->setParagraph( p2 ); cursor->setIndex( indexTo ); - doc->setSelectionStart( selNum, &c ); - doc->setSelectionEnd( selNum, cursor ); + doc->setSelectionStart( selNum, c ); + doc->setSelectionEnd( selNum, *cursor ); repaintChanged(); ensureCursorVisible(); if ( selNum != QTextDocument::Standard ) *cursor = oldCursor; drawCursor( TRUE ); } /*! If there is a selection, \e *\a paraFrom is set to the number of the paragraph in which the selection begins and \e *\a paraTo is set to the number of the paragraph in which the selection ends. (They could be the same.) \e *\a indexFrom is set to the index at which the @@ -3047,84 +3078,84 @@ void QTextEdit::setTextFormat( TextFormat format ) Qt::TextFormat QTextEdit::textFormat() const { return doc->textFormat(); } /*! Returns the number of paragraphs in the text; this could be 0. */ int QTextEdit::paragraphs() const { - return doc->lastParag()->paragId() + 1; + return doc->lastParagraph()->paragId() + 1; } /*! Returns the number of lines in paragraph \a para, or -1 if there is no paragraph with index \a para. */ int QTextEdit::linesOfParagraph( int para ) const { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return -1; return p->lines(); } /*! Returns the length of the paragraph \a para (number of characters), or -1 if there is no paragraph with index \a para */ int QTextEdit::paragraphLength( int para ) const { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return -1; return p->length() - 1; } /*! Returns the number of lines in the text edit; this could be 0. \warning This function may be slow. Lines change all the time during word wrapping, so this function has to iterate over all the paragraphs and get the number of lines from each one individually. */ int QTextEdit::lines() const { - QTextParag *p = doc->firstParag(); + QTextParagraph *p = doc->firstParagraph(); int l = 0; while ( p ) { l += p->lines(); p = p->next(); } return l; } /*! Returns the line number of the line in paragraph \a para in which the character at position \a index appears. The \a index position is relative to the beginning of the paragraph. If there is no such paragraph or no such character at the \a index position (e.g. the index is out of range) -1 is returned. */ int QTextEdit::lineOfChar( int para, int index ) { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return -1; int idx, line; QTextStringChar *c = p->lineStartOfChar( index, &idx, &line ); if ( !c ) return -1; return line; } void QTextEdit::setModified( bool m ) @@ -3239,25 +3270,25 @@ QFont QTextEdit::font() const */ int QTextEdit::alignment() const { return currentAlignment; } void QTextEdit::startDrag() { #ifndef QT_NO_DRAGANDDROP mousePressed = FALSE; inDoubleClick = FALSE; - QDragObject *drag = new QTextDrag( doc->selectedText( QTextDocument::Standard ), viewport() ); + QDragObject *drag = new QTextDrag( doc->selectedText( QTextDocument::Standard, qt_enable_richtext_copy ), viewport() ); if ( isReadOnly() ) { drag->dragCopy(); } else { if ( drag->drag() && QDragObject::target() != this && QDragObject::target() != viewport() ) removeSelectedText(); } #endif } /*! If \a select is TRUE (the default), all the text is selected as selection 0. @@ -3276,40 +3307,38 @@ void QTextEdit::selectAll( bool select ) repaintChanged(); emit copyAvailable( doc->hasSelection( QTextDocument::Standard ) ); emit selectionChanged(); #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif } void QTextEdit::UndoRedoInfo::clear() { if ( valid() ) { if ( type == Insert || type == Return ) - doc->addCommand( new QTextInsertCommand( doc, id, index, d->text.rawData(), oldStyles, oldListStyles, oldAligns ) ); + doc->addCommand( new QTextInsertCommand( doc, id, index, d->text.rawData(), styleInformation ) ); else if ( type == Format ) doc->addCommand( new QTextFormatCommand( doc, id, index, eid, eindex, d->text.rawData(), format, flags ) ); - else if ( type == Alignment ) - doc->addCommand( new QTextAlignmentCommand( doc, id, eid, newAlign, oldAligns ) ); - else if ( type == ParagType ) - doc->addCommand( new QTextParagTypeCommand( doc, id, eid, list, listStyle, oldStyles, oldListStyles ) ); - else if ( type != Invalid ) - doc->addCommand( new QTextDeleteCommand( doc, id, index, d->text.rawData(), oldStyles, oldListStyles, oldAligns ) ); + else if ( type == Style ) + doc->addCommand( new QTextStyleCommand( doc, id, eid, styleInformation ) ); + else if ( type != Invalid ) { + doc->addCommand( new QTextDeleteCommand( doc, id, index, d->text.rawData(), styleInformation ) ); + } } + type = Invalid; d->text = QString::null; id = -1; index = -1; - oldStyles.clear(); - oldListStyles.clear(); - oldAligns.resize( 0 ); + styleInformation = QByteArray(); } /*! If there is some selected text (in selection 0) it is deleted. If there is no selected text (in selection 0) the character to the right of the text cursor is deleted. \sa removeSelectedText() cut() */ @@ -3331,25 +3360,25 @@ QTextEdit::UndoRedoInfo::UndoRedoInfo( QTextDocument *dc ) d->text = QString::null; id = -1; index = -1; } QTextEdit::UndoRedoInfo::~UndoRedoInfo() { delete d; } bool QTextEdit::UndoRedoInfo::valid() const { - return d->text.length() > 0 && id >= 0 && index >= 0; + return id >= 0 && type != Invalid; } /*! \internal Resets the current format to the default format. */ void QTextEdit::resetFormat() { setAlignment( Qt3::AlignAuto ); setParagType( QStyleSheetItem::DisplayBlock, QStyleSheetItem::ListDisc ); @@ -3400,28 +3429,25 @@ QBrush QTextEdit::paper() const } /*! \property QTextEdit::linkUnderline \brief whether hypertext links will be underlined If TRUE (the default) hypertext links will be displayed underlined. If FALSE links will not be displayed underlined. */ void QTextEdit::setLinkUnderline( bool b ) { - if ( b == doc->underlineLinks() ) - return; doc->setUnderlineLinks( b ); - updateStyles(); } bool QTextEdit::linkUnderline() const { return doc->underlineLinks(); } /*! Sets the text edit's mimesource factory to \a factory. See QMimeSourceFactory for further details. \sa mimeSourceFactory() */ @@ -3456,65 +3482,66 @@ int QTextEdit::heightForWidth( int w ) const doc->invalidate(); ( (QTextEdit*)this )->formatMore(); return h; } /*! Appends the text \a text to the end of the text edit. Note that the undo/redo history is cleared by this function. */ void QTextEdit::append( const QString &text ) { // flush and clear the undo/redo stack if necessary - if ( isReadOnly() && undoRedoInfo.valid() ) { undoRedoInfo.clear(); doc->commands()->clear(); - } + doc->removeSelection( QTextDocument::Standard ); TextFormat f = doc->textFormat(); if ( f == AutoText ) { if ( QStyleSheet::mightBeRichText( text ) ) f = RichText; else f = PlainText; } - if ( f == PlainText ) { + + drawCursor( FALSE ); QTextCursor oldc( *cursor ); - ensureFormatted( doc->lastParag() ); - bool scrollToEnd = contentsY() >= contentsHeight() - visibleHeight() - - ( horizontalScrollBar()->isVisible() ? horizontalScrollBar()->height() : 0 ); - if ( !scrollToEnd ) - blockEnsureCursorVisible = TRUE; + ensureFormatted( doc->lastParagraph() ); + bool atBottom = contentsY() >= contentsHeight() - visibleHeight(); cursor->gotoEnd(); if ( cursor->index() > 0 ) - cursor->splitAndInsertEmptyParag(); + cursor->splitAndInsertEmptyParagraph(); QTextCursor oldCursor2 = *cursor; + + if ( f == Qt::PlainText ) { cursor->insert( text, TRUE ); - if ( doc->useFormatCollection() && currentFormat != cursor->parag()->at( cursor->index() )->format() ) { - doc->setSelectionStart( QTextDocument::Temp, &oldCursor2 ); - doc->setSelectionEnd( QTextDocument::Temp, cursor ); + if ( doc->useFormatCollection() && + currentFormat != cursor->paragraph()->at( cursor->index() )->format() ) { + doc->setSelectionStart( QTextDocument::Temp, oldCursor2 ); + doc->setSelectionEnd( QTextDocument::Temp, *cursor ); doc->setFormat( QTextDocument::Temp, currentFormat, QTextFormat::Format ); doc->removeSelection( QTextDocument::Temp ); } + } else { + if ( cursor->paragraph()->prev() ) + cursor->paragraph()->prev()->invalidate(0); // vertical margins might have to change + doc->setRichTextInternal( text ); + } formatMore(); repaintChanged(); - ensureCursorVisible(); - drawCursor( TRUE ); + if ( atBottom ) + scrollToBottom(); *cursor = oldc; - if ( !scrollToEnd ) - blockEnsureCursorVisible = FALSE; - } else if ( f == RichText ) { - doc->setRichTextInternal( text ); - repaintChanged(); - } + if ( !isReadOnly() ) + cursorVisible = TRUE; setModified(); emit textChanged(); } /*! \property QTextEdit::hasSelectedText \brief whether some text is selected in selection 0 */ bool QTextEdit::hasSelectedText() const { return doc->hasSelection( QTextDocument::Standard ); } @@ -3608,111 +3635,162 @@ QString QTextEdit::context() const \brief the title of the document parsed from the text. For \c PlainText the title will be an empty string. For \c RichText the title will be the text between the \c{<title>} tags, if present, otherwise an empty string. */ QString QTextEdit::documentTitle() const { return doc->attributes()[ "title" ]; } -void QTextEdit::makeParagVisible( QTextParag *p ) +void QTextEdit::makeParagVisible( QTextParagraph *p ) { setContentsPos( contentsX(), QMIN( p->rect().y(), contentsHeight() - visibleHeight() ) ); } /*! Scrolls the text edit to make the text at the anchor called \a name visible, if it can be found in the document. If the anchor isn't found no scrolling will occur. An anchor is defined using the HTML anchor tag, e.g. \c{<a name="target">}. */ void QTextEdit::scrollToAnchor( const QString& name ) { + if ( !isVisible() ) { + d->scrollToAnchor = name; + return; + } if ( name.isEmpty() ) return; sync(); QTextCursor cursor( doc ); - QTextParag* last = doc->lastParag(); - do { - QTextStringChar* c = cursor.parag()->at( cursor.index() ); + QTextParagraph* last = doc->lastParagraph(); + for (;;) { + QTextStringChar* c = cursor.paragraph()->at( cursor.index() ); if( c->isAnchor() ) { QString a = c->anchorName(); if ( a == name || (a.contains( '#' ) && QStringList::split( '#', a ).contains( name ) ) ) { - setContentsPos( contentsX(), QMIN( cursor.parag()->rect().top() + cursor.totalOffsetY(), contentsHeight() - visibleHeight() ) ); - return; + setContentsPos( contentsX(), QMIN( cursor.paragraph()->rect().top() + cursor.totalOffsetY(), contentsHeight() - visibleHeight() ) ); + break; } } + if ( cursor.paragraph() == last && cursor.atParagEnd() ) + break; cursor.gotoNextLetter(); - } while( cursor.parag() != last || !cursor.atParagEnd() ); + } } /*! If there is an anchor at position \a pos (in contents coordinates), its name is returned, otherwise an empty string is returned. */ QString QTextEdit::anchorAt( const QPoint& pos ) { QTextCursor c( doc ); placeCursor( pos, &c ); - return c.parag()->at( c.index() )->anchorHref(); + return c.paragraph()->at( c.index() )->anchorHref(); } void QTextEdit::documentWidthChanged( int w ) { resizeContents( QMAX( visibleWidth(), w), contentsHeight() ); } -/*! - Updates all the rendering styles used to display the text. You will - probably want to call this function after calling setStyleSheet(). +/*! \internal + + This function does nothing */ void QTextEdit::updateStyles() { - doc->updateStyles(); - updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); } void QTextEdit::setDocument( QTextDocument *dc ) { if ( dc == doc ) return; doc = dc; - cursor->setDocument( doc ); + delete cursor; + cursor = new QTextCursor( doc ); clearUndoRedo(); + undoRedoInfo.doc = doc; lastFormatted = 0; } #ifndef QT_NO_CLIPBOARD /*! Pastes the text with format \a subtype from the clipboard into the text edit at the current cursor position. The \a subtype can be "plain" or "html". If there is no text with format \a subtype in the clipboard nothing happens. \sa paste() cut() QTextEdit::copy() */ void QTextEdit::pasteSubType( const QCString& subtype ) { QCString st = subtype; QString t = QApplication::clipboard()->text(st); + if ( doc->hasSelection( QTextDocument::Standard ) ) + removeSelectedText(); if ( !t.isEmpty() ) { + if ( t.startsWith( "<selstart/>" ) ) { + t.remove( 0, 11 ); + QTextCursor oldC = *cursor; + lastFormatted = cursor->paragraph(); + if ( lastFormatted->prev() ) + lastFormatted = lastFormatted->prev(); + doc->setRichTextInternal( t, cursor ); + + if ( undoEnabled && !isReadOnly() ) { + doc->setSelectionStart( QTextDocument::Temp, oldC ); + doc->setSelectionEnd( QTextDocument::Temp, *cursor ); + + checkUndoRedoInfo( UndoRedoInfo::Insert ); + if ( !undoRedoInfo.valid() ) { + undoRedoInfo.id = oldC.paragraph()->paragId(); + undoRedoInfo.index = oldC.index(); + undoRedoInfo.d->text = QString::null; + } + int oldLen = undoRedoInfo.d->text.length(); + if ( !doc->preProcessor() ) { + QString txt = doc->selectedText( QTextDocument::Temp ); + undoRedoInfo.d->text += txt; + for ( int i = 0; i < (int)txt.length(); ++i ) { + if ( txt[ i ] != '\n' && oldC.paragraph()->at( oldC.index() )->format() ) { + oldC.paragraph()->at( oldC.index() )->format()->addRef(); + undoRedoInfo.d->text. + setFormat( oldLen + i, oldC.paragraph()->at( oldC.index() )->format(), TRUE ); + } + oldC.gotoNextLetter(); + } + } + undoRedoInfo.clear(); + removeSelection( QTextDocument::Temp ); + } + + formatMore(); + setModified(); + emit textChanged(); + repaintChanged(); + ensureCursorVisible(); + return; + } + #if defined(Q_OS_WIN32) // Need to convert CRLF to LF int index = t.find( QString::fromLatin1("\r\n"), 0 ); while ( index != -1 ) { t.replace( index, 2, QChar('\n') ); index = t.find( "\r\n", index ); } #elif defined(Q_OS_MAC) //need to convert CR to LF for( unsigned int index = 0; index < t.length(); index++ ) if(t[index] == '\r') t[index] = '\n'; @@ -3829,25 +3907,25 @@ void QTextEdit::setWordWrap( WordWrap mode ) { if ( wrapMode == mode ) return; wrapMode = mode; switch ( mode ) { case NoWrap: document()->formatter()->setWrapEnabled( FALSE ); document()->formatter()->setWrapAtColumn( -1 ); doc->setWidth( visibleWidth() ); doc->setMinimumWidth( -1 ); doc->invalidate(); updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); - lastFormatted = doc->firstParag(); + lastFormatted = doc->firstParagraph(); interval = 0; formatMore(); break; case WidgetWidth: document()->formatter()->setWrapEnabled( TRUE ); document()->formatter()->setWrapAtColumn( -1 ); doResize(); break; case FixedPixelWidth: document()->formatter()->setWrapEnabled( TRUE ); document()->formatter()->setWrapAtColumn( -1 ); if ( wrapWidth < 0 ) @@ -3890,25 +3968,25 @@ void QTextEdit::setWrapColumnOrWidth( int value ) doc->setWidth( visibleWidth() ); doc->setMinimumWidth( -1 ); } else if (wrapMode == FixedPixelWidth ) { document()->formatter()->setWrapAtColumn( -1 ); resizeContents( wrapWidth, 0 ); doc->setWidth( wrapWidth ); doc->setMinimumWidth( wrapWidth ); } else { return; } doc->invalidate(); updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); - lastFormatted = doc->firstParag(); + lastFormatted = doc->firstParagraph(); interval = 0; formatMore(); } int QTextEdit::wrapColumnOrWidth() const { if ( wrapMode == WidgetWidth ) return visibleWidth(); return wrapWidth; } @@ -3943,25 +4021,25 @@ void QTextEdit::setWrapPolicy( WrapPolicy policy ) return; wPolicy = policy; QTextFormatter *formatter; if ( policy == AtWhiteSpace ) formatter = new QTextFormatterBreakWords; else formatter = new QTextFormatterBreakInWords; formatter->setWrapAtColumn( document()->formatter()->wrapAtColumn() ); formatter->setWrapEnabled( document()->formatter()->isWrapEnabled( 0 ) ); document()->setFormatter( formatter ); doc->invalidate(); updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); - lastFormatted = doc->firstParag(); + lastFormatted = doc->firstParagraph(); interval = 0; formatMore(); } QTextEdit::WrapPolicy QTextEdit::wrapPolicy() const { return wPolicy; } /*! Deletes all the text in the text edit. @@ -3970,32 +4048,31 @@ QTextEdit::WrapPolicy QTextEdit::wrapPolicy() const */ void QTextEdit::clear() { // make clear undoable doc->selectAll( QTextDocument::Temp ); removeSelectedText( QTextDocument::Temp ); setContentsPos( 0, 0 ); if ( cursor->isValid() ) cursor->restoreState(); doc->clear( TRUE ); - cursor->setDocument( doc ); - cursor->setParag( doc->firstParag() ); - cursor->setIndex( 0 ); + delete cursor; + cursor = new QTextCursor( doc ); lastFormatted = 0; updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); emit cursorPositionChanged( cursor ); - emit cursorPositionChanged( cursor->parag()->paragId(), cursor->index() ); + emit cursorPositionChanged( cursor->paragraph()->paragId(), cursor->index() ); } int QTextEdit::undoDepth() const { return document()->undoDepth(); } /*! \property QTextEdit::length \brief the number of characters in the text */ @@ -4016,97 +4093,109 @@ int QTextEdit::tabStopWidth() const return document()->tabStopWidth(); } void QTextEdit::setUndoDepth( int d ) { document()->setUndoDepth( d ); } void QTextEdit::setTabStopWidth( int ts ) { document()->setTabStops( ts ); doc->invalidate(); - lastFormatted = doc->firstParag(); + lastFormatted = doc->firstParagraph(); interval = 0; formatMore(); updateContents( contentsX(), contentsY(), visibleWidth(), visibleHeight() ); } /*! \reimp */ QSize QTextEdit::sizeHint() const { // ### calculate a reasonable one return QSize( 100, 100 ); } void QTextEdit::clearUndoRedo() { undoRedoInfo.clear(); emit undoAvailable( doc->commands()->isUndoAvailable() ); emit redoAvailable( doc->commands()->isRedoAvailable() ); } -/*! This function gets the format of the character at position \a +/*! \internal + + \warning In Qt 3.1 we will provide a cleaer API for the + functionality which is provided by this function and in Qt 4.0 this + function will go away. + + This function gets the format of the character at position \a index in paragraph \a para. Sets \a font to the character's font, \a color to the character's color and \a verticalAlignment to the character's vertical alignment. Returns FALSE if \a para or \a index is out of range otherwise returns TRUE. */ bool QTextEdit::getFormat( int para, int index, QFont *font, QColor *color, VerticalAlignment *verticalAlignment ) { if ( !font || !color ) return FALSE; - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return FALSE; if ( index < 0 || index >= p->length() ) return FALSE; *font = p->at( index )->format()->font(); *color = p->at( index )->format()->color(); *verticalAlignment = (VerticalAlignment)p->at( index )->format()->vAlign(); return TRUE; } -/*! This function gets the format of the paragraph \a para. Sets \a +/*! \internal + + \warning In Qt 3.1 we will provide a cleaer API for the + functionality which is provided by this function and in Qt 4.0 this + function will go away. + + This function gets the format of the paragraph \a para. Sets \a font to the paragraphs's font, \a color to the paragraph's color, \a verticalAlignment to the paragraph's vertical alignment, \a alignment to the paragraph's alignment, \a displayMode to the paragraph's display mode, \a listStyle to the paragraph's list style (if the display mode is QStyleSheetItem::DisplayListItem) and \a listDepth to the depth of the list (if the display mode is QStyleSheetItem::DisplayListItem). Returns FALSE if \a para is out of range otherwise returns TRUE. */ bool QTextEdit::getParagraphFormat( int para, QFont *font, QColor *color, VerticalAlignment *verticalAlignment, int *alignment, QStyleSheetItem::DisplayMode *displayMode, QStyleSheetItem::ListStyle *listStyle, int *listDepth ) { if ( !font || !color || !alignment || !displayMode || !listStyle ) return FALSE; - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return FALSE; - *font = p->paragFormat()->font(); - *color = p->paragFormat()->color(); - *verticalAlignment = (VerticalAlignment)p->paragFormat()->vAlign(); + *font = p->at(0)->format()->font(); + *color = p->at(0)->format()->color(); + *verticalAlignment = (VerticalAlignment)p->at(0)->format()->vAlign(); *alignment = p->alignment(); - *displayMode = p->style() ? p->style()->displayMode() : QStyleSheetItem::DisplayBlock; + *displayMode = p->isListItem() ? QStyleSheetItem::DisplayListItem : QStyleSheetItem::DisplayBlock; *listStyle = p->listStyle(); *listDepth = p->listDepth(); return TRUE; } /*! This function is called to create a right mouse button popup menu at the document position \a pos. If you want to create a custom popup menu, reimplement this function and return the created @@ -4146,57 +4235,48 @@ QPopupMenu *QTextEdit::createPopupMenu( const QPoint& pos ) popup->setItemEnabled( d->id[ IdCopy ], doc->hasSelection( QTextDocument::Standard, TRUE ) ); popup->setItemEnabled( d->id[ IdPaste ], !isReadOnly() && !QApplication::clipboard()->text().isEmpty() ); #endif popup->setItemEnabled( d->id[ IdClear ], !isReadOnly() && !text().isEmpty() ); popup->setItemEnabled( d->id[ IdSelectAll ], (bool)text().length() ); return popup; #else return 0; #endif } /*! \overload + \obsolete This function is called to create a right mouse button popup menu. If you want to create a custom popup menu, reimplement this function and return the created popup menu. Ownership of the popup menu is transferred to the caller. + + This function is only called if createPopupMenu( const QPoint & ) + returns 0. */ QPopupMenu *QTextEdit::createPopupMenu() { return 0; } /*! \reimp */ void QTextEdit::setFont( const QFont &f ) { QFont old( QScrollView::font() ); QScrollView::setFont( f ); doc->setMinimumWidth( -1 ); - - // ### that is a bit hacky - static short diff = 1; - diff *= -1; - doc->setWidth( visibleWidth() + diff ); - - int s = f.pointSize(); - bool usePixels = FALSE; - if ( s == -1 ) { - s = f.pixelSize(); - usePixels = TRUE; - } - doc->updateFontSizes( s, usePixels ); - doc->updateFontAttributes( f, old ); - lastFormatted = doc->firstParag(); + doc->setDefaultFormat( f, doc->formatCollection()->defaultFormat()->color() ); + lastFormatted = doc->firstParagraph(); formatMore(); repaintChanged(); } /*! \fn QTextEdit::zoomIn() \overload Zooms in on the text by by making the base font size one point larger and recalculating all font sizes. This does not change the size of any images. @@ -4264,28 +4344,27 @@ void QTextEdit::zoomTo( int size ) optimizations is to format only the visible text, formatting the rest on demand, e.g. as the user scrolls, so you don't usually need to call this function. In some situations you may want to force the whole text to be formatted. For example, if after calling setText(), you wanted to know the height of the document (using contentsHeight()), you would call this function first. */ void QTextEdit::sync() { - QTextParag *p = lastFormatted; - while ( p ) { - p->format(); - p = p->next(); + while ( lastFormatted ) { + lastFormatted->format(); + lastFormatted = lastFormatted->next(); } resizeContents( contentsWidth(), doc->height() ); } /*! \reimp */ void QTextEdit::setEnabled( bool b ) { QScrollView::setEnabled( b ); if ( !b ) { blinkTimer->stop(); drawCursor( FALSE ); @@ -4351,95 +4430,95 @@ void QTextEdit::scrollToBottom() sync(); setContentsPos( contentsX(), contentsHeight() - visibleHeight() ); } /*! Returns the rectangle of the paragraph \a para in contents coordinates, or an invalid rectangle if \a para is out of range. */ QRect QTextEdit::paragraphRect( int para ) const { QTextEdit *that = (QTextEdit *)this; that->sync(); - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return QRect( -1, -1, -1, -1 ); return p->rect(); } /*! Returns the paragraph which is at position \a pos (in contents coordinates), or -1 if there is no paragraph with index \a pos. */ int QTextEdit::paragraphAt( const QPoint &pos ) const { QTextCursor c( doc ); - c.place( pos, doc->firstParag() ); - if ( c.parag() ) - return c.parag()->paragId(); + c.place( pos, doc->firstParagraph() ); + if ( c.paragraph() ) + return c.paragraph()->paragId(); return -1; } /*! Returns the index of the character (relative to its paragraph) at position \a pos (in contents coordinates). If \a para is not null, \e *\a para is set to this paragraph. If there is no character at \a pos, -1 is returned. */ int QTextEdit::charAt( const QPoint &pos, int *para ) const { QTextCursor c( doc ); - c.place( pos, doc->firstParag() ); - if ( c.parag() ) { + c.place( pos, doc->firstParagraph() ); + if ( c.paragraph() ) { if ( para ) - *para = c.parag()->paragId(); + *para = c.paragraph()->paragId(); return c.index(); } return -1; } /*! Sets the background color of the paragraph \a para to \a bg */ void QTextEdit::setParagraphBackgroundColor( int para, const QColor &bg ) { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return; p->setBackgroundColor( bg ); repaintChanged(); } /*! Clears the background color of the paragraph \a para, so that the default color is used again. */ void QTextEdit::clearParagraphBackground( int para ) { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return; p->clearBackgroundColor(); repaintChanged(); } /*! Returns the background color of the paragraph \a para or an invalid color if \a para is out of range or the paragraph has no background set */ QColor QTextEdit::paragraphBackgroundColor( int para ) const { - QTextParag *p = doc->paragAt( para ); + QTextParagraph *p = doc->paragAt( para ); if ( !p ) return QColor(); QColor *c = p->backgroundColor(); if ( c ) return *c; return QColor(); } /*! \property QTextEdit::undoRedoEnabled \brief whether undo/redo is enabled The default is TRUE. @@ -4460,46 +4539,46 @@ bool QTextEdit::isUndoRedoEnabled() const bool QTextEdit::isUndoAvailable() const { return doc->commands()->isUndoAvailable() || undoRedoInfo.valid(); } /*! Returns whether redo is available */ bool QTextEdit::isRedoAvailable() const { return doc->commands()->isRedoAvailable(); } -void QTextEdit::ensureFormatted( QTextParag *p ) +void QTextEdit::ensureFormatted( QTextParagraph *p ) { while ( !p->isValid() ) { if ( !lastFormatted ) return; formatMore(); } } /*! \internal */ void QTextEdit::updateCursor( const QPoint & pos ) { if ( isReadOnly() && linksEnabled() ) { QTextCursor c = *cursor; placeCursor( pos, &c, TRUE ); #ifndef QT_NO_NETWORKPROTOCOL - if ( c.parag() && c.parag()->at( c.index() ) && - c.parag()->at( c.index() )->isAnchor() && - !c.parag()->at( c.index() )->anchorHref().isEmpty() ) { - if ( c.index() < c.parag()->length() - 1 ) - onLink = c.parag()->at( c.index() )->anchorHref(); + if ( c.paragraph() && c.paragraph()->at( c.index() ) && + c.paragraph()->at( c.index() )->isAnchor() && + !c.paragraph()->at( c.index() )->anchorHref().isEmpty() ) { + if ( c.index() < c.paragraph()->length() - 1 ) + onLink = c.paragraph()->at( c.index() )->anchorHref(); else onLink = QString::null; #ifndef QT_NO_CURSOR viewport()->setCursor( onLink.isEmpty() ? arrowCursor : pointingHandCursor ); #endif QUrl u( doc->context(), onLink, TRUE ); emitHighlighted( u.toString( FALSE, FALSE ) ); } else { #ifndef QT_NO_CURSOR viewport()->setCursor( isReadOnly() ? arrowCursor : ibeamCursor ); #endif |