comparison src/ui-gtk.c @ 5124:623d57b7fbe8 ben-lisp-object

separate regular and disksave finalization, print method fixes. Create separate disksave method and make the finalize method only be for actual object finalization, not disksave finalization. Fix places where 0 was given in place of a printer -- print methods are mandatory, and internal objects formerly without a print method now must explicitly specify internal_object_printer(). Change the defn of CONSOLE_LIVE_P to avoid problems in some weird situations. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-01-20 Ben Wing <ben@xemacs.org> * alloc.c: * alloc.c (very_old_free_lcrecord): * alloc.c (disksave_object_finalization_1): * alloc.c (make_lcrecord_list): * alloc.c (alloc_managed_lcrecord): * alloc.c (free_managed_lcrecord): * alloc.c (sweep_lcrecords_1): * buffer.c: * bytecode.c: * bytecode.c (Fcompiled_function_p): * chartab.c: * console-impl.h: * console-impl.h (CONSOLE_TYPE_P): * console.c: * console.c (set_quit_events): * data.c: * data.c (Fmake_ephemeron): * database.c: * database.c (finalize_database): * database.c (Fclose_database): * device-msw.c: * device-msw.c (finalize_devmode): * device-msw.c (allocate_devmode): * device.c: * elhash.c: * elhash.c (finalize_hash_table): * eval.c: * eval.c (bind_multiple_value_limits): * event-stream.c: * event-stream.c (finalize_command_builder): * events.c: * events.c (mark_event): * extents.c: * extents.c (finalize_extent_info): * extents.c (uninit_buffer_extents): * faces.c: * file-coding.c: * file-coding.c (finalize_coding_system): * file-coding.h: * file-coding.h (struct coding_system_methods): * file-coding.h (struct detector): * floatfns.c: * floatfns.c (extract_float): * fns.c: * fns.c (Fidentity): * font-mgr.c (finalize_fc_pattern): * font-mgr.c (finalize_fc_config): * frame.c: * glyphs.c: * glyphs.c (finalize_image_instance): * glyphs.c (unmap_subwindow_instance_cache_mapper): * gui.c: * gui.c (gui_error): * keymap.c: * lisp.h (struct Lisp_Symbol): * lrecord.h: * lrecord.h (struct lrecord_implementation): * lrecord.h (MC_ALLOC_CALL_FINALIZER): * lrecord.h (MC_ALLOC_CALL_FINALIZER_FOR_DISKSAVE): * lrecord.h (DEFINE_DUMPABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_FROB_BLOCK_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_INTERNAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_SIZABLE_INTERNAL_LISP_OBJECT): * lrecord.h (MAKE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_DUMPABLE_MODULE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_GENERAL_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_LISP_OBJECT): * lrecord.h (DEFINE_NODUMP_MODULE_SIZABLE_GENERAL_LISP_OBJECT): * lrecord.h (MAKE_MODULE_LISP_OBJECT): * lstream.c: * lstream.c (finalize_lstream): * lstream.c (disksave_lstream): * marker.c: * marker.c (finalize_marker): * mule-charset.c (make_charset): * number.c: * objects.c: * objects.c (finalize_color_instance): * objects.c (finalize_font_instance): * opaque.c: * opaque.c (make_opaque_ptr): * process-nt.c: * process-nt.c (nt_finalize_process_data): * process-nt.c (nt_deactivate_process): * process.c: * process.c (finalize_process): * procimpl.h (struct process_methods): * scrollbar.c: * scrollbar.c (free_scrollbar_instance): * specifier.c (finalize_specifier): * symbols.c: * toolbar.c: * toolbar.c (Ftoolbar_button_p): * tooltalk.c: * ui-gtk.c: * ui-gtk.c (emacs_gtk_object_finalizer): * ui-gtk.c (allocate_emacs_gtk_boxed_data): * window.c: * window.c (finalize_window): * window.c (mark_window_as_deleted): Separate out regular and disksave finalization. Instead of a FOR_DISKSAVE argument to the finalizer, create a separate object method `disksaver'. Make `finalizer' have only one argument. Go through and separate out all finalize methods into finalize and disksave. Delete lots of thereby redundant disksave checking. Delete places that signal an error if we attempt to disksave -- all of these objects are non-dumpable and we will get an error from pdump anyway if we attempt to dump them. After this is done, only one object remains that has a disksave method -- lstream. Change DEFINE_*_LISP_OBJECT_WITH_PROPS to DEFINE_*_GENERAL_LISP_OBJECT, which is used for specifying either property methods or disksave methods (or in the future, any other less-used methods). Remove the for_disksave argument to finalize_process_data. Don't provide a disksaver for processes because no one currently needs it. Clean up various places where objects didn't provide a print method. It was made mandatory in previous changes, and all methods now either provide their own print method or use internal_object_printer or external_object_printer. Change the definition of CONSOLE_LIVE_P to use the contype enum rather than looking into the conmeths structure -- in some weird situations with dead objects, the conmeths structure is NULL, and printing such objects from debug_print() will crash if we try to look into the conmeths structure.
author Ben Wing <ben@xemacs.org>
date Wed, 20 Jan 2010 07:05:57 -0600
parents e0db3c197671
children b5df3737028a
comparison
equal deleted inserted replaced
5123:fc85923c49af 5124:623d57b7fbe8
334 write_fmt_string (printcharfun, " %d arguments", XFFI (obj)->n_args); 334 write_fmt_string (printcharfun, " %d arguments", XFFI (obj)->n_args);
335 write_fmt_string (printcharfun, " %p>", (void *)XFFI (obj)->function_ptr); 335 write_fmt_string (printcharfun, " %p>", (void *)XFFI (obj)->function_ptr);
336 } 336 }
337 337
338 DEFINE_NODUMP_LISP_OBJECT ("ffi", emacs_ffi, 338 DEFINE_NODUMP_LISP_OBJECT ("ffi", emacs_ffi,
339 mark_ffi_data, ffi_object_printer, 339 mark_ffi_data, ffi_object_printer,
340 0, 0, 0, 340 0, 0, 0,
341 ffi_data_description, emacs_ffi_data); 341 ffi_data_description, emacs_ffi_data);
342 342
343 #if defined (__cplusplus) 343 #if defined (__cplusplus)
344 #define MANY_ARGS ... 344 #define MANY_ARGS ...
345 #else 345 #else
346 #define MANY_ARGS 346 #define MANY_ARGS
922 { 922 {
923 return (XGTK_OBJECT (obj)->plist); 923 return (XGTK_OBJECT (obj)->plist);
924 } 924 }
925 925
926 static void 926 static void
927 emacs_gtk_object_finalizer (void *header, int for_disksave) 927 emacs_gtk_object_finalizer (void *header)
928 { 928 {
929 emacs_gtk_object_data *data = (emacs_gtk_object_data *) header; 929 emacs_gtk_object_data *data = (emacs_gtk_object_data *) header;
930 930
931 if (for_disksave)
932 {
933 Lisp_Object obj = wrap_emacs_gtk_object (data);
934
935
936 invalid_operation
937 ("Can't dump an emacs containing GtkObject objects", obj);
938 }
939
940 if (data->alive_p) 931 if (data->alive_p)
941 { 932 gtk_object_unref (data->object);
942 gtk_object_unref (data->object); 933 }
943 } 934
944 } 935 DEFINE_NODUMP_GENERAL_LISP_OBJECT ("GtkObject", emacs_gtk_object,
945 936 mark_gtk_object_data,
946 DEFINE_NODUMP_LISP_OBJECT_WITH_PROPS ("GtkObject", emacs_gtk_object, 937 emacs_gtk_object_printer,
947 mark_gtk_object_data, 938 emacs_gtk_object_finalizer,
948 emacs_gtk_object_printer, 939 0, /* equality */
949 emacs_gtk_object_finalizer, 940 0, /* hash */
950 0, /* equality */ 941 gtk_object_data_description,
951 0, /* hash */ 942 object_getprop,
952 gtk_object_data_description, 943 object_putprop,
953 object_getprop, 944 0, /* rem prop */
954 object_putprop, 945 0, /* plist */
955 0, /* rem prop */ 946 0, /* disksaver */
956 0, /* plist */ 947 emacs_gtk_object_data);
957 emacs_gtk_object_data);
958 948
959 static emacs_gtk_object_data * 949 static emacs_gtk_object_data *
960 allocate_emacs_gtk_object_data (void) 950 allocate_emacs_gtk_object_data (void)
961 { 951 {
962 Lisp_Object obj = ALLOC_LISP_OBJECT (emacs_gtk_object); 952 Lisp_Object obj = ALLOC_LISP_OBJECT (emacs_gtk_object);
1136 { 1126 {
1137 emacs_gtk_boxed_data *data = XGTK_BOXED(obj); 1127 emacs_gtk_boxed_data *data = XGTK_BOXED(obj);
1138 return (HASH2 ((Hashcode) data->object, data->object_type)); 1128 return (HASH2 ((Hashcode) data->object, data->object_type));
1139 } 1129 }
1140 1130
1141 DEFINE_NODUMP_LISP_OBJECT_WITH_PROPS ("GtkBoxed", emacs_gtk_boxed, 1131 DEFINE_NODUMP_LISP_OBJECT ("GtkBoxed", emacs_gtk_boxed,
1142 0, /* marker function */ 1132 0, /* marker function */
1143 emacs_gtk_boxed_printer, 1133 emacs_gtk_boxed_printer,
1144 0, /* nuker */ 1134 0, /* nuker */
1145 emacs_gtk_boxed_equality, 1135 emacs_gtk_boxed_equality,
1146 emacs_gtk_boxed_hash, 1136 emacs_gtk_boxed_hash,
1147 emacs_gtk_boxed_description, 1137 emacs_gtk_boxed_description,
1148 0, /* get prop */ 1138 emacs_gtk_boxed_data);
1149 0, /* put prop */
1150 0, /* rem prop */
1151 0, /* plist */
1152 emacs_gtk_boxed_data);
1153 /* Currently defined GTK_TYPE_BOXED structures are: 1139 /* Currently defined GTK_TYPE_BOXED structures are:
1154 1140
1155 GtkAccelGroup - 1141 GtkAccelGroup -
1156 GtkSelectionData - 1142 GtkSelectionData -
1157 GtkStyle - 1143 GtkStyle -