FCL/sf/mw/qt: comparison src/gui/text/qtextlayout.cpp

equal deleted inserted replaced

-:ef0373b55136
+:758a864f9613
 || !eng->isRightToLeft())
 return QFixed();
 int pos = line.length;
 const HB_CharAttributes *attributes = eng->attributes();
+if (!attributes)
+return QFixed();
 while (pos > 0 && attributes[line.from + pos - 1].whiteSpace)
 --pos;
 return eng->width(line.from + pos, line.length - pos);
 }
 Begins the layout process.
 */
 void QTextLayout::beginLayout()
 {
 #ifndef QT_NO_DEBUG
-if (d->layoutData && d->layoutData->inLayout) {
+if (d->layoutData && d->layoutData->layoutState == QTextEngine::InLayout) {
 qWarning("QTextLayout::beginLayout: Called while already doing layout");
 return;
 }
 #endif
 d->invalidate();
 d->clearLineData();
 d->itemize();
-d->layoutData->inLayout = true;
+d->layoutData->layoutState = QTextEngine::InLayout;
 }
 /*!
 Ends the layout process.
 */
 void QTextLayout::endLayout()
 {
 #ifndef QT_NO_DEBUG
-if (!d->layoutData || !d->layoutData->inLayout) {
+if (!d->layoutData || d->layoutData->layoutState == QTextEngine::LayoutEmpty) {
 qWarning("QTextLayout::endLayout: Called without beginLayout()");
 return;
 }
 #endif
 int l = d->lines.size();
 if (l && d->lines.at(l-1).length < 0) {
 QTextLine(l-1, d).setNumColumns(INT_MAX);
 }
-d->layoutData->inLayout = false;
+d->layoutData->layoutState = QTextEngine::LayoutEmpty;
 if (!d->cacheGlyphs)
 d->freeMemory();
 }
 /*!  \since 4.4
 (isValid() will return false).
 */
 QTextLine QTextLayout::createLine()
 {
 #ifndef QT_NO_DEBUG
-if (!d->layoutData || !d->layoutData->inLayout) {
+if (!d->layoutData || d->layoutData->layoutState == QTextEngine::LayoutEmpty) {
 qWarning("QTextLayout::createLine: Called without layouting");
 return QTextLine();
 }
 #endif
+if (d->layoutData->layoutState == QTextEngine::LayoutFailed)
+return QTextLine();
 int l = d->lines.size();
 if (l && d->lines.at(l-1).length < 0) {
 QTextLine(l-1, d).setNumColumns(INT_MAX);
 }
 int from = l > 0 ? d->lines.at(l-1).from + d->lines.at(l-1).length : 0;
 bool hasText = (selection.format.foreground().style() != Qt::NoBrush);
 bool hasBackground= (selection.format.background().style() != Qt::NoBrush);
 if (hasBackground) {
 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());
 Q_ASSERT(logClusters[currentPosition - 1] < glyphs.numGlyphs);
 return glyphs.glyphs[logClusters[currentPosition - 1]];
 }
+inline void adjustRightBearing(glyph_t glyph)
+{
+qreal rb;
+fontEngine->getGlyphBearings(glyph, 0, &rb);
+rightBearing = qMin(QFixed(), QFixed::fromReal(rb));
+}
 inline void adjustRightBearing()
 {
 if (currentPosition <= 0)
 return;
+adjustRightBearing(currentGlyph());
-qreal rb;
-fontEngine->getGlyphBearings(currentGlyph(), 0, &rb);
-rightBearing = qMin(QFixed(), QFixed::fromReal(rb));
 }
 inline void resetRightBearing()
 {
 rightBearing = QFixed(1); // Any positive number is defined as invalid since only
 // negative right bearings are interesting to us.
 }
 };
 inline bool LineBreakHelper::checkFullOtherwiseExtend(QScriptLine &line)
 {
 LB_DEBUG("possible break width %f, spacew=%f", tmpData.textWidth.toReal(), spaceData.textWidth.toReal());
 QFixed newWidth = calculateNewWidth(line);
 if (line.length && !manualWrap && (newWidth > line.width || glyphCount > maxGlyphs))
 return true;
 QTextOption::WrapMode wrapMode = eng->option.wrapMode();
 bool breakany = (wrapMode == QTextOption::WrapAnywhere);
 lbh.manualWrap = (wrapMode == QTextOption::ManualWrap || wrapMode == QTextOption::NoWrap);
-// #### binary search!
 int item = -1;
-int newItem;
+int newItem = -1;
-for (newItem = eng->layoutData->items.size()-1; newItem > 0; --newItem) {
+int left = 0;
-if (eng->layoutData->items[newItem].position <= line.from)
+int right = eng->layoutData->items.size()-1;
+while(left <= right) {
+int middle = ((right-left)/2)+left;
+if (line.from > eng->layoutData->items[middle].position)
+left = middle+1;
+else if(line.from < eng->layoutData->items[middle].position)
+right = middle-1;
+else {
+newItem = middle;
 break;
 }
+}
+if (newItem == -1)
+newItem = right;
 LB_DEBUG("from: %d: item=%d, total %d, width available %f", line.from, newItem, eng->layoutData->items.size(), line.width.toReal());
 Qt::Alignment alignment = eng->option.alignment();
 const HB_CharAttributes *attributes = eng->attributes();
+if (!attributes)
+return;
 lbh.currentPosition = line.from;
 int end = 0;
 lbh.logClusters = eng->layoutData->logClustersPtr;
 while (newItem < eng->layoutData->items.size()) {
 item = newItem;
 const QScriptItem &current = eng->layoutData->items[item];
 if (!current.num_glyphs) {
 eng->shape(item);
 attributes = eng->attributes();
+if (!attributes)
+return;
 lbh.logClusters = eng->layoutData->logClustersPtr;
 }
 lbh.currentPosition = qMax(line.from, current.position);
 end = current.position + eng->length(item);
 lbh.glyphs = eng->shapedGlyphs(&current);
 goto found;
 }
 } else {
 lbh.whiteSpaceOrObject = false;
 bool sb_or_ws = false;
+glyph_t previousGlyph = 0;
+if (lbh.currentPosition > 0 && lbh.logClusters[lbh.currentPosition - 1] <lbh.glyphs.numGlyphs)
+previousGlyph = lbh.currentGlyph(); // needed to calculate right bearing later
 do {
 addNextCluster(lbh.currentPosition, end, lbh.tmpData, lbh.glyphCount,
 current, lbh.logClusters, lbh.glyphs);
 if (attributes[lbh.currentPosition].whiteSpace || attributes[lbh.currentPosition-1].lineBreakType != HB_NoBreak) {
 // 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.
 // We ignore the right bearing if the minimum negative bearing is too little to
 // expand the text beyond the edge.
 if (sb_or_ws|breakany) {
+QFixed rightBearing = lbh.rightBearing; // store previous right bearing
+#if !defined(Q_WS_MAC)
 if (lbh.calculateNewWidth(line) - lbh.minimumRightBearing > line.width)
+#endif
 lbh.adjustRightBearing();
 if (lbh.checkFullOtherwiseExtend(line)) {
+// we are too wide, fix right bearing
+if (rightBearing <= 0)
+lbh.rightBearing = rightBearing; // take from cache
+else if (previousGlyph > 0)
+lbh.adjustRightBearing(previousGlyph);
 if (!breakany) {
 line.textWidth += lbh.softHyphenWidth;
 }
 goto found;
 if (lbh.currentPosition == end)
 newItem = item + 1;
 }
 LB_DEBUG("reached end of line");
 lbh.checkFullOtherwiseExtend(line);
 found:
 if (lbh.rightBearing > 0 && !lbh.whiteSpaceOrObject) // If right bearing has not yet been adjusted
 lbh.adjustRightBearing();
 line.textAdvance = line.textWidth;
 line.textWidth -= qMin(QFixed(), lbh.rightBearing);

changeset 37	758a864f9613
parent 33	3e2da88830cd