Mercurial > hg > xemacs-beta
view src/devslots.h @ 5803:b79e1e02bf01
Preserve extent information in the command builder code.
src/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* event-stream.c:
* event-stream.c (mark_command_builder):
* event-stream.c (finalize_command_builder): Removed.
* event-stream.c (allocate_command_builder):
* event-stream.c (free_command_builder): Removed. Use
free_normal_lisp_object() instead.
* event-stream.c (echo_key_event):
* event-stream.c (regenerate_echo_keys_from_this_command_keys):
Detach all extents here.
* event-stream.c (maybe_echo_keys):
* event-stream.c (reset_key_echo):
* event-stream.c (execute_help_form):
* event-stream.c (Fnext_event):
* event-stream.c (command_builder_find_leaf_no_jit_binding):
* event-stream.c (command_builder_find_leaf):
* event-stream.c (lookup_command_event):
* events.h (struct command_builder):
Move the command builder's echo_buf to being a Lisp string rather
than a malloced Ibyte array. This allows passing through extent
information, which was previously dropped. It also simplifies the
allocation and release code for the command builder.
Rename echo_buf_index to echo_buf_fill_pointer, better reflecting
its function.
Don't rely on zero-termination (something not particularly
compatible with Lisp-level code) when showing a substring of
echo_buf that differs from that designated by
echo_buf_fill_pointer, keep a separate counter instead and use
that.
* minibuf.c:
* minibuf.c (echo_area_append):
Use the new START and END keyword arguments to #'append-message,
rather than consing a new string for basically every #'next-event
prompt displayed.
test/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* automated/extent-tests.el:
Check that extent information is passed through to the echo area
correctly with #'next-event's PROMPT argument.
lisp/ChangeLog addition:
2014-07-14 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (raw-append-message):
Use #'write-sequence in this, take its START and END keyword
arguments, so our callers don't have to cons as much.
* simple.el (append-message):
Pass through START and END here.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Mon, 14 Jul 2014 13:42:42 +0100 |
| parents | 308d34e9f07d |
| children |
line wrap: on
line source
/* Definitions of marked slots in consoles Copyright (C) 1990, 1992, 1993 Free Software Foundation, Inc. Copyright (C) 2002 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 3 of the License, 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. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* We define the Lisp_Objects in the device 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. No need to undefine; that happens automatically. */ /* Name of this device, for resourcing and printing purposes. If not explicitly given, it's initialized in a device-specific manner. */ MARKED_SLOT (name) /* What this device is connected to */ MARKED_SLOT (connection) /* A canonical name for the connection that is used to determine whether `make-device' is being called on an existing device. */ MARKED_SLOT (canon_connection) /* List of frames on this device. */ MARKED_SLOT (frame_list) /* The console this device is on. */ MARKED_SLOT (console) /* Frame which is "currently selected". This is what `selected-frame' returns and is the default frame for many operations. This may not be the same as frame_with_focus `select-frame' changes the selected_frame but not the frame_with_focus. However, eventually either the two values will be the same, or frame_with_focus will be nil: right before waiting for an event, the focus is changed to point to the selected_frame if XEmacs currently has the focus on this device. Note that frame_with_focus may be nil (none of the frames on this device have the window-system focus), but selected_frame will never be nil if there are any frames on the device. */ MARKED_SLOT (selected_frame) /* Frame that currently contains the window-manager focus, or none. Note that we've split frame_with_focus into two variables. frame_with_focus_real is the value we use most of the time, but frame_with_focus_for_hooks is used for running the select-frame-hook and deselect-frame-hook. We do this because we split the focus handling into two parts: one part (deals with drawing the solid/box cursor) runs as soon as a focus event is received the other (running the hooks) runs after any pending sit-for/sleep-for/accept-process-output calls are done. */ MARKED_SLOT (frame_with_focus_real) MARKED_SLOT (frame_with_focus_for_hooks) /* If we have recently issued a request to change the focus as a result of select-frame having been called, the following variable records the frame we are trying to focus on. The reason for this is that the window manager may not grant our request to change the focus (so we can't just change frame_with_focus), and we don't want to keep sending requests again and again to the window manager. This variable is reset whenever a focus-change event is seen. */ MARKED_SLOT (frame_that_ought_to_have_focus) /* Color class of this device. */ MARKED_SLOT (device_class) /* Alist of values for user-defined tags in this device. */ MARKED_SLOT (user_defined_tags) /* Hash tables for device-specific objects (fonts, colors, etc). These are key-weak hash tables (or hash tables containing key-weak hash tables) so that they disappear when the key goes away. */ /* This is a simple key-weak hash table hashing color names to instances. */ MARKED_SLOT (color_instance_cache) /* This is a simple key-weak hash table hashing font names to instances. */ MARKED_SLOT (font_instance_cache) #ifdef MULE /* This is a bi-level cache, where the hash table in this slot here indexes charset objects to key-weak hash tables, which in turn index font names to more specific font names that match the given charset's registry. This speeds up the horrendously slow XListFonts() operation that needs to be done in order to determine an appropriate font. */ MARKED_SLOT (charset_font_cache_stage_1) /* Similar cache for stage 2, if it exists. See fontcolor.c. */ MARKED_SLOT (charset_font_cache_stage_2) #endif /* This is a bi-level cache, where the hash table in this slot here indexes image-instance-type masks (there are currently 6 image-instance types and thus 64 possible masks) to key-weak hash tables like the one for colors. */ MARKED_SLOT (image_instance_cache) #undef MARKED_SLOT
