Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 d1247f3cc363
children b5df3737028a
comparison
equal deleted inserted replaced
5123:fc85923c49af 5124:623d57b7fbe8
1111 (ii, printcharfun, escapeflag)); 1111 (ii, printcharfun, escapeflag));
1112 write_fmt_string (printcharfun, " 0x%x>", ii->header.uid); 1112 write_fmt_string (printcharfun, " 0x%x>", ii->header.uid);
1113 } 1113 }
1114 1114
1115 static void 1115 static void
1116 finalize_image_instance (void *header, int for_disksave) 1116 finalize_image_instance (void *header)
1117 { 1117 {
1118 Lisp_Image_Instance *i = (Lisp_Image_Instance *) header; 1118 Lisp_Image_Instance *i = (Lisp_Image_Instance *) header;
1119 1119
1120 /* objects like this exist at dump time, so don't bomb out. */ 1120 /* objects like this exist at dump time, so don't bomb out. */
1121 if (IMAGE_INSTANCE_TYPE (i) == IMAGE_NOTHING 1121 if (IMAGE_INSTANCE_TYPE (i) == IMAGE_NOTHING
1122 || 1122 ||
1123 NILP (IMAGE_INSTANCE_DEVICE (i))) 1123 NILP (IMAGE_INSTANCE_DEVICE (i)))
1124 return; 1124 return;
1125 if (for_disksave) finalose (i);
1126 1125
1127 /* We can't use the domain here, because it might have 1126 /* We can't use the domain here, because it might have
1128 disappeared. */ 1127 disappeared. */
1129 MAYBE_DEVMETH (XDEVICE (IMAGE_INSTANCE_DEVICE (i)), 1128 MAYBE_DEVMETH (XDEVICE (IMAGE_INSTANCE_DEVICE (i)),
1130 finalize_image_instance, (i)); 1129 finalize_image_instance, (i));
1313 image_instance_hash, (i, depth), 1312 image_instance_hash, (i, depth),
1314 0)); 1313 0));
1315 } 1314 }
1316 1315
1317 DEFINE_NODUMP_LISP_OBJECT ("image-instance", image_instance, 1316 DEFINE_NODUMP_LISP_OBJECT ("image-instance", image_instance,
1318 mark_image_instance, print_image_instance, 1317 mark_image_instance, print_image_instance,
1319 finalize_image_instance, image_instance_equal, 1318 finalize_image_instance, image_instance_equal,
1320 image_instance_hash, 1319 image_instance_hash,
1321 image_instance_description, 1320 image_instance_description,
1322 Lisp_Image_Instance); 1321 Lisp_Image_Instance);
1323 1322
1324 static Lisp_Object 1323 static Lisp_Object
1325 allocate_image_instance (Lisp_Object governing_domain, Lisp_Object parent, 1324 allocate_image_instance (Lisp_Object governing_domain, Lisp_Object parent,
1326 Lisp_Object instantiator) 1325 Lisp_Object instantiator)
1327 { 1326 {
3808 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, face) }, 3807 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, face) },
3809 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, plist) }, 3808 { XD_LISP_OBJECT, offsetof (Lisp_Glyph, plist) },
3810 { XD_END } 3809 { XD_END }
3811 }; 3810 };
3812 3811
3813 DEFINE_DUMPABLE_LISP_OBJECT_WITH_PROPS ("glyph", glyph, 3812 DEFINE_DUMPABLE_GENERAL_LISP_OBJECT ("glyph", glyph,
3814 mark_glyph, print_glyph, 0, 3813 mark_glyph, print_glyph, 0,
3815 glyph_equal, glyph_hash, 3814 glyph_equal, glyph_hash,
3816 glyph_description, 3815 glyph_description,
3817 glyph_getprop, glyph_putprop, 3816 glyph_getprop, glyph_putprop,
3818 glyph_remprop, glyph_plist, 3817 glyph_remprop, glyph_plist,
3819 Lisp_Glyph); 3818 0 /* no disksaver */,
3819 Lisp_Glyph);
3820 3820
3821 Lisp_Object 3821 Lisp_Object
3822 allocate_glyph (enum glyph_type type, 3822 allocate_glyph (enum glyph_type type,
3823 void (*after_change) (Lisp_Object glyph, Lisp_Object property, 3823 void (*after_change) (Lisp_Object glyph, Lisp_Object property,
3824 Lisp_Object locale)) 3824 Lisp_Object locale))
4507 cache also. Otherwise code that checks the sanity of the instance 4507 cache also. Otherwise code that checks the sanity of the instance
4508 will fail. */ 4508 will fail. */
4509 XWEAK_LIST_LIST (FRAME_SUBWINDOW_CACHE (f)) 4509 XWEAK_LIST_LIST (FRAME_SUBWINDOW_CACHE (f))
4510 = delq_no_quit (value, 4510 = delq_no_quit (value,
4511 XWEAK_LIST_LIST (FRAME_SUBWINDOW_CACHE (f))); 4511 XWEAK_LIST_LIST (FRAME_SUBWINDOW_CACHE (f)));
4512 finalize_image_instance (XIMAGE_INSTANCE (value), 0); 4512 finalize_image_instance (XIMAGE_INSTANCE (value));
4513 } 4513 }
4514 } 4514 }
4515 return 0; 4515 return 0;
4516 } 4516 }
4517 4517