Mercurial > hg > xemacs-beta
view src/window.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 | e0db3c197671 |
| children | 2a462149bd6a |
line wrap: on
line source
/* Window definitions for XEmacs. Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996, 2002 Ben Wing. Copyright (C) 1996 Chuck Thompson. 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. */ #ifndef INCLUDED_window_h_ #define INCLUDED_window_h_ #include "redisplay.h" #ifdef HAVE_SCROLLBARS #include "scrollbar.h" #endif struct window; DECLARE_LISP_OBJECT (window, struct window); #define XWINDOW(x) XRECORD (x, window, struct window) #define wrap_window(p) wrap_record (p, window) #define WINDOWP(x) RECORDP (x, window) #define CHECK_WINDOW(x) CHECK_RECORD (x, window) #define CONCHECK_WINDOW(x) CONCHECK_RECORD (x, window) /* Basic properties available to non-privileged users; redefined in window-impl.h */ int window_live_p (struct window *w); Lisp_Object window_frame (struct window *w); Lisp_Object window_buffer (struct window *w); #define WINDOW_LIVE_P(w) window_live_p (w) #define WINDOW_FRAME(w) window_frame (w) #define WINDOW_BUFFER(w) window_buffer (w) #define WINDOW_XFRAME(w) XFRAME (WINDOW_FRAME (w)) #define WINDOW_DEVICE(w) XFRAME_DEVICE (WINDOW_FRAME (w)) #define WINDOW_XDEVICE(w) XDEVICE (WINDOW_DEVICE (w)) #define WINDOW_CONSOLE(w) XDEVICE_CONSOLE (WINDOW_DEVICE (w)) #define WINDOW_XCONSOLE(w) XCONSOLE (WINDOW_CONSOLE (w)) #define WINDOW_XBUFFER(w) XBUFFER (WINDOW_BUFFER (w)) #define XWINDOW_FRAME(w) WINDOW_FRAME (XWINDOW (w)) #define XWINDOW_XFRAME(w) XFRAME (XWINDOW_FRAME (w)) #define XWINDOW_DEVICE(w) XFRAME_DEVICE (XWINDOW_FRAME (w)) #define XWINDOW_XDEVICE(w) XDEVICE (XWINDOW_DEVICE (w)) #define XWINDOW_CONSOLE(w) XDEVICE_CONSOLE (XWINDOW_DEVICE (w)) #define XWINDOW_XCONSOLE(w) XCONSOLE (XWINDOW_CONSOLE (w)) #define XWINDOW_BUFFER(w) WINDOW_BUFFER (XWINDOW (w)) #define XWINDOW_XBUFFER(w) XBUFFER (XWINDOW_BUFFER (w)) #define CHECK_LIVE_WINDOW(x) do { \ CHECK_WINDOW (x); \ if (!WINDOW_LIVE_P (XWINDOW (x))) \ dead_wrong_type_argument (Qwindow_live_p, (x)); \ } while (0) #define CONCHECK_LIVE_WINDOW(x) do { \ CONCHECK_WINDOW (x); \ if (!WINDOW_LIVE_P (XWINDOW (x))) \ x = wrong_type_argument (Qwindow_live_p, (x)); \ } while (0) struct window_mirror; DECLARE_LISP_OBJECT (window_mirror, struct window_mirror); #define XWINDOW_MIRROR(x) XRECORD (x, window_mirror, struct window_mirror) #define wrap_window_mirror(p) wrap_record (p, window_mirror) #define WINDOW_MIRRORP(x) RECORDP (x, window_mirror) #define CHECK_WINDOW_MIRROR(x) CHECK_RECORD (x, window_mirror) #define CONCHECK_WINDOW_MIRROR(x) CONCHECK_RECORD (x, window_mirror) DECLARE_LISP_OBJECT (window_configuration, struct window_config); EXFUN (Fget_buffer_window, 3); EXFUN (Fmove_to_window_line, 2); EXFUN (Frecenter, 2); EXFUN (Freplace_buffer_in_windows, 3); EXFUN (Fselect_window, 2); EXFUN (Fselected_window, 1); EXFUN (Fset_window_buffer, 3); EXFUN (Fset_window_hscroll, 2); EXFUN (Fset_window_point, 2); EXFUN (Fset_window_start, 3); EXFUN (Fwindow_buffer, 1); EXFUN (Fwindow_highest_p, 1); EXFUN (Fwindow_point, 1); EXFUN (Fwindow_start, 1); extern Lisp_Object Qcurrent_window_configuration, Qset_window_configuration; Lisp_Object display_buffer (Lisp_Object, Lisp_Object, Lisp_Object); /* The minibuffer window of the selected frame. Note that you cannot test for minibufferness of an arbitrary window by comparing against this; but you can test for minibufferness of the selected window or of any window that is displayed. */ extern Lisp_Object minibuf_window; /* Prompt to display in front of the minibuffer contents, or nil */ extern Lisp_Object Vminibuf_prompt; /* Prompt to display in front of the minibuffer prompt, or nil */ extern Lisp_Object Vminibuf_preprompt; Lisp_Object allocate_window (void); int window_char_width (struct window *, int include_margins_p); int window_char_height (struct window *, int include_gutters_p); int window_displayed_height (struct window *); int window_is_leftmost (struct window *w); int window_is_rightmost (struct window *w); int window_is_lowest (struct window *w); int window_is_highest (struct window *w); int window_truncation_on (struct window *w); int window_needs_vertical_divider (struct window *); int window_scrollbar_width (struct window *w); int window_scrollbar_height (struct window *w); int window_modeline_height (struct window *w); int window_left_margin_width (struct window *w); int window_right_margin_width (struct window *w); int window_top_gutter_height (struct window *w); int window_bottom_gutter_height (struct window *w); int window_left_gutter_width (struct window *w, int modeline); int window_right_gutter_width (struct window *w, int modeline); void delete_all_subwindows (struct window *w); void set_window_pixheight (Lisp_Object window, int pixheight, int nodelete); void set_window_pixwidth (Lisp_Object window, int pixwidth, int nodelete); void window_scroll (Lisp_Object window, Lisp_Object n, int direction, Error_Behavior errb); int buffer_window_count (struct buffer *b, struct frame *f); int buffer_window_mru (struct window *w); void check_frame_size (struct frame *frame, int *rows, int *cols); int frame_pixsize_valid_p (struct frame *frame, int width, int height); int frame_size_valid_p (struct frame *frame, int rows, int cols); struct window *decode_window (Lisp_Object window); struct window *find_window_by_pixel_pos (int pix_x, int pix_y, Lisp_Object win); void free_window_mirror (struct window_mirror *mir); Lisp_Object real_window (struct window_mirror *mir, int no_abort); struct window_mirror *find_window_mirror (struct window *w); display_line_dynarr *window_display_lines (struct window *w, int); struct buffer *window_display_buffer (struct window *w); void set_window_display_buffer (struct window *w, struct buffer *b); void update_frame_window_mirror (struct frame *f); int map_windows (struct frame *f, int (*mapfun) (struct window *w, void *closure), void *closure); void some_window_value_changed (Lisp_Object specifier, struct window *w, Lisp_Object oldval); int invalidate_vertical_divider_cache_in_window (struct window *w, void *u_n_u_s_e_d); int window_divider_width (struct window *w); #endif /* INCLUDED_window_h_ */
