X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbcwindowdraw.C;h=cd28636f19c15e307c05627657cd01062e156341;hp=52b7f83727a4cbfce049250ba9c91a43aafd1c9a;hb=b78e8ac7987fbf35a4ba60534c4a3d2b290562b9;hpb=4f7f413cbc1c6ea5da27cb75ca27a3ab317243ec

diff --git a/cinelerra-5.1/guicast/bcwindowdraw.C b/cinelerra-5.1/guicast/bcwindowdraw.C
index 52b7f837..cd28636f 100644
--- a/cinelerra-5.1/guicast/bcwindowdraw.C
+++ b/cinelerra-5.1/guicast/bcwindowdraw.C
@@ -232,51 +232,21 @@ void BC_WindowBase::draw_xft_text(int x, int y,
 {
 	int dy = -1;
 	const wchar_t *wsp = text, *wep = wsp + length;
+	int font = top_level->current_font;
 	while( wsp < wep ) {
 		const wchar_t *wcp = wsp;
 		while( wcp < wep && *wcp != '\n' ) ++wcp;
 		int len = wcp - wsp;
 		if( len > 0 )
-			draw_wtext(x, y, wsp, len, pixmap);
+			draw_single_text(1, font, x, y, wsp, len, pixmap);
 		if( wcp >= wep ) break;
 		if( dy < 0 )
-			dy = get_text_height(top_level->current_font);
+			dy = get_text_height(font);
 		y += dy;
 		wsp = wcp + 1;
 	}
 }
 
-int BC_WindowBase::wcharpos(const wchar_t *text, XftFont *font, int length,
-		int *charpos)
-{
-	XGlyphInfo extents;
-
-	if(charpos)
-	{
-		int bpos = charpos[-1];
-
-		for(int i = 0; i < length; i++)
-		{
-			XftTextExtents32(top_level->display,
-				font,
-				(const FcChar32*)text,
-				i + 1,
-				&extents);
-			charpos[i] = extents.xOff + bpos;
-		}
-		return charpos[length - 1] - bpos;
-	}
-	else
-	{
-		XftTextExtents32(top_level->display,
-			font,
-			(const FcChar32*)text,
-			length,
-			&extents);
-		return extents.xOff;
-	}
-}
-
 void BC_WindowBase::xft_draw_string(XftColor *xft_color, XftFont *xft_font,
 		int x, int y, const FcChar32 *fc, int len, BC_Pixmap *pixmap)
 {
@@ -311,116 +281,111 @@ void BC_WindowBase::xft_draw_string(XftColor *xft_color, XftFont *xft_font,
 	}
 }
 
-void BC_WindowBase::draw_wtext(int x, int y,
-	const wchar_t *text, int length, BC_Pixmap *pixmap, int *charpos)
+int BC_WindowBase::get_single_text_width(int font, const wchar_t *text, int length)
+{
+	return draw_single_text(0, font, 0,0, text, length);
+}
+
+int BC_WindowBase::draw_single_text(int draw, int font,
+	int x, int y, const wchar_t *text, int length, BC_Pixmap *pixmap)
 {
+	if( length < 0 )
+		length = wcslen(text);
+	if( !length ) return 0;
+
 	if( !get_resources()->use_xft ) {
-		if( !get_font_struct(current_font) ) return;
+		if( !get_font_struct(font) ) return 0;
 		XChar2b xtext[length], *xp = xtext;
 		for( int i=0; i<length; ++i,++xp ) {
 			xp->byte1 = (unsigned char) (text[i] >> 8);
 			xp->byte2 = (unsigned char) (text[i] & 0xff);
 		}
-		XDrawString16(top_level->display,
-			pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
-			top_level->gc, x, y, xtext, length);
-		return;
+		if( draw ) {
+			XDrawString16(top_level->display,
+				pixmap ? pixmap->opaque_pixmap : this->pixmap->opaque_pixmap,
+				top_level->gc, x, y, xtext, length);
+		}
+		return XTextWidth16(get_font_struct(font), xtext, length);
 	}
-	XRenderColor color;
-	XftColor xft_color;
-	const wchar_t *up, *ubp;
-	int l, *cp;
-	FcPattern *newpat;
-	XftFont *curfont, *nextfont, *altfont, *basefont;
-
-	if(length < 0)
-		length = wcslen(text);
-
-	if(charpos)
-		charpos[0] = 0;
-	if(!length)
-		return;
 
-	color.red = (top_level->current_color & 0xff0000) >> 16;
-	color.red |= color.red << 8;
-	color.green = (top_level->current_color & 0xff00) >> 8;
-	color.green |= color.green << 8;
-	color.blue = (top_level->current_color & 0xff);
-	color.blue |= color.blue << 8;
-	color.alpha = 0xffff;
-
-	XftColorAllocValue(top_level->display,
-		top_level->vis,
-		top_level->cmap,
-		&color,
-		&xft_color);
-
-	basefont = top_level->get_xft_struct(top_level->current_font);
-
-	curfont = nextfont = basefont;
-	altfont = 0;
-	cp = 0;
-	ubp = text;
-
-	for(up = text; up < &text[length]; up++)
-	{
-		if(XftCharExists(top_level->display, basefont, *up))
-			nextfont = basefont;
-		else if(altfont && XftCharExists(top_level->display, altfont, *up))
-			nextfont = altfont;
-		else
-		{
-			if(altfont)
+#ifdef HAVE_XFT
+	XftColor xft_color;
+	if( draw ) {
+		XRenderColor color;
+		color.red = (top_level->current_color & 0xff0000) >> 16;
+		color.red |= color.red << 8;
+		color.green = (top_level->current_color & 0xff00) >> 8;
+		color.green |= color.green << 8;
+		color.blue = (top_level->current_color & 0xff);
+		color.blue |= color.blue << 8;
+		color.alpha = 0xffff;
+
+		XftColorAllocValue(top_level->display, top_level->vis, top_level->cmap,
+			&color, &xft_color);
+	}
+
+	int x0 = x;
+	XftFont *basefont = top_level->get_xft_struct(font);
+	XftFont *curfont = 0, *altfont = 0;
+	const wchar_t *up = text, *ubp = up, *uep = ubp + length;
+
+	while( up < uep ) {
+		XftFont *xft_font = 0;
+		if( XftCharExists(top_level->display, basefont, *up) )
+			xft_font = basefont;
+		else if( altfont ) {
+			if( XftCharExists(top_level->display, altfont, *up))
+				xft_font = altfont;
+			else {
 				XftFontClose(top_level->display, altfont);
-
-			if( (newpat = BC_Resources::find_similar_font(*up, basefont->pattern)) != 0 ) {
-				double psize;
-
-				FcPatternGetDouble(basefont->pattern, FC_PIXEL_SIZE,
-					0, &psize);
-				FcPatternAddDouble(newpat, FC_PIXEL_SIZE, psize);
-				FcPatternDel(newpat, FC_SCALABLE);
-				altfont = XftFontOpenPattern(top_level->display,
-					newpat);
-				if(altfont)
-				nextfont = altfont;
-			}
-			else
-			{
 				altfont = 0;
-				nextfont = basefont;
 			}
 		}
-		if(nextfont != curfont)
-		{
-			l = up - ubp;
-			xft_draw_string(&xft_color, curfont, x, y,
-				(const FcChar32*)ubp, l, pixmap);
-
-			if(charpos)
-				cp = &charpos[ubp - text + 1];
-
-			x += wcharpos(ubp, curfont, l, cp);
-			ubp = up;
-			curfont = nextfont;
+		if( !xft_font ) {
+			FcPattern *pattern = BC_Resources::find_similar_font(*up, basefont->pattern);
+			if( pattern != 0 ) {
+				double psize = 0;
+				FcPatternGetDouble(basefont->pattern, FC_PIXEL_SIZE, 0, &psize);
+				FcPatternAddDouble(pattern, FC_PIXEL_SIZE, psize);
+				FcPatternDel(pattern, FC_SCALABLE);
+				xft_font = altfont = XftFontOpenPattern(top_level->display, pattern);
+			}
 		}
+		if( !xft_font )
+			xft_font = basefont;
+		if( xft_font != curfont ) {
+			if( curfont && up > ubp ) {
+				if( draw ) {
+					xft_draw_string(&xft_color, curfont, x, y,
+						(const FcChar32*)ubp, up-ubp, pixmap);
+				}
+				XGlyphInfo extents;
+				XftTextExtents32(top_level->display, curfont,
+					(const FcChar32*)ubp, up-ubp, &extents);
+				x += extents.xOff;
+			}
+			ubp = up;  curfont = xft_font;
+		}
+		++up;
 	}
 
-	if(up > ubp)
-	{
-		xft_draw_string(&xft_color, curfont, x, y,
-			(const FcChar32*)ubp, up - ubp, pixmap);
-		if(charpos)
-			wcharpos(ubp, curfont, up - ubp, &charpos[ubp - text + 1]);
+	if( curfont && up > ubp ) {
+		if( draw ) {
+			xft_draw_string(&xft_color, curfont, x, y,
+				(const FcChar32*)ubp, up-ubp, pixmap);
+		}
+		XGlyphInfo extents;
+		XftTextExtents32(top_level->display, curfont,
+			(const FcChar32*)ubp, up-ubp, &extents);
+		x += extents.xOff;
 	}
 
-	if(altfont)
+	if( altfont )
 		XftFontClose(top_level->display, altfont);
 
-	XftColorFree(top_level->display,
-		top_level->vis,
-		top_level->cmap,
-		&xft_color);
+	XftColorFree(top_level->display, top_level->vis, top_level->cmap, &xft_color);
+#endif
+	return x - x0;
 }
 
 void BC_WindowBase::truncate_text(char *result, const char *text, int w)