Enlightenment CVS committal

Author  : kwo
Project : e16
Module  : e

Dir     : e16/e/src


Modified Files:
        text.c 


Log Message:
Fix Xft fonts/encoding (always go via utf8).

===================================================================
RCS file: /cvs/e/e16/e/src/text.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- text.c      22 Oct 2006 14:09:50 -0000      1.78
+++ text.c      30 Oct 2006 21:06:01 -0000      1.79
@@ -307,6 +307,7 @@
       return -1;
    fdc->font = font;
    ts->fdc = fdc;
+   ts->need_utf8 = 1;
    ts->type = FONT_TYPE_XFT;
    ts->ops = &FontOpsXft;
    return 0;
@@ -329,7 +330,7 @@
 
    if (len == 0)
       len = strlen(text);
-   XftTextExtents8(disp, fdc->font, (XftChar8 *) text, len, &gi);
+   XftTextExtentsUtf8(disp, fdc->font, (const XftChar8 *)text, len, &gi);
    *width = gi.xOff;
    *height = fdc->font->height;
    *ascent = fdc->font->ascent;
@@ -345,8 +346,8 @@
 {
    FontCtxXft         *fdc = (FontCtxXft *) ts->fdc;
 
-   XftDrawString8(fdc->xftd, &(fdc->xftc), fdc->font, x, y, (XftChar8 *) text,
-                 len);
+   XftDrawStringUtf8(fdc->xftd, &(fdc->xftc), fdc->font, x, y,
+                    (const XftChar8 *)text, len);
 }
 
 static int



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to