X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2FPainter.h;h=7906aa986be865e8e60a0051a2df403b4e8b4ecf;hb=af42a9d683728a0af34a56f7fd56ec8be4155227;hp=7267839621b73f3f904f5c017a77a236eb430cb5;hpb=065db6806771190d12d37d64c4c86f9c5ebaf225;p=lyx.git

diff --git a/src/frontends/Painter.h b/src/frontends/Painter.h
index 7267839621..7906aa986b 100644
--- a/src/frontends/Painter.h
+++ b/src/frontends/Painter.h
@@ -14,9 +14,11 @@
 #define PAINTER_H
 
 #include "support/strfwd.h"
+#include "support/types.h"
 
 namespace lyx {
 
+class Font;
 class FontInfo;
 
 namespace graphics { class Image; }
@@ -52,7 +54,7 @@ namespace frontend {
  */
 class Painter {
 public:
-	Painter() : drawing_enabled_(true) {}
+	Painter(double pixel_ratio) : drawing_enabled_(true), pixel_ratio_(pixel_ratio) {}
 
 	static const float thin_line;
 
@@ -62,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 {
@@ -83,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,
@@ -106,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; }
@@ -118,6 +142,8 @@ 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.
@@ -154,6 +180,8 @@ public:
 private:
 	///
 	bool drawing_enabled_;
+	/// Ratio between physical pixels and device-independent pixels
+	double pixel_ratio_;
 };
 
 } // namespace frontend