X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Finternal-gui.h;h=d23ae867ffd9c7334a6e0233c6657f0f11ecc504;hb=82066fec65a88c4a7d9f98ca069fb641ee02af97;hp=70c8fe1659f765575ab4f5d7f4b98877d7cae51a;hpb=6b82a212fd0b84088ce443940b3cf0b2c2946104;p=m17n%2Fm17n-lib.git

diff --git a/src/internal-gui.h b/src/internal-gui.h
index 70c8fe1..d23ae86 100644
--- a/src/internal-gui.h
+++ b/src/internal-gui.h
@@ -54,6 +54,8 @@ struct MFrame
       character of the default face.  */
   int space_width;
 
+  int average_width;
+
   /** The default ascent and descent of a line.  It is ascent and
       descent of ASCII font of the default face.  */
   int ascent, descent;
@@ -72,6 +74,9 @@ struct MFrame
   /** Logical OR of enum MDeviceType.  */
   int device_type;
 
+  /** Resolution (dots per inch) of the device.  */
+  int dpi;
+
   /** Correction of functions to manipulate the device.  */
   MDeviceDriver *driver;
 
@@ -110,12 +115,18 @@ enum glyph_type
     GLYPH_TYPE_MAX
   };
 
+enum glyph_category
+  {
+    GLYPH_CATEGORY_NORMAL,
+    GLYPH_CATEGORY_MODIFIER,
+    GLYPH_CATEGORY_FORMATTER
+  };
+
 typedef struct
 {
   int pos, to;
   int c;
   unsigned code;
-  MSymbol category;
   MRealizedFace *rface;
   short width, ascent, descent, lbearing, rbearing;
   short xoff, yoff;
@@ -124,6 +135,7 @@ typedef struct
   unsigned right_padding : 1;
   unsigned otf_encoded : 1;
   unsigned bidi_level : 6;
+  enum glyph_category category : 2;
   enum glyph_type type : 3;
   int combining_code;
 } MGlyph;
@@ -216,8 +228,6 @@ struct MGlyphString
 
 typedef struct MGlyphString MGlyphString;
 
-typedef struct MFontDriver MFontDriver;
-
 typedef struct
 {
   short x, y;