--- deliantra/Deliantra-Client/Client.xs	2006/06/05 00:17:47	1.104
+++ deliantra/Deliantra-Client/Client.xs	2006/06/05 03:33:09	1.105
@@ -88,11 +88,8 @@
 substitute_func (FcPattern *pattern, gpointer data)
 {
   FcPatternAddBool (pattern, FC_HINTING , 1);
-#ifdef _WIN32
-  FcPatternAddBool (pattern, FC_AUTOHINT, 1);
-#else
+  //FcPatternAddBool (pattern, FC_AUTOHINT, 1);
   FcPatternAddBool (pattern, FC_AUTOHINT, 0);
-#endif
 }
 
 static void
@@ -420,14 +417,24 @@
 void
 pango_init ()
 	CODE:
-{
         // delayed, so it can pick up new fonts added by AddFontResourceEx
-        ft2_fontmap = pango_ft2_font_map_new ();
-        pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
-        ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
-
-        cairo_fontmap = pango_cairo_font_map_get_default ();
-        cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
+{
+        {
+          ft2_fontmap = pango_ft2_font_map_new ();
+          pango_ft2_font_map_set_default_substitute ((PangoFT2FontMap *)ft2_fontmap, substitute_func, 0, 0);
+          ft2_context = pango_ft2_font_map_create_context ((PangoFT2FontMap *)ft2_fontmap);
+        }
+
+        {
+          cairo_font_options_t *fopt = cairo_font_options_create ();
+          cairo_fontmap = pango_cairo_font_map_get_default ();
+          cairo_context = pango_cairo_font_map_create_context ((PangoCairoFontMap *)cairo_fontmap);
+          cairo_font_options_set_antialias (fopt, CAIRO_ANTIALIAS_GRAY);
+          cairo_font_options_set_hint_style (fopt, CAIRO_HINT_STYLE_FULL);
+          cairo_font_options_set_hint_metrics (fopt, CAIRO_HINT_METRICS_ON);
+          pango_cairo_context_set_font_options (cairo_context, fopt);
+          cairo_font_options_destroy (fopt);
+        }
 }
 
 int