Mercurial > hg > xemacs-beta
annotate src/libinterface.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 | 26a2f3423141 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 870 | 1 /* Interface to graphics/etc libraries, with cdecl calling convention. |
| 2 Copyright (C) 2002 Ben Wing | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 #include <config.h> | |
| 24 #include "lisp.h" | |
| 25 | |
| 26 #include "libinterface.h" | |
| 27 | |
| 28 /* YUUUUUUUUUUUUUUCK! | |
| 29 | |
| 30 This file exists only because VC++ lacks pragmas that let you change the | |
| 31 default calling convention in the middle of a file. With optimization, | |
| 32 we compile XEmacs using fastcall as the default convention; but | |
| 33 libraries are not compiled this way, and thus need __cdecl in their | |
| 34 declaration. Without the pragma, we either | |
| 35 | |
| 36 (a) depend on libraries that declare their external functions with | |
| 37 suitable preprocessor definitions that we can change; | |
| 38 | |
| 39 (b) force the user to recompile the library with fastcall (not | |
| 40 reasonable); | |
| 41 | |
| 42 (c) hack the headers manually (not reasonable); | |
| 43 | |
| 44 (d) put all calls to the library in a separate file where the default | |
| 45 calling convention is __cdecl (hence, this file). | |
| 46 | |
| 47 In fact, some libraries do make (a) feasible. This is the case with PNG | |
| 48 and ZLIB. JPEG almost does so, since all externs are wrapped with | |
| 49 EXTERN(); but they fail to wrap their definition of EXTERN with #ifndef | |
| 50 EXTERN, so we can't override it. XPM is similar, wrapping their externs | |
| 51 with FUNC() -- again, not overridable. With PNG, we define PNG_EXPORT; | |
| 52 with ZLIB, we define ZEXPORT and ZEXPORTVA. */ | |
| 53 | |
| 54 #ifdef HAVE_XPM | |
| 55 | |
| 56 void | |
| 57 qxe_XpmFreeXpmImage (XpmImage *image) | |
| 58 { | |
| 59 XpmFreeXpmImage (image); | |
| 60 } | |
| 61 | |
| 62 void | |
| 63 qxe_XpmFreeXpmInfo (XpmInfo *info) | |
| 64 { | |
| 65 XpmFreeXpmInfo (info); | |
| 66 } | |
| 67 | |
| 68 int | |
| 69 qxe_XpmCreateXpmImageFromBuffer (char *buffer, XpmImage *image, XpmInfo *info) | |
| 70 { | |
| 71 return XpmCreateXpmImageFromBuffer (buffer, image, info); | |
| 72 } | |
| 73 | |
| 74 void | |
| 75 qxe_XpmFree (void *ptr) | |
| 76 { | |
| 77 XpmFree (ptr); | |
| 78 } | |
| 79 | |
| 80 int | |
| 81 qxe_XpmReadFileToData (char *filename, char ***data_return) | |
| 82 { | |
| 83 return XpmReadFileToData (filename, data_return); | |
| 84 } | |
| 85 | |
| 86 #endif /* HAVE_XPM */ | |
| 87 | |
| 88 #ifdef HAVE_JPEG | |
| 89 | |
| 90 boolean | |
| 91 qxe_jpeg_finish_decompress (j_decompress_ptr cinfo) | |
| 92 { | |
| 93 return jpeg_finish_decompress (cinfo); | |
| 94 } | |
| 95 | |
| 96 boolean | |
| 97 qxe_jpeg_start_decompress (j_decompress_ptr cinfo) | |
| 98 { | |
| 99 return jpeg_start_decompress (cinfo); | |
| 100 } | |
| 101 | |
| 102 JDIMENSION | |
| 103 qxe_jpeg_read_scanlines (j_decompress_ptr cinfo, JSAMPARRAY scanlines, | |
| 104 JDIMENSION max_lines) | |
| 105 { | |
| 106 return jpeg_read_scanlines (cinfo, scanlines, max_lines); | |
| 107 } | |
| 108 | |
| 109 int | |
| 110 qxe_jpeg_read_header (j_decompress_ptr cinfo, boolean require_image) | |
| 111 { | |
| 112 return jpeg_read_header (cinfo, require_image); | |
| 113 } | |
| 114 | |
| 115 void | |
| 116 qxe_jpeg_CreateDecompress (j_decompress_ptr cinfo, int version, | |
| 117 size_t structsize) | |
| 118 { | |
| 119 jpeg_CreateDecompress (cinfo, version, structsize); | |
| 120 } | |
| 121 | |
| 122 struct jpeg_error_mgr * | |
| 123 qxe_jpeg_std_error (struct jpeg_error_mgr *err) | |
| 124 { | |
| 125 return jpeg_std_error (err); | |
| 126 } | |
| 127 | |
| 128 void | |
| 129 qxe_jpeg_destroy_decompress (j_decompress_ptr cinfo) | |
| 130 { | |
| 131 jpeg_destroy_decompress (cinfo); | |
| 132 } | |
| 133 | |
| 134 boolean | |
| 135 qxe_jpeg_resync_to_restart (j_decompress_ptr cinfo, int desired) | |
| 136 { | |
| 137 return jpeg_resync_to_restart (cinfo, desired); | |
| 138 } | |
| 139 | |
| 140 #endif /* HAVE_JPEG */ | |
| 141 | |
| 142 #ifdef HAVE_TIFF | |
| 143 | |
| 144 tdata_t | |
| 145 qxe_TIFFmalloc (tsize_t x1) | |
| 146 { | |
| 147 return _TIFFmalloc (x1); | |
| 148 } | |
| 149 | |
| 150 void | |
| 151 qxe_TIFFfree (tdata_t x1) | |
| 152 { | |
| 153 _TIFFfree (x1); | |
| 154 } | |
| 155 | |
| 156 void | |
| 157 qxe_TIFFClose (TIFF *x1) | |
| 158 { | |
| 159 TIFFClose (x1); | |
| 160 } | |
| 161 | |
| 162 int | |
| 163 qxe_TIFFGetField (TIFF *x1, ttag_t x2, uint32 *x3) | |
| 164 { | |
| 165 return TIFFGetField (x1, x2, x3); | |
| 166 } | |
| 167 | |
| 168 TIFF * | |
| 169 qxe_TIFFClientOpen (const char *x1, const char *x2, | |
| 170 thandle_t x3, | |
| 171 TIFFReadWriteProc x4, TIFFReadWriteProc x5, | |
| 172 TIFFSeekProc x6, TIFFCloseProc x7, | |
| 173 TIFFSizeProc x8, | |
| 174 TIFFMapFileProc x9, TIFFUnmapFileProc x10) | |
| 175 { | |
| 176 return TIFFClientOpen (x1, x2, x3, x4, x5, x6, x7, x8, x9, x10); | |
| 177 } | |
| 178 | |
| 179 TIFFErrorHandler | |
| 180 qxe_TIFFSetErrorHandler (TIFFErrorHandler x1) | |
| 181 { | |
| 182 return TIFFSetErrorHandler (x1); | |
| 183 } | |
| 184 | |
| 185 TIFFErrorHandler | |
| 186 qxe_TIFFSetWarningHandler (TIFFErrorHandler x1) | |
| 187 { | |
| 188 return TIFFSetWarningHandler (x1); | |
| 189 } | |
| 190 | |
| 191 int | |
| 192 qxe_TIFFReadRGBAImage (TIFF *x1, uint32 x2, uint32 x3, uint32 *x4, int x5) | |
| 193 { | |
| 194 return TIFFReadRGBAImage (x1, x2, x3, x4, x5); | |
| 195 } | |
| 196 | |
| 197 #endif /* HAVE_TIFF */ |