X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FPainter.h;h=7906aa986be865e8e60a0051a2df403b4e8b4ecf;hb=abefdcaf309554ae9ea506affcb84e6c0219128c;hp=8bbda37701955e54f71c0da47501353977b3fcee;hpb=85d87c0a46e834389f5d7c8bd52ff5e32a6092c9;p=lyx.git

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 8bbda37701..7906aa986b 100644
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -13,12 +13,12 @@
 #ifndef PAINTER_H
 #define PAINTER_H
 
-#include "Color.h"
-
 #include "support/strfwd.h"
+#include "support/types.h"
 
 namespace lyx {
 
+class Font;
 class FontInfo;
 
 namespace graphics { class Image; }
@@ -54,9 +54,8 @@ namespace frontend {
  */
 class Painter {
 public:
-	Painter() : drawing_enabled_(true) {}
+	Painter(double pixel_ratio) : drawing_enabled_(true), pixel_ratio_(pixel_ratio) {}
 
-	float line_width;
 	static const float thin_line;
 
 	/// possible line styles
@@ -65,6 +64,13 @@ public:
 		line_onoffdash //< dashes with spaces
 	};
 
+	/// possible fill styles
+	enum fill_style {
+		fill_none,
+		fill_oddeven,
+		fill_winding
+	};
+
 	/// possible character styles of preedit string.
 	/// This is used for CJK input method support.
 	enum preedit_style {
@@ -86,7 +92,8 @@ public:
 	 * @param np size of the points array
 	 */
 	virtual void lines(int const * xp, int const * yp, int np, Color,
-		line_style = line_solid, float line_width = thin_line) = 0;
+		fill_style = fill_none, line_style = line_solid,
+		float line_width = thin_line) = 0;
 
 	/// draw a rectangle
 	virtual void rectangle(int x, int y, int w, int h, Color,
@@ -109,11 +116,25 @@ public:
 	virtual void image(int x, int y, int w, int h,
 		graphics::Image const & image) = 0;
 
-	/// draw a string at position x, y (y is the baseline)
-	/**
-	* \return the width of the drawn text.
-	*/
-	virtual int text(int x, int y, docstring const & str, FontInfo const & f) = 0;
+	/** draw a string at position x, y (y is the baseline). The
+	 * text direction is given by \c rtl.
+	 * \return the width of the drawn text.
+	 */
+	virtual int text(int x, int y, docstring const & str, FontInfo const & f, bool rtl = false) = 0;
+
+	/** draw a string at position x, y (y is the baseline). The
+	 * text direction is enforced by the \c Font.
+	 * \return the width of the drawn text.
+	 */
+	virtual int text(int x, int y, docstring const & str, Font const & f) = 0;
+
+	/** draw a string at position x, y (y is the baseline), but
+	 * make sure that the part between \c from and \c to is in
+	 * \c other color. The text direction is enforced by the \c Font.
+	 * \return the width of the drawn text.
+	 */
+	virtual int text(int x, int y, docstring const & str, Font const & f,
+			 Color other, size_type from, size_type to) = 0;
 
 	void setDrawingEnabled(bool drawing_enabled)
 	{ drawing_enabled_ = drawing_enabled; }
@@ -121,12 +142,17 @@ public:
 	/// Indicate wether real screen drawing shall be done or not.
 	bool isDrawingEnabled() const { return drawing_enabled_; }
 
+	double pixelRatio() const { return pixel_ratio_; }
+
 	/// draw a char at position x, y (y is the baseline)
 	/**
 	* \return the width of the drawn text.
 	*/
 	virtual int text(int x, int y, char_type c, FontInfo const & f) = 0;
 
+	/// draw the underbar, strikeout, uuline and uwave font attributes
+	virtual void textDecoration(FontInfo const & f, int x, int y, int width) = 0;
+
 	/**
 	 * Draw a string and enclose it inside a rectangle. If
 	 * back color is specified, the background is cleared with
@@ -154,6 +180,8 @@ public:
 private:
 	///
 	bool drawing_enabled_;
+	/// Ratio between physical pixels and device-independent pixels
+	double pixel_ratio_;
 };
 
 } // namespace frontend