Patch from Anders Kaseorg, use Xutf8DrawText et al. where available,

and use XFontSet instead of XFontStruct *
Tweaks to resource file to help the above pick some less wrong fonts.

1 files changed, 2 insertions, 2 deletions

diff --git a/zwgc/X_gram.h b/zwgc/X_gram.h
index dfff8f1..fe591be 100644
--- a/zwgc/X_gram.h
+++ b/zwgc/X_gram.h
@@ -25,7 +25,7 @@
 
 typedef struct _xblock {
     unsigned long fgcolor;
-    Font fid;
+    XFontSet font;
     int x,y;
     int x1,y1,x2,y2; /* bounds of block.  used for cut and paste. */
     int strindex;
@@ -49,7 +49,7 @@ typedef struct _x_gram {
 
 typedef struct _xauxblock {
     int align;
-    XFontStruct *font;
+    XFontSet font;
     char *str;
     int len;
     int width;