X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPainter.C;h=13eaa3a68af11b6a26e9590fba038e4068c0cb13;hb=4590c8cfab02a3bc56813cfb1f2e80bd1119af9e;hp=8d44c84fb244872c03f71c0eb96e569081b6e8a3;hpb=36e819ef14243c9121b0d88526c37ad83c6bca1f;p=lyx.git

diff --git a/src/Painter.C b/src/Painter.C
index 8d44c84fb2..13eaa3a68a 100644
--- a/src/Painter.C
+++ b/src/Painter.C
@@ -4,7 +4,7 @@
  * 
  *           LyX, The Document Processor
  * 	 
- *	    Copyright 1998-2000 The LyX Team
+ *	    Copyright 1998-2001 The LyX Team
  *
  *======================================================*/
 
@@ -29,6 +29,12 @@
 #include "support/lstrings.h"
 #include "WorkArea.h"
 #include "font.h"
+#include "ColorHandler.h"
+#include "lyxrc.h"
+#include "encoding.h"
+#include "language.h"
+
+#include "frontends/support/LyXImage.h"
 
 using std::endl;
 using std::max;
@@ -36,32 +42,7 @@ using std::max;
 Painter::Painter(WorkArea & wa)
 	: PainterBase(wa)
 {
-	colormap = fl_state[fl_get_vclass()].colormap;
-	// Clear the GC cache
-	for (int i = 0; i <= LColor::ignore; ++i) {
-		colorGCcache[i] = 0;
-	}
-}
-
-
-Painter::~Painter() {
-	// Release all the registered GCs
-	for (int i = 0; i <= LColor::ignore; ++i) {
-		if (colorGCcache[i] != 0) {
-			XFreeGC(display, colorGCcache[i]);
-		}
-	}
-	// Iterate over the line cache and Free the GCs
-	for (LineGCCache::iterator lit = lineGCcache.begin();
-	     lit != lineGCcache.end(); ++lit) {
-		XFreeGC(display, (*lit).second);
-	}
-}
-
-
-Drawable Painter::drawable() const 
-{
-	return owner.getPixmap();
+	display = fl_get_display();
 }
 
 
@@ -71,14 +52,16 @@ extern bool Lgb_bug_find_hack;
 
 PainterBase & Painter::point(int x, int y, LColor::color c)
 {
-	if (lyxerr.debugging()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "point not called from "
 				"workarea::workhandler\n";
-		lyxerr.debug() << "Painter drawable: " << drawable() << endl;
+		lyxerr.debug() << "Painter drawable: "
+			       << owner.getPixmap() << endl;
 	}
 	
-	XDrawPoint(display, drawable(), getGCForeground(c), x, y);
+	XDrawPoint(display, owner.getPixmap(),
+		   lyxColorHandler->getGCForeground(c), x, y);
 	return *this;
 }
 
@@ -88,15 +71,17 @@ PainterBase & Painter::line(int x1, int y1, int x2, int y2,
 			enum line_style ls,
 			enum line_width lw)
 {
-	if (lyxerr.debugging()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "line not called from "
 				"workarea::workhandler\n";
-		lyxerr.debug() << "Painter drawable: " << drawable() << endl;
+		lyxerr.debug() << "Painter drawable: "
+			       << owner.getPixmap() << endl;
 	}
 	
-	XDrawLine(display, drawable(), 
-		  getGCLinepars(ls, lw, col), x1, y1, x2, y2);
+	XDrawLine(display, owner.getPixmap(), 
+		  lyxColorHandler->getGCLinepars(ls, lw, col),
+		  x1, y1, x2, y2);
 	return *this;
 }
 
