* output_plaintext.C: cosmetics in comment: line length cannot be < 0

[lyx.git] / src / metricsinfo.h

diff --git a/src/metricsinfo.h b/src/metricsinfo.h
index a1a241451e0a63c341e720f365828ca7687edb56..733bccd3f239ec0caa4820ef38c767a4ae230c66 100644 (file)
--- a/src/metricsinfo.h
+++ b/src/metricsinfo.h
@@ -13,13 +13,15 @@
 #define METRICSINFO_H
 
 #include "lyxfont.h"
-#include "support/types.h"
-
+#include "support/docstring.h"
 #include <string>
 
-class Painter;
 class BufferView;
 
+namespace lyx {
+
+namespace frontend { class Painter; }
+
 
 /// Standard Sizes (mode styles)
 enum Styles {
@@ -80,16 +82,16 @@ public:
 class PainterInfo {
 public:
        ///
-       PainterInfo(BufferView * bv, Painter & pain);
+       PainterInfo(BufferView * bv, frontend::Painter & pain);
        ///
-       void draw(int x, int y, char c);
+       void draw(int x, int y, char_type c);
        ///
-       void draw(int x, int y, std::string const & str);
+       void draw(int x, int y, docstring const & str);
 
        ///
        MetricsBase base;
        ///
-       Painter & pain;
+       frontend::Painter & pain;
        /// Whether the text at this point is right-to-left (for InsetNewline)
        bool ltr_pos;
        /// Whether the parent is deleted (change tracking)
@@ -98,18 +100,32 @@ public:
 
 class TextMetricsInfo {};
 
+enum ScreenUpdateStrategy {
+       NoScreenUpdate,
+       SingleParUpdate,
+       FullScreenUpdate,
+       DecorationUpdate
+};
+
 class ViewMetricsInfo
 {
 public:
-       ViewMetricsInfo(lyx::pit_type p1, lyx::pit_type p2, int y1, int y2,
-                       bool singlepar, lyx::pit_type size) : p1(p1), p2(p2), 
-                       y1(y1), y2(y2), singlepar(singlepar), size(size) {}
-       lyx::pit_type p1;
-       lyx::pit_type p2;
+       ViewMetricsInfo()
+                       : p1(0), p2(0), y1(0), y2(0),
+                       update_strategy(FullScreenUpdate), size(0)
+               {}
+       ViewMetricsInfo(pit_type p1, pit_type p2, int y1, int y2,
+                       ScreenUpdateStrategy updatestrategy, pit_type size)
+                       : p1(p1), p2(p2), y1(y1), y2(y2),
+                       update_strategy(updatestrategy), size(size)
+               {}
+
+       pit_type p1;
+       pit_type p2;
        int y1;
        int y2;
-       bool singlepar;
-       lyx::pit_type size;
+       ScreenUpdateStrategy update_strategy;
+       pit_type size;
 };
 
 
@@ -134,7 +150,8 @@ protected:
 class FontChanger : public Changer<LyXFont> {
 public:
        ///
-       FontChanger(LyXFont & orig, char const * font);
+       FontChanger(LyXFont & orig, docstring const & font);
+       FontChanger(MetricsBase & mb, char const * const font);
        ///
        ~FontChanger();
 };
@@ -144,7 +161,8 @@ public:
 class FontSetChanger : public Changer<MetricsBase> {
 public:
        ///
-       FontSetChanger(MetricsBase & mb, char const * font);
+       FontSetChanger(MetricsBase & mb, docstring const & font);
+       FontSetChanger(MetricsBase & mb, char const * const font);
        ///
        ~FontSetChanger();
 };
@@ -215,4 +233,6 @@ public:
        ~ColorChanger();
 };
 
+} // namespace lyx
+
 #endif