Mercurial > hg > xemacs-beta
annotate src/frame-tty.c @ 5127:a9c41067dd88 ben-lisp-object
more cleanups, terminology clarification, lots of doc work
-------------------- ChangeLog entries follow: --------------------
man/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* internals/internals.texi (Introduction to Allocation):
* internals/internals.texi (Integers and Characters):
* internals/internals.texi (Allocation from Frob Blocks):
* internals/internals.texi (lrecords):
* internals/internals.texi (Low-level allocation):
Rewrite section on allocation of Lisp objects to reflect the new
reality. Remove references to nonexistent XSETINT and XSETCHAR.
modules/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* postgresql/postgresql.c (allocate_pgconn):
* postgresql/postgresql.c (allocate_pgresult):
* postgresql/postgresql.h (struct Lisp_PGconn):
* postgresql/postgresql.h (struct Lisp_PGresult):
* ldap/eldap.c (allocate_ldap):
* ldap/eldap.h (struct Lisp_LDAP):
Same changes as in src/ dir. See large log there in ChangeLog,
but basically:
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
../hlo/src/ChangeLog addition:
2010-03-05 Ben Wing <ben@xemacs.org>
* alloc.c:
* alloc.c (old_alloc_sized_lcrecord):
* alloc.c (very_old_free_lcrecord):
* alloc.c (copy_lisp_object):
* alloc.c (zero_sized_lisp_object):
* alloc.c (zero_nonsized_lisp_object):
* alloc.c (lisp_object_storage_size):
* alloc.c (free_normal_lisp_object):
* alloc.c (FREE_FIXED_TYPE_WHEN_NOT_IN_GC):
* alloc.c (ALLOC_FROB_BLOCK_LISP_OBJECT):
* alloc.c (Fcons):
* alloc.c (noseeum_cons):
* alloc.c (make_float):
* alloc.c (make_bignum):
* alloc.c (make_bignum_bg):
* alloc.c (make_ratio):
* alloc.c (make_ratio_bg):
* alloc.c (make_ratio_rt):
* alloc.c (make_bigfloat):
* alloc.c (make_bigfloat_bf):
* alloc.c (size_vector):
* alloc.c (make_compiled_function):
* alloc.c (Fmake_symbol):
* alloc.c (allocate_extent):
* alloc.c (allocate_event):
* alloc.c (make_key_data):
* alloc.c (make_button_data):
* alloc.c (make_motion_data):
* alloc.c (make_process_data):
* alloc.c (make_timeout_data):
* alloc.c (make_magic_data):
* alloc.c (make_magic_eval_data):
* alloc.c (make_eval_data):
* alloc.c (make_misc_user_data):
* alloc.c (Fmake_marker):
* alloc.c (noseeum_make_marker):
* alloc.c (size_string_direct_data):
* alloc.c (make_uninit_string):
* alloc.c (make_string_nocopy):
* alloc.c (mark_lcrecord_list):
* alloc.c (alloc_managed_lcrecord):
* alloc.c (free_managed_lcrecord):
* alloc.c (sweep_lcrecords_1):
* alloc.c (malloced_storage_size):
* buffer.c (allocate_buffer):
* buffer.c (compute_buffer_usage):
* buffer.c (DEFVAR_BUFFER_LOCAL_1):
* buffer.c (nuke_all_buffer_slots):
* buffer.c (common_init_complex_vars_of_buffer):
* buffer.h (struct buffer_text):
* buffer.h (struct buffer):
* bytecode.c:
* bytecode.c (make_compiled_function_args):
* bytecode.c (size_compiled_function_args):
* bytecode.h (struct compiled_function_args):
* casetab.c (allocate_case_table):
* casetab.h (struct Lisp_Case_Table):
* charset.h (struct Lisp_Charset):
* chartab.c (fill_char_table):
* chartab.c (Fmake_char_table):
* chartab.c (make_char_table_entry):
* chartab.c (copy_char_table_entry):
* chartab.c (Fcopy_char_table):
* chartab.c (put_char_table):
* chartab.h (struct Lisp_Char_Table_Entry):
* chartab.h (struct Lisp_Char_Table):
* console-gtk-impl.h (struct gtk_device):
* console-gtk-impl.h (struct gtk_frame):
* console-impl.h (struct console):
* console-msw-impl.h (struct Lisp_Devmode):
* console-msw-impl.h (struct mswindows_device):
* console-msw-impl.h (struct msprinter_device):
* console-msw-impl.h (struct mswindows_frame):
* console-msw-impl.h (struct mswindows_dialog_id):
* console-stream-impl.h (struct stream_console):
* console-stream.c (stream_init_console):
* console-tty-impl.h (struct tty_console):
* console-tty-impl.h (struct tty_device):
* console-tty.c (allocate_tty_console_struct):
* console-x-impl.h (struct x_device):
* console-x-impl.h (struct x_frame):
* console.c (allocate_console):
* console.c (nuke_all_console_slots):
* console.c (DEFVAR_CONSOLE_LOCAL_1):
* console.c (common_init_complex_vars_of_console):
* data.c (make_weak_list):
* data.c (make_weak_box):
* data.c (make_ephemeron):
* database.c:
* database.c (struct Lisp_Database):
* database.c (allocate_database):
* database.c (finalize_database):
* device-gtk.c (allocate_gtk_device_struct):
* device-impl.h (struct device):
* device-msw.c:
* device-msw.c (mswindows_init_device):
* device-msw.c (msprinter_init_device):
* device-msw.c (finalize_devmode):
* device-msw.c (allocate_devmode):
* device-tty.c (allocate_tty_device_struct):
* device-x.c (allocate_x_device_struct):
* device.c:
* device.c (nuke_all_device_slots):
* device.c (allocate_device):
* dialog-msw.c (handle_question_dialog_box):
* elhash.c:
* elhash.c (struct Lisp_Hash_Table):
* elhash.c (finalize_hash_table):
* elhash.c (make_general_lisp_hash_table):
* elhash.c (Fcopy_hash_table):
* elhash.h (htentry):
* emacs.c (main_1):
* eval.c:
* eval.c (size_multiple_value):
* event-stream.c (finalize_command_builder):
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder):
* event-stream.c (event_stream_generate_wakeup):
* event-stream.c (event_stream_resignal_wakeup):
* event-stream.c (event_stream_disable_wakeup):
* event-stream.c (event_stream_wakeup_pending_p):
* events.h (struct Lisp_Timeout):
* events.h (struct command_builder):
* extents-impl.h:
* extents-impl.h (struct extent_auxiliary):
* extents-impl.h (struct extent_info):
* extents-impl.h (set_extent_no_chase_aux_field):
* extents-impl.h (set_extent_no_chase_normal_field):
* extents.c:
* extents.c (gap_array_marker):
* extents.c (gap_array):
* extents.c (extent_list_marker):
* extents.c (extent_list):
* extents.c (stack_of_extents):
* extents.c (gap_array_make_marker):
* extents.c (extent_list_make_marker):
* extents.c (allocate_extent_list):
* extents.c (SLOT):
* extents.c (mark_extent_auxiliary):
* extents.c (allocate_extent_auxiliary):
* extents.c (attach_extent_auxiliary):
* extents.c (size_gap_array):
* extents.c (finalize_extent_info):
* extents.c (allocate_extent_info):
* extents.c (uninit_buffer_extents):
* extents.c (allocate_soe):
* extents.c (copy_extent):
* extents.c (vars_of_extents):
* extents.h:
* faces.c (allocate_face):
* faces.h (struct Lisp_Face):
* faces.h (struct face_cachel):
* file-coding.c:
* file-coding.c (finalize_coding_system):
* file-coding.c (sizeof_coding_system):
* file-coding.c (Fcopy_coding_system):
* file-coding.h (struct Lisp_Coding_System):
* file-coding.h (MARKED_SLOT):
* fns.c (size_bit_vector):
* font-mgr.c:
* font-mgr.c (finalize_fc_pattern):
* font-mgr.c (print_fc_pattern):
* font-mgr.c (Ffc_pattern_p):
* font-mgr.c (Ffc_pattern_create):
* font-mgr.c (Ffc_name_parse):
* font-mgr.c (Ffc_name_unparse):
* font-mgr.c (Ffc_pattern_duplicate):
* font-mgr.c (Ffc_pattern_add):
* font-mgr.c (Ffc_pattern_del):
* font-mgr.c (Ffc_pattern_get):
* font-mgr.c (fc_config_create_using):
* font-mgr.c (fc_strlist_to_lisp_using):
* font-mgr.c (fontset_to_list):
* font-mgr.c (Ffc_config_p):
* font-mgr.c (Ffc_config_up_to_date):
* font-mgr.c (Ffc_config_build_fonts):
* font-mgr.c (Ffc_config_get_cache):
* font-mgr.c (Ffc_config_get_fonts):
* font-mgr.c (Ffc_config_set_current):
* font-mgr.c (Ffc_config_get_blanks):
* font-mgr.c (Ffc_config_get_rescan_interval):
* font-mgr.c (Ffc_config_set_rescan_interval):
* font-mgr.c (Ffc_config_app_font_add_file):
* font-mgr.c (Ffc_config_app_font_add_dir):
* font-mgr.c (Ffc_config_app_font_clear):
* font-mgr.c (size):
* font-mgr.c (Ffc_config_substitute):
* font-mgr.c (Ffc_font_render_prepare):
* font-mgr.c (Ffc_font_match):
* font-mgr.c (Ffc_font_sort):
* font-mgr.c (finalize_fc_config):
* font-mgr.c (print_fc_config):
* font-mgr.h:
* font-mgr.h (struct fc_pattern):
* font-mgr.h (XFC_PATTERN):
* font-mgr.h (struct fc_config):
* font-mgr.h (XFC_CONFIG):
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-impl.h (struct frame):
* frame-msw.c (mswindows_init_frame_1):
* frame-x.c (allocate_x_frame_struct):
* frame.c (nuke_all_frame_slots):
* frame.c (allocate_frame_core):
* gc.c:
* gc.c (GC_CHECK_NOT_FREE):
* glyphs.c (finalize_image_instance):
* glyphs.c (allocate_image_instance):
* glyphs.c (Fcolorize_image_instance):
* glyphs.c (allocate_glyph):
* glyphs.c (unmap_subwindow_instance_cache_mapper):
* glyphs.c (register_ignored_expose):
* glyphs.h (struct Lisp_Image_Instance):
* glyphs.h (struct Lisp_Glyph):
* glyphs.h (struct glyph_cachel):
* glyphs.h (struct expose_ignore):
* gui.c (allocate_gui_item):
* gui.h (struct Lisp_Gui_Item):
* keymap.c (struct Lisp_Keymap):
* keymap.c (make_keymap):
* lisp.h:
* lisp.h (struct Lisp_String_Direct_Data):
* lisp.h (struct Lisp_String_Indirect_Data):
* lisp.h (struct Lisp_Vector):
* lisp.h (struct Lisp_Bit_Vector):
* lisp.h (DECLARE_INLINE_LISP_BIT_VECTOR):
* lisp.h (struct weak_box):
* lisp.h (struct ephemeron):
* lisp.h (struct weak_list):
* lrecord.h:
* lrecord.h (struct lrecord_implementation):
* lrecord.h (MC_ALLOC_CALL_FINALIZER):
* lrecord.h (struct lcrecord_list):
* lstream.c (finalize_lstream):
* lstream.c (sizeof_lstream):
* lstream.c (Lstream_new):
* lstream.c (Lstream_delete):
* lstream.h (struct lstream):
* marker.c:
* marker.c (finalize_marker):
* marker.c (compute_buffer_marker_usage):
* mule-charset.c:
* mule-charset.c (make_charset):
* mule-charset.c (compute_charset_usage):
* objects-impl.h (struct Lisp_Color_Instance):
* objects-impl.h (struct Lisp_Font_Instance):
* objects-tty-impl.h (struct tty_color_instance_data):
* objects-tty-impl.h (struct tty_font_instance_data):
* objects-tty.c (tty_initialize_color_instance):
* objects-tty.c (tty_initialize_font_instance):
* objects.c (finalize_color_instance):
* objects.c (Fmake_color_instance):
* objects.c (finalize_font_instance):
* objects.c (Fmake_font_instance):
* objects.c (reinit_vars_of_objects):
* opaque.c:
* opaque.c (sizeof_opaque):
* opaque.c (make_opaque_ptr):
* opaque.c (free_opaque_ptr):
* opaque.h:
* opaque.h (Lisp_Opaque):
* opaque.h (Lisp_Opaque_Ptr):
* print.c (printing_unreadable_lcrecord):
* print.c (external_object_printer):
* print.c (debug_p4):
* process.c (finalize_process):
* process.c (make_process_internal):
* procimpl.h (struct Lisp_Process):
* rangetab.c (Fmake_range_table):
* rangetab.c (Fcopy_range_table):
* rangetab.h (struct Lisp_Range_Table):
* scrollbar.c:
* scrollbar.c (create_scrollbar_instance):
* scrollbar.c (compute_scrollbar_instance_usage):
* scrollbar.h (struct scrollbar_instance):
* specifier.c (finalize_specifier):
* specifier.c (sizeof_specifier):
* specifier.c (set_specifier_caching):
* specifier.h (struct Lisp_Specifier):
* specifier.h (struct specifier_caching):
* symeval.h:
* symeval.h (SYMBOL_VALUE_MAGIC_P):
* symeval.h (DEFVAR_SYMVAL_FWD):
* symsinit.h:
* syntax.c (init_buffer_syntax_cache):
* syntax.h (struct syntax_cache):
* toolbar.c:
* toolbar.c (allocate_toolbar_button):
* toolbar.c (update_toolbar_button):
* toolbar.h (struct toolbar_button):
* tooltalk.c (struct Lisp_Tooltalk_Message):
* tooltalk.c (make_tooltalk_message):
* tooltalk.c (struct Lisp_Tooltalk_Pattern):
* tooltalk.c (make_tooltalk_pattern):
* ui-gtk.c:
* ui-gtk.c (allocate_ffi_data):
* ui-gtk.c (emacs_gtk_object_finalizer):
* ui-gtk.c (allocate_emacs_gtk_object_data):
* ui-gtk.c (allocate_emacs_gtk_boxed_data):
* ui-gtk.h:
* window-impl.h (struct window):
* window-impl.h (struct window_mirror):
* window.c (finalize_window):
* window.c (allocate_window):
* window.c (new_window_mirror):
* window.c (mark_window_as_deleted):
* window.c (make_dummy_parent):
* window.c (compute_window_mirror_usage):
* window.c (compute_window_usage):
Overall point of this change and previous ones in this repository:
(1) Introduce new, clearer terminology: everything other than int
or char is a "record" object, which comes in two types: "normal
objects" and "frob-block objects". Fix up all places that
referred to frob-block objects as "simple", "basic", etc.
(2) Provide an advertised interface for doing operations on Lisp
objects, including creating new types, that is clean and
consistent in its naming, uses the above-referenced terms and
avoids referencing "lrecords", "old lcrecords", etc., which should
hide under the surface.
(3) Make the size_in_bytes and finalizer methods take a
Lisp_Object rather than a void * for consistency with other methods.
(4) Separate finalizer method into finalizer and disksaver, so
that normal finalize methods don't have to worry about disksaving.
Other specifics:
(1) Renaming:
LISP_OBJECT_HEADER -> NORMAL_LISP_OBJECT_HEADER
ALLOC_LISP_OBJECT -> ALLOC_NORMAL_LISP_OBJECT
implementation->basic_p -> implementation->frob_block_p
ALLOCATE_FIXED_TYPE_AND_SET_IMPL -> ALLOC_FROB_BLOCK_LISP_OBJECT
*FCCONFIG*, wrap_fcconfig -> *FC_CONFIG*, wrap_fc_config
*FCPATTERN*, wrap_fcpattern -> *FC_PATTERN*, wrap_fc_pattern
(the last two changes make the naming of these macros consistent
with the naming of all other macros, since the objects are named
fc-config and fc-pattern with a hyphen)
(2) Lots of documentation fixes in lrecord.h.
(3) Eliminate macros for copying, freeing, zeroing objects, getting
their storage size. Instead, new functions:
zero_sized_lisp_object()
zero_nonsized_lisp_object()
lisp_object_storage_size()
free_normal_lisp_object()
(copy_lisp_object() already exists)
LISP_OBJECT_FROB_BLOCK_P() (actually a macro)
Eliminated:
free_lrecord()
zero_lrecord()
copy_lrecord()
copy_sized_lrecord()
old_copy_lcrecord()
old_copy_sized_lcrecord()
old_zero_lcrecord()
old_zero_sized_lcrecord()
LISP_OBJECT_STORAGE_SIZE()
COPY_SIZED_LISP_OBJECT()
COPY_SIZED_LCRECORD()
COPY_LISP_OBJECT()
ZERO_LISP_OBJECT()
FREE_LISP_OBJECT()
(4) Catch the remaining places where lrecord stuff was used directly
and use the advertised interface, e.g. alloc_sized_lrecord() ->
ALLOC_SIZED_LISP_OBJECT().
(5) Make certain statically-declared pseudo-objects
(buffer_local_flags, console_local_flags) have their lheader
initialized correctly, so things like copy_lisp_object() can work
on them. Make extent_auxiliary_defaults a proper heap object
Vextent_auxiliary_defaults, and make extent auxiliaries dumpable
so that this object can be dumped. allocate_extent_auxiliary()
now just creates the object, and attach_extent_auxiliary()
creates an extent auxiliary and attaches to an extent, like the
old allocate_extent_auxiliary().
(6) Create EXTENT_AUXILIARY_SLOTS macro, similar to the foo-slots.h
files but in a macro instead of a file. The purpose is to avoid
duplication when iterating over all the slots in an extent auxiliary.
Use it.
(7) In lstream.c, don't zero out object after allocation because
allocation routines take care of this.
(8) In marker.c, fix a mistake in computing marker overhead.
(9) In print.c, clean up printing_unreadable_lcrecord(),
external_object_printer() to avoid lots of ifdef NEW_GC's.
(10) Separate toolbar-button allocation into a separate
allocate_toolbar_button() function for use in the example code
in lrecord.h.
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Fri, 05 Mar 2010 04:08:17 -0600 |
| parents | e34711681f30 |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 428 | 1 /* TTY frame functions. |
| 771 | 2 Copyright (C) 1995, 1997 Free Software Foundation, Inc. |
| 3 Copyright (C) 1995, 1996, 2002 Ben Wing. | |
| 428 | 4 |
| 5 This file is part of XEmacs. | |
| 6 | |
| 7 XEmacs is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 9 Free Software Foundation; either version 2, or (at your option) any | |
| 10 later version. | |
| 11 | |
| 12 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 18 along with XEmacs; see the file COPYING. If not, write to | |
| 19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 20 Boston, MA 02111-1307, USA. */ | |
| 21 | |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Written by Ben Wing. | |
| 25 Multi-frame support added by Hrvoje Niksic. */ | |
| 26 | |
| 27 #include <config.h> | |
| 28 #include "lisp.h" | |
| 29 | |
| 872 | 30 #include "device-impl.h" |
| 800 | 31 #include "events.h" |
| 872 | 32 #include "frame-impl.h" |
| 428 | 33 |
| 872 | 34 #include "console-tty-impl.h" |
| 428 | 35 |
| 36 | |
| 37 /* Default properties to use when creating frames. */ | |
| 38 Lisp_Object Vdefault_tty_frame_plist; | |
| 39 | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3025
diff
changeset
|
40 Lisp_Object Qframe_number, Qmake_frame_after_init_entry_point; |
| 771 | 41 |
| 428 | 42 static void tty_raise_frame (struct frame *); |
| 43 | |
| 44 | |
| 45 static void | |
| 2286 | 46 tty_init_frame_1 (struct frame *f, Lisp_Object UNUSED (props), |
| 771 | 47 int frame_name_is_defaulted) |
| 428 | 48 { |
| 49 struct device *d = XDEVICE (FRAME_DEVICE (f)); | |
| 50 struct console *c = XCONSOLE (DEVICE_CONSOLE (d)); | |
| 51 | |
| 52 ++CONSOLE_TTY_DATA (c)->frame_count; | |
| 53 f->order_count = CONSOLE_TTY_DATA (c)->frame_count; | |
| 54 f->height = CONSOLE_TTY_DATA (c)->height; | |
| 55 f->width = CONSOLE_TTY_DATA (c)->width; | |
| 771 | 56 if (frame_name_is_defaulted) |
| 57 f->name = emacs_sprintf_string ("F%d", f->order_count); | |
| 428 | 58 } |
| 59 | |
| 60 static void | |
| 61 tty_init_frame_3 (struct frame *f) | |
| 62 { | |
| 63 tty_raise_frame (f); | |
| 64 } | |
| 65 | |
| 66 static void | |
| 67 tty_select_frame_if_unhidden (Lisp_Object frame) | |
| 68 { | |
| 69 if (FRAME_REPAINT_P (XFRAME (frame))) | |
| 70 select_frame_1 (frame); | |
| 71 } | |
| 72 | |
| 73 static void | |
| 74 tty_schedule_frame_select (struct frame *f) | |
| 75 { | |
| 793 | 76 Lisp_Object frame = wrap_frame (f); |
| 428 | 77 |
| 78 enqueue_magic_eval_event (tty_select_frame_if_unhidden, frame); | |
| 79 } | |
| 80 | |
| 81 static void | |
| 2286 | 82 tty_after_init_frame (struct frame *f, int UNUSED (first_on_device), |
| 428 | 83 int first_on_console) |
| 84 { | |
| 85 if (first_on_console) | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3025
diff
changeset
|
86 call1 (Qmake_frame_after_init_entry_point, FRAME_CONSOLE (f)); |
| 428 | 87 } |
| 88 | |
| 89 /* Change from withdrawn state to mapped state. */ | |
| 90 static void | |
| 91 tty_make_frame_visible (struct frame *f) | |
| 92 { | |
| 771 | 93 if (!FRAME_VISIBLE_P (f)) |
| 428 | 94 { |
| 95 f->visible = -1; | |
| 96 } | |
| 97 } | |
| 98 | |
| 99 /* Change from mapped state to withdrawn state. */ | |
| 100 static void | |
| 101 tty_make_frame_invisible (struct frame *f) | |
| 102 { | |
| 103 f->visible = 0; | |
| 104 } | |
| 105 | |
| 106 static void | |
| 107 tty_make_frame_hidden (struct frame *f) | |
| 108 { | |
| 109 f->visible = -1; | |
| 110 } | |
| 111 | |
| 112 static void | |
| 113 tty_make_frame_unhidden (struct frame *f) | |
| 114 { | |
| 771 | 115 if (!FRAME_REPAINT_P (f)) |
| 428 | 116 { |
| 771 | 117 SET_FRAME_CLEAR (f); |
| 428 | 118 f->visible = 1; |
| 119 } | |
| 120 } | |
| 121 | |
| 122 static int | |
| 123 tty_frame_visible_p (struct frame *f) | |
| 124 { | |
| 125 return FRAME_VISIBLE_P (f); | |
| 126 } | |
| 127 | |
| 128 static void | |
| 129 tty_raise_frame_no_select (struct frame *f) | |
| 130 { | |
| 131 LIST_LOOP_2 (frame, DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f)))) | |
| 132 { | |
| 133 struct frame *o = XFRAME (frame); | |
| 134 if (o != f && FRAME_REPAINT_P (o)) | |
| 135 { | |
| 136 tty_make_frame_hidden (o); | |
| 137 break; | |
| 138 } | |
| 139 } | |
| 140 tty_make_frame_unhidden (f); | |
| 141 } | |
| 142 | |
| 143 static void | |
| 144 tty_raise_frame (struct frame *f) | |
| 145 { | |
| 146 tty_raise_frame_no_select (f); | |
| 147 tty_schedule_frame_select (f); | |
| 148 } | |
| 149 | |
| 150 static void | |
| 151 tty_lower_frame (struct frame *f) | |
| 152 { | |
| 153 Lisp_Object frame_list = DEVICE_FRAME_LIST (XDEVICE (FRAME_DEVICE (f))); | |
| 3025 | 154 Lisp_Object tail, new_; |
| 428 | 155 |
| 156 if (!FRAME_REPAINT_P (f)) | |
| 157 return; | |
| 158 | |
| 159 LIST_LOOP (tail, frame_list) | |
| 160 { | |
| 161 if (f == XFRAME (XCAR (tail))) | |
| 162 break; | |
| 163 } | |
| 164 | |
| 165 /* To lower this frame, another frame has to be raised. Return if | |
| 166 there is no other frame. */ | |
| 771 | 167 if (NILP (tail) && EQ (frame_list, tail)) |
| 428 | 168 return; |
| 169 | |
| 170 tty_make_frame_hidden (f); | |
| 171 if (CONSP (XCDR (tail))) | |
| 3025 | 172 new_ = XCAR (XCDR (tail)); |
| 428 | 173 else |
| 3025 | 174 new_ = XCAR (frame_list); |
| 175 tty_make_frame_unhidden (XFRAME (new_)); | |
| 176 tty_schedule_frame_select (XFRAME (new_)); | |
| 428 | 177 } |
| 178 | |
| 179 static void | |
| 180 tty_delete_frame (struct frame *f) | |
| 181 { | |
| 182 struct device *d = XDEVICE (FRAME_DEVICE (f)); | |
| 183 | |
| 184 if (!NILP (DEVICE_SELECTED_FRAME (d))) | |
| 185 tty_raise_frame (XFRAME (DEVICE_SELECTED_FRAME (d))); | |
| 186 } | |
| 771 | 187 |
| 188 static Lisp_Object | |
| 189 tty_frame_property (struct frame *f, Lisp_Object property) | |
| 190 { | |
| 191 if (EQ (Qframe_number, property)) | |
| 192 return make_int (f->order_count); | |
| 193 | |
| 194 return Qunbound; | |
| 195 } | |
| 196 | |
| 197 static int | |
| 2286 | 198 tty_internal_frame_property_p (struct frame *UNUSED (f), Lisp_Object property) |
| 771 | 199 { |
| 200 return EQ (property, Qframe_number); | |
| 201 } | |
| 202 | |
| 203 static Lisp_Object | |
| 204 tty_frame_properties (struct frame *f) | |
| 205 { | |
| 206 Lisp_Object props = Qnil; | |
| 207 | |
| 208 props = cons3 (Qframe_number, make_int (f->order_count), props); | |
| 209 | |
| 210 return props; | |
| 211 } | |
| 428 | 212 |
| 213 /************************************************************************/ | |
| 214 /* initialization */ | |
| 215 /************************************************************************/ | |
| 216 | |
| 217 void | |
| 218 console_type_create_frame_tty (void) | |
| 219 { | |
| 220 CONSOLE_HAS_METHOD (tty, init_frame_1); | |
| 221 CONSOLE_HAS_METHOD (tty, init_frame_3); | |
| 222 CONSOLE_HAS_METHOD (tty, after_init_frame); | |
| 223 CONSOLE_HAS_METHOD (tty, make_frame_visible); | |
| 224 CONSOLE_HAS_METHOD (tty, make_frame_invisible); | |
| 225 CONSOLE_HAS_METHOD (tty, frame_visible_p); | |
| 226 CONSOLE_HAS_METHOD (tty, raise_frame); | |
| 227 CONSOLE_HAS_METHOD (tty, lower_frame); | |
| 228 CONSOLE_HAS_METHOD (tty, delete_frame); | |
| 771 | 229 CONSOLE_HAS_METHOD (tty, frame_property); |
| 230 CONSOLE_HAS_METHOD (tty, internal_frame_property_p); | |
| 231 CONSOLE_HAS_METHOD (tty, frame_properties); | |
| 232 } | |
| 233 | |
| 234 void | |
| 235 syms_of_frame_tty (void) | |
| 236 { | |
| 237 DEFSYMBOL (Qframe_number); | |
|
4477
e34711681f30
Don't determine whether to call general device-type code at startup,
Aidan Kehoe <kehoea@parhasard.net>
parents:
3025
diff
changeset
|
238 DEFSYMBOL (Qmake_frame_after_init_entry_point); |
| 428 | 239 } |
| 240 | |
| 241 void | |
| 242 vars_of_frame_tty (void) | |
| 243 { | |
| 244 DEFVAR_LISP ("default-tty-frame-plist", &Vdefault_tty_frame_plist /* | |
| 245 Plist of default frame-creation properties for tty frames. | |
| 246 These are in addition to and override what is specified in | |
| 247 `default-frame-plist', but are overridden by the arguments to the | |
| 248 particular call to `make-frame'. | |
| 249 */ ); | |
| 250 Vdefault_tty_frame_plist = Qnil; | |
| 251 | |
| 252 tty_console_methods->device_specific_frame_props = | |
| 253 &Vdefault_tty_frame_plist; | |
| 254 | |
| 255 /* Tty frames are now supported. Advertise a feature to indicate this. */ | |
| 256 Fprovide (intern ("tty-frames")); | |
| 257 } |