XEmacs 21.2.41 "Polyhymnia".

[chise/xemacs-chise.git.1] / src / glyphs.h

diff --git a/src/glyphs.h b/src/glyphs.h
index 056cc23..d9c64d4 100644 (file)
--- a/src/glyphs.h
+++ b/src/glyphs.h
@@ -222,19 +222,19 @@ extern struct image_instantiator_methods *format##_image_instantiator_methods
 struct image_instantiator_methods *format##_image_instantiator_methods
 
 #define INITIALIZE_IMAGE_INSTANTIATOR_FORMAT_NO_SYM(format, obj_name)  \
-do {                                                           \
-  format##_image_instantiator_methods =                                \
-    xnew_and_zero (struct image_instantiator_methods);         \
-  format##_image_instantiator_methods->symbol = Q##format;     \
-  format##_image_instantiator_methods->device = Qnil;          \
-  format##_image_instantiator_methods->keywords =              \
-    Dynarr_new (ii_keyword_entry);                             \
-  format##_image_instantiator_methods->consoles =              \
-    Dynarr_new (console_type_entry);                           \
-  add_entry_to_image_instantiator_format_list                  \
-    (Q##format, format##_image_instantiator_methods);          \
-  dumpstruct (&format##_image_instantiator_methods,            \
-              &iim_description);                               \
+do {                                                                   \
+  format##_image_instantiator_methods =                                        \
+    xnew_and_zero (struct image_instantiator_methods);                 \
+  format##_image_instantiator_methods->symbol = Q##format;             \
+  format##_image_instantiator_methods->device = Qnil;                  \
+  format##_image_instantiator_methods->keywords =                      \
+    Dynarr_new (ii_keyword_entry);                                     \
+  format##_image_instantiator_methods->consoles =                      \
+    Dynarr_new (console_type_entry);                                   \
+  add_entry_to_image_instantiator_format_list                          \
+    (Q##format, format##_image_instantiator_methods);                  \
+  dump_add_root_struct_ptr (&format##_image_instantiator_methods,      \
+                           &iim_description);                          \
 } while (0)
 
 #define INITIALIZE_IMAGE_INSTANTIATOR_FORMAT(format, obj_name) \
@@ -300,19 +300,19 @@ IIFORMAT_VALID_GENERIC_KEYWORD(format, keyw, validate_fun, 0, 0)
 DECLARE_IMAGE_INSTANTIATOR_FORMAT(format);     \
 struct image_instantiator_methods *type##_##format##_image_instantiator_methods
 
-#define INITIALIZE_DEVICE_IIFORMAT(type, format)                       \
-do {                                                                   \
-  type##_##format##_image_instantiator_methods =                       \
-    xnew_and_zero (struct image_instantiator_methods);                 \
-  type##_##format##_image_instantiator_methods->symbol = Q##format;    \
-  type##_##format##_image_instantiator_methods->device = Q##type;      \
-  type##_##format##_image_instantiator_methods->keywords =             \
-    Dynarr_new (ii_keyword_entry);                                     \
-  add_entry_to_device_ii_format_list                                   \
-    (Q##type, Q##format, type##_##format##_image_instantiator_methods);        \
-  IIFORMAT_VALID_CONSOLE(type,format);                                 \
-  dumpstruct (&type##_##format##_image_instantiator_methods,           \
-              &iim_description);                                       \
+#define INITIALIZE_DEVICE_IIFORMAT(type, format)                               \
+do {                                                                           \
+  type##_##format##_image_instantiator_methods =                               \
+    xnew_and_zero (struct image_instantiator_methods);                         \
+  type##_##format##_image_instantiator_methods->symbol = Q##format;            \
+  type##_##format##_image_instantiator_methods->device = Q##type;              \
+  type##_##format##_image_instantiator_methods->keywords =                     \
+    Dynarr_new (ii_keyword_entry);                                             \
+  add_entry_to_device_ii_format_list                                           \
+    (Q##type, Q##format, type##_##format##_image_instantiator_methods);                \
+  IIFORMAT_VALID_CONSOLE(type,format);                                         \
+  dump_add_root_struct_ptr (&type##_##format##_image_instantiator_methods,     \
+                           &iim_description);                                  \
 } while (0)
 
 /* Declare that image-instantiator format FORMAT has method M; used in
@@ -327,6 +327,8 @@ do {                                                                        \
 #define IIFORMAT_INHERITS_SHARED_DEVMETHOD(type, from, format, m, fromformat) \
   (type##_##format##_image_instantiator_methods->m##_method = from##_##fromformat##_##m)
 
+#define INSTANTIATOR_TYPE(inst) (XVECTOR_DATA ((inst))[0])
+
 struct image_instantiator_methods *
 decode_device_ii_format (Lisp_Object device, Lisp_Object format,
                         Error_behavior errb);
@@ -374,6 +376,7 @@ int layout_layout (Lisp_Object image_instance,
                   int width, int height, int xoffset, int yoffset,
                   Lisp_Object domain);
 int invalidate_glyph_geometry_maybe (Lisp_Object glyph_or_ii, struct window* w);
+Lisp_Object make_image_instance_cache_hash_table (void);
 
 DECLARE_DOESNT_RETURN (incompatible_image_types (Lisp_Object instantiator,
                                                  int given_dest_mask,