From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 2 Jun 2006 16:25:38 +0000 (+0000)
Subject: finally implement proper clipping for texts
X-Git-Tag: 2.6.0~3369
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/db7917f04df76583bb8949283b45e2c4f5c9d48b?ds=sidebyside

finally implement proper clipping for texts
---

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 4c08b4fc..2ff5fbf7 100644
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -685,89 +685,92 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
 
 	int buffer_stride=surface->stride;
 	
-	for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
+	for (unsigned int c = 0; c < clip.rects.size(); ++c)
 	{
-		if (!(i->flags & GS_INVERT))
+		for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
 		{
-			lookup8 = lookup8_normal;
-			lookup32 = lookup32_normal;
-		} else
-		{
-			lookup8 = lookup8_invert;
-			lookup32 = lookup32_invert;
-		}
+			if (!(i->flags & GS_INVERT))
+			{
+				lookup8 = lookup8_normal;
+				lookup32 = lookup32_normal;
+			} else
+			{
+				lookup8 = lookup8_invert;
+				lookup32 = lookup32_invert;
+			}
 		
-		static FTC_SBit glyph_bitmap;
-		if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
-			continue;
-		int rx=i->x+glyph_bitmap->left + offset.x();
-		int ry=i->y-glyph_bitmap->top  + offset.y();
+			static FTC_SBit glyph_bitmap;
+			if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
+				continue;
+			int rx=i->x+glyph_bitmap->left + offset.x();
+			int ry=i->y-glyph_bitmap->top  + offset.y();
 		
-		__u8 *d=(__u8*)(surface->data)+buffer_stride*ry+rx*surface->bypp;
-		__u8 *s=glyph_bitmap->buffer;
-		register int sx=glyph_bitmap->width;
-		int sy=glyph_bitmap->height;
-		if ((sy+ry) >= clip.extends.bottom())
-			sy=clip.extends.bottom()-ry;
-		if ((sx+rx) >= clip.extends.right())
-			sx=clip.extends.right()-rx;
-		if (rx < clip.extends.left())
-		{
-			int diff=clip.extends.left()-rx;
-			s+=diff;
-			sx-=diff;
-			rx+=diff;
-			d+=diff*surface->bypp;
-		}
-		if (ry < clip.extends.top())
-		{
-			int diff=clip.extends.top()-ry;
-			s+=diff*glyph_bitmap->pitch;
-			sy-=diff;
-			ry+=diff;
-			d+=diff*buffer_stride;
-		}
-		if (sx>0)
-			for (int ay=0; ay<sy; ay++)
+			__u8 *d=(__u8*)(surface->data)+buffer_stride*ry+rx*surface->bypp;
+			__u8 *s=glyph_bitmap->buffer;
+			register int sx=glyph_bitmap->width;
+			int sy=glyph_bitmap->height;
+			if ((sy+ry) >= clip.rects[c].bottom())
+				sy=clip.rects[c].bottom()-ry;
+			if ((sx+rx) >= clip.rects[c].right())
+				sx=clip.rects[c].right()-rx;
+			if (rx < clip.rects[c].left())
 			{
-				if (!opcode)		// 4bit lookup to 8bit
-				{
-					register __u8 *td=d;
-					register int ax;
-					
-					for (ax=0; ax<sx; ax++)
-					{	
-						register int b=(*s++)>>4;
-						if(b)
-							*td++=lookup8[b];
-						else
-							td++;
-					}
-				} else if (opcode == 1)	// 8bit direct
-				{
-					register __u8 *td=d;
-					register int ax;
-					for (ax=0; ax<sx; ax++)
-					{	
-						register int b=*s++;
-						*td++^=b;
-					}
-				} else
+				int diff=clip.rects[c].left()-rx;
+				s+=diff;
+				sx-=diff;
+				rx+=diff;
+				d+=diff*surface->bypp;
+			}
+			if (ry < clip.rects[c].top())
+			{
+				int diff=clip.rects[c].top()-ry;
+				s+=diff*glyph_bitmap->pitch;
+				sy-=diff;
+				ry+=diff;
+				d+=diff*buffer_stride;
+			}
+			if (sx>0)
+				for (int ay=0; ay<sy; ay++)
 				{
-					register __u32 *td=(__u32*)d;
-					register int ax;
-					for (ax=0; ax<sx; ax++)
-					{	
-						register int b=(*s++)>>4;
-						if(b)
-							*td++=lookup32[b];
-						else
-							td++;
+					if (!opcode)		// 4bit lookup to 8bit
+					{
+						register __u8 *td=d;
+						register int ax;
+						
+						for (ax=0; ax<sx; ax++)
+						{	
+							register int b=(*s++)>>4;
+							if(b)
+								*td++=lookup8[b];
+							else
+								td++;
+						}
+					} else if (opcode == 1)	// 8bit direct
+					{
+						register __u8 *td=d;
+						register int ax;
+						for (ax=0; ax<sx; ax++)
+						{	
+							register int b=*s++;
+							*td++^=b;
+						}
+					} else
+					{
+						register __u32 *td=(__u32*)d;
+						register int ax;
+						for (ax=0; ax<sx; ax++)
+						{	
+							register int b=(*s++)>>4;
+							if(b)
+								*td++=lookup32[b];
+							else
+								td++;
+						}
 					}
+					s+=glyph_bitmap->pitch-sx;
+					d+=buffer_stride;
 				}
-				s+=glyph_bitmap->pitch-sx;
-				d+=buffer_stride;
-			}
+		}
 	}
 }