- add invert support for glyphs

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index 9a7ec069737613492d6e9464958440bb87b309c9..cc2449417bd0f5ec57bdf21e9f9d1e2233b62cbf 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -630,14 +630,22 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        gSurface *surface = target->surface;
 
        register int opcode;
        gSurface *surface = target->surface;
 
        register int opcode;

-       gColor *lookup8=0;
-       __u32 lookup32[16];
-               
+
+       gColor *lookup8, lookup8_invert[16];
+       gColor *lookup8_normal=0;
+
+       __u32 lookup32_normal[16], lookup32_invert[16], *lookup32;
+       

        if (surface->bpp == 8)
        {
                if (surface->clut.data)
                {
        if (surface->bpp == 8)
        {
                if (surface->clut.data)
                {

-                       lookup8=getColor(surface->clut, background, foreground).lookup;
+                       lookup8_normal=getColor(surface->clut, background, foreground).lookup;
+                       
+                       int i;
+                       for (i=0; i<16; ++i)
+                               lookup8_invert[i] = lookup8_normal[i^0xF];
+                       

                        opcode=0;
                } else
                        opcode=1;
                        opcode=0;
                } else
                        opcode=1;


@@ -648,15 +656,17 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
                {
                        lookup8=getColor(surface->clut, background, foreground).lookup;
                        for (int i=0; i<16; ++i)
                {
                        lookup8=getColor(surface->clut, background, foreground).lookup;
                        for (int i=0; i<16; ++i)

-                               lookup32[i]=((surface->clut.data[lookup8[i]].a<<24)|
+                               lookup32_normal[i]=((surface->clut.data[lookup8[i]].a<<24)|

                                        (surface->clut.data[lookup8[i]].r<<16)|
                                        (surface->clut.data[lookup8[i]].g<<8)|
                                        (surface->clut.data[lookup8[i]].b))^0xFF000000;
                } else
                {
                        for (int i=0; i<16; ++i)
                                        (surface->clut.data[lookup8[i]].r<<16)|
                                        (surface->clut.data[lookup8[i]].g<<8)|
                                        (surface->clut.data[lookup8[i]].b))^0xFF000000;
                } else
                {
                        for (int i=0; i<16; ++i)

-                               lookup32[i]=(0x010101*i)|0xFF000000;
+                               lookup32_normal[i]=(0x010101*i)|0xFF000000;

                }
                }

+               for (int i=0; i<16; ++i)
+                       lookup32_invert[i]=lookup32_normal[i^0xF];

        } else
        {
                eWarning("can't render to %dbpp", surface->bpp);
        } else
        {
                eWarning("can't render to %dbpp", surface->bpp);


@@ -667,9 +677,19 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        gRegion clip = dc.getClip() & area;
 
        int buffer_stride=surface->stride;
        gRegion clip = dc.getClip() & area;
 
        int buffer_stride=surface->stride;

-
+       

        for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
        {
        for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
        {

+               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;
                static FTC_SBit glyph_bitmap;
                if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
                        continue;

diff --git a/lib/gdi/font.h b/lib/gdi/font.h
index c55b8f46dee102245d6abd45702648baa1dae561..a38454d11bcda4ae80bf5141ba717dd00ef28d05 100644 (file)
--- a/lib/gdi/font.h
+++ b/lib/gdi/font.h
@@ -63,6 +63,8 @@ public:
 #define GS_ISFIRST  2
 #define GS_USED                        4
 
 #define GS_ISFIRST  2
 #define GS_USED                        4
 

+#define GS_INVERT   8
+

 struct pGlyph
 {
        int x, y, w;
 struct pGlyph
 {
        int x, y, w;


@@ -142,6 +144,20 @@ public:
                assert(num < (int)glyphs.size());
                return glyphs[num].bbox;
        }
                assert(num < (int)glyphs.size());
                return glyphs[num].bbox;
        }

+       
+       void setGlyphFlag(int g, int f)
+       {
+               assert(g >= 0);
+               assert(g < (int)glyphs.size());
+               glyphs[g].flags |= f;
+       }
+
+       void clearGlyphFlag(int g, int f)
+       {
+               assert(g >= 0);
+               assert(g < (int)glyphs.size());
+               glyphs[g].flags |= f;
+       }

 };
 
 class Font: public iObject
 };
 
 class Font: public iObject