[Emacs-diffs] Changes to emacs/src/w32font.h,v

[Jason Rumney]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Jason Rumney <jasonr>   08/04/08 14:29:21

Index: w32font.h
===================================================================
RCS file: /sources/emacs/emacs/src/w32font.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- w32font.h   3 Apr 2008 12:28:57 -0000       1.6
+++ w32font.h   8 Apr 2008 14:29:21 -0000       1.7
@@ -36,6 +36,16 @@
 
 #define NTMFLAGS_OPENTYPE (NTM_PS_OPENTYPE | NTM_TT_OPENTYPE)
 
+struct w32_metric_cache
+{
+  short lbearing, rbearing, width;
+  unsigned char status;
+};
+
+#define W32METRIC_NO_ATTEMPT 0
+#define W32METRIC_SUCCESS 1
+#define W32METRIC_FAIL 2
+
 /* The actual structure for a w32 font, that can be cast to struct font.
    The Uniscribe backend extends this.  */
 struct w32font_info
@@ -43,9 +53,12 @@
   struct font font;
   TEXTMETRIC metrics;
   unsigned int glyph_idx;
-  struct font_metrics ascii_metrics[128];
+  struct w32_metric_cache **cached_metrics;
+  int n_cache_blocks;
 };
 
+#define CACHE_BLOCKSIZE 128
+
 Lisp_Object w32font_get_cache P_ ((FRAME_PTR fe));
 Lisp_Object w32font_list_internal P_ ((Lisp_Object frame,
                                        Lisp_Object font_spec,