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

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qtextlayout.cpp (modified) (34 diffs)

trunk/src/gui/text/qtextlayout.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -62 +62 @@
 
 #define ObjectSelectionBrush (QTextFormat::ForegroundBrush + 1)
+
+
 
 static inline QFixed leadingSpaceWidth(QTextEngine *eng, const QScriptLine &line)
@@ -127 +129 @@
     a QTextLayout.
 
-    \ingroup text
+    \ingroup 
 
     This class is only used if the text layout is used to lay out
@@ -284 +286 @@
     paragraph of text.
 
-    \ingroup text
+    \ingroup 
 
     It offers most features expected from a modern text layout
@@ -366 +368 @@
     if (paintdevice)
         f = QFont(font, paintdevice);
-    d = new QTextEngine((text.isNull() ? (const QString&)QString::fromLatin1("") : text), f.d);
+    d = new QTextEngine((text.isNull() ? (const QString&)QString::fromLatin1("") : text), f.d);
 }
 
@@ -859 +861 @@
         xmax = qMax(xmax, si.x+qMax(si.width, si.textWidth));
         // ### shouldn't the ascent be used in ymin???
-        ymax = qMax(ymax, si.y+si.ascent+si.descent+1);
+        ymax = qMax(ymax, si.y+si.);
     }
     return QRectF(xmin.toReal(), ymin.toReal(), (xmax-xmin).toReal(), (ymax-ymin).toReal());
@@ -1070 +1072 @@
     QTextLineItemIterator iterator(eng, lineNumber, pos, selection);
 
-    const QFixed y = QFixed::fromReal(pos.y()) + line.y + line.ascent;
-
+
+
+    const qreal selectionY = pos.y() + line.y.toReal();
     const qreal lineHeight = line.height().toReal();
-    const qreal selectionY = (y - line.ascent).toReal();
 
     QFixed lastSelectionX = iterator.x;
@@ -1144 +1146 @@
 
     QPainterPath excludedRegion;
+
     for (int i = 0; i < selections.size(); ++i) {
         FormatRange selection = selections.at(i);
@@ -1203 +1206 @@
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         p->save();
         p->setClipPath(region, Qt::IntersectClip);
-
-        selection.format.setProperty(ObjectSelectionBrush, selection.format.property(QTextFormat::BackgroundBrush));
-        // don't just clear the property, set an empty brush that overrides a potential
-        // background brush specified in the text
-        selection.format.setProperty(QTextFormat::BackgroundBrush, QBrush());
-        selection.format.clearProperty(QTextFormat::OutlinePen);
 
         for (int line = firstLine; line < lastLine; ++line) {
@@ -1218 +1232 @@
         p->restore();
 
-        if (selection.format.foreground().style() != Qt::NoBrush) // i.e. we have drawn text
-            excludedRegion += region;
+        if (hasText) {
+            textDoneRegion += region;
+        } else {
+            if (hasBackground)
+                textDoneRegion -= region;
+        }
+
+        excludedRegion += region;
+    }
+
+    QPainterPath needsTextButNoBackground = excludedRegion - textDoneRegion;
+    if (!needsTextButNoBackground.isEmpty()){
+        p->save();
+        p->setClipPath(needsTextButNoBackground, Qt::IntersectClip);
+        FormatRange selection;
+        selection.start = 0;
+        selection.length = INT_MAX;
+        selection.format.setProperty(SuppressBackground, true);
+        for (int line = firstLine; line < lastLine; ++line) {
+            QTextLine l(line, d);
+            l.draw(p, position, &selection);
+        }
+        p->restore();
     }
 
@@ -1300 +1335 @@
 
     int itm = d->findItem(cursorPosition - 1);
-    QFixed ascent = sl.ascent;
+    QFixed ;
     QFixed descent = sl.descent;
     bool rightToLeft = (d->option.textDirection() == Qt::RightToLeft);
@@ -1306 +1341 @@
         const QScriptItem &si = d->layoutData->items.at(itm);
         if (si.ascent > 0)
-            ascent = si.ascent;
+             = si.ascent;
         if (si.descent > 0)
             descent = si.descent;
         rightToLeft = si.analysis.bidiLevel % 2;
     }
