Amend f441590c

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

diff --git a/src/frontends/qt4/GuiFontMetrics.h b/src/frontends/qt4/GuiFontMetrics.h
index d310741cc33c00facdd7ce40a4d7d611b93ea3f3..8c8daab5cd97aa3d54053df78a318d668910d1fe 100644 (file)
--- a/src/frontends/qt4/GuiFontMetrics.h
+++ b/src/frontends/qt4/GuiFontMetrics.h
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /**
- * \file FontMetrics.h
+ * \file GuiFontMetrics.h
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
@@ -9,56 +9,49 @@
  * Full author contact details are available in file CREDITS.
  */
 
-#ifndef QT4_FONT_METRICS_H
-#define QT4_FONT_METRICS_H
+#ifndef GUI_FONT_METRICS_H
+#define GUI_FONT_METRICS_H
 
 #include "frontends/FontMetrics.h"
 
 #include "support/docstring.h"
 
+#include <QByteArray>
+#include <QCache>
+#include <QFont>
 #include <QFontMetrics>
-
-// Starting with version 3.1.0, Qt/X11 does its own caching of
-// character width, so it is not necessary to provide ours.
-#if defined(Q_WS_MACX) || defined(Q_WS_WIN32)
-#define USE_LYX_FONTCACHE
-#endif
+#include <QHash>
+#include <QTextLayout>
 
 namespace lyx {
 namespace frontend {
 
-struct CharMetrics
-{
-       int width;
-       int ascent;
-       int descent;
-};
-
-
-class GuiFontMetrics: public FontMetrics
+class GuiFontMetrics : public FontMetrics
 {
 public:
-
        GuiFontMetrics(QFont const & font);
-       GuiFontMetrics(QFont const & font, QFont const & smallcaps_font);
 
        virtual ~GuiFontMetrics() {}
 
        virtual int maxAscent() const;
        virtual int maxDescent() const;
-#ifndef USE_LYX_FONTCACHE
-       virtual int width(char_type c) const {
-               return metrics_.width(QChar(static_cast<short int>(c)));
-       }
-#else
+       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;
-#endif
        virtual int ascent(char_type c) const;
        virtual int descent(char_type c) const;
        virtual int lbearing(char_type c) const;
        virtual int rbearing(char_type c) const;
-       virtual int width(char_type const * s, size_t n) 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, 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;
+
        virtual void rectText(docstring const & str,
                int & width,
                int & ascent,
@@ -71,28 +64,45 @@ public:
        int width(QString const & str) const;
 
 private:
-       int smallcapsWidth(QString const & s) const;
+
+       QTextLayout const &
+       getTextLayout(docstring const & s, QFont font,
+                     bool const rtl, double const wordspacing) const;
+
+       /// The font
+       QFont font_;
 
        /// Metrics on the font
        QFontMetrics metrics_;
-       QFontMetrics smallcaps_metrics_;
 
-       bool smallcaps_shape_;
+       /// Cache of char widths
+       mutable QHash<char_type, int> width_cache_;
+
+       /// Cache of string widths
+       mutable QCache<QByteArray, int> strwidth_cache_;
 
-#ifdef USE_LYX_FONTCACHE
+       struct AscendDescend {
+               int ascent;
+               int descent;
+       };
+       /// Cache of char ascends and descends
+       mutable QHash<char_type, AscendDescend> metrics_cache_;
        /// fill in \c metrics_cache_ at specified value.
-       void fillCache(unsigned short val) const;
-       /// Cache of char widths
-       /** This cache adds 20Mo of memory to the LyX executable when
-       * loading UserGuide.lyx which contains a good number of fonts. If
-       * this turns out to be too much, we can switch to a \c QHash based
-       * solution.
-       **/
-       mutable CharMetrics metrics_cache_[65536];
-#endif // USE_LYX_FONTCACHE
+       AscendDescend const fillMetricsCache(char_type) const;
+
+       /// Cache of char right bearings
+       mutable QHash<char_type, int> 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
 } // namespace lyx
 
-#endif // QT4_FONT_METRICS_H
+#endif // GUI_FONT_METRICS_H