Mercurial > hg > xemacs-beta
comparison src/ui-gtk.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 | 804517e16990 |
children | 5b372a329b97 |
comparison
equal
deleted
inserted
replaced
933:f6bc42928b34 | 934:c925bacdda60 |
---|---|
296 data->marshal = 0; | 296 data->marshal = 0; |
297 | 297 |
298 return (data); | 298 return (data); |
299 } | 299 } |
300 | 300 |
301 #ifdef USE_KKCC | |
302 static const struct lrecord_description ffi_data_description [] = { | |
303 { XD_LISP_OBJECT, offsetof (struct emacs_ffi_data, function_name) }, | |
304 { XD_END } | |
305 }; | |
306 #endif /* USE_KKCC */ | |
307 | |
301 static Lisp_Object | 308 static Lisp_Object |
302 mark_ffi_data (Lisp_Object obj) | 309 mark_ffi_data (Lisp_Object obj) |
303 { | 310 { |
304 emacs_ffi_data *data = (emacs_ffi_data *) XFFI (obj); | 311 emacs_ffi_data *data = (emacs_ffi_data *) XFFI (obj); |
305 | 312 |
317 if (XFFI (obj)->n_args) | 324 if (XFFI (obj)->n_args) |
318 write_fmt_string (printcharfun, " %d arguments", XFFI (obj)->n_args); | 325 write_fmt_string (printcharfun, " %d arguments", XFFI (obj)->n_args); |
319 write_fmt_string (printcharfun, " %p>", (void *)XFFI (obj)->function_ptr); | 326 write_fmt_string (printcharfun, " %p>", (void *)XFFI (obj)->function_ptr); |
320 } | 327 } |
321 | 328 |
329 #ifdef USE_KKCC | |
330 DEFINE_LRECORD_IMPLEMENTATION ("ffi", emacs_ffi, | |
331 mark_ffi_data, ffi_object_printer, | |
332 0, 0, 0, | |
333 ffi_data_description, emacs_ffi_data); | |
334 #else /* not USE_KKCC */ | |
322 DEFINE_LRECORD_IMPLEMENTATION ("ffi", emacs_ffi, | 335 DEFINE_LRECORD_IMPLEMENTATION ("ffi", emacs_ffi, |
323 mark_ffi_data, ffi_object_printer, | 336 mark_ffi_data, ffi_object_printer, |
324 0, 0, 0, NULL, emacs_ffi_data); | 337 0, 0, 0, NULL, emacs_ffi_data); |
338 #endif /* not USE_KKCC */ | |
325 | 339 |
326 typedef GtkObject * (*__OBJECT_fn) (); | 340 typedef GtkObject * (*__OBJECT_fn) (); |
327 typedef gint (*__INT_fn) (); | 341 typedef gint (*__INT_fn) (); |
328 typedef void (*__NONE_fn) (); | 342 typedef void (*__NONE_fn) (); |
329 typedef gchar * (*__STRING_fn) (); | 343 typedef gchar * (*__STRING_fn) (); |
883 gtk_object_setv (XGTK_OBJECT (obj)->object, 1, args); | 897 gtk_object_setv (XGTK_OBJECT (obj)->object, 1, args); |
884 | 898 |
885 return (1); | 899 return (1); |
886 } | 900 } |
887 | 901 |
902 #ifdef USE_KKCC | |
903 static const struct lrecord_description gtk_object_data_description [] = { | |
904 { XD_LISP_OBJECT, offsetof (struct emacs_gtk_object_data, plist) }, | |
905 { XD_END } | |
906 }; | |
907 #endif /* USE_KKCC */ | |
908 | |
888 static Lisp_Object | 909 static Lisp_Object |
889 mark_gtk_object_data (Lisp_Object obj) | 910 mark_gtk_object_data (Lisp_Object obj) |
890 { | 911 { |
891 return (XGTK_OBJECT (obj)->plist); | 912 return (XGTK_OBJECT (obj)->plist); |
892 } | 913 } |
909 { | 930 { |
910 gtk_object_unref (data->object); | 931 gtk_object_unref (data->object); |
911 } | 932 } |
912 } | 933 } |
913 | 934 |
935 #ifdef USE_KKCC | |
936 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("GtkObject", emacs_gtk_object, | |
937 mark_gtk_object_data, /* marker function */ | |
938 emacs_gtk_object_printer, /* print function */ | |
939 emacs_gtk_object_finalizer, /* finalizer */ | |
940 0, /* equality */ | |
941 0, /* hash */ | |
942 gtk_object_data_description, /* desc */ | |
943 object_getprop, /* get prop */ | |
944 object_putprop, /* put prop */ | |
945 0, /* rem prop */ | |
946 0, /* plist */ | |
947 emacs_gtk_object_data); | |
948 #else /* not USE_KKCC */ | |
914 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("GtkObject", emacs_gtk_object, | 949 DEFINE_LRECORD_IMPLEMENTATION_WITH_PROPS ("GtkObject", emacs_gtk_object, |
915 mark_gtk_object_data, /* marker function */ | 950 mark_gtk_object_data, /* marker function */ |
916 emacs_gtk_object_printer, /* print function */ | 951 emacs_gtk_object_printer, /* print function */ |
917 emacs_gtk_object_finalizer, /* finalizer */ | 952 emacs_gtk_object_finalizer, /* finalizer */ |
918 0, /* equality */ | 953 0, /* equality */ |
921 object_getprop, /* get prop */ | 956 object_getprop, /* get prop */ |
922 object_putprop, /* put prop */ | 957 object_putprop, /* put prop */ |
923 0, /* rem prop */ | 958 0, /* rem prop */ |
924 0, /* plist */ | 959 0, /* plist */ |
925 emacs_gtk_object_data); | 960 emacs_gtk_object_data); |
961 #endif /* not USE_KKCC */ | |
926 | 962 |
927 static emacs_gtk_object_data * | 963 static emacs_gtk_object_data * |
928 allocate_emacs_gtk_object_data (void) | 964 allocate_emacs_gtk_object_data (void) |
929 { | 965 { |
930 emacs_gtk_object_data *data = alloc_lcrecord_type (emacs_gtk_object_data, | 966 emacs_gtk_object_data *data = alloc_lcrecord_type (emacs_gtk_object_data, |