[xemacs-hg @ 2002-07-29 09:21:12 by michaels] 2002-07-17 Marcus Crestani <crestani@informatik.uni-tuebingen.de> Markus Kaltenbach <makalten@informatik.uni-tuebingen.de> Mike Sperber <mike@xemacs.org> configure flag to turn these changes on: --use-kkcc First we added a dumpable flag to lrecord_implementation. It shows, if the object is dumpable and should be processed by the dumper. * lrecord.h (struct lrecord_implementation): added dumpable flag (MAKE_LRECORD_IMPLEMENTATION): fitted the different makro definitions to the new lrecord_implementation and their calls. Then we changed mark_object, that it no longer needs a mark method for those types that have pdump descritions. * alloc.c: (mark_object): If the object has a description, the new mark algorithm is called, and the object is marked according to its description. Otherwise it uses the mark method like before. These procedures mark objects according to their descriptions. They are modeled on the corresponding pdumper procedures. (mark_with_description): (get_indirect_count): (structure_size): (mark_struct_contents): These procedures still call mark_object, this is needed while there are Lisp_Objects without descriptions left. We added pdump descriptions for many Lisp_Objects: * extents.c: extent_auxiliary_description * database.c: database_description * gui.c: gui_item_description * scrollbar.c: scrollbar_instance_description * toolbar.c: toolbar_button_description * event-stream.c: command_builder_description * mule-charset.c: charset_description * device-msw.c: devmode_description * dialog-msw.c: mswindows_dialog_id_description * eldap.c: ldap_description * postgresql.c: pgconn_description pgresult_description * tooltalk.c: tooltalk_message_description tooltalk_pattern_description * ui-gtk.c: emacs_ffi_description emacs_gtk_object_description * events.c: * events.h: * event-stream.c: * event-Xt.c: * event-gtk.c: * event-tty.c: To write a pdump description for Lisp_Event, we converted every struct in the union event to a Lisp_Object. So we created nine new Lisp_Objects: Lisp_Key_Data, Lisp_Button_Data, Lisp_Motion_Data, Lisp_Process_Data, Lisp_Timeout_Data, Lisp_Eval_Data, Lisp_Misc_User_Data, Lisp_Magic_Data, Lisp_Magic_Eval_Data. We also wrote makro selectors and mutators for the fields of the new designed Lisp_Event and added everywhere these new abstractions. We implemented XD_UNION support in (mark_with_description), so we can describe exspecially console/device specific data with XD_UNION. To describe with XD_UNION, we added a field to these objects, which holds the variant type of the object. This field is initialized in the appendant constructor. The variant is an integer, it has also to be described in an description, if XD_UNION is used. XD_UNION is used in following descriptions: * console.c: console_description (get_console_variant): returns the variant (create_console): added variant initialization * console.h (console_variant): the different console types * console-impl.h (struct console): added enum console_variant contype * device.c: device_description (Fmake_device): added variant initialization * device-impl.h (struct device): added enum console_variant devtype * objects.c: image_instance_description font_instance_description (Fmake_color_instance): added variant initialization (Fmake_font_instance): added variant initialization * objects-impl.h (struct Lisp_Color_Instance): added color_instance_type * objects-impl.h (struct Lisp_Font_Instance): added font_instance_type * process.c: process_description (make_process_internal): added variant initialization * process.h (process_variant): the different process types

--- a/src/window.c	Sat Jul 27 03:53:09 2002 +0000
+++ b/src/window.c	Mon Jul 29 09:21:25 2002 +0000
@@ -231,10 +231,16 @@
   return make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, HASH_TABLE_EQ);
 }
 
+#ifdef USE_KKCC
+DEFINE_LRECORD_IMPLEMENTATION ("window", window,
+			       0, /*dumpable-flag*/
+                               mark_window, print_window, finalize_window,
+			       0, 0, 0, struct window);
+#else /* not USE_KKCC */
 DEFINE_LRECORD_IMPLEMENTATION ("window", window,
                                mark_window, print_window, finalize_window,
 			       0, 0, 0, struct window);
-
+#endif /* not USE_KKCC */
 
 #define INIT_DISP_VARIABLE(field, initialization)	\
   p->field[CURRENT_DISP] = initialization;		\
@@ -336,6 +342,12 @@
    because neither structure is created very often (only when windows are
    created or deleted). --ben */
 
+#ifdef USE_KKCC
+static const struct lrecord_description window_mirror_description [] = {
+  { XD_END }
+};
+#endif /* USE_KKCC */
+
 static Lisp_Object
 mark_window_mirror (Lisp_Object obj)
 {
@@ -368,9 +380,16 @@
     return Qnil;
 }
 
+#ifdef USE_KKCC
+DEFINE_LRECORD_IMPLEMENTATION ("window-mirror", window_mirror,
+			       0, /*dumpable-flag*/
+                               mark_window_mirror, internal_object_printer,
+			       0, 0, 0, 0/*window_mirror_description*/, struct window_mirror);
+#else /* not USE_KKCC */
 DEFINE_LRECORD_IMPLEMENTATION ("window-mirror", window_mirror,
                                mark_window_mirror, internal_object_printer,
 			       0, 0, 0, 0, struct window_mirror);
+#endif /* not USE_KKCC */
 
 /* Create a new window mirror structure and associated redisplay
    structs. */
@@ -5192,6 +5211,19 @@
 #define WINDOW_CONFIGURATIONP(x) RECORDP (x, window_configuration)
 #define CHECK_WINDOW_CONFIGURATION(x) CHECK_RECORD (x, window_configuration)
 
+#ifdef USE_KKCC
+static const struct struct_description saved_window_description = {
+};
+
+static const struct lrecord_description window_config_description [] = {
+  { XD_LISP_OBJECT, offsetof (struct window_config, current_window) },
+  { XD_LISP_OBJECT, offsetof (struct window_config, current_buffer) },
+  { XD_LISP_OBJECT, offsetof (struct window_config, minibuffer_scroll_window) },
+  { XD_LISP_OBJECT, offsetof (struct window_config, root_window) },
+  { XD_END }
+};
+#endif /* USE_KKCC */
+
 static Lisp_Object
 mark_window_config (Lisp_Object obj)
 {
@@ -5251,13 +5283,23 @@
   write_fmt_string (printcharfun, "0x%x>", config->header.uid);
 }
 
+#ifdef USE_KKCC
+DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("window-configuration",
+					window_configuration,
+					0, /*dumpable-flag*/
+					mark_window_config,
+					print_window_config,
+					0, 0, 0, 
+					0/*window_config_description*/, sizeof_window_config,
+					struct window_config);
+#else /* not USE_KKCC */
 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("window-configuration",
 					window_configuration,
 					mark_window_config,
 					print_window_config,
 					0, 0, 0, 0, sizeof_window_config,
 					struct window_config);
-
+#endif /* not USE_KKCC */
 
 /* Returns a boolean indicating whether the two saved windows are
    identical. */