diff src/console-impl.h @ 3659:98af8a976fc3

[xemacs-hg @ 2006-11-05 22:31:31 by aidan] Support specifying fonts for particular character sets in Mule; support translation to ISO 10646-1 for Mule character sets without an otherwise matching font; move to a vector of X11-charset-X11-registry instead of a regex for the charset-registry property.
author aidan
date Sun, 05 Nov 2006 22:31:46 +0000
parents 1e7cc382eb16
children ea701c23ed84 d1247f3cc363
line wrap: on
line diff
--- a/src/console-impl.h	Sat Nov 04 22:51:03 2006 +0000
+++ b/src/console-impl.h	Sun Nov 05 22:31:46 2006 +0000
@@ -26,6 +26,7 @@
 #define INCLUDED_console_impl_h_
 
 #include "console.h"
+#include "specifier.h"
 
 extern const struct sized_memory_description cted_description;
 extern const struct sized_memory_description console_methods_description;
@@ -212,17 +213,13 @@
   Lisp_Object (*font_list_method) (Lisp_Object pattern,
 				    Lisp_Object device,
 				    Lisp_Object maxnumber);
-  Lisp_Object (*find_charset_font_method) (Lisp_Object device,
-					   Lisp_Object font,
-					   Lisp_Object charset,
-					   int stage);
-  int (*font_spec_matches_charset_method) (struct device *d,
-					   Lisp_Object charset,
-					   const Ibyte *nonreloc,
-					   Lisp_Object reloc,
-					   Bytecount offset,
-					   Bytecount length,
-					   int stage);
+  Lisp_Object (*find_charset_font_method) 
+    (Lisp_Object device, Lisp_Object font, Lisp_Object charset,
+     enum font_specifier_matchspec_stages stage); 
+  int (*font_spec_matches_charset_method)
+    (struct device *d, Lisp_Object charset, const Ibyte *nonreloc,
+     Lisp_Object reloc, Bytecount offset, Bytecount length,
+     enum font_specifier_matchspec_stages stage);
 
   /* image methods */
   void (*mark_image_instance_method) (Lisp_Image_Instance *);