Mercurial > hg > xemacs-beta
annotate src/console-x-impl.h @ 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 | b5df3737028a |
| children | 7be849cb8828 |
| rev | line source |
|---|---|
| 872 | 1 /* Define X specific console, device, and frame object for XEmacs. |
| 2 Copyright (C) 1989, 1992, 1993, 1994, 1995 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1994, 1995 Board of Trustees, University of Illinois. | |
| 1346 | 4 Copyright (C) 1996, 2002, 2003 Ben Wing. |
| 872 | 5 |
| 6 This file is part of XEmacs. | |
| 7 | |
| 8 XEmacs is free software; you can redistribute it and/or modify it | |
| 9 under the terms of the GNU General Public License as published by the | |
| 10 Free Software Foundation; either version 2, or (at your option) any | |
| 11 later version. | |
| 12 | |
| 13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 16 for more details. | |
| 17 | |
| 18 You should have received a copy of the GNU General Public License | |
| 19 along with XEmacs; see the file COPYING. If not, write to | |
| 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 21 Boston, MA 02111-1307, USA. */ | |
| 22 | |
| 23 /* Synched up with: Not in FSF. */ | |
| 24 | |
| 25 | |
| 26 /* Authorship: | |
| 27 | |
| 28 Ultimately based on FSF, then later on JWZ work for Lemacs. | |
| 29 Rewritten over time by Ben Wing and Chuck Thompson (original | |
| 30 multi-device work by Chuck Thompson). | |
| 31 */ | |
| 32 | |
| 33 #ifndef INCLUDED_console_x_impl_h_ | |
| 34 #define INCLUDED_console_x_impl_h_ | |
| 35 | |
| 36 #ifdef HAVE_X_WINDOWS | |
| 37 | |
| 38 #include "console-impl.h" | |
| 39 #include "console-x.h" | |
| 40 | |
| 41 DECLARE_CONSOLE_TYPE (x); | |
| 42 | |
| 3381 | 43 extern int wedge_metacity; |
| 44 | |
| 872 | 45 struct x_device |
| 46 { | |
| 3092 | 47 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
48 NORMAL_LISP_OBJECT_HEADER header; |
| 3092 | 49 #endif /* NEW_GC */ |
| 872 | 50 /* The X connection of this device. */ |
| 51 Display *display; | |
| 52 | |
| 53 /* Set by x_IO_error_handler(). */ | |
| 54 int being_deleted; | |
| 55 | |
| 56 /* Xt application info. */ | |
| 57 Widget Xt_app_shell; | |
| 58 | |
| 59 /* Cache of GC's for frames on this device. */ | |
| 60 struct gc_cache *gc_cache; | |
| 61 | |
| 62 /* Selected visual, depth and colormap for this device */ | |
| 63 Visual *visual; | |
| 64 int depth; | |
| 65 Colormap device_cmap; | |
| 66 | |
| 67 /* Used by x_bevel_modeline in redisplay-x.c */ | |
| 68 Pixmap gray_pixmap; | |
| 69 | |
| 70 /* Atoms associated with this device. */ | |
| 71 /* allocated in Xatoms_of_device_x */ | |
| 72 Atom Xatom_WM_PROTOCOLS; | |
| 73 Atom Xatom_WM_DELETE_WINDOW; | |
| 74 Atom Xatom_WM_SAVE_YOURSELF; | |
| 75 Atom Xatom_WM_TAKE_FOCUS; | |
| 76 Atom Xatom_WM_STATE; | |
| 77 | |
| 78 /* allocated in Xatoms_of_select_x */ | |
| 79 Atom Xatom_CLIPBOARD; | |
| 80 Atom Xatom_TIMESTAMP; | |
| 81 Atom Xatom_TEXT; | |
| 82 Atom Xatom_DELETE; | |
| 83 Atom Xatom_MULTIPLE; | |
| 84 Atom Xatom_INCR; | |
| 85 Atom Xatom_EMACS_TMP; | |
| 86 Atom Xatom_TARGETS; | |
| 87 Atom Xatom_NULL; | |
| 88 Atom Xatom_ATOM_PAIR; | |
| 89 Atom Xatom_COMPOUND_TEXT; | |
| 90 | |
| 91 /* allocated in Xatoms_of_objects_x */ | |
| 92 Atom Xatom_FOUNDRY; | |
| 93 Atom Xatom_FAMILY_NAME; | |
| 94 Atom Xatom_WEIGHT_NAME; | |
| 95 Atom Xatom_SLANT; | |
| 96 Atom Xatom_SETWIDTH_NAME; | |
| 97 Atom Xatom_ADD_STYLE_NAME; | |
| 98 Atom Xatom_PIXEL_SIZE; | |
| 99 Atom Xatom_POINT_SIZE; | |
| 100 Atom Xatom_RESOLUTION_X; | |
| 101 Atom Xatom_RESOLUTION_Y; | |
| 102 Atom Xatom_SPACING; | |
| 103 Atom Xatom_AVERAGE_WIDTH; | |
| 104 Atom Xatom_CHARSET_REGISTRY; | |
| 105 Atom Xatom_CHARSET_ENCODING; | |
| 106 | |
| 107 /* The following items are all used exclusively in event-Xt.c. */ | |
| 108 int MetaMask, HyperMask, SuperMask, AltMask, ModeMask; | |
| 109 KeySym lock_interpretation; | |
| 110 | |
| 111 XModifierKeymap *x_modifier_keymap; | |
| 112 | |
| 113 KeySym *x_keysym_map; | |
| 114 int x_keysym_map_min_code; | |
| 115 int x_keysym_map_max_code; | |
| 116 int x_keysym_map_keysyms_per_code; | |
| 117 Lisp_Object x_keysym_map_hash_table; | |
| 118 | |
| 119 /* frame that holds the WM_COMMAND property; there should be exactly | |
| 120 one of these per device. */ | |
| 121 Lisp_Object WM_COMMAND_frame; | |
| 122 | |
| 123 /* #### It's not clear that there is much distinction anymore | |
| 124 between mouse_timestamp and global_mouse_timestamp, now that | |
| 125 Emacs doesn't see most (all?) events not destined for it. */ | |
| 126 | |
| 127 /* The timestamp of the last button or key event used by emacs itself. | |
| 128 This is used for asserting selections and input focus. */ | |
| 129 Time mouse_timestamp; | |
| 130 | |
| 131 /* This is the timestamp the last button or key event whether it was | |
| 132 dispatched to emacs or widgets. */ | |
| 133 Time global_mouse_timestamp; | |
| 134 | |
| 135 /* This is the last known timestamp received from the server. It is | |
| 136 maintained by x_event_to_emacs_event and used to patch bogus | |
| 137 WM_TAKE_FOCUS messages sent by Mwm. */ | |
| 138 Time last_server_timestamp; | |
| 139 | |
| 140 /* Used by Xlib to preserve information across calls to | |
| 141 XLookupString(), to implement compose processing. | |
| 142 | |
| 143 According to The X Window System, p. 467, "The creation of | |
| 144 XComposeStatus structures is implementation dependent; | |
| 145 a portable program must pass NULL for this argument." | |
| 146 But this means that a portable program cannot implement | |
| 147 compose processing! WTF? | |
| 148 | |
| 149 So we just set it to all zeros. */ | |
| 150 | |
| 151 /* No X Server ever used this, AFAIK -- mrb */ | |
| 152 /* XComposeStatus x_compose_status; */ | |
| 153 | |
| 154 #ifdef HAVE_XIM | |
| 155 XIM xim; | |
| 156 XIMStyles *xim_styles; | |
| 157 #endif /* HAVE_XIM */ | |
| 158 | |
| 159 /* stuff for sticky modifiers: */ | |
| 160 | |
| 161 unsigned int need_to_add_mask, down_mask; | |
| 162 KeyCode last_downkey; | |
| 163 Time release_time; | |
| 164 Time modifier_release_time; | |
| 165 }; | |
| 166 | |
| 3092 | 167 #ifdef NEW_GC |
| 168 typedef struct x_device Lisp_X_Device; | |
| 169 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4584
diff
changeset
|
170 DECLARE_LISP_OBJECT (x_device, Lisp_X_Device); |
| 3092 | 171 |
| 172 #define XX_DEVICE(x) \ | |
| 173 XRECORD (x, x_device, Lisp_X_Device) | |
| 174 #define wrap_x_device(p) wrap_record (p, x_device) | |
| 175 #define X_DEVICE_P(x) RECORDP (x, x_device) | |
| 176 #endif /* NEW_GC */ | |
| 177 | |
| 872 | 178 #define DEVICE_X_DATA(d) DEVICE_TYPE_DATA (d, x) |
| 179 | |
| 180 #define FRAME_X_DISPLAY(f) (DEVICE_X_DISPLAY (XDEVICE (f->device))) | |
| 181 #define DEVICE_X_DISPLAY(d) (DEVICE_X_DATA (d)->display) | |
| 182 #define DEVICE_X_BEING_DELETED(d) (DEVICE_X_DATA (d)->being_deleted) | |
| 183 #define DEVICE_X_VISUAL(d) (DEVICE_X_DATA (d)->visual) | |
| 184 #define DEVICE_X_DEPTH(d) (DEVICE_X_DATA (d)->depth) | |
| 185 #define DEVICE_X_COLORMAP(d) (DEVICE_X_DATA (d)->device_cmap) | |
| 186 #define DEVICE_XT_APP_SHELL(d) (DEVICE_X_DATA (d)->Xt_app_shell) | |
| 187 #define DEVICE_X_GC_CACHE(d) (DEVICE_X_DATA (d)->gc_cache) | |
| 188 #define DEVICE_X_GRAY_PIXMAP(d) (DEVICE_X_DATA (d)->gray_pixmap) | |
| 189 #define DEVICE_X_WM_COMMAND_FRAME(d) (DEVICE_X_DATA (d)->WM_COMMAND_frame) | |
| 190 #define DEVICE_X_MOUSE_TIMESTAMP(d) (DEVICE_X_DATA (d)->mouse_timestamp) | |
| 191 #define DEVICE_X_GLOBAL_MOUSE_TIMESTAMP(d) (DEVICE_X_DATA (d)->global_mouse_timestamp) | |
| 192 #define DEVICE_X_LAST_SERVER_TIMESTAMP(d) (DEVICE_X_DATA (d)->last_server_timestamp) | |
| 193 #define DEVICE_X_KEYSYM_MAP_HASH_TABLE(d) (DEVICE_X_DATA (d)->x_keysym_map_hash_table) | |
| 194 /* #define DEVICE_X_X_COMPOSE_STATUS(d) (DEVICE_X_DATA (d)->x_compose_status) */ | |
| 195 #ifdef HAVE_XIM | |
| 196 #define DEVICE_X_XIM(d) (DEVICE_X_DATA (d)->xim) | |
| 197 #define DEVICE_X_XIM_STYLES(d) (DEVICE_X_DATA (d)->xim_styles) | |
| 198 #define DEVICE_X_FONTSET(d) (DEVICE_X_DATA (d)->fontset) | |
| 199 #endif /* HAVE_XIM */ | |
| 200 | |
| 201 /* allocated in Xatoms_of_device_x */ | |
| 202 #define DEVICE_XATOM_WM_PROTOCOLS(d) (DEVICE_X_DATA (d)->Xatom_WM_PROTOCOLS) | |
| 203 #define DEVICE_XATOM_WM_DELETE_WINDOW(d) (DEVICE_X_DATA (d)->Xatom_WM_DELETE_WINDOW) | |
| 204 #define DEVICE_XATOM_WM_SAVE_YOURSELF(d) (DEVICE_X_DATA (d)->Xatom_WM_SAVE_YOURSELF) | |
| 205 #define DEVICE_XATOM_WM_TAKE_FOCUS(d) (DEVICE_X_DATA (d)->Xatom_WM_TAKE_FOCUS) | |
| 206 #define DEVICE_XATOM_WM_STATE(d) (DEVICE_X_DATA (d)->Xatom_WM_STATE) | |
| 207 | |
| 208 /* allocated in Xatoms_of_select_x */ | |
| 209 #define DEVICE_XATOM_CLIPBOARD(d) (DEVICE_X_DATA (d)->Xatom_CLIPBOARD) | |
| 210 #define DEVICE_XATOM_TIMESTAMP(d) (DEVICE_X_DATA (d)->Xatom_TIMESTAMP) | |
| 211 #define DEVICE_XATOM_TEXT(d) (DEVICE_X_DATA (d)->Xatom_TEXT) | |
| 212 #define DEVICE_XATOM_DELETE(d) (DEVICE_X_DATA (d)->Xatom_DELETE) | |
| 213 #define DEVICE_XATOM_MULTIPLE(d) (DEVICE_X_DATA (d)->Xatom_MULTIPLE) | |
| 214 #define DEVICE_XATOM_INCR(d) (DEVICE_X_DATA (d)->Xatom_INCR) | |
| 215 #define DEVICE_XATOM_EMACS_TMP(d) (DEVICE_X_DATA (d)->Xatom_EMACS_TMP) | |
| 216 #define DEVICE_XATOM_TARGETS(d) (DEVICE_X_DATA (d)->Xatom_TARGETS) | |
| 217 #define DEVICE_XATOM_NULL(d) (DEVICE_X_DATA (d)->Xatom_NULL) | |
| 218 #define DEVICE_XATOM_ATOM_PAIR(d) (DEVICE_X_DATA (d)->Xatom_ATOM_PAIR) | |
| 219 #define DEVICE_XATOM_COMPOUND_TEXT(d) (DEVICE_X_DATA (d)->Xatom_COMPOUND_TEXT) | |
| 220 | |
| 221 /* allocated in Xatoms_of_objects_x */ | |
| 222 #define DEVICE_XATOM_FOUNDRY(d) (DEVICE_X_DATA (d)->Xatom_FOUNDRY) | |
| 223 #define DEVICE_XATOM_FAMILY_NAME(d) (DEVICE_X_DATA (d)->Xatom_FAMILY_NAME) | |
| 224 #define DEVICE_XATOM_WEIGHT_NAME(d) (DEVICE_X_DATA (d)->Xatom_WEIGHT_NAME) | |
| 225 #define DEVICE_XATOM_SLANT(d) (DEVICE_X_DATA (d)->Xatom_SLANT) | |
| 226 #define DEVICE_XATOM_SETWIDTH_NAME(d) (DEVICE_X_DATA (d)->Xatom_SETWIDTH_NAME) | |
| 227 #define DEVICE_XATOM_ADD_STYLE_NAME(d) (DEVICE_X_DATA (d)->Xatom_ADD_STYLE_NAME) | |
| 228 #define DEVICE_XATOM_PIXEL_SIZE(d) (DEVICE_X_DATA (d)->Xatom_PIXEL_SIZE) | |
| 229 #define DEVICE_XATOM_POINT_SIZE(d) (DEVICE_X_DATA (d)->Xatom_POINT_SIZE) | |
| 230 #define DEVICE_XATOM_RESOLUTION_X(d) (DEVICE_X_DATA (d)->Xatom_RESOLUTION_X) | |
| 231 #define DEVICE_XATOM_RESOLUTION_Y(d) (DEVICE_X_DATA (d)->Xatom_RESOLUTION_Y) | |
| 232 #define DEVICE_XATOM_SPACING(d) (DEVICE_X_DATA (d)->Xatom_SPACING) | |
| 233 #define DEVICE_XATOM_AVERAGE_WIDTH(d) (DEVICE_X_DATA (d)->Xatom_AVERAGE_WIDTH) | |
| 234 #define DEVICE_XATOM_CHARSET_REGISTRY(d) (DEVICE_X_DATA (d)->Xatom_CHARSET_REGISTRY) | |
| 235 #define DEVICE_XATOM_CHARSET_ENCODING(d) (DEVICE_X_DATA (d)->Xatom_CHARSET_ENCODING) | |
| 236 | |
| 237 /* The maximum number of widgets that can be displayed above the text | |
| 238 area at one time. Currently no more than 3 will ever actually be | |
| 3381 | 239 displayed (menubar, psheet, debugger panel). |
| 240 #### Are "psheet" and "debugger panel" relevant any more? */ | |
| 872 | 241 #define MAX_CONCURRENT_TOP_WIDGETS 8 |
| 242 | |
| 243 struct x_frame | |
| 244 { | |
| 3092 | 245 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5125
diff
changeset
|
246 NORMAL_LISP_OBJECT_HEADER header; |
| 3092 | 247 #endif /* NEW_GC */ |
| 248 | |
| 3381 | 249 /* The widget of this frame. |
| 250 This is an EmacsShell or an ExternalShell. | |
| 251 It negotiates with the window manager or containing app on behalf of | |
| 252 the container widget. Should be (but isn't) invisible to Emacs. */ | |
| 872 | 253 Widget widget; |
| 254 | |
| 255 /* The parent of the EmacsFrame, the menubar, and the scrollbars. | |
| 3381 | 256 This is an EmacsManager. |
| 257 It is responsible for managing the geometry of the frame. This is what | |
| 258 Emacs mostly talks to. Anything that affects its geometry will be | |
| 259 reflected in the Shell widget, and thus cause WM interaction. */ | |
| 872 | 260 Widget container; |
| 261 | |
| 262 /* The widget of the menubar, of whatever widget class it happens to be. */ | |
| 263 Widget menubar_widget; | |
| 264 | |
| 265 /* The widget of the edit portion of this frame; this is an EmacsFrame, | |
| 266 and the window of this widget is what the redisplay code draws on. */ | |
| 267 Widget edit_widget; | |
| 268 | |
| 269 /* Lists the widgets above the text area, in the proper order. | |
| 270 Used by the EmacsManager. */ | |
| 271 Widget top_widgets[MAX_CONCURRENT_TOP_WIDGETS]; | |
| 272 int num_top_widgets; | |
| 273 | |
| 1346 | 274 /* lwlib ID of the tree of widgets corresponding to this popup. We pass |
| 275 this to lw_map_widget_values() to retrieve all of our Lispy call-data | |
| 276 and accel values that need to be GCPRO'd, and store them in the | |
| 277 following list. (We used to call lw_map_widget_values() during GC | |
| 278 mark, but that isn't compatible with KKCC.) */ | |
| 279 LWLIB_ID menubar_id; | |
| 280 | |
| 281 /* For the frame popup data, this is the last buffer for which the | |
| 282 menubar was displayed. If the buffer has changed, we may have to | |
| 283 update things. */ | |
| 284 Lisp_Object last_menubar_buffer; | |
| 285 | |
| 286 /* This flag tells us if the menubar contents are up-to-date with respect | |
| 287 to the current menubar structure. If we want to actually pull down a | |
| 288 menu and this is false, then we need to update things. */ | |
| 2367 | 289 Boolbyte menubar_contents_up_to_date; |
| 872 | 290 |
| 291 /* The icon pixmaps; these are Lisp_Image_Instance objects, or Qnil. */ | |
| 292 Lisp_Object icon_pixmap; | |
| 293 Lisp_Object icon_pixmap_mask; | |
| 294 | |
| 295 #ifdef HAVE_TOOLBARS | |
| 296 int old_toolbar_size[4]; | |
| 297 | |
| 298 /* We don't provide a mechanism for changing these after they are | |
| 299 initialized so we might as well keep pointers to them and avoid | |
| 300 lots of expensive calls to gc_cache_lookup. */ | |
| 301 GC toolbar_top_shadow_gc; | |
| 302 GC toolbar_bottom_shadow_gc; | |
| 303 GC toolbar_blank_background_gc; | |
| 304 GC toolbar_pixmap_background_gc; | |
| 305 #endif /* HAVE_TOOLBARS */ | |
| 306 | |
| 307 /* geometry string that ought to be freed. */ | |
| 2367 | 308 Ascbyte *geom_free_me_please; |
| 872 | 309 |
| 310 #ifdef HAVE_XIM | |
| 311 XPoint xic_spot; /* Spot Location cache */ | |
| 312 #ifdef XIM_XLIB | |
| 313 XIC xic; | |
| 314 /* Could get these at any time by asking xic, but... */ | |
| 315 XIMStyle xic_style; /* XIM Style cache */ | |
| 316 #endif /* XIM_XLIB */ | |
| 317 #endif /* HAVE_XIM */ | |
| 318 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4584
diff
changeset
|
319 #ifdef HAVE_XFT |
| 3094 | 320 /* The Xft Drawable wrapper for this device. |
| 321 #### Should this be per-device, or per-frame? */ | |
| 322 /* This is persistent to take advantage of the ability of Xft's glyph | |
| 323 cache in the server, and avoid rendering the font again and again... | |
| 324 | |
| 325 This is created the first time through redisplay, and destroyed when our | |
| 326 connection to the X display is destroyed. */ | |
| 327 XftDraw *xftDraw; | |
| 328 #endif | |
| 329 | |
| 872 | 330 /* 1 if the frame is completely visible on the display, 0 otherwise. |
| 331 if 0 the frame may have been iconified or may be totally | |
| 332 or partially hidden by another X window */ | |
| 333 unsigned int totally_visible_p :1; | |
| 334 | |
|
4584
56e67d42eb04
Clarify comment in struct x_frame.
Stephen J. Turnbull <stephen@xemacs.org>
parents:
3381
diff
changeset
|
335 /* NB: Both of the following flags are derivable from the 'widget' |
| 872 | 336 field above, but it's easier if we also have them separately here. */ |
| 337 | |
| 338 /* Are we a top-level frame? This means that our shell is a | |
| 339 TopLevelShell, and we should do certain things to interact with | |
| 340 the window manager. */ | |
| 341 unsigned int top_level_frame_p :1; | |
| 342 | |
| 343 #ifdef EXTERNAL_WIDGET | |
| 344 /* Are we using somebody else's window for our shell window? This | |
| 345 means that our shell is an ExternalShell. If this flag is set, then | |
| 346 `top_level_frame_p' will never be set. */ | |
| 347 unsigned int external_window_p :1; | |
| 348 #endif /* EXTERNAL_WIDGET */ | |
| 349 }; | |
| 350 | |
| 3092 | 351 #ifdef NEW_GC |
| 352 typedef struct x_frame Lisp_X_Frame; | |
| 353 | |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
4584
diff
changeset
|
354 DECLARE_LISP_OBJECT (x_frame, Lisp_X_Frame); |
| 3092 | 355 |
| 356 #define XX_FRAME(x) \ | |
| 357 XRECORD (x, x_frame, Lisp_X_Frame) | |
| 358 #define wrap_x_frame(p) wrap_record (p, x_frame) | |
| 359 #define X_FRAME_P(x) RECORDP (x, x_frame) | |
| 360 #endif /* NEW_GC */ | |
| 872 | 361 #define FRAME_X_DATA(f) FRAME_TYPE_DATA (f, x) |
| 362 | |
| 363 #define FRAME_X_SHELL_WIDGET(f) (FRAME_X_DATA (f)->widget) | |
| 364 #define FRAME_X_CONTAINER_WIDGET(f) (FRAME_X_DATA (f)->container) | |
| 365 #define FRAME_X_MENUBAR_WIDGET(f) (FRAME_X_DATA (f)->menubar_widget) | |
| 366 #define FRAME_X_TEXT_WIDGET(f) (FRAME_X_DATA (f)->edit_widget) | |
| 367 #define FRAME_X_TOP_WIDGETS(f) (FRAME_X_DATA (f)->top_widgets) | |
| 368 #define FRAME_X_NUM_TOP_WIDGETS(f) (FRAME_X_DATA (f)->num_top_widgets) | |
| 369 | |
| 1346 | 370 #define FRAME_X_MENUBAR_ID(f) (FRAME_X_DATA (f)->menubar_id) |
| 371 #define FRAME_X_LAST_MENUBAR_BUFFER(f) (FRAME_X_DATA (f)->last_menubar_buffer) | |
| 372 #define FRAME_X_MENUBAR_CONTENTS_UP_TO_DATE(f) \ | |
| 373 (FRAME_X_DATA (f)->menubar_contents_up_to_date) | |
| 374 | |
| 872 | 375 #define FRAME_X_ICON_PIXMAP(f) (FRAME_X_DATA (f)->icon_pixmap) |
| 376 #define FRAME_X_ICON_PIXMAP_MASK(f) (FRAME_X_DATA (f)->icon_pixmap_mask) | |
| 377 | |
| 378 #ifdef HAVE_TOOLBARS | |
| 379 #define FRAME_X_OLD_TOOLBAR_SIZE(f, pos) (FRAME_X_DATA (f)->old_toolbar_size[pos]) | |
| 380 | |
| 381 #define FRAME_X_TOOLBAR_TOP_SHADOW_GC(f) (FRAME_X_DATA (f)->toolbar_top_shadow_gc) | |
| 382 #define FRAME_X_TOOLBAR_BOTTOM_SHADOW_GC(f) (FRAME_X_DATA (f)->toolbar_bottom_shadow_gc) | |
| 383 #define FRAME_X_TOOLBAR_BLANK_BACKGROUND_GC(f) (FRAME_X_DATA (f)->toolbar_blank_background_gc) | |
| 384 #define FRAME_X_TOOLBAR_PIXMAP_BACKGROUND_GC(f) (FRAME_X_DATA (f)->toolbar_pixmap_background_gc) | |
| 385 #endif /* HAVE_TOOLBARS */ | |
| 386 | |
| 387 #define FRAME_X_GEOM_FREE_ME_PLEASE(f) (FRAME_X_DATA (f)->geom_free_me_please) | |
| 388 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
4584
diff
changeset
|
389 #ifdef HAVE_XFT |
| 3094 | 390 #define FRAME_X_XFTDRAW(f) (FRAME_X_DATA (f)->xftDraw) |
| 391 #endif | |
| 392 | |
| 872 | 393 #define FRAME_X_TOTALLY_VISIBLE_P(f) (FRAME_X_DATA (f)->totally_visible_p) |
| 394 #define FRAME_X_TOP_LEVEL_FRAME_P(f) (FRAME_X_DATA (f)->top_level_frame_p) | |
| 395 | |
| 396 #ifdef EXTERNAL_WIDGET | |
| 397 #define FRAME_X_EXTERNAL_WINDOW_P(f) (FRAME_X_DATA (f)->external_window_p) | |
| 398 #endif | |
| 399 | |
| 400 #ifdef HAVE_XIM | |
| 401 #define FRAME_X_XIC_SPOT(f) (FRAME_X_DATA (f)->xic_spot) | |
| 402 #ifdef XIM_XLIB | |
| 403 #define FRAME_X_XIC(f) (FRAME_X_DATA (f)->xic) | |
| 404 #define FRAME_X_XIC_STYLE(f) (FRAME_X_DATA (f)->xic_style) | |
| 405 #endif /* XIM_XLIB */ | |
| 406 #endif /* HAVE_XIM */ | |
| 407 | |
| 408 extern struct console_type *x_console_type; | |
| 409 | |
| 410 #endif /* HAVE_X_WINDOWS */ | |
| 411 | |
| 412 #endif /* INCLUDED_console_x_impl_h_ */ |