diff options
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 128 |
1 files changed, 89 insertions, 39 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 6a285b872c..b9f29df1fe 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -7,29 +7,29 @@ ** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** ** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. ** ** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception +** rights. These rights are described in the Nokia Qt LGPL Exception ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. ** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. ** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. ** ** ** @@ -577,12 +577,12 @@ bool QTextLayout::cacheEnabled() const } /*! - Set the cursor movement style. If the QTextLayout is backed by - a document, you can ignore this and use the option in QTextDocument, - this option is for widgets like QLineEdit or custom widgets without - a QTextDocument. Default value is Qt::LogicalMoveStyle. + Sets the visual cursor movement style to the given \a style. If the + QTextLayout is backed by a document, you can ignore this and use the option + in QTextDocument, this option is for widgets like QLineEdit or custom + widgets without a QTextDocument. Default value is QTextCursor::Logical. - \sa setCursorMoveStyle() + \sa cursorMoveStyle() */ void QTextLayout::setCursorMoveStyle(Qt::CursorMoveStyle style) { @@ -995,11 +995,20 @@ static inline QRectF clipIfValid(const QRectF &rect, const QRectF &clip) \sa draw(), QPainter::drawGlyphRun() */ #if !defined(QT_NO_RAWFONT) -QList<QGlyphRun> QTextLayout::glyphRuns() const -{ +QList<QGlyphRun> QTextLayout::glyphRuns(int from, int length) const +{ + if (from < 0) + from = 0; + if (length < 0) + length = text().length(); + QList<QGlyphRun> glyphs; - for (int i=0; i<d->lines.size(); ++i) - glyphs += QTextLine(i, d).glyphs(-1, -1); + for (int i=0; i<d->lines.size(); ++i) { + if (d->lines[i].from > from + length) + break; + else if (d->lines[i].from + d->lines[i].length >= from) + glyphs += QTextLine(i, d).glyphRuns(from, length); + } return glyphs; } @@ -2082,25 +2091,32 @@ namespace { } /*! - \internal + Returns the glyph indexes and positions for all glyphs in this QTextLine for characters + in the range defined by \a from and \a length. The \a from index is relative to the beginning + of the text in the containing QTextLayout, and the range must be within the range of QTextLine + as given by functions textStart() and textLength(). - Returns the glyph indexes and positions for all glyphs in this QTextLine which reside in - QScriptItems that overlap with the range defined by \a from and \a length. The arguments - specify characters, relative to the text in the layout. Note that it is not possible to - use this function to retrieve a subset of the glyphs in a QScriptItem. + If \a from is negative, it will default to textStart(), and if \a length is negative it will + default to the return value of textLength(). - \since 4.8 + \since 5.0 \sa QTextLayout::glyphRuns() */ #if !defined(QT_NO_RAWFONT) -QList<QGlyphRun> QTextLine::glyphs(int from, int length) const +QList<QGlyphRun> QTextLine::glyphRuns(int from, int length) const { const QScriptLine &line = eng->lines[i]; if (line.length == 0) return QList<QGlyphRun>(); + if (from < 0) + from = textStart(); + + if (length < 0) + length = textLength(); + QHash<QFontEngine *, GlyphInfo> glyphLayoutHash; QTextLineItemIterator iterator(eng, i); @@ -2112,8 +2128,9 @@ QList<QGlyphRun> QTextLine::glyphs(int from, int length) const QPointF pos(iterator.x.toReal(), y); if (from >= 0 && length >= 0 && - (from >= si.position + eng->length(&si) || from + length <= si.position)) + (from >= si.position + eng->length(&si) || from + length <= si.position)) { continue; + } QFont font = eng->font(si); @@ -2124,11 +2141,42 @@ QList<QGlyphRun> QTextLine::glyphs(int from, int length) const flags |= QTextItem::Underline; if (font.strikeOut()) flags |= QTextItem::StrikeOut; - if (si.analysis.bidiLevel % 2) + + bool rtl = false; + if (si.analysis.bidiLevel % 2) { flags |= QTextItem::RightToLeft; + rtl = true; + } - QGlyphLayout glyphLayout = eng->shapedGlyphs(&si).mid(iterator.glyphsStart, - iterator.glyphsEnd - iterator.glyphsStart); + int relativeFrom = qMax(iterator.itemStart, from) - si.position; + int relativeTo = qMin(iterator.itemEnd, from + length - 1) - si.position; + + unsigned short *logClusters = eng->logClusters(&si); + int glyphsStart = logClusters[relativeFrom]; + int glyphsEnd = (relativeTo == eng->length(&si)) + ? si.num_glyphs - 1 + : logClusters[relativeTo]; + + QGlyphLayout glyphLayout = eng->shapedGlyphs(&si); + + // Calculate new x position of glyph layout for a subset. This becomes somewhat complex + // when we're breaking a RTL script item, since the expected position passed into + // getGlyphPositions() is the left-most edge of the left-most glyph in an RTL run. + if (relativeFrom != (iterator.itemStart - si.position) && !rtl) { + for (int i=0; i<glyphsStart; ++i) { + QFixed justification = QFixed::fromFixed(glyphLayout.justifications[i].space_18d6); + pos += QPointF((glyphLayout.advances_x[i] + justification).toReal(), + glyphLayout.advances_y[i].toReal()); + } + } else if (relativeTo != (iterator.itemEnd - si.position) && rtl) { + for (int i=glyphLayout.numGlyphs - 1; i>glyphsEnd; --i) { + QFixed justification = QFixed::fromFixed(glyphLayout.justifications[i].space_18d6); + pos += QPointF((glyphLayout.advances_x[i] + justification).toReal(), + glyphLayout.advances_y[i].toReal()); + } + } + + glyphLayout = glyphLayout.mid(glyphsStart, glyphsEnd - glyphsStart + 1); if (glyphLayout.numGlyphs > 0) { QFontEngine *mainFontEngine = font.d->engineForScript(si.analysis.script); @@ -2145,9 +2193,10 @@ QList<QGlyphRun> QTextLine::glyphs(int from, int length) const QGlyphLayout subLayout = glyphLayout.mid(start, end - start); glyphLayoutHash.insertMulti(multiFontEngine->engine(which), GlyphInfo(subLayout, pos, flags)); - for (int i = 0; i < subLayout.numGlyphs; i++) + for (int i = 0; i < subLayout.numGlyphs; i++) { pos += QPointF(subLayout.advances_x[i].toReal(), subLayout.advances_y[i].toReal()); + } start = end; which = e; @@ -2499,8 +2548,9 @@ qreal QTextLine::cursorToX(int *cursorPos, Edge edge) const pos = 0; int glyph_pos = pos == l ? si->num_glyphs : logClusters[pos]; - if (edge == Trailing) { + if (edge == Trailing && glyph_pos < si->num_glyphs) { // trailing edge is leading edge of next cluster + glyph_pos++; while (glyph_pos < si->num_glyphs && !glyphs.attributes[glyph_pos].clusterStart) glyph_pos++; } |