-    qreal y = position.y() + (sl.y + sl.ascent - ascent).toReal();
+    qreal y = position.y() + (sl.y + sl.).toReal();
     bool toggleAntialiasing = !(p->renderHints() & QPainter::Antialiasing)
                               && (p->transform().type() > QTransform::TxTranslate);
     if (toggleAntialiasing)
         p->setRenderHint(QPainter::Antialiasing);
-    p->fillRect(QRectF(x, y, qreal(width), (ascent + descent).toReal()), p->pen().brush());
+    p->fillRect(QRectF(x, y, qreal(width), ().toReal()), p->pen().brush());
     if (toggleAntialiasing)
         p->setRenderHint(QPainter::Antialiasing, false);
@@ -1334 +1369 @@
     \brief The QTextLine class represents a line of text inside a QTextLayout.
 
-    \ingroup text
+    \ingroup 
 
     A text line is usually created by QTextLayout::createLine().
@@ -1466 +1501 @@
 
 /*!
-    Returns the line's height. This is equal to ascent() + descent() + 1.
-
-    \sa ascent() descent()
+    Returns the line's height. This is equal to ascent() + descent() + 1
+    if leading is not included. If leading is included, this equals to
+    ascent() + descent() + leading() + 1.
+
+    \sa ascent() descent() leading() setLeadingIncluded()
 */
 qreal QTextLine::height() const
@@ -1474 +1511 @@
     return eng->lines[i].height().toReal();
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*!
@@ -1555 +1637 @@
 #endif
 
-static inline bool checkFullOtherwiseExtend(QScriptLine &line, QScriptLine &tmpData, QScriptLine &spaceData,
-                                            int glyphCount, int maxGlyphs, QFixed &minw, bool manualWrap,
-                                            QFixed softHyphenWidth = QFixed())
-{
+namespace {
+
+    struct LineBreakHelper
+    {
+        LineBreakHelper() : glyphCount(0), maxGlyphs(0), manualWrap(false) {}
+
+        QScriptLine tmpData;
+        QScriptLine spaceData;
+
+        int glyphCount;
+        int maxGlyphs;
+
+        QFixed minw;
+        QFixed softHyphenWidth;
+        QFixed rightBearing;
+
+        bool manualWrap;
+
+        bool checkFullOtherwiseExtend(QScriptLine &line);
+    };
+
+inline bool LineBreakHelper::checkFullOtherwiseExtend(QScriptLine &line)
+{        
     LB_DEBUG("possible break width %f, spacew=%f", tmpData.textWidth.toReal(), spaceData.textWidth.toReal());
-    if (line.length && !manualWrap &&
-        (line.textWidth + tmpData.textWidth + spaceData.textWidth + softHyphenWidth > line.width || glyphCount > maxGlyphs))
+
+    QFixed newWidth = line.textWidth + tmpData.textWidth + spaceData.textWidth + softHyphenWidth + rightBearing;
+    if (line.length && !manualWrap && (newWidth > line.width || glyphCount > maxGlyphs))
         return true;
+
     minw = qMax(minw, tmpData.textWidth);
     line += tmpData;
     line.textWidth += spaceData.textWidth;
+
     line.length += spaceData.length;
     tmpData.textWidth = 0;
@@ -1571 +1675 @@
     spaceData.textWidth = 0;
     spaceData.length = 0;
+
     return false;
 }
 
+
+
+
 static inline void addNextCluster(int &pos, int end, QScriptLine &line, int &glyphCount,
-                                  const QScriptItem &current, const unsigned short *logClusters, const QGlyphLayout &glyphs)
+                                  const QScriptItem &current, const unsigned short *logClusters,
+                                  const QGlyphLayout &glyphs)
 {
     int glyphPosition = logClusters[pos];
@@ -1608 +1717 @@
     Q_ASSERT(line.from < eng->layoutData->string.length());
 
+
+
+
+
     QTextOption::WrapMode wrapMode = eng->option.wrapMode();
     bool breakany = (wrapMode == QTextOption::WrapAnywhere);
-    bool manualWrap = (wrapMode == QTextOption::ManualWrap || wrapMode == QTextOption::NoWrap);
+    manualWrap = (wrapMode == QTextOption::ManualWrap || wrapMode == QTextOption::NoWrap);
 
     // #### binary search!
@@ -1620 +1733 @@
     }
 
-    QFixed minw = 0;
-    int glyphCount = 0;
-
     LB_DEBUG("from: %d: item=%d, total %d, width available %f", line.from, newItem, eng->layoutData->items.size(), line.width.toReal());
-    QScriptLine tmpData;
-    QScriptLine spaceData;
 
     Qt::Alignment alignment = eng->option.alignment();
@@ -1634 +1742 @@
     QGlyphLayout glyphs;
     const unsigned short *logClusters = eng->layoutData->logClustersPtr;
+
     while (newItem < eng->layoutData->items.size()) {
+
+
         if (newItem != item) {
             item = newItem;
@@ -1649 +1760 @@
         const QScriptItem &current = eng->layoutData->items[item];
 
-        tmpData.ascent = qMax(tmpData.ascent, current.ascent);
-        tmpData.descent = qMax(tmpData.descent, current.descent);
+        lbh.tmpData.leading = qMax(lbh.tmpData.leading + lbh.tmpData.ascent,
+                                   current.leading + current.ascent) - qMax(lbh.tmpData.ascent,
+                                                                            current.ascent);
+        lbh.tmpData.ascent = qMax(lbh.tmpData.ascent, current.ascent);
+        lbh.tmpData.descent = qMax(lbh.tmpData.descent, current.descent);
 
         if (current.analysis.flags == QScriptAnalysis::Tab && (alignment & (Qt::AlignLeft | Qt::AlignRight | Qt::AlignCenter | Qt::AlignJustify))) {
-            if (checkFullOtherwiseExtend(line, tmpData, spaceData, glyphCount, maxGlyphs, minw, manualWrap))
+            if ())
                 goto found;
 
-            QFixed x = line.x + line.textWidth + tmpData.textWidth + spaceData.textWidth;
-            spaceData.textWidth += eng->calculateTabWidth(item, x);
-            spaceData.length++;
+            QFixed x = line.x + line.textWidth + lbh.tmpData.textWidth + lbh.spaceData.textWidth;
+            QFixed tabWidth = eng->calculateTabWidth(item, x);
+
+            lbh.spaceData.textWidth += tabWidth;
+            lbh.spaceData.length++;
             newItem = item + 1;
-            ++glyphCount;
-            if (checkFullOtherwiseExtend(line, tmpData, spaceData, glyphCount, maxGlyphs, minw, manualWrap))
+
+            QFixed averageCharWidth = eng->fontEngine(current)->averageCharWidth();
+            lbh.glyphCount += qRound(tabWidth / averageCharWidth);
+
+            if (lbh.checkFullOtherwiseExtend(line))
                 goto found;
         } else if (current.analysis.flags == QScriptAnalysis::LineOrParagraphSeparator) {
             // if the line consists only of the line separator make sure
             // we have a sane height
-            if (!line.length && !tmpData.length)
+            if (!line.length && !tmpData.length)
                 line.setDefaultHeight(eng);
             if (eng->option.flags() & QTextOption::ShowLineAndParagraphSeparators) {
-                addNextCluster(pos, end, tmpData, glyphCount, current, logClusters, glyphs);
+                addNextCluster(pos, end, lbh.tmpData, lbh.glyphCount,
+                               current, logClusters, glyphs);
             } else {
-                tmpData.length++;
+                tmpData.length++;
             }
-            line += tmpData;
+            line += tmpData;
             goto found;
         } else if (current.analysis.flags == QScriptAnalysis::Object) {
-            tmpData.length++;
+            tmpData.length++;
 
             QTextFormat format = eng->formats()->format(eng->formatIndex(&eng->layoutData->items[item]));
@@ -1682 +1802 @@
                 eng->docLayout()->positionInlineObject(QTextInlineObject(item, eng), eng->block.position() + current.position, format);
 
-            tmpData.textWidth += current.width;
+            tmpData.textWidth += current.width;
 
             newItem = item + 1;
-            ++glyphCount;
-            if (checkFullOtherwiseExtend(line, tmpData, spaceData, glyphCount, maxGlyphs, minw, manualWrap))
+            ++glyphCount;
+            if ())
                 goto found;
         } else if (attributes[pos].whiteSpace) {
             while (pos < end && attributes[pos].whiteSpace)
-                addNextCluster(pos, end, spaceData, glyphCount, current, logClusters, glyphs);
-
-            if (!manualWrap && spaceData.textWidth > line.width) {
-                spaceData.textWidth = line.width; // ignore spaces that fall out of the line.
+                addNextCluster(pos, end, lbh.spaceData, lbh.glyphCount,
+                               current, logClusters, glyphs);
+
+            if (!lbh.manualWrap && lbh.spaceData.textWidth > line.width) {
+                lbh.spaceData.textWidth = line.width; // ignore spaces that fall out of the line.
                 goto found;
             }
@@ -1699 +1820 @@
             bool sb_or_ws = false;
             do {
-                addNextCluster(pos, end, tmpData, glyphCount, current, logClusters, glyphs);
+                addNextCluster(pos, end, lbh.tmpData, lbh.glyphCount,
+                               current, logClusters, glyphs);
 
                 if (attributes[pos].whiteSpace || attributes[pos-1].lineBreakType != HB_NoBreak) {
@@ -1708 +1830 @@
                 }
             } while (pos < end);
-            minw = qMax(tmpData.textWidth, minw);
-
-            QFixed softHyphenWidth;
+            lbh.minw = qMax(lbh.tmpData.textWidth, lbh.minw);
+
             if (pos && attributes[pos - 1].lineBreakType == HB_SoftHyphen) {
                 // if we are splitting up a word because of
@@ -1729 +1850 @@
                 //
                 if (line.length)
-                    softHyphenWidth = glyphs.advances_x[logClusters[pos - 1]];
+                    softHyphenWidth = glyphs.advances_x[logClusters[pos - 1]];
                 else if (breakany)
-                    tmpData.textWidth += glyphs.advances_x[logClusters[pos - 1]];
+                    tmpData.textWidth += glyphs.advances_x[logClusters[pos - 1]];
             }
 
-            if ((sb_or_ws|breakany)
-                && checkFullOtherwiseExtend(line, tmpData, spaceData, glyphCount, maxGlyphs, minw, manualWrap, softHyphenWidth)) {
+            // The actual width of the text needs to take the right bearing into account. The
+            // right bearing is left-ward, which means that if the rightmost pixel is to the right
+            // of the advance of the glyph, the bearing will be negative. We flip the sign
+            // for the code to be more readable. Logic borrowed from qfontmetrics.cpp.
+            if (pos) {
+                QFontEngine *fontEngine = eng->fontEngine(current);
+                glyph_t glyph = glyphs.glyphs[logClusters[pos - 1]];
+                glyph_metrics_t gi = fontEngine->boundingBox(glyph);
+                if (gi.isValid())
+                    lbh.rightBearing = qMax(QFixed(), -(gi.xoff - gi.x - gi.width));
+            }
+
+            if ((sb_or_ws|breakany) && lbh.checkFullOtherwiseExtend(line)) {
                 if (!breakany) {
-                    line.textWidth += softHyphenWidth;
+                    line.textWidth += softHyphenWidth;
                 }
+
+
+
                 goto found;
             }
@@ -1746 +1881 @@
     }
     LB_DEBUG("reached end of line");
-    checkFullOtherwiseExtend(line, tmpData, spaceData, glyphCount, maxGlyphs, minw, manualWrap);
-found:
+    lbh.checkFullOtherwiseExtend(line);
+    line.textWidth += lbh.rightBearing;
+
+found:       
     if (line.length == 0) {
         LB_DEBUG("no break available in line, adding temp: length %d, width %f, space: length %d, width %f",
-               tmpData.length, tmpData.textWidth.toReal(), spaceData.length, spaceData.textWidth.toReal());
-        line += tmpData;
+               lbh.tmpData.length, lbh.tmpData.textWidth.toReal(),
+               lbh.spaceData.length, lbh.spaceData.textWidth.toReal());
+        line += lbh.tmpData;
     }
 
     LB_DEBUG("line length = %d, ascent=%f, descent=%f, textWidth=%f (spacew=%f)", line.length, line.ascent.toReal(),
-           line.descent.toReal(), line.textWidth.toReal(), spaceData.width.toReal());
+           line.descent.toReal(), line.textWidth.toReal(), spaceData.width.toReal());
     LB_DEBUG("        : '%s'", eng->layoutData->string.mid(line.from, line.length).toUtf8().data());
 
-    if (manualWrap) {
+    if (manualWrap) {
         eng->minWidth = qMax(eng->minWidth, line.textWidth);
         eng->maxWidth = qMax(eng->maxWidth, line.textWidth);
     } else {
-        eng->minWidth = qMax(eng->minWidth, minw);
+        eng->minWidth = qMax(eng->minWidth, minw);
         eng->maxWidth += line.textWidth;
     }
 
     if (line.textWidth > 0 && item < eng->layoutData->items.size())
-        eng->maxWidth += spaceData.textWidth;
+        eng->maxWidth += spaceData.textWidth;
     if (eng->option.flags() & QTextOption::IncludeTrailingSpaces)
-        line.textWidth += spaceData.textWidth;
-    line.length += spaceData.length;
-    if (spaceData.length)
+        line.textWidth += spaceData.textWidth;
+    line.length += spaceData.length;
+    if (spaceData.length)
         line.hasTrailingSpaces = true;
 
@@ -1778 +1916 @@
 
     if (eng->option.wrapMode() == QTextOption::WrapAtWordBoundaryOrAnywhere) {
-        if ((maxGlyphs != INT_MAX && glyphCount > maxGlyphs)
-            || (maxGlyphs == INT_MAX && line.textWidth > line.width)) {
+        if ((maxGlyphs)
+            || (maxGlyphs == INT_MAX && line.textWidth > line.width)) {
 
             eng->option.setWrapMode(QTextOption::WrapAnywhere);
             line.length = 0;
             line.textWidth = 0;
-            layout_helper(maxGlyphs);
+            layout_helper(maxGlyphs);
             eng->option.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
         }
@@ -1913 +2051 @@
 {
     QBrush c = chf.foreground();
-    if (c.style() == Qt::NoBrush)
+    if (c.style() == Qt::NoBrush)
         p->setPen(defaultPen);
+
 
     QBrush bg = chf.background();
-    if (bg.style() != Qt::NoBrush)
+    if (bg.style() != Qt::NoBrush)
         p->fillRect(r, bg);
-    if (c.style() != Qt::NoBrush)
+    if (c.style() != Qt::NoBrush)
         p->setPen(QPen(c, 0));
+
+
 }
 
@@ -1934 +2075 @@
     QPen pen = p->pen();
 
-    bool noText = (selection && selection->format.foreground().style() == Qt::NoBrush);
+    bool noText = (selection && selection->format.);
 
     if (!line.length) {
@@ -1952 +2093 @@
 
     QTextLineItemIterator iterator(eng, i, pos, selection);
-    const QFixed y = QFixed::fromReal(pos.y()) + line.y + line.ascent;
+    QFixed lineBase = line.base();
+
+    const QFixed y = QFixed::fromReal(pos.y()) + line.y + lineBase;
 
     bool suppressColors = (eng->option.flags() & QTextOption::SuppressColors);
@@ -1975 +2118 @@
                 format.merge(selection->format);
 
-            setPenAndDrawBackground(p, pen, format, QRectF(iterator.x.toReal(), (y - line.ascent).toReal(),
+            setPenAndDrawBackground(p, pen, format, QRectF(iterator.x.toReal(), (y - line).toReal(),
                                                            iterator.itemWidth.toReal(), line.height().toReal()));
 
@@ -1996 +2139 @@
                     QFixed itemY = y - si.ascent;
                     if (format.verticalAlignment() == QTextCharFormat::AlignTop) {
-                        itemY = y - line.ascent;
+                        itemY = y - line;
                     }