Fix bug 2195: Slowness in rendering inside insets, especially on the Mac

[lyx.git] / src / metricsinfo.h

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index fe64b81725b457b38b45b1d70a088da3c11af140..ad9b33f677d4e7ee6bbf0668da8207e19a89230e 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -1,8 +1,21 @@
+// -*- C++ -*-
+/**
+ * \file metricsinfo.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef METRICSINFO_H
 #define METRICSINFO_H
 
 #include "lyxfont.h"
-#include "LString.h"
+#include "support/types.h"
+
+#include <string>
 
 class Painter;
 class BufferView;
@@ -21,10 +34,11 @@ enum Styles {
 };
 
 
-// 
+//
 // This is the part common to MetricsInfo and PainterInfo
 //
-struct MetricsBase {
+class MetricsBase {
+public:
        ///
        MetricsBase();
        ///
@@ -37,17 +51,18 @@ struct MetricsBase {
        /// current math style (display/text/script/..)
        Styles style;
        /// name of current font - mathed specific
-       string fontname;
+       std::string fontname;
        /// This is the width available in pixels
        int textwidth;
 };
 
 
 //
-// This contains a Metricsbase and Information that's only relevant during
+// This contains a MetricsBase and information that's only relevant during
 // the first phase of the two-phase draw
 //
-struct MetricsInfo {
+class MetricsInfo {
+public:
        ///
        MetricsInfo();
        ///
@@ -59,32 +74,50 @@ struct MetricsInfo {
 
 
 //
-// This contains a Metricsbase and Information that's only relevant during
+// This contains a MetricsBase and information that's only relevant during
 // the second phase of the two-phase draw
 //
-struct PainterInfo {
+class PainterInfo {
+public:
        ///
-       explicit PainterInfo(BufferView * bv);
+       PainterInfo(BufferView * bv, Painter & pain);
        ///
        void draw(int x, int y, char c);
+       ///
+       void draw(int x, int y, std::string const & str);
 
        ///
        MetricsBase base;
        ///
        Painter & pain;
-       /// width of current item
-       int width;
+       /// Whether the text at this point is right-to-left (for InsetNewline)
+       bool ltr_pos;
+       /// Whether the parent is deleted (change tracking)
+       bool erased_;
 };
 
+class TextMetricsInfo {};
 
-struct TextMetricsInfo {};
+class ViewMetricsInfo
+{
+public:
+       ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2, int y1, int y2,
+                       bool singlepar) : p1(p1), p2(p2), y1(y1), y2(y2),
+                       singlepar(singlepar) {}
+       lyx::pit_type p1;
+       lyx::pit_type p2;
+       int y1;
+       int y2;
+       bool singlepar;
+};
 
 
 // Generic base for temporarily changing things.
 // The original state gets restored when the Changer is destructed.
 
 template <class Struct, class Temp = Struct>
-struct Changer {
+class Changer {
+public:
        ///
        Changer(Struct & orig) : orig_(orig) {}
 protected:
@@ -97,7 +130,8 @@ protected:
 
 
 // temporarily change some aspect of a font
-struct FontChanger : public Changer<LyXFont> {
+class FontChanger : public Changer<LyXFont> {
+public:
        ///
        FontChanger(LyXFont & orig, char const * font);
        ///
@@ -106,7 +140,8 @@ struct FontChanger : public Changer<LyXFont> {
 
 
 // temporarily change a full font
-struct FontSetChanger : public Changer<MetricsBase> {
+class FontSetChanger : public Changer<MetricsBase> {
+public:
        ///
        FontSetChanger(MetricsBase & mb, char const * font);
        ///
@@ -115,7 +150,8 @@ struct FontSetChanger : public Changer<MetricsBase> {
 
 
 // temporarily change the style
-struct StyleChanger : public Changer<MetricsBase> {
+class StyleChanger : public Changer<MetricsBase> {
+public:
        ///
        StyleChanger(MetricsBase & mb, Styles style);
        ///
@@ -124,21 +160,24 @@ struct StyleChanger : public Changer<MetricsBase> {
 
 
 // temporarily change the style to script style
-struct ScriptChanger : public StyleChanger {
+class ScriptChanger : public StyleChanger {
+public:
        ///
        ScriptChanger(MetricsBase & mb);
 };
 
 
 // temporarily change the style suitable for use in fractions
-struct FracChanger : public StyleChanger {
+class FracChanger : public StyleChanger {
+public:
        ///
        FracChanger(MetricsBase & mb);
 };
 
 
 // temporarily change the style suitable for use in tabulars and arrays
-struct ArrayChanger : public StyleChanger {
+class ArrayChanger : public StyleChanger {
+public:
        ///
        ArrayChanger(MetricsBase & mb);
 };
@@ -146,7 +185,8 @@ struct ArrayChanger : public StyleChanger {
 
 
 // temporarily change the shape of a font
-struct ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+class ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
+public:
        ///
        ShapeChanger(LyXFont & font, LyXFont::FONT_SHAPE shape);
        ///
@@ -155,8 +195,9 @@ struct ShapeChanger : public Changer<LyXFont, LyXFont::FONT_SHAPE> {
 
 
 // temporarily change the available text width
-struct WidthChanger : public Changer<MetricsBase>
+class WidthChanger : public Changer<MetricsBase>
 {
+public:
        ///
        WidthChanger(MetricsBase & mb, int width);
        ///
@@ -164,4 +205,13 @@ struct WidthChanger : public Changer<MetricsBase>
 };
 
 
+// temporarily change the used color
+class ColorChanger : public Changer<LyXFont, std::string> {
+public:
+       ///
+       ColorChanger(LyXFont & font, std::string const & color);
+       ///
+       ~ColorChanger();
+};
+
 #endif