Merge branch 'master' into biblatex2

[lyx.git] / src / frontends / qt4 / GuiFontMetrics.h

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index bc6b24aceb1d77c883b11eb752d189b9bd2f3da4..de567ef8fb3742714ad96252405bafa663df2129 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -16,11 +16,28 @@
 
 #include "support/docstring.h"
 
-#include <map>
-
 #include <QFont>
 #include <QFontMetrics>
 #include <QHash>
+#include <QTextLayout>
+
+// 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 <QCache>
+#endif
 
 namespace lyx {
 namespace frontend {
@@ -36,6 +53,9 @@ public:
        virtual int maxDescent() const;
        virtual Dimension const defaultDimension() const;
        virtual int em() const;
+       virtual int lineWidth() const;
+       virtual int underlinePos() const;
+       virtual int strikeoutPos() const;
        virtual int width(char_type c) const;
        virtual int ascent(char_type c) const;
        virtual int descent(char_type c) const;
@@ -43,8 +63,8 @@ public:
        virtual int rbearing(char_type c) const;
        virtual int width(docstring const & s) const;
        virtual int signedWidth(docstring const & s) const;
-       virtual int pos2x(docstring const & s, int pos, bool rtl) const;
-       virtual int x2pos(docstring const & s, int & x, bool rtl) const;
+       virtual int pos2x(docstring const & s, int pos, bool rtl, double ws) const;
+       virtual int x2pos(docstring const & s, int & x, bool rtl, double ws) const;
        virtual bool breakAt(docstring & s, int & x, bool rtl, bool force) const;
        virtual Dimension const dimension(char_type c) const;
 
@@ -56,10 +76,22 @@ public:
                int & width,
                int & ascent,
                int & descent) const;
+
+       int countExpanders(docstring const & str) const;
        ///
        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:
+
+       std::pair<int, int> *
+       breakAt_helper(docstring const & s, int const x,
+                      bool const rtl, bool const force) const;
+
        /// The font
        QFont font_;
 
@@ -69,9 +101,20 @@ private:
        /// Cache of char widths
        mutable QHash<char_type, int> width_cache_;
 
+#ifdef CACHE_METRICS_WIDTH
        /// Cache of string widths
-       /// FIXME Try to use a QHash (this requires to define qHash(docstring))
-       mutable std::map<docstring, int> strwidth_cache_;
+       mutable QCache<docstring, int> strwidth_cache_;
+#endif
+
+#ifdef CACHE_METRICS_BREAKAT
+       /// Cache for breakAt
+       mutable QCache<docstring, std::pair<int, int>> breakat_cache_;
+#endif
+
+#ifdef CACHE_METRICS_QTEXTLAYOUT
+       /// Cache for QTextLayout:s
+       mutable QCache<docstring, QTextLayout> qtextlayout_cache_;
+#endif
 
        struct AscendDescend {
                int ascent;
@@ -84,6 +127,7 @@ private:
 
        /// Cache of char right bearings
        mutable QHash<char_type, int> rbearing_cache_;
+
 };
 
 } // namespace frontend