Mercurial > hg > xemacs-beta
annotate src/ExternalShellP.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 | 2aa9cd456ae7 |
| children |
| rev | line source |
|---|---|
| 0 | 1 /* External shell widget internal header file. |
| 2 Copyright (C) 1993, 1994 Sun Microsystems, Inc. | |
| 3 | |
| 5405 | 4 This library is free software: you can redistribute it and/or modify it |
| 5 under the terms of the GNU General Public License as published by the | |
| 6 Free Software Foundation, either version 3 of the License, or (at your | |
| 7 option) any later version. | |
| 0 | 8 |
| 5405 | 9 This library is distributed in the hope that it will be useful, but WITHOUT |
| 10 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 12 for more details. | |
| 0 | 13 |
| 5405 | 14 You should have received a copy of the GNU General Public License |
| 15 along with this library. If not, see <http://www.gnu.org/licenses/>. */ | |
| 0 | 16 |
| 17 /* Synched up with: Not in FSF. */ | |
| 18 | |
| 19 /* Written by Ben Wing, September 1993. */ | |
| 20 | |
| 398 | 21 #ifndef INCLUDED_ExternalShellP_h_ |
| 22 #define INCLUDED_ExternalShellP_h_ | |
| 0 | 23 |
| 24 #include "xintrinsic.h" | |
| 25 #include <X11/ShellP.h> | |
| 26 #include "ExternalShell.h" | |
| 27 | |
| 28 typedef struct { /* new fields for ExternalShell class */ | |
| 29 int dummy; | |
| 30 } ExternalShellClassPart; | |
| 31 | |
| 32 typedef struct _ExternalShellClassRec { /* full class record declaration */ | |
| 33 CoreClassPart core_class; | |
| 34 CompositeClassPart composite_class; | |
| 35 ShellClassPart shell_class; | |
| 36 ExternalShellClassPart externalShell_class; | |
| 37 } ExternalShellClassRec; | |
| 38 | |
| 39 typedef struct { /* new fields for ExternalShell widget */ | |
| 40 Window external_window; /* an already-created window to run on */ | |
| 41 Bool dead_client; /* is the client dead? */ | |
| 42 unsigned long client_timeout;/* how long to wait for client's response */ | |
| 43 | |
| 44 /* private */ | |
| 45 unsigned char client_type; | |
| 46 } ExternalShellPart; | |
| 47 | |
| 48 typedef struct _ExternalShellRec { /* full instance record */ | |
| 49 CorePart core; | |
| 50 CompositePart composite; | |
| 51 ShellPart shell; | |
| 52 ExternalShellPart externalShell; | |
| 53 } ExternalShellRec; | |
| 54 | |
| 55 extern ExternalShellClassRec externalShellClassRec; /* class pointer */ | |
| 56 | |
| 398 | 57 #endif /* INCLUDED_ExternalShellP_h_ */ |