[Dotgnu-pnet-commits] pnetlib/Xsharp Font.cs, 1.11, 1.12 XsharpPCF.c, 1.3, 1.4

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/Xsharp
In directory subversions:/tmp/cvs-serv18128/Xsharp

Modified Files:
        Font.cs XsharpPCF.c 
Log Message:


Fix some metrics issues in "mssR08.pcf" and enable the PCF-based font renderer.


Index: Font.cs
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/Font.cs,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Font.cs     1 Dec 2003 07:39:58 -0000       1.11
--- Font.cs     1 Dec 2003 10:20:14 -0000       1.12
***************
*** 265,269 ****
                                bool latin1 = IsLatin1();
  
- #if false
                                // Do we have a registered font for this name, 
size, and style?
                                RegisteredFont font;
--- 265,268 ----
***************
*** 299,303 ****
                                        }
                                }
- #endif
  
                                // Re-adjust point sizes for Windows vs X 
differences.
--- 298,301 ----

Index: XsharpPCF.c
===================================================================
RCS file: /cvsroot/dotgnu-pnet/pnetlib/Xsharp/XsharpPCF.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** XsharpPCF.c 1 Dec 2003 09:43:20 -0000       1.3
--- XsharpPCF.c 1 Dec 2003 10:20:14 -0000       1.4
***************
*** 524,528 ****
                }
  
-               printf("%c %d\n", buffer[0], overall_ink.x);
                /* Render the bitmaps for the characters into the XImage */
                xposn = -(overall_ink.x);
--- 524,527 ----
***************
*** 628,632 ****
        if(line1 != y || line2 != y)
        {
!               XSharpTextExtentsStruct(dpy, fontSet, str, origOffset, 
origLength,
                                                                &overall_ink, 
&overall_logical);
                XSetLineAttributes(dpy, gc, 1, LineSolid, CapNotLast, 
JoinMiter);
--- 627,631 ----
        if(line1 != y || line2 != y)
        {
!               XSharpTextExtentsStruct(dpy, &(image->fs), str, origOffset, 
origLength,
                                                                &overall_ink, 
&overall_logical);
                XSetLineAttributes(dpy, gc, 1, LineSolid, CapNotLast, 
JoinMiter);