X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPainter.C;h=34f54f2a33bd6ec142fd8fcb9c005cd2b32f56ba;hb=77639efa94ce5c071cf47bfd3ba0026f157a1e6a;hp=d3216b9ef93c27515be46b26e61ed2cb63aa1079;hpb=9062ce972e562477eb64c294769747ebf386fa6c;p=lyx.git

diff --git a/src/Painter.C b/src/Painter.C
index d3216b9ef9..34f54f2a33 100644
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -33,13 +33,15 @@
 #include "lyxrc.h"
 #include "encoding.h"
 
+#include "frontends/support/LyXImage.h"
+
 using std::endl;
 using std::max;
 
 Painter::Painter(WorkArea & wa)
 	: PainterBase(wa)
 {
-	display = fl_display;
+	display = fl_get_display();
 }
 
 
@@ -235,7 +237,6 @@ PainterBase & Painter::segments(int const * x1, int const * y1,
 	return *this;
 }
 
-
 PainterBase & Painter::pixmap(int x, int y, int w, int h, Pixmap bitmap)
 {
 	if (lyxerr.debugging(Debug::GUI)) {
@@ -244,7 +245,7 @@ PainterBase & Painter::pixmap(int x, int y, int w, int h, Pixmap bitmap)
 				"workarea::workhandler\n";
 		lyxerr << "Painter drawable: " << owner.getPixmap() << endl;
 	}
-	
+
 	XGCValues val;
 	val.function = GXcopy;
 	GC gc = XCreateGC(display, owner.getPixmap(),
@@ -255,6 +256,13 @@ PainterBase & Painter::pixmap(int x, int y, int w, int h, Pixmap bitmap)
 	return *this;
 }
 
+PainterBase & Painter::image(int x, int y, int w, int h, LyXImage const * image)
+{
+	Pixmap bitmap = image->getPixmap();
+
+	return pixmap(x, y, w, h, bitmap);
+}
+
 
 PainterBase & Painter::text(int x, int y, string const & s, LyXFont const & f)
 {
@@ -269,28 +277,26 @@ PainterBase & Painter::text(int x, int y, char c, LyXFont const & f)
 }
 
 
-PainterBase & Painter::text(int x, int y, char const * s, int ls,
+PainterBase & Painter::text(int x, int y, char const * s, size_t ls,
 			LyXFont const & f)
 {
 	if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
 		XChar2b * xs = new XChar2b[ls];
 		Encoding const * encoding = f.language()->encoding();
-		LyXFont const * font = &f; 
+		LyXFont font(f);
 		if (f.family() == LyXFont::SYMBOL_FAMILY) {
 #ifdef USE_UNICODE_FOR_SYMBOLS
-			LyXFont font2 = f;
-			font2.setFamily(LyXFont::ROMAN_FAMILY);
-			font2.setShape(LyXFont::UP_SHAPE);
-			font = &font2;
+			font.setFamily(LyXFont::ROMAN_FAMILY);
+			font.setShape(LyXFont::UP_SHAPE);
 #endif
-			encoding = &symbol_encoding;
+			encoding = encodings.symbol_encoding();
 		}
-		for (int i = 0; i < ls; ++i) {
+		for (size_t i = 0; i < ls; ++i) {
 			Uchar c = encoding->ucs(s[i]);
 			xs[i].byte1 = c >> 8;
 			xs[i].byte2 = c & 0xff;
 		}
-		text(x , y, xs, ls, *font);
+		text(x , y, xs, ls, font);
 		delete[] xs;
 		return *this;
 	}
@@ -310,7 +316,7 @@ PainterBase & Painter::text(int x, int y, char const * s, int ls,
 		smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
 		char c;
 		int tmpx = x;
-		for(int i = 0; i < ls; ++i) {
+		for (size_t i = 0; i < ls; ++i) {
 			c = s[i];
 			if (islower(static_cast<unsigned char>(c))) {
 				c = toupper(c);
@@ -350,7 +356,7 @@ PainterBase & Painter::text(int x, int y, XChar2b const * s, int ls,
 		smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
 		static XChar2b c = {0, 0};
 		int tmpx = x;
-		for(int i = 0; i < ls; ++i) {
+		for (int i = 0; i < ls; ++i) {
 			if (s[i].byte1 == 0 && islower(s[i].byte2)) {
 				c.byte2 = toupper(s[i].byte2);
 				lyxfont::XSetFont(display, gc, smallfont);