comparison src/device-msw.c @ 934:c925bacdda60

[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
author michaels
date Mon, 29 Jul 2002 09:21:25 +0000
parents 4a27df428c73
children 8d610ea37af8
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
1072 1072
1073 /************************************************************************/ 1073 /************************************************************************/
1074 /* devmode */ 1074 /* devmode */
1075 /************************************************************************/ 1075 /************************************************************************/
1076 1076
1077 #ifdef USE_KKCC
1078 static const struct lrecord_description devmode_description[] = {
1079 { XD_LISP_OBJECT, offsetof (struct Lisp_Devmode, printer_name) },
1080 { XD_LISP_OBJECT, offsetof (struct Lisp_Devmode, device) }
1081 { XD_END }
1082 };
1083 #endif /* USE_KKCC */
1084
1077 static Lisp_Object 1085 static Lisp_Object
1078 mark_devmode (Lisp_Object obj) 1086 mark_devmode (Lisp_Object obj)
1079 { 1087 {
1080 Lisp_Devmode *data = XDEVMODE (obj); 1088 Lisp_Devmode *data = XDEVMODE (obj);
1081 mark_object (data->printer_name); 1089 mark_object (data->printer_name);
1141 dm->devmode ? memory_hash (dm->devmode, XDEVMODE_SIZE (dm)) 1149 dm->devmode ? memory_hash (dm->devmode, XDEVMODE_SIZE (dm))
1142 : 0, 1150 : 0,
1143 internal_hash (dm->printer_name, depth + 1)); 1151 internal_hash (dm->printer_name, depth + 1));
1144 } 1152 }
1145 1153
1154 #ifdef USE_KKCC
1155 DEFINE_LRECORD_IMPLEMENTATION ("msprinter-settings", devmode,
1156 mark_devmode, print_devmode, finalize_devmode,
1157 equal_devmode, hash_devmode,
1158 devmode_description,
1159 Lisp_Devmode);
1160 #else /* not USE_KKCC */
1146 DEFINE_LRECORD_IMPLEMENTATION ("msprinter-settings", devmode, 1161 DEFINE_LRECORD_IMPLEMENTATION ("msprinter-settings", devmode,
1147 mark_devmode, print_devmode, finalize_devmode, 1162 mark_devmode, print_devmode, finalize_devmode,
1148 equal_devmode, hash_devmode, 0/*description*/, 1163 equal_devmode, hash_devmode, 0/*description*/,
1149 Lisp_Devmode); 1164 Lisp_Devmode);
1165 #endif /* not USE_KKCC */
1166
1150 static Lisp_Object 1167 static Lisp_Object
1151 allocate_devmode (DEVMODEW* src_devmode, int do_copy, 1168 allocate_devmode (DEVMODEW* src_devmode, int do_copy,
1152 Lisp_Object src_name, struct device *d) 1169 Lisp_Object src_name, struct device *d)
1153 { 1170 {
1154 Lisp_Devmode *dm; 1171 Lisp_Devmode *dm;