Mercurial > hg > xemacs-beta
annotate src/glade.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 | db7068430402 |
| children | 304aebb79cd3 |
| rev | line source |
|---|---|
| 462 | 1 /* glade.c |
| 2 ** | |
| 3 ** Description: Interface to `libglade' for XEmacs/GTK | |
| 4 ** | |
| 5 ** Created by: William M. Perry <wmperry@gnu.org> | |
| 6 ** | |
| 7 ** Copyright (C) 1999 John Harper <john@dcs.warwick.ac.uk> | |
| 8 ** Copyright (c) 2000 Free Software Foundation | |
| 9 ** | |
|
4709
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
10 ** This file is part of XEmacs. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
11 ** |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
12 ** XEmacs is free software; you can redistribute it and/or modify it |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
13 ** under the terms of the GNU General Public License as published by the |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
14 ** Free Software Foundation; either version 2, or (at your option) any |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
15 ** later version. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
16 ** |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
17 ** XEmacs is distributed in the hope that it will be useful, but WITHOUT |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
18 ** ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
19 ** FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
20 ** for more details. |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
21 ** |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
22 ** You should have received a copy of the GNU General Public License |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
23 ** along with XEmacs; see the file COPYING. If not, write to |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
24 ** the Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, |
|
db7068430402
Add explicit GPL v2 or later notices to Bill Perry's code, where such notices
Jerry James <james@xemacs.org>
parents:
4677
diff
changeset
|
25 ** Boston, MA 02111-1301, USA. */ |
| 462 | 26 */ |
| 27 | |
| 28 #if defined(HAVE_GLADE_H) || defined(HAVE_GLADE_GLADE_H) | |
| 29 | |
| 30 /* For COMPILED_FUNCTIONP */ | |
| 31 #include "bytecode.h" | |
| 32 | |
| 33 #ifdef HAVE_GLADE_GLADE_H | |
| 34 #include <glade/glade.h> | |
| 35 #endif | |
| 36 | |
| 37 #ifdef HAVE_GLADE_H | |
| 38 #include <glade.h> | |
| 39 #endif | |
| 40 | |
| 41 /* This is based on the code from rep-gtk 0.11 in libglade-support.c */ | |
| 42 | |
| 43 static void | |
| 44 connector (const gchar *handler_name, GtkObject *object, | |
| 45 const gchar *signal_name, const gchar *signal_data, | |
| 46 GtkObject *connect_object, gboolean after, gpointer user_data) | |
| 47 { | |
| 48 Lisp_Object func; | |
| 49 Lisp_Object lisp_data = Qnil; | |
| 50 | |
| 826 | 51 func = VOID_TO_LISP (user_data); |
| 462 | 52 |
| 53 if (NILP (func)) | |
| 54 { | |
| 55 /* Look for a lisp function called HANDLER_NAME */ | |
| 56 func = intern (handler_name); | |
| 57 } | |
| 58 | |
| 59 if (signal_data && signal_data[0]) | |
| 60 { | |
|
4677
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2054
diff
changeset
|
61 lisp_data |
|
8f1ee2d15784
Support full Common Lisp multiple values in C.
Aidan Kehoe <kehoea@parhasard.net>
parents:
2054
diff
changeset
|
62 = IGNORE_MULTIPLE_VALUES (Feval (Fread (build_string (signal_data)))); |
| 462 | 63 } |
| 64 | |
| 65 /* obj, name, func, cb_data, object_signal, after_p */ | |
| 66 Fgtk_signal_connect (build_gtk_object (object), | |
| 67 intern (signal_name), | |
| 68 func, | |
| 69 lisp_data, | |
| 70 connect_object ? Qt : Qnil, | |
| 71 after ? Qt : Qnil); | |
| 72 } | |
| 73 | |
| 74 /* This differs from lisp/subr.el (functionp) definition by allowing | |
| 75 ** symbol names that may not necessarily be fboundp yet. | |
| 76 */ | |
| 77 static int __almost_functionp (Lisp_Object obj) | |
| 78 { | |
| 79 return (SYMBOLP (obj) || | |
| 80 SUBRP (obj) || | |
| 81 COMPILED_FUNCTIONP (obj) || | |
| 82 EQ (Fcar_safe (obj), Qlambda)); | |
| 83 } | |
| 84 | |
| 85 DEFUN ("glade-xml-signal-connect", Fglade_xml_signal_connect, 3, 3, 0, /* | |
| 86 Connect a glade handler. | |
| 87 */ | |
| 88 (xml, handler_name, func)) | |
| 89 { | |
| 90 CHECK_GTK_OBJECT (xml); | |
| 91 CHECK_STRING (handler_name); | |
| 92 | |
| 93 if (!__almost_functionp (func)) | |
| 94 { | |
| 95 func = wrong_type_argument (intern ("functionp"), func); | |
| 96 } | |
| 97 | |
| 98 glade_xml_signal_connect_full (GLADE_XML (XGTK_OBJECT (xml)->object), | |
| 2054 | 99 (char*) XSTRING_DATA (handler_name), |
| 462 | 100 connector, LISP_TO_VOID (func)); |
| 101 return (Qt); | |
| 102 } | |
| 103 | |
| 104 DEFUN ("glade-xml-signal-autoconnect", Fglade_xml_signal_autoconnect, 1, 1, 0, /* | |
| 105 Connect all glade handlers. | |
| 106 */ | |
| 107 (xml)) | |
| 108 { | |
| 109 CHECK_GTK_OBJECT (xml); | |
| 110 | |
| 111 glade_xml_signal_autoconnect_full (GLADE_XML (XGTK_OBJECT (xml)->object), | |
| 112 connector, LISP_TO_VOID (Qnil)); | |
| 113 return (Qt); | |
| 114 } | |
| 115 | |
| 116 DEFUN ("glade-xml-textdomain", Fglade_xml_textdomain, 1, 1, 0, /* | |
| 117 Return the textdomain of a GladeXML object. | |
| 118 */ | |
| 119 (xml)) | |
| 120 { | |
| 121 gchar *the_domain = NULL; | |
| 122 | |
| 123 CHECK_GTK_OBJECT (xml); | |
| 124 | |
| 125 if (!GLADE_IS_XML (XGTK_OBJECT (xml)->object)) | |
| 126 { | |
| 563 | 127 wtaerror ("Object is not a GladeXML type.", xml); |
| 462 | 128 } |
| 129 | |
| 130 #ifdef LIBGLADE_XML_TXTDOMAIN | |
| 131 the_domain = GLADE_XML (XGTK_OBJECT (xml)->object)->txtdomain; | |
| 132 #else | |
| 133 the_domain = GLADE_XML (XGTK_OBJECT (xml)->object)->textdomain; | |
| 134 #endif | |
| 135 return (build_string (the_domain)); | |
| 136 } | |
| 137 | |
| 138 void syms_of_glade (void) | |
| 139 { | |
| 140 DEFSUBR (Fglade_xml_signal_connect); | |
| 141 DEFSUBR (Fglade_xml_signal_autoconnect); | |
| 142 DEFSUBR (Fglade_xml_textdomain); | |
| 143 } | |
| 144 | |
| 145 void vars_of_glade (void) | |
| 146 { | |
| 147 Fprovide (intern ("glade")); | |
| 148 } | |
| 149 | |
| 150 #else /* !(HAVE_GLADE_H || HAVE_GLADE_GLADE_H) */ | |
| 151 #define syms_of_glade() | |
| 152 #define vars_of_glade() | |
| 153 #endif |
