comparison src/gui.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 e22b0213b713
comparison
equal deleted inserted replaced
933:f6bc42928b34 934:c925bacdda60
547 547
548 /* No keys - no right flush display */ 548 /* No keys - no right flush display */
549 return Qnil; 549 return Qnil;
550 } 550 }
551 551
552 #ifdef USE_KKCC
553 static const struct lrecord_description gui_item_description [] = {
554 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, name) },
555 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, callback) },
556 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, callback_ex) },
557 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, suffix) },
558 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, active) },
559 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, included) },
560 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, config) },
561 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, filter) },
562 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, style) },
563 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, selected) },
564 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, keys) },
565 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, accelerator) },
566 { XD_LISP_OBJECT, offsetof (struct Lisp_Gui_Item, value) },
567 { XD_END }
568 };
569 #endif /* USE_KKCC */
570
552 static Lisp_Object 571 static Lisp_Object
553 mark_gui_item (Lisp_Object obj) 572 mark_gui_item (Lisp_Object obj)
554 { 573 {
555 Lisp_Gui_Item *p = XGUI_ITEM (obj); 574 Lisp_Gui_Item *p = XGUI_ITEM (obj);
556 575
768 static void 787 static void
769 finalize_gui_item (void *header, int for_disksave) 788 finalize_gui_item (void *header, int for_disksave)
770 { 789 {
771 } 790 }
772 791
792 #ifdef USE_KKCC
793 DEFINE_LRECORD_IMPLEMENTATION ("gui-item", gui_item,
794 0, /*dumpable-flag*/
795 mark_gui_item, print_gui_item,
796 finalize_gui_item, gui_item_equal,
797 gui_item_hash,
798 gui_item_description,
799 Lisp_Gui_Item);
800 #else /* not USE_KKCC */
773 DEFINE_LRECORD_IMPLEMENTATION ("gui-item", gui_item, 801 DEFINE_LRECORD_IMPLEMENTATION ("gui-item", gui_item,
774 mark_gui_item, print_gui_item, 802 mark_gui_item, print_gui_item,
775 finalize_gui_item, gui_item_equal, 803 finalize_gui_item, gui_item_equal,
776 gui_item_hash, 804 gui_item_hash,
777 0, 805 0,
778 Lisp_Gui_Item); 806 Lisp_Gui_Item);
779 807 #endif /* not USE_KKCC */
780 808
781 DOESNT_RETURN 809 DOESNT_RETURN
782 gui_error (const Char_ASCII *reason, Lisp_Object frob) 810 gui_error (const Char_ASCII *reason, Lisp_Object frob)
783 { 811 {
784 signal_error (Qgui_error, reason, frob); 812 signal_error (Qgui_error, reason, frob);