comparison src/window.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 79c6ff3eef26
children e6409999af4b
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
229 make_saved_buffer_point_cache (void) 229 make_saved_buffer_point_cache (void)
230 { 230 {
231 return make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, HASH_TABLE_EQ); 231 return make_lisp_hash_table (20, HASH_TABLE_KEY_WEAK, HASH_TABLE_EQ);
232 } 232 }
233 233
234 #ifdef USE_KKCC
235 DEFINE_LRECORD_IMPLEMENTATION ("window", window,
236 0, /*dumpable-flag*/
237 mark_window, print_window, finalize_window,
238 0, 0, 0, struct window);
239 #else /* not USE_KKCC */
234 DEFINE_LRECORD_IMPLEMENTATION ("window", window, 240 DEFINE_LRECORD_IMPLEMENTATION ("window", window,
235 mark_window, print_window, finalize_window, 241 mark_window, print_window, finalize_window,
236 0, 0, 0, struct window); 242 0, 0, 0, struct window);
237 243 #endif /* not USE_KKCC */
238 244
239 #define INIT_DISP_VARIABLE(field, initialization) \ 245 #define INIT_DISP_VARIABLE(field, initialization) \
240 p->field[CURRENT_DISP] = initialization; \ 246 p->field[CURRENT_DISP] = initialization; \
241 p->field[DESIRED_DISP] = initialization; \ 247 p->field[DESIRED_DISP] = initialization; \
242 p->field[CMOTION_DISP] = initialization; 248 p->field[CMOTION_DISP] = initialization;
334 thing, then, is to make both structures Lisp objects and not explicitly 340 thing, then, is to make both structures Lisp objects and not explicitly
335 xfree() them. This should make no practical difference in memory usage 341 xfree() them. This should make no practical difference in memory usage
336 because neither structure is created very often (only when windows are 342 because neither structure is created very often (only when windows are
337 created or deleted). --ben */ 343 created or deleted). --ben */
338 344
345 #ifdef USE_KKCC
346 static const struct lrecord_description window_mirror_description [] = {
347 { XD_END }
348 };
349 #endif /* USE_KKCC */
350
339 static Lisp_Object 351 static Lisp_Object
340 mark_window_mirror (Lisp_Object obj) 352 mark_window_mirror (Lisp_Object obj)
341 { 353 {
342 struct window_mirror *mir = XWINDOW_MIRROR (obj); 354 struct window_mirror *mir = XWINDOW_MIRROR (obj);
343 355
366 return wrap_window_mirror (mir->next); 378 return wrap_window_mirror (mir->next);
367 else 379 else
368 return Qnil; 380 return Qnil;
369 } 381 }
370 382
383 #ifdef USE_KKCC
384 DEFINE_LRECORD_IMPLEMENTATION ("window-mirror", window_mirror,
385 0, /*dumpable-flag*/
386 mark_window_mirror, internal_object_printer,
387 0, 0, 0, 0/*window_mirror_description*/, struct window_mirror);
388 #else /* not USE_KKCC */
371 DEFINE_LRECORD_IMPLEMENTATION ("window-mirror", window_mirror, 389 DEFINE_LRECORD_IMPLEMENTATION ("window-mirror", window_mirror,
372 mark_window_mirror, internal_object_printer, 390 mark_window_mirror, internal_object_printer,
373 0, 0, 0, 0, struct window_mirror); 391 0, 0, 0, 0, struct window_mirror);
392 #endif /* not USE_KKCC */
374 393
375 /* Create a new window mirror structure and associated redisplay 394 /* Create a new window mirror structure and associated redisplay
376 structs. */ 395 structs. */
377 static struct window_mirror * 396 static struct window_mirror *
378 new_window_mirror (struct frame *f) 397 new_window_mirror (struct frame *f)
5190 #define XWINDOW_CONFIGURATION(x) XRECORD (x, window_configuration, struct window_config) 5209 #define XWINDOW_CONFIGURATION(x) XRECORD (x, window_configuration, struct window_config)
5191 #define wrap_window_configuration(p) wrap_record (p, window_configuration) 5210 #define wrap_window_configuration(p) wrap_record (p, window_configuration)
5192 #define WINDOW_CONFIGURATIONP(x) RECORDP (x, window_configuration) 5211 #define WINDOW_CONFIGURATIONP(x) RECORDP (x, window_configuration)
5193 #define CHECK_WINDOW_CONFIGURATION(x) CHECK_RECORD (x, window_configuration) 5212 #define CHECK_WINDOW_CONFIGURATION(x) CHECK_RECORD (x, window_configuration)
5194 5213
5214 #ifdef USE_KKCC
5215 static const struct struct_description saved_window_description = {
5216 };
5217
5218 static const struct lrecord_description window_config_description [] = {
5219 { XD_LISP_OBJECT, offsetof (struct window_config, current_window) },
5220 { XD_LISP_OBJECT, offsetof (struct window_config, current_buffer) },
5221 { XD_LISP_OBJECT, offsetof (struct window_config, minibuffer_scroll_window) },
5222 { XD_LISP_OBJECT, offsetof (struct window_config, root_window) },
5223 { XD_END }
5224 };
5225 #endif /* USE_KKCC */
5226
5195 static Lisp_Object 5227 static Lisp_Object
5196 mark_window_config (Lisp_Object obj) 5228 mark_window_config (Lisp_Object obj)
5197 { 5229 {
5198 struct window_config *config = XWINDOW_CONFIGURATION (obj); 5230 struct window_config *config = XWINDOW_CONFIGURATION (obj);
5199 int i; 5231 int i;
5249 config->header.uid); 5281 config->header.uid);
5250 write_c_string (printcharfun, "#<window-configuration "); 5282 write_c_string (printcharfun, "#<window-configuration ");
5251 write_fmt_string (printcharfun, "0x%x>", config->header.uid); 5283 write_fmt_string (printcharfun, "0x%x>", config->header.uid);
5252 } 5284 }
5253 5285
5286 #ifdef USE_KKCC
5287 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("window-configuration",
5288 window_configuration,
5289 0, /*dumpable-flag*/
5290 mark_window_config,
5291 print_window_config,
5292 0, 0, 0,
5293 0/*window_config_description*/, sizeof_window_config,
5294 struct window_config);
5295 #else /* not USE_KKCC */
5254 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("window-configuration", 5296 DEFINE_LRECORD_SEQUENCE_IMPLEMENTATION ("window-configuration",
5255 window_configuration, 5297 window_configuration,
5256 mark_window_config, 5298 mark_window_config,
5257 print_window_config, 5299 print_window_config,
5258 0, 0, 0, 0, sizeof_window_config, 5300 0, 0, 0, 0, sizeof_window_config,
5259 struct window_config); 5301 struct window_config);
5260 5302 #endif /* not USE_KKCC */
5261 5303
5262 /* Returns a boolean indicating whether the two saved windows are 5304 /* Returns a boolean indicating whether the two saved windows are
5263 identical. */ 5305 identical. */
5264 static int 5306 static int
5265 saved_window_equal (struct saved_window *win1, struct saved_window *win2) 5307 saved_window_equal (struct saved_window *win1, struct saved_window *win2)