[ros-diffs] [fireball] 47923: - Fix an off by one error in glyph drawing which resulted in a slightly distorted text output. - Add support for grey glyphs (still with sharp output).

[fireball at svn.reactos.org]

Author: fireball
Date: Fri Jul  2 09:41:09 2010
New Revision: 47923

URL: http://svn.reactos.org/svn/reactos?rev=47923&view=rev
Log:
- Fix an off by one error in glyph drawing which resulted in a slightly distorted text output.
- Add support for grey glyphs (still with sharp output).

Modified:
    branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c

Modified: branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c
URL: http://svn.reactos.org/svn/reactos/branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c?rev=47923&r1=47922&r2=47923&view=diff
==============================================================================
--- branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] (original)
+++ branches/arwinss/reactos/subsystems/win32/win32k/gre/font.c [iso-8859-1] Fri Jul  2 09:41:09 2010
@@ -63,7 +63,7 @@
                     &pTextBrush->BrushObj,
                     xspan,
                     y,
-                    xspan + lenspan,
+                    xspan + lenspan - 1,
                     y,
                     &rcBounds,
                     0);
@@ -128,6 +128,69 @@
 #endif
 }
 
+static void SharpGlyphGray(PDC physDev, INT x, INT y,
+                           void *bitmap, GlyphInfo *gi, BRUSHGDI *pTextBrush)
+{
+    unsigned char   *srcLine = bitmap, *src, bits;
+    int             width = gi->width;
+    int             stride = ((width + 3) & ~3);
+    int             height = gi->height;
+    int             w;
+    int             xspan, lenspan;
+    RECTL           rcBounds;
+
+    x -= gi->x;
+    y -= gi->y;
+    while (height--)
+    {
+        src = srcLine;
+        srcLine += stride;
+        w = width;
+        
+        bits = *src++;
+        xspan = x;
+        while (w)
+        {
+            if (bits >= 0x80)
+            {
+                lenspan = 0;
+                do
+                {
+                    lenspan++;
+                    if (lenspan == w)
+                        break;
+                    bits = *src++;
+                } while (bits >= 0x80);
+                rcBounds.left = xspan; rcBounds.top = y;
+                rcBounds.right = xspan+lenspan; rcBounds.bottom = y+1;
+                GreLineTo(&physDev->pBitmap->SurfObj,
+                    physDev->CombinedClip,
+                    &pTextBrush->BrushObj,
+                    xspan,
+                    y,
+                    xspan + lenspan - 1,
+                    y,
+                    &rcBounds,
+                    0);
+                xspan += lenspan;
+                w -= lenspan;
+            }
+            else
+            {
+                do
+                {
+                    w--;
+                    xspan++;
+                    if (!w)
+                        break;
+                    bits = *src++;
+                } while (bits < 0x80);
+            }
+        }
+        y++;
+    }
+}
+
 /* PUBLIC FUNCTIONS **********************************************************/
 
 VOID NTAPI
@@ -147,10 +210,10 @@
     {
         void (* sharp_glyph_fn)(PDC, INT, INT, void *, GlyphInfo *, BRUSHGDI *);
 
-        //if(aa_type == AA_None)
+        if(aa_type == AA_None)
             sharp_glyph_fn = SharpGlyphMono;
-        //else
-            //sharp_glyph_fn = SharpGlyphGray;
+        else
+            sharp_glyph_fn = SharpGlyphGray;
 
         for(idx = 0; idx < count; idx++) {
             sharp_glyph_fn(pDC,
@@ -176,6 +239,7 @@
             }
         }
     } else {
+        UNIMPLEMENTED;
 #if 0
         OUTDATED (need to merge 47289 and higher)
         XImage *image;