diff --git a/src/frontends/qt4/GuiFontMetrics.cpp b/src/frontends/qt4/GuiFontMetrics.cpp index a1d5b40094..f17ac37081 100644 --- a/src/frontends/qt4/GuiFontMetrics.cpp +++ b/src/frontends/qt4/GuiFontMetrics.cpp @@ -21,11 +21,33 @@ #include "insets/Inset.h" +#include "support/convert.h" #include "support/lassert.h" +#ifdef CACHE_SOME_METRICS +#include +#endif + using namespace std; using namespace lyx::support; +#ifdef CACHE_SOME_METRICS +namespace std { + +/* + * Argument-dependent lookup implies that this function shall be + * declared in the namespace of its argument. But this is std + * namespace, since lyx::docstring is just std::basic_string. + */ +uint qHash(lyx::docstring const & s) +{ + return qHash(QByteArray(reinterpret_cast(s.data()), + s.size() * sizeof(lyx::docstring::value_type))); +} + +} +#endif + namespace lyx { namespace frontend { @@ -51,11 +73,23 @@ inline QChar const ucs4_to_qchar(char_type const ucs4) } // anon namespace -// Limit strwidth_cache_ size to 512kB of string data +/* + * Limit (strwidth|breakat)_cache_ size to 512kB of string data. + * Limit qtextlayout_cache_ size to 500 elements (we do not know the + * size of the QTextLayout objects anyway). + * Note that all these numbers are arbitrary. + */ GuiFontMetrics::GuiFontMetrics(QFont const & font) - : font_(font), metrics_(font, 0), - strwidth_cache_(1 << 19), - tl_cache_rtl_(false), tl_cache_wordspacing_(-1.0) + : font_(font), metrics_(font, 0) +#ifdef CACHE_METRICS_WIDTH + , strwidth_cache_(1 << 19) +#endif +#ifdef CACHE_METRICS_BREAKAT + , breakat_cache_(1 << 19) +#endif +#ifdef CACHE_METRICS_QTEXTLAYOUT + , qtextlayout_cache_(500) +#endif { } @@ -140,14 +174,13 @@ int GuiFontMetrics::rbearing(char_type c) const int GuiFontMetrics::width(docstring const & s) const { - QByteArray qba = - QByteArray(reinterpret_cast(s.data()), - s.size() * sizeof(docstring::value_type)); - int * pw = strwidth_cache_[qba]; +#ifdef CACHE_METRICS_WIDTH + int * pw = strwidth_cache_[s]; if (pw) return *pw; // For some reason QMetrics::width returns a wrong value with Qt5 // int w = metrics_.width(toqstr(s)); +#endif QTextLayout tl; tl.setText(toqstr(s)); tl.setFont(font_); @@ -155,8 +188,9 @@ int GuiFontMetrics::width(docstring const & s) const QTextLine line = tl.createLine(); tl.endLayout(); int w = int(line.naturalTextWidth()); - - strwidth_cache_.insert(qba, new int(w), qba.size()); +#ifdef CACHE_METRICS_WIDTH + strwidth_cache_.insert(s, new int(w), s.size() * sizeof(char_type)); +#endif return w; } @@ -179,58 +213,66 @@ int GuiFontMetrics::signedWidth(docstring const & s) const } -QTextLayout const & -GuiFontMetrics::getTextLayout(docstring const & s, QFont font, - bool const rtl, double const wordspacing) const +QTextLayout const * +GuiFontMetrics::getTextLayout(docstring const & s, bool const rtl, + double const wordspacing) const { - if (s != tl_cache_s_ || font != tl_cache_font_ || rtl != tl_cache_rtl_ - || wordspacing != tl_cache_wordspacing_) { - tl_cache_.setText(toqstr(s)); - font.setWordSpacing(wordspacing); - tl_cache_.setFont(font); + QTextLayout * ptl; +#ifdef CACHE_METRICS_QTEXTLAYOUT + docstring const s_cache = s + (rtl ? "r" : "l") + convert(wordspacing); + ptl = qtextlayout_cache_[s_cache]; + if (!ptl) { +#endif + ptl = new QTextLayout(); + ptl->setCacheEnabled(true); + ptl->setText(toqstr(s)); + QFont copy = font_; + copy.setWordSpacing(wordspacing); + ptl->setFont(copy); // Note that both setFlags and the enums are undocumented - tl_cache_.setFlags(rtl ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight); - tl_cache_.beginLayout(); - tl_cache_.createLine(); - tl_cache_.endLayout(); - tl_cache_s_ = s; - tl_cache_font_ = font; - tl_cache_rtl_ = rtl; - tl_cache_wordspacing_ = wordspacing; + ptl->setFlags(rtl ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight); + ptl->beginLayout(); + ptl->createLine(); + ptl->endLayout(); +#ifdef CACHE_METRICS_QTEXTLAYOUT + qtextlayout_cache_.insert(s_cache, ptl); } - return tl_cache_; +#endif + return ptl; } -int GuiFontMetrics::pos2x(docstring const & s, int const pos, bool const rtl, +int GuiFontMetrics::pos2x(docstring const & s, int pos, bool const rtl, double const wordspacing) const { - QTextLayout const & tl = getTextLayout(s, font_, rtl, wordspacing); + if (pos <= 0) + pos = 0; + QTextLayout const * tl = getTextLayout(s, rtl, wordspacing); /* Since QString is UTF-16 and docstring is UCS-4, the offsets may * not be the same when there are high-plan unicode characters * (bug #10443). */ int const qpos = toqstr(s.substr(0, pos)).length(); - return static_cast(tl.lineForTextPosition(qpos).cursorToX(qpos)); + return static_cast(tl->lineForTextPosition(qpos).cursorToX(qpos)); } int GuiFontMetrics::x2pos(docstring const & s, int & x, bool const rtl, double const wordspacing) const { - QTextLayout const & tl = getTextLayout(s, font_, rtl, wordspacing); - int const qpos = tl.lineForTextPosition(0).xToCursor(x); + QTextLayout const * tl = getTextLayout(s, rtl, wordspacing); + int const qpos = tl->lineForTextPosition(0).xToCursor(x); // correct x value to the actual cursor position. - x = static_cast(tl.lineForTextPosition(0).cursorToX(qpos)); + x = static_cast(tl->lineForTextPosition(0).cursorToX(qpos)); /* Since QString is UTF-16 and docstring is UCS-4, the offsets may * not be the same when there are high-plan unicode characters * (bug #10443). */ #if QT_VERSION < 0x040801 || QT_VERSION >= 0x050100 - return qstring_to_ucs4(tl.text().left(qpos)).length(); + return qstring_to_ucs4(tl->text().left(qpos)).length(); #else /* Due to QTBUG-25536 in 4.8.1 <= Qt < 5.1.0, the string returned - * by QString::toUcs4 (used by qstring_to_ucs4)may have wrong + * by QString::toUcs4 (used by qstring_to_ucs4) may have wrong * length. We work around the problem by trying all docstring * positions until the right one is found. This is slow only if * there are many high-plane Unicode characters. It might be @@ -246,10 +288,11 @@ int GuiFontMetrics::x2pos(docstring const & s, int & x, bool const rtl, } -bool GuiFontMetrics::breakAt(docstring & s, int & x, bool const rtl, bool const force) const + +pair * +GuiFontMetrics::breakAt_helper(docstring const & s, int const x, + bool const rtl, bool const force) const { - if (s.empty()) - return false; QTextLayout tl; /* Qt will not break at a leading or trailing space, and we need * that sometimes, see http://www.lyx.org/trac/ticket/9921. @@ -257,7 +300,7 @@ bool GuiFontMetrics::breakAt(docstring & s, int & x, bool const rtl, bool const * To work around the problem, we enclose the string between * zero-width characters so that the QTextLayout algorithm will * agree to break the text at these extremal spaces. - */ + */ // Unicode character ZERO WIDTH NO-BREAK SPACE QChar const zerow_nbsp(0xfeff); QString qs = zerow_nbsp + toqstr(s) + zerow_nbsp; @@ -291,8 +334,7 @@ bool GuiFontMetrics::breakAt(docstring & s, int & x, bool const rtl, bool const tl.createLine(); tl.endLayout(); if ((force && line.textLength() == offset) || int(line.naturalTextWidth()) > x) - return false; - x = int(line.naturalTextWidth()); + return new pair(-1, -1); /* Since QString is UTF-16 and docstring is UCS-4, the offsets may * not be the same when there are high-plan unicode characters * (bug #10443). @@ -301,10 +343,10 @@ bool GuiFontMetrics::breakAt(docstring & s, int & x, bool const rtl, bool const // The ending character zerow_nbsp has to be ignored if the line is complete. int const qlen = line.textLength() - offset - (line.textLength() == qs.length()); #if QT_VERSION < 0x040801 || QT_VERSION >= 0x050100 - s = qstring_to_ucs4(qs.mid(offset, qlen)); + int len = qstring_to_ucs4(qs.mid(offset, qlen)).length(); #else /* Due to QTBUG-25536 in 4.8.1 <= Qt < 5.1.0, the string returned - * by QString::toUcs4 (used by qstring_to_ucs4)may have wrong + * by QString::toUcs4 (used by qstring_to_ucs4) may have wrong * length. We work around the problem by trying all docstring * positions until the right one is found. This is slow only if * there are many high-plane Unicode characters. It might be @@ -315,7 +357,34 @@ bool GuiFontMetrics::breakAt(docstring & s, int & x, bool const rtl, bool const while (len >= 0 && toqstr(s.substr(0, len)).length() != qlen) --len; LASSERT(len > 0 || qlen == 0, /**/); - s = s.substr(0, len); +#endif + // The -1 is here to account for the leading zerow_nbsp. + return new pair(len, int(line.naturalTextWidth())); +} + + +bool GuiFontMetrics::breakAt(docstring & s, int & x, bool const rtl, bool const force) const +{ + if (s.empty()) + return false; + pair * pp; +#ifdef CACHE_METRICS_BREAKAT + docstring const s_cache = s + convert(x) + (rtl ? "r" : "l") + (force ? "f" : "w"); + + pp = breakat_cache_[s_cache]; + if (!pp) { +#endif + pp = breakAt_helper(s, x, rtl, force); +#ifdef CACHE_METRICS_BREAKAT + breakat_cache_.insert(s_cache, pp, s_cache.size() * sizeof(char_type)); + } +#endif + if (pp->first == -1) + return false; + s = s.substr(0, pp->first); + x = pp->second; +#ifndef CACHE_METRICS_BREAKAT + delete pp; #endif return true; } @@ -332,7 +401,6 @@ void GuiFontMetrics::rectText(docstring const & str, } - void GuiFontMetrics::buttonText(docstring const & str, int & w, int & ascent, int & descent) const { diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h index 8c8daab5cd..2b55d0ecb7 100644 --- a/src/frontends/qt4/GuiFontMetrics.h +++ b/src/frontends/qt4/GuiFontMetrics.h @@ -16,13 +16,29 @@ #include "support/docstring.h" -#include -#include #include #include #include #include +// Declare which font metrics elements have to be cached + +#define CACHE_METRICS_WIDTH +#define CACHE_METRICS_BREAKAT +// Qt 5.x already has its own caching of QTextLayout objects +#if (QT_VERSION < 0x050000) +#define CACHE_METRICS_QTEXTLAYOUT +#endif + +#if defined(CACHE_METRICS_WIDTH) || defined(CACHE_METRICS_BREAKAT) \ + || defined(CACHE_METRICS_QTEXTLAYOUT) +#define CACHE_SOME_METRICS +#endif + +#ifdef CACHE_SOME_METRICS +#include +#endif + namespace lyx { namespace frontend { @@ -63,11 +79,16 @@ public: /// int width(QString const & str) const; + /// Return a pointer to a cached QTextLayout object + QTextLayout const * + getTextLayout(docstring const & s, bool const rtl, + double const wordspacing) const; + private: - QTextLayout const & - getTextLayout(docstring const & s, QFont font, - bool const rtl, double const wordspacing) const; + std::pair * + breakAt_helper(docstring const & s, int const x, + bool const rtl, bool const force) const; /// The font QFont font_; @@ -78,8 +99,20 @@ private: /// Cache of char widths mutable QHash width_cache_; +#ifdef CACHE_METRICS_WIDTH /// Cache of string widths - mutable QCache strwidth_cache_; + mutable QCache strwidth_cache_; +#endif + +#ifdef CACHE_METRICS_BREAKAT + /// Cache for breakAt + mutable QCache> breakat_cache_; +#endif + +#ifdef CACHE_METRICS_QTEXTLAYOUT + /// Cache for QTextLayout:s + mutable QCache qtextlayout_cache_; +#endif struct AscendDescend { int ascent; @@ -93,13 +126,6 @@ private: /// Cache of char right bearings mutable QHash rbearing_cache_; - // A trivial QTextLayout cache - mutable QTextLayout tl_cache_; - mutable docstring tl_cache_s_; - mutable QFont tl_cache_font_; - mutable bool tl_cache_rtl_; - mutable double tl_cache_wordspacing_; - }; } // namespace frontend diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp index 1434ce7376..8607454d8d 100644 --- a/src/frontends/qt4/GuiPainter.cpp +++ b/src/frontends/qt4/GuiPainter.cpp @@ -470,8 +470,17 @@ int GuiPainter::text(int x, int y, docstring const & s, return textwidth; } - // don't use the pixmap cache, - do_drawText(x, y, str, dir, f, ff); + // don't use the pixmap cache + setQPainterPen(computeColor(f.realColor())); + if (dir != Auto) { + QTextLayout const * ptl = fm.getTextLayout(s, dir == RtL, wordspacing); + ptl->draw(this, QPointF(x, y - fm.maxAscent())); + } + else { + if (font() != ff) + setFont(ff); + drawText(x, y, str); + } //LYXERR(Debug::PAINTING, "draw " << string(str.toUtf8()) // << " at " << x << "," << y); return textwidth; diff --git a/src/support/convert.cpp b/src/support/convert.cpp index 6b985f50ba..49eaccc387 100644 --- a/src/support/convert.cpp +++ b/src/support/convert.cpp @@ -122,6 +122,13 @@ string convert(double d) } +template<> +docstring convert(double d) +{ + return from_ascii(convert(d)); +} + + template<> int convert(string const s) { diff --git a/status.22x b/status.22x index d600c4b257..62bb7ff4f0 100644 --- a/status.22x +++ b/status.22x @@ -58,6 +58,8 @@ What's new - Issue an error message if incompatible languages (in terms of language package requirements) are used (bug 10456). +- Improve display speed, especially when compiled against Qt 4.x. + * DOCUMENTATION AND LOCALIZATION