/[emacs]/emacs/src/dispextern.h
ViewVC logotype

Diff of /emacs/src/dispextern.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.128.2.3 by fx, Wed Jul 3 22:09:46 2002 UTC revision 1.128.2.4 by handa, Fri Jul 26 04:05:48 2002 UTC
# Line 1265  struct face Line 1265  struct face
1265       reallocated.  */       reallocated.  */
1266    int font_info_id;    int font_info_id;
1267    
1268    /* Fontset ID if this face uses a fontset, or -1.  This is only >= 0    /* Fontset ID if for this face's fontset.  Non-ASCII faces derived
1269       if the face was realized for a composition sequence.       from the same ASCII face have the same fontset.  */
      Otherwise, a specific font is loaded from the set of fonts  
      specified by the fontset given by the family attribute of the face.  */  
1270    int fontset;    int fontset;
1271        
1272    /* Pixmap width and height.  */    /* Pixmap width and height.  */
# Line 1300  struct face Line 1298  struct face
1298    /* The hash value of this face.  */    /* The hash value of this face.  */
1299    unsigned hash;    unsigned hash;
1300    
   /* The charset for which this face was realized if it was realized  
      for use in multibyte text.  If fontset >= 0, this is the charset  
      of the first character of the composition sequence.  A value of  
      charset < 0 means the face was realized for use in unibyte text  
      where the idea of Emacs charsets isn't applicable.  */  
   int charset;  
   
1301    /* Non-zero if text in this face should be underlined, overlined,    /* Non-zero if text in this face should be underlined, overlined,
1302       strike-through or have a box drawn around it.  */       strike-through or have a box drawn around it.  */
1303    unsigned underline_p : 1;    unsigned underline_p : 1;
# Line 1349  struct face Line 1340  struct face
1340    /* Next and previous face in hash collision list of face cache.  */    /* Next and previous face in hash collision list of face cache.  */
1341    struct face *next, *prev;    struct face *next, *prev;
1342    
1343    /* If this face is for ASCII characters, this points this face    /* If this face is an ASCII face, this points to this face itself.
1344       itself.  Otherwise, this points a face for ASCII characters.  */       Otherwise, this points to an ASCII face that has the same
1345         attributes except the font.  */
1346    struct face *ascii_face;    struct face *ascii_face;
1347  };  };
1348    
# Line 1437  struct face_cache Line 1429  struct face_cache
1429  /* Non-zero if FACE is suitable for displaying character CHAR.  */  /* Non-zero if FACE is suitable for displaying character CHAR.  */
1430    
1431  #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR)    \  #define FACE_SUITABLE_FOR_CHAR_P(FACE, CHAR)    \
1432    (SINGLE_BYTE_CHAR_P (CHAR)                    \    (ASCII_CHAR_P (CHAR)                  \
1433     ? (FACE) == (FACE)->ascii_face               \     ? (FACE) == (FACE)->ascii_face               \
1434     : face_suitable_for_char_p ((FACE), (CHAR)))     : face_suitable_for_char_p ((FACE), (CHAR)))
1435    
# Line 1446  struct face_cache Line 1438  struct face_cache
1438     This macro is only meaningful for multibyte character CHAR.  */     This macro is only meaningful for multibyte character CHAR.  */
1439        
1440  #define FACE_FOR_CHAR(F, FACE, CHAR)    \  #define FACE_FOR_CHAR(F, FACE, CHAR)    \
1441    (SINGLE_BYTE_CHAR_P (CHAR)            \    (ASCII_CHAR_P (CHAR)          \
1442     ? (FACE)->ascii_face->id             \     ? (FACE)->ascii_face->id             \
1443     : face_for_char ((F), (FACE), (CHAR)))     : face_for_char ((F), (FACE), (CHAR)))
1444    
# Line 2276  unsigned long load_color P_ ((struct fra Line 2268  unsigned long load_color P_ ((struct fra
2268                                enum lface_attribute_index));                                enum lface_attribute_index));
2269  void unload_color P_ ((struct frame *, unsigned long));  void unload_color P_ ((struct frame *, unsigned long));
2270  int frame_update_line_height P_ ((struct frame *));  int frame_update_line_height P_ ((struct frame *));
2271    char *choose_face_font P_ ((struct frame *, Lisp_Object *, Lisp_Object));
2272  int ascii_face_of_lisp_face P_ ((struct frame *, int));  int ascii_face_of_lisp_face P_ ((struct frame *, int));
2273  void prepare_face_for_display P_ ((struct frame *, struct face *));  void prepare_face_for_display P_ ((struct frame *, struct face *));
2274  int xstricmp P_ ((unsigned char *, unsigned char *));  int xstricmp P_ ((unsigned char *, unsigned char *));
2275  int lookup_face P_ ((struct frame *, Lisp_Object *, int, struct face *));  int lookup_face P_ ((struct frame *, Lisp_Object *));
2276  int lookup_named_face P_ ((struct frame *, Lisp_Object, int));  int lookup_non_ascii_face P_ ((struct frame *, int, struct face *));
2277    int lookup_named_face P_ ((struct frame *, Lisp_Object));
2278  int smaller_face P_ ((struct frame *, int, int));  int smaller_face P_ ((struct frame *, int, int));
2279  int face_with_height P_ ((struct frame *, int, int));  int face_with_height P_ ((struct frame *, int, int));
2280  int lookup_derived_face P_ ((struct frame *, Lisp_Object, int, int));  int lookup_derived_face P_ ((struct frame *, Lisp_Object, int));
2281  void init_frame_faces P_ ((struct frame *));  void init_frame_faces P_ ((struct frame *));
2282  void free_frame_faces P_ ((struct frame *));  void free_frame_faces P_ ((struct frame *));
2283  void recompute_basic_faces P_ ((struct frame *));  void recompute_basic_faces P_ ((struct frame *));
# Line 2298  void free_realized_face P_ ((struct fram Line 2292  void free_realized_face P_ ((struct fram
2292  extern Lisp_Object Qforeground_color, Qbackground_color;  extern Lisp_Object Qforeground_color, Qbackground_color;
2293  extern char unspecified_fg[], unspecified_bg[];  extern char unspecified_fg[], unspecified_bg[];
2294  extern void check_face_attributes P_ ((Lisp_Object, Lisp_Object, Lisp_Object));  extern void check_face_attributes P_ ((Lisp_Object, Lisp_Object, Lisp_Object));
2295  extern Lisp_Object generate_ascii_font P_ ((Lisp_Object, Lisp_Object));  extern Lisp_Object generate_ascii_font_name P_ ((Lisp_Object, Lisp_Object));
2296    extern Lisp_Object font_name_registry P_ ((Lisp_Object));
2297    
2298  /* Defined in xfns.c  */  /* Defined in xfns.c  */
2299    

Legend:
Removed from v.1.128.2.3  
changed lines
  Added in v.1.128.2.4

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26