@@ -106,11 +91,12 @@ PainterBase & Painter::lines(int const * xp, int const * yp, int np,
 			     enum line_style ls,
 			     enum line_width lw)
 {
-	if (lyxerr.debugging()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "lines not called from "
 				"workarea::workhandler\n";
-		lyxerr.debug() << "Painter drawable: " << drawable() << endl;
+		lyxerr.debug() << "Painter drawable: "
+			       << owner.getPixmap() << endl;
 	}
 	
 #ifndef HAVE_AUTO_PTR
@@ -123,7 +109,8 @@ PainterBase & Painter::lines(int const * xp, int const * yp, int np,
 		points[i].y = yp[i];
 	}
 
-        XDrawLines(display, drawable(), getGCLinepars(ls, lw, col), 
+        XDrawLines(display, owner.getPixmap(),
+		   lyxColorHandler->getGCLinepars(ls, lw, col), 
 		   points, np, CoordModeOrigin);
 
 #ifndef HAVE_AUTO_PTR
@@ -138,14 +125,16 @@ PainterBase & Painter::rectangle(int x, int y, int w, int h,
 				 enum line_style ls,
 				 enum line_width lw)
 {
-	if (lyxerr.debugging()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "rectangle not called from "
 				"workarea::workhandler\n";
-		lyxerr << "Painter drawable: " << drawable() << endl;
+		lyxerr << "Painter drawable: "
+		       << owner.getPixmap() << endl;
 	}
 	
-	XDrawRectangle(display, drawable(), getGCLinepars(ls, lw, col), 
+	XDrawRectangle(display, owner.getPixmap(),
+		       lyxColorHandler->getGCLinepars(ls, lw, col), 
 		       x, y, w, h);
 	return *this;
 }
@@ -154,14 +143,16 @@ PainterBase & Painter::rectangle(int x, int y, int w, int h,
 PainterBase & Painter::fillRectangle(int x, int y, int w, int h,
 				 LColor::color col)
 {
-	if (lyxerr.debugging()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "fillrectangle not called from "
 				"workarea::workhandler\n";
-		lyxerr << "Painter drawable: " << drawable() << endl;
+		lyxerr << "Painter drawable: "
+		       << owner.getPixmap() << endl;
 	}
 	
-	XFillRectangle(display, drawable(), getGCForeground(col), x, y, w, h);
+	XFillRectangle(display, owner.getPixmap(),
+		       lyxColorHandler->getGCForeground(col), x, y, w, h);
 	return *this;
 }
 
@@ -169,11 +160,11 @@ PainterBase & Painter::fillRectangle(int x, int y, int w, int h,
 PainterBase & Painter::fillPolygon(int const * xp, int const * yp, int np,
 			       LColor::color col)
 {
-	if (lyxerr.debugging()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr <<"fillpolygon not called from "
 				"workarea::workhandler\n";
-		lyxerr << "Painter drawable: " << drawable() << endl;
+		lyxerr << "Painter drawable: " << owner.getPixmap() << endl;
 	}
 	
 #ifndef HAVE_AUTO_PTR
@@ -186,7 +177,8 @@ PainterBase & Painter::fillPolygon(int const * xp, int const * yp, int np,
 		points[i].y = yp[i];
 	}
 
-	XFillPolygon(display, drawable(), getGCForeground(col), points, np, 
+	XFillPolygon(display, owner.getPixmap(),
+		     lyxColorHandler->getGCForeground(col), points, np, 
 		     Nonconvex, CoordModeOrigin);
 #ifndef HAVE_AUTO_PTR
 	delete[] points;
@@ -199,14 +191,15 @@ PainterBase & Painter::arc(int x, int y,
 		  unsigned int w, unsigned int h,
 		  int a1, int a2, LColor::color col)
 {
-	if (lyxerr.debugging()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "arc not called from "
 				"workarea::workhandler\n";
-		lyxerr << "Painter drawable: " << drawable() << endl;
+		lyxerr << "Painter drawable: " << owner.getPixmap() << endl;
 	}
 	
-        XDrawArc(display, drawable(), getGCForeground(col),
+        XDrawArc(display, owner.getPixmap(),
+		 lyxColorHandler->getGCForeground(col),
                  x, y, w, h, a1, a2);
 	return *this;
 }     
@@ -218,11 +211,11 @@ PainterBase & Painter::segments(int const * x1, int const * y1,
 			    LColor::color col,
 			    enum line_style ls, enum line_width lw)
 {
-	if (lyxerr.debugging()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "segments not called from "
 				"workarea::workhandler\n";
-		lyxerr << "Painter drawable: " << drawable() << endl;
+		lyxerr << "Painter drawable: " << owner.getPixmap() << endl;
 	}
 	
 #ifndef HAVE_AUTO_PTR
@@ -236,7 +229,8 @@ PainterBase & Painter::segments(int const * x1, int const * y1,
 		s[i].x2 = x2[i];
 		s[i].y2 = y2[i];
 	}
-	XDrawSegments(display, drawable(), getGCLinepars(ls, lw, col), s, ns);
+	XDrawSegments(display, owner.getPixmap(),
+		      lyxColorHandler->getGCLinepars(ls, lw, col), s, ns);
 
 #ifndef HAVE_AUTO_PTR
 	delete [] s;
@@ -244,26 +238,32 @@ 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()) {
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "workAreaExpose not called from "
 				"workarea::workhandler\n";
-		lyxerr << "Painter drawable: " << drawable() << endl;
+		lyxerr << "Painter drawable: " << owner.getPixmap() << endl;
 	}
-	
+
 	XGCValues val;
 	val.function = GXcopy;
-	GC gc = XCreateGC(display, drawable(),
+	GC gc = XCreateGC(display, owner.getPixmap(),
 			  GCFunction, &val);
-	XCopyArea(display, bitmap, drawable(), gc,
+	XCopyArea(display, bitmap, owner.getPixmap(), gc,
 		  0, 0, w, h, x, y);
 	XFreeGC(display, gc);
 	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)
 {
@@ -278,190 +278,113 @@ 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 (lyxerr.debugging()) {
+	if (lyxrc.font_norm_type == LyXRC::ISO_10646_1) {
+		XChar2b * xs = new XChar2b[ls];
+		Encoding const * encoding = f.language()->encoding();
+		LyXFont font(f);
+		if (f.family() == LyXFont::SYMBOL_FAMILY) {
+#ifdef USE_UNICODE_FOR_SYMBOLS
+			font.setFamily(LyXFont::ROMAN_FAMILY);
+			font.setShape(LyXFont::UP_SHAPE);
+#endif
+			encoding = encodings.symbol_encoding();
+		}
+		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);
+		delete[] xs;
+		return *this;
+	}
+
+	if (lyxerr.debugging(Debug::GUI)) {
 		if (!Lgb_bug_find_hack)
 			lyxerr << "text not called from "
 				"workarea::workhandler\n";
-		lyxerr << "Painter drawable: " << drawable() << endl;
+		lyxerr << "Painter drawable: " << owner.getPixmap() << endl;
 	}
-	GC gc = getGCForeground(f.realColor());
+	GC gc = lyxColorHandler->getGCForeground(f.realColor());
 	if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
 		lyxfont::XSetFont(display, gc, f);
-		XDrawString(display, drawable(), gc, x, y, s, ls);
+		XDrawString(display, owner.getPixmap(), gc, x, y, s, ls);
 	} else {
 		LyXFont smallfont(f);
 		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);
 				lyxfont::XSetFont(display, gc, smallfont);
-				XDrawString(display, drawable(),
+				XDrawString(display, owner.getPixmap(),
 					    gc, tmpx, y, &c, 1);
 				tmpx += lyxfont::XTextWidth(smallfont, &c, 1);
-				//tmpx += lyxfont::width(c, f);
 			} else {
 				lyxfont::XSetFont(display, gc, f);
-				XDrawString(display, drawable(),
+				XDrawString(display, owner.getPixmap(),
 					    gc, tmpx, y, &c, 1);
 				tmpx += lyxfont::XTextWidth(f, &c, 1);
-				//tmpx += lyxfont::width(c, f);
 			}
 		}
 	}
-	underline(f, x, y, lyxfont::width(s, ls, f));
+	if (f.underbar() == LyXFont::ON && f.latex() != LyXFont::ON)
+		underline(f, x, y, lyxfont::width(s, ls, f));
 	return *this;
 }
 
 
-void Painter::underline(LyXFont const & f, int x, int y, int width)
-{
-	// What about underbars?
-	if (f.underbar() == LyXFont::ON && f.latex() != LyXFont::ON) {
-		int below = max(lyxfont::maxDescent(f) / 2, 2);
-		int height = max((lyxfont::maxDescent(f) / 4) - 1, 1);
-		if (height < 2)
-			line(x, y + below, x + width, y + below, f.color());
-		else
-			fillRectangle(x, y + below, width, below + height,
-				      f.color());
-	}
-}
-
-
-// Gets GC according to color
-// Uses caching
-GC Painter::getGCForeground(LColor::color c)
+PainterBase & Painter::text(int x, int y, XChar2b const * s, int ls,
+			LyXFont const & f)
 {
-	if (lyxerr.debugging()) {
-		lyxerr << "Painter drawable: " << drawable() << endl;
+	if (lyxerr.debugging(Debug::GUI)) {
+		if (!Lgb_bug_find_hack)
+			lyxerr << "text not called from "
+				"workarea::workhandler\n";
+		lyxerr << "Painter drawable: " << owner.getPixmap() << endl;
 	}
-	
-    	if (colorGCcache[c] != 0) return colorGCcache[c];
-
-	XColor xcol, ccol;
-	string s = lcolor.getX11Name(c);
-	XGCValues val;
-
-	// Look up the RGB values for the color, and an approximate
-	// color that we can hope to get on this display.
-        if (XLookupColor(display, colormap, s.c_str(), &xcol, &ccol) == 0) {
-		lyxerr << _("LyX: Unknown X11 color ") << s
-		       << _(" for ") << lcolor.getGUIName(c) << '\n'
-		       << _("     Using black instead, sorry!.") << endl;
-		unsigned long bla = BlackPixel(display,
-					       DefaultScreen(display));
-		val.foreground = bla;
-	// Try the exact RGB values first, then the approximate.
-	} else if (XAllocColor(display, colormap, &xcol) != 0) {
-		if (lyxerr.debugging()) {
-			lyxerr << _("LyX: X11 color ") << s
-			       << _(" allocated for ") 
-			       << lcolor.getGUIName(c) << endl;
-		}
-		val.foreground = xcol.pixel;
-	} else if (XAllocColor(display, colormap, &ccol)) {
-		lyxerr << _("LyX: Using approximated X11 color ") << s
-		       << _(" allocated for ")
-		       << lcolor.getGUIName(c) << endl;
-		val.foreground = xcol.pixel;
+	GC gc = lyxColorHandler->getGCForeground(f.realColor());
+	if (f.realShape() != LyXFont::SMALLCAPS_SHAPE) {
+		lyxfont::XSetFont(display, gc, f);
+		XDrawString16(display, owner.getPixmap(), gc, x, y, s, ls);
 	} else {
-		// Here we are traversing the current colormap to find
-		// the color closest to the one we want.
-		Visual * vi = DefaultVisual(display, DefaultScreen(display));
-
-		XColor * cmap = new XColor[vi->map_entries];
-
-		for(int i = 0; i < vi->map_entries; ++i) {
-			cmap[i].pixel = i;
-		}
-		XQueryColors(display, colormap, cmap, vi->map_entries);
-
-		// Walk through the cmap and look for close colors.
-		int closest_pixel = 0;
-		double closest_distance = 1e20; // we want to minimize this
-		double distance = 0;
-		for(int t = 0; t < vi->map_entries; ++t) {
-			// The Euclidean distance between two points in 
-			// a three-dimensional space, the RGB color-cube,
-			// is used as the distance measurement between two
-			// colors.
-
-			// Since square-root is monotonous, we don't have to
-			// take the square-root to find the minimum, and thus 
-			// we use the squared distance instead to be faster.
-
-			// If we want to get fancy, we could convert the RGB
-			// coordinates to a different color-cube, maybe HSV,
-			// but the RGB cube seems to work great.  (Asger)
-			distance = pow(cmap[t].red   - xcol.red,   2.0) +
-				   pow(cmap[t].green - xcol.green, 2.0) +
-				   pow(cmap[t].blue  - xcol.blue,  2.0);
-			if (distance < closest_distance) {
-				closest_distance = distance;
-				closest_pixel = t;
+		LyXFont smallfont(f);
+		smallfont.decSize().decSize().setShape(LyXFont::UP_SHAPE);
+		static XChar2b c = {0, 0};
+		int tmpx = x;
+		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);
+				XDrawString16(display, owner.getPixmap(),
+					    gc, tmpx, y, &c, 1);
+				tmpx += lyxfont::XTextWidth16(smallfont, &c, 1);
+			} else {
+				lyxfont::XSetFont(display, gc, f);
+				XDrawString16(display, owner.getPixmap(),
+					    gc, tmpx, y, &s[i], 1);
+				tmpx += lyxfont::XTextWidth16(f, const_cast<XChar2b *>(&s[i]), 1);
 			}
 		}
-		lyxerr << _("LyX: Couldn't allocate '") << s 
-		       << _("' for ") << lcolor.getGUIName(c)
-		       << _(" with (r,g,b)=(") 
-		       << xcol.red << "," << xcol.green << ","
-		       << xcol.blue << ").\n"
-		       << _("     Using closest allocated "
-			    "color with (r,g,b)=(") 
-		       << cmap[closest_pixel].red << ","
-		       << cmap[closest_pixel].green << ","
-		       << cmap[closest_pixel].blue << ") instead.\n"
-		       << "Pixel [" << closest_pixel << "] is used." << endl;
-		val.foreground = cmap[closest_pixel].pixel;
-		delete[] cmap;
 	}
-
-	val.function = GXcopy;
-	return colorGCcache[c] = XCreateGC(display, drawable(),
-				    GCForeground | GCFunction, &val);
+	if (f.underbar() == LyXFont::ON && f.latex() != LyXFont::ON)
+		underline(f, x, y, lyxfont::width(s, ls, f));
+	return *this;
 }
 
 
-// Gets GC for line
-GC Painter::getGCLinepars(enum line_style ls,
-			  enum line_width lw, LColor::color c)
+void Painter::underline(LyXFont const & f, int x, int y, int width)
 {
-	if (lyxerr.debugging()) {
-		lyxerr << "Painter drawable: " << drawable() << endl;
-	}
-	
-	int index = lw + (ls << 1) + (c << 3);
-
-	if (lineGCcache.find(index) != lineGCcache.end())
-		return lineGCcache[index];
-
-	XGCValues val;
-	XGetGCValues(display, getGCForeground(c), GCForeground, &val);
-	
-	switch (lw) {
-	case line_thin:  	val.line_width = 0; break;
-	case line_thick: 	val.line_width = 2; break;
-	}
-	
-	switch (ls) {
-	case line_solid:	val.line_style = LineSolid; break;
-	case line_onoffdash: 	val.line_style = LineOnOffDash; break;
-	case line_doubledash: 	val.line_style = LineDoubleDash; break;
-	}
-
-
-	val.cap_style = CapRound;
-	val.join_style = JoinRound;
-	val.function = GXcopy;
-
-	return lineGCcache[index] =
-		XCreateGC(display, drawable(), 
-			  GCForeground | GCLineStyle | GCLineWidth | 
-			  GCCapStyle | GCJoinStyle | GCFunction, &val);
+	int below = max(lyxfont::maxDescent(f) / 2, 2);
+	int height = max((lyxfont::maxDescent(f) / 4) - 1, 1);
+	if (height < 2)
+		line(x, y + below, x + width, y + below, f.color());
+	else
+		fillRectangle(x, y + below, width, below + height,
+			      f.color());
 }