(Fcharset_name): Define `byte_offset' in non-UTF-2000 configuration.

[chise/xemacs-chise.git-] / src / faces.h

diff --git a/src/faces.h b/src/faces.h
index 7d4523e..e94c195 100644 (file)
--- a/src/faces.h
+++ b/src/faces.h
@@ -215,7 +215,7 @@ struct face_cachel
      right sort are available on the system.  In this case, the
      whole program will just crash.  For the moment, this is
      OK (for debugging purposes) but we should fix this by
-     storing a "blank font" if the instantation fails. */
+     storing a "blank font" if the instantiation fails. */
   unsigned int dirty :1;
   unsigned int updated :1;
   /* #### Of course we should use a bit array or something. */
@@ -234,12 +234,12 @@ Lisp_Object ensure_face_cachel_contains_charset (struct face_cachel *cachel,
                                                 Lisp_Object charset);
 void ensure_face_cachel_complete (struct face_cachel *cachel,
                                  Lisp_Object domain,
-                                 unsigned char *charsets);
+                                 Charset_ID *charsets);
 void update_face_cachel_data (struct face_cachel *cachel,
                              Lisp_Object domain,
                              Lisp_Object face);
 void face_cachel_charset_font_metric_info (struct face_cachel *cachel,
-                                          unsigned char *charsets,
+                                          Charset_ID *charsets,
                                           struct font_metric_info *fm);
 void mark_face_cachels (face_cachel_dynarr *elements,
                        void (*markobj) (Lisp_Object));
@@ -261,7 +261,7 @@ EXFUN (Fget_face, 1);
 extern Lisp_Object Qstrikethru, Vbuilt_in_face_specifiers, Vdefault_face;
 extern Lisp_Object Vleft_margin_face, Vpointer_face, Vright_margin_face;
 extern Lisp_Object Vtext_cursor_face, Vvertical_divider_face; 
-extern Lisp_Object Vtoolbar_face, Vgui_element_face;
+extern Lisp_Object Vtoolbar_face, Vgui_element_face, Vwidget_face;
 
 void mark_all_faces_as_clean (void);
 void init_frame_faces (struct frame *f);
@@ -281,7 +281,7 @@ void default_face_height_and_width_1 (Lisp_Object domain,
                                      int *height, int *width);
 
 #define FACE_CACHEL_FONT(cachel, charset) \
-  (cachel->font[XCHARSET_LEADING_BYTE (charset) - 128])
+  (cachel->font[XCHARSET_LEADING_BYTE (charset) - MIN_LEADING_BYTE])
 
 #define WINDOW_FACE_CACHEL(window, index) \
   Dynarr_atp ((window)->face_cachels, index)