Mercurial > hg > xemacs-beta
view src/console-tty-impl.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 | d1247f3cc363 |
| children | a9c41067dd88 |
line wrap: on
line source
/* Define TTY specific console, device, and frame object for XEmacs. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1996 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: Not in FSF. */ /* Written by Chuck Thompson and Ben Wing. */ /* NOTE: Currently each TTY console can have only one device. Therefore, all stuff for both input and output is lumped into the console structure. If it ever becomes meaningful to have more than one device on a TTY console, the output stuff will have to get separated out. */ #ifndef INCLUDED_console_tty_impl_h_ #define INCLUDED_console_tty_impl_h_ #include "console-impl.h" #include "console-tty.h" DECLARE_CONSOLE_TYPE (tty); struct tty_console { #ifdef NEW_GC LISP_OBJECT_HEADER header; #endif /* NEW_GC */ int infd, outfd; Lisp_Object instream, outstream; Lisp_Object terminal_type; Lisp_Object controlling_process; char *term_entry_buffer; /* Physical location of cursor on this console. */ int cursor_x; int cursor_y; /* The real location of the cursor. The above physical location may be ahead of where we really are. */ int real_cursor_x; int real_cursor_y; int final_cursor_x; int final_cursor_y; int height; int width; /* The count of frame number. */ int frame_count; /* flags indicating presence, absence or value of various features */ struct { unsigned int must_write_spaces :1; /* terminal inserts nulls, not spaces to fill whitespace on screen */ unsigned int insert_mode_motion :1; /* cursor movement commands work while in insert mode */ unsigned int standout_motion :1; /* cursor movement is graceful in standout or underline mode */ unsigned int memory_above_frame :1; /* display retained above screen */ unsigned int memory_below_frame :1; /* display retained below screen */ unsigned int meta_key :2; /* 0 == mask off top bit; 1 == top bit is meta; 2 == top bit is useful as character info */ unsigned int flow_control :1; /* Nonzero means use ^S/^Q as cretinous flow control. */ int standout_width; /* # of spaces printed when change to standout mode */ int underline_width; /* # of spaces printed when change to underline mode */ } flags; /* cursor motion entries - each entry is commented with the terminfo and the termcap entry */ struct { /* local cursor movement */ const char *up; /* cuu1, up */ const char *down; /* cud1, do */ const char *left; /* cub1, le */ const char *right; /* cuf1, nd */ const char *home; /* home, ho */ const char *low_left; /* ll, ll */ const char *car_return; /* cr, cr */ /* parameterized local cursor movement */ const char *multi_up; /* cuu, UP */ const char *multi_down; /* cud, DO */ const char *multi_left; /* cub, LE */ const char *multi_right; /* cuf, RI */ /* absolute cursor motion */ const char *abs; /* cup, cm */ const char *hor_abs; /* hpa, ch */ const char *ver_abs; /* vpa, cv */ /* scrolling */ const char *scroll_forw; /* ind, sf */ const char *scroll_back; /* ri, sr */ const char *multi_scroll_forw; /* indn, SF */ const char *multi_scroll_back; /* rin, SR */ const char *set_scroll_region; /* csr, cs */ } cm; /* screen editing entries - each entry is commented with the terminfo and the termcap entry */ struct { /* adding to the screen */ const char *ins_line; /* il1, al */ const char *multi_ins_line; /* il, AL */ const char *repeat; /* rep, rp */ const char *begin_ins_mode; /* smir, im */ const char *end_ins_mode; /* rmir, ei */ const char *ins_char; /* ich1, ic */ const char *multi_ins_char; /* ich, IC */ const char *insert_pad; /* ip, ip */ /* deleting from the screen */ const char *clr_frame; /* clear, cl */ const char *clr_from_cursor; /* ed, cd */ const char *clr_to_eol; /* el, ce */ const char *del_line; /* dl1, dl */ const char *multi_del_line; /* dl, DL */ const char *del_char; /* dch1, dc */ const char *multi_del_char; /* dch, DC */ const char *begin_del_mode; /* smdc, dm */ const char *end_del_mode; /* rmdc, ed */ const char *erase_at_cursor; /* ech, ec */ } se; /* screen display entries - each entry is commented with the terminfo and termcap entry */ struct { const char *begin_standout; /* smso, so */ const char *end_standout; /* rmso, se */ const char *begin_underline; /* smul, us */ const char *end_underline; /* rmul, ue */ const char *begin_alternate; /* smacs, as */ const char *end_alternate; /* rmacs, ae */ const char *turn_on_reverse; /* rev, mr */ const char *turn_on_blinking; /* blink, mb */ const char *turn_on_bold; /* bold, md */ const char *turn_on_dim; /* dim, mh */ const char *turn_off_attributes; /* sgr0, me */ const char *visual_bell; /* flash, vb */ const char *audio_bell; /* bel, bl */ const char *cursor_visible; /* cvvis, vs */ const char *cursor_normal; /* cnorm, ve */ const char *init_motion; /* smcup, ti */ const char *end_motion; /* rmcup, te */ const char *keypad_on; /* smkx, ks */ const char *keypad_off; /* rmkx, ke */ const char *orig_pair; /* op, op */ } sd; /* costs of various operations */ struct { int cm_up; int cm_down; int cm_left; int cm_right; int cm_home; int cm_low_left; int cm_car_return; int cm_abs; int cm_hor_abs; int cm_ver_abs; } cost; /* The initial tty mode bits */ struct emacs_tty old_tty; /* Is this TTY our controlling terminal? */ unsigned int controlling_terminal :1; unsigned int is_stdio :1; /* Do East Asian chars take up two columns? */ unsigned int multiple_width :1; }; #ifdef NEW_GC typedef struct tty_console Lisp_Tty_Console; DECLARE_LISP_OBJECT (tty_console, Lisp_Tty_Console); #define XTTY_CONSOLE(x) \ XRECORD (x, tty_console, Lisp_Tty_Console) #define wrap_tty_console(p) wrap_record (p, tty_console) #define TTY_CONSOLE_P(x) RECORDP (x, tty_console) #endif /* NEW_GC */ #define CONSOLE_TTY_DATA(c) CONSOLE_TYPE_DATA (c, tty) #define CONSOLE_TTY_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->cursor_x) #define CONSOLE_TTY_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->cursor_y) #define CONSOLE_TTY_REAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->real_cursor_x) #define CONSOLE_TTY_REAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->real_cursor_y) #define CONSOLE_TTY_FINAL_CURSOR_X(c) (CONSOLE_TTY_DATA (c)->final_cursor_x) #define CONSOLE_TTY_FINAL_CURSOR_Y(c) (CONSOLE_TTY_DATA (c)->final_cursor_y) /* In a more ideal world where available terminfo files actually included information on whether a given TTY supports double-width characters or not, oh, and where Mule was not conditional, SUPPORTS_MULTIPLE_WIDTH would be as console-specific as its syntax implies. In this world, this is overengineering more than it is anything. */ #define CONSOLE_TTY_SUPPORTS_MULTIPLE_WIDTH(c) (1 != MAX_ICHAR_LEN) #define CONSOLE_TTY_MULTIPLE_WIDTH(c) \ (CONSOLE_TTY_SUPPORTS_MULTIPLE_WIDTH(c) ? \ CONSOLE_TTY_DATA (c)->multiple_width : (0)) #define TTY_CM(c) (CONSOLE_TTY_DATA (c)->cm) #define TTY_SE(c) (CONSOLE_TTY_DATA (c)->se) #define TTY_SD(c) (CONSOLE_TTY_DATA (c)->sd) #define TTY_FLAGS(c) (CONSOLE_TTY_DATA (c)->flags) #define TTY_COST(c) (CONSOLE_TTY_DATA (c)->cost) #define TTY_INC_CURSOR_X(c, n) do { \ int TICX_n = (n); \ assert (CONSOLE_TTY_CURSOR_X (c) == CONSOLE_TTY_REAL_CURSOR_X (c)); \ CONSOLE_TTY_CURSOR_X (c) += TICX_n; \ CONSOLE_TTY_REAL_CURSOR_X (c) += TICX_n; \ } while (0) #define TTY_INC_CURSOR_Y(c, n) do { \ int TICY_n = (n); \ CONSOLE_TTY_CURSOR_Y (c) += TICY_n; \ CONSOLE_TTY_REAL_CURSOR_Y (c) += TICY_n; \ } while (0) struct tty_device { #ifdef NEW_GC LISP_OBJECT_HEADER header; #endif /* NEW_GC */ #ifdef HAVE_TERMIOS speed_t ospeed; /* Output speed (from sg_ospeed) */ #else short ospeed; /* Output speed (from sg_ospeed) */ #endif }; #ifdef NEW_GC typedef struct tty_device Lisp_Tty_Device; DECLARE_LISP_OBJECT (tty_device, Lisp_Tty_Device); #define XTTY_DEVICE(x) \ XRECORD (x, tty_device, Lisp_Tty_Device) #define wrap_tty_device(p) wrap_record (p, tty_device) #define TTY_DEVICE_P(x) RECORDP (x, tty_device) #endif /* NEW_GC */ #define DEVICE_TTY_DATA(d) DEVICE_TYPE_DATA (d, tty) /* termcap requires this to be global */ #ifndef HAVE_TERMIOS extern short ospeed; /* Output speed (from sg_ospeed) */ #endif #endif /* INCLUDED_console_tty_impl_h_ */
