Mercurial > hg > xemacs-beta
view src/frameslots.h @ 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 | 01c57eb70ae9 |
| children | 308d34e9f07d |
line wrap: on
line source
/* Definitions of marked slots in frames Copyright (C) 1988, 1992, 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1996, 2002, 2003 Ben Wing. This file is part of XEmacs. XEmacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version. XEmacs is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with XEmacs; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: FSF 19.30. Split out of frame.h. */ /* We define the Lisp_Objects in the frame structure in a separate file because there are numerous places we want to iterate over them, such as when defining them in the structure, initializing them, or marking them. To use, define MARKED_SLOT before including this file. In the structure definition, you also need to define FRAME_SLOT_DECLARATION. No need to undefine either value; that happens automatically. */ #ifndef MARKED_SLOT_ARRAY #ifdef FRAME_SLOT_DECLARATION #define MARKED_SLOT_ARRAY(slot, size) MARKED_SLOT(slot[size]) #else #define MARKED_SLOT_ARRAY(slot, size) do { \ int mslotidx; \ for (mslotidx = 0; mslotidx < size; mslotidx++) \ { \ MARKED_SLOT (slot[mslotidx]) \ } \ } while (0); #endif #endif /* not MARKED_SLOT_ARRAY */ /* device frame belongs to. */ MARKED_SLOT (device) /* Name of this frame: a Lisp string. NOT the same as the frame's title, even though FSF bogusly confuses the two. The frame's name is used for resourcing and lookup purposes and is something you can count on having a specific value, while the frame's title may vary depending on the user's choice of `frame-title-format'. */ MARKED_SLOT (name) /* The frame which should receive keystrokes that occur in this frame, or nil if they should go to the frame itself. This is usually nil, but if the frame is minibufferless, we can use this to redirect keystrokes to a surrogate minibuffer frame when needed. Note that a value of nil is different than having the field point to the frame itself. Whenever the Fselect_frame function is used to shift from one frame to the other, any redirections to the original frame are shifted to the newly selected frame; if focus_frame is nil, Fselect_frame will leave it alone. */ MARKED_SLOT (focus_frame) /* This frame's root window. Every frame has one. If the frame has only a minibuffer window, this is it. Otherwise, if the frame has a minibuffer window, this is its sibling. */ MARKED_SLOT (root_window) /* This frame's selected window. Each frame has its own window hierarchy and one of the windows in it is selected within the frame. The selected window of the selected frame is Emacs's selected window. */ MARKED_SLOT (selected_window) /* This frame's minibuffer window. Most frames have their own minibuffer windows, but only the selected frame's minibuffer window can actually appear to exist. */ MARKED_SLOT (minibuffer_window) /* The most recently selected nonminibuf window. This is used by things like the toolbar code, which doesn't want the toolbar to change when moving to the minibuffer. This will only be a minibuf window if we are a minibuf-only frame. */ MARKED_SLOT (last_nonminibuf_window) /* This frame's root window mirror. This structure exactly mirrors the frame's window structure but contains only pointers to the display structures. */ MARKED_SLOT (root_mirror) /* frame property list */ MARKED_SLOT (plist) /* buffer_alist at last redisplay. */ MARKED_SLOT (old_buffer_alist) /* A copy of the global Vbuffer_list, to maintain a per-frame buffer ordering. The Vbuffer_list variable and the buffer_list slot of each frame contain exactly the same data, just in different orders. */ MARKED_SLOT (buffer_alist) /* Predicate for selecting buffers for other-buffer. */ MARKED_SLOT (buffer_predicate) /* The current mouse pointer for the frame. This is set by calling `set-frame-pointer'. */ MARKED_SLOT (pointer) /* The current icon for the frame. */ MARKED_SLOT (icon) /* specifier values cached in the struct frame: */ #ifdef HAVE_MENUBARS MARKED_SLOT (menubar_visible_p) #endif #ifdef HAVE_SCROLLBARS /* Width and height of the scrollbars. */ MARKED_SLOT (scrollbar_width) MARKED_SLOT (scrollbar_height) /* Whether the scrollbars are visible */ MARKED_SLOT (horizontal_scrollbar_visible_p) MARKED_SLOT (vertical_scrollbar_visible_p) /* Scrollbars location */ MARKED_SLOT (scrollbar_on_left_p) MARKED_SLOT (scrollbar_on_top_p) #endif #ifdef HAVE_TOOLBARS /* The following three don't really need to be cached except that we need to know when they've changed. */ MARKED_SLOT (default_toolbar_width) MARKED_SLOT (default_toolbar_height) MARKED_SLOT (default_toolbar_visible_p) MARKED_SLOT (default_toolbar_border_width) MARKED_SLOT (toolbar_shadow_thickness) /* List of toolbar buttons of current toolbars */ MARKED_SLOT_ARRAY (toolbar_buttons, 4) /* Size of the toolbars. The frame-local toolbar space is subtracted before the windows are arranged. Window and buffer local toolbars overlay their windows. */ MARKED_SLOT_ARRAY (toolbar_size, 4) /* Visibility of the toolbars. This acts as a valve for toolbar_size. */ MARKED_SLOT_ARRAY (toolbar_visible_p, 4) /* Thickness of the border around the toolbar. */ MARKED_SLOT_ARRAY (toolbar_border_width, 4) #endif /* Cache of subwindow instances for this frame */ MARKED_SLOT (subwindow_instance_cache) /* Possible frame-local default for outside margin widths. */ MARKED_SLOT (left_margin_width) MARKED_SLOT (right_margin_width) #undef MARKED_SLOT #undef MARKED_SLOT_ARRAY #undef FRAME_SLOT_DECLARATION
