(w32font_open_internal): Determine if glyph indices are likely to work here.

diff --git a/src/ChangeLog b/src/ChangeLog
index fdcbc3469c70443ceb1bbb59f1bdacdd5fe85f0e..e9047f1a70155784db7325ef79e0756677f8c5bb 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-27  Jason Rumney  <jasonr@gnu.org>
+
+        * w32font.c (w32font_open_internal): Determine if glyph indices
+        are likely to work here.
+
 2008-05-27  Chong Yidong  <cyd@stupidchicken.com>
 
        * xdisp.c (draw_glyphs): If mouse-highlighting is on, attempt to

diff --git a/src/w32font.c b/src/w32font.c
index 6639825e1afa67367bf88dd710e78b13c84373bc..413c103d6e4d99aee8aed1c1a723b902b77b8c8b 100644 (file)
--- a/src/w32font.c
+++ b/src/w32font.c
@@ -796,11 +796,16 @@ w32font_open_internal (f, font_entity, pixel_size, font_object)
                sizeof (TEXTMETRIC));
       else
         metrics = NULL;
+
+      /* If it supports outline metrics, it should support Glyph Indices.  */
+      w32_font->glyph_idx = ETO_GLYPH_INDEX;
     }
-  if (!metrics)
-    GetTextMetrics (dc, &w32_font->metrics);
 
-  w32_font->glyph_idx = ETO_GLYPH_INDEX;
+  if (!metrics)
+    {
+      GetTextMetrics (dc, &w32_font->metrics);
+      w32_font->glyph_idx = 0;
+    }
 
   w32_font->cached_metrics = NULL;
   w32_font->n_cache_blocks = 0;