Mercurial > hg > xemacs-beta
annotate src/fontcolor-tty-impl.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 |
| rev | line source |
|---|---|
| 872 | 1 /* TTY-specific Lisp objects. |
| 2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 3 Copyright (C) 1995 Ben Wing | |
| 4 | |
| 5 This file is part of XEmacs. | |
| 6 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5178
diff
changeset
|
7 XEmacs is free software: you can redistribute it and/or modify it |
| 872 | 8 under the terms of the GNU General Public License as published by the |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5178
diff
changeset
|
9 Free Software Foundation, either version 3 of the License, or (at your |
|
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5178
diff
changeset
|
10 option) any later version. |
| 872 | 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 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5178
diff
changeset
|
18 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 872 | 19 |
| 20 /* Synched up with: Not in FSF. */ | |
| 21 | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3092
diff
changeset
|
22 #ifndef INCLUDED_fontcolor_tty_impl_h_ |
|
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3092
diff
changeset
|
23 #define INCLUDED_fontcolor_tty_impl_h_ |
| 872 | 24 |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3092
diff
changeset
|
25 #include "fontcolor-impl.h" |
|
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3092
diff
changeset
|
26 #include "fontcolor-tty.h" |
| 872 | 27 |
| 28 struct tty_color_instance_data | |
| 29 { | |
| 3092 | 30 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
31 NORMAL_LISP_OBJECT_HEADER header; |
| 3092 | 32 #endif /* NEW_GC */ |
| 872 | 33 Lisp_Object symbol; /* so we don't have to constantly call Fintern() */ |
| 34 }; | |
| 35 | |
| 3092 | 36 #ifdef NEW_GC |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3092
diff
changeset
|
37 DECLARE_LISP_OBJECT (tty_color_instance_data, struct tty_color_instance_data); |
| 3092 | 38 #define XTTY_COLOR_INSTANCE_DATA(x) \ |
| 39 XRECORD (x, tty_color_instance_data, struct tty_color_instance_data) | |
| 40 #define wrap_tty_color_instance_data(p) \ | |
| 41 wrap_record (p, tty_color_instance_data) | |
| 42 #define TTY_COLOR_INSTANCE_DATAP(x) RECORDP (x, tty_color_instance_data) | |
| 43 #define CHECK_TTY_COLOR_INSTANCE_DATA(x) \ | |
| 44 CHECK_RECORD (x, tty_color_instance_data) | |
| 45 #define CONCHECK_TTY_COLOR_INSTANCE_DATA(x) \ | |
| 46 CONCHECK_RECORD (x, tty_color_instance_data) | |
| 47 #endif /* NEW_GC */ | |
| 48 | |
| 872 | 49 #define TTY_COLOR_INSTANCE_DATA(c) \ |
| 50 ((struct tty_color_instance_data *) (c)->data) | |
| 51 | |
| 52 #define COLOR_INSTANCE_TTY_SYMBOL(c) (TTY_COLOR_INSTANCE_DATA (c)->symbol) | |
| 53 | |
| 54 struct tty_font_instance_data | |
| 55 { | |
| 3092 | 56 #ifdef NEW_GC |
|
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
57 NORMAL_LISP_OBJECT_HEADER header; |
| 3092 | 58 #endif /* NEW_GC */ |
| 872 | 59 Lisp_Object charset; |
| 60 }; | |
| 61 | |
| 3092 | 62 #ifdef NEW_GC |
|
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3092
diff
changeset
|
63 DECLARE_LISP_OBJECT (tty_font_instance_data, struct tty_font_instance_data); |
| 3092 | 64 #define XTTY_FONT_INSTANCE_DATA(x) \ |
| 65 XRECORD (x, tty_font_instance_data, struct tty_font_instance_data) | |
| 66 #define wrap_tty_font_instance_data(p) \ | |
| 67 wrap_record (p, tty_font_instance_data) | |
| 68 #define TTY_FONT_INSTANCE_DATAP(x) RECORDP (x, tty_font_instance_data) | |
| 69 #define CHECK_TTY_FONT_INSTANCE_DATA(x) \ | |
| 70 CHECK_RECORD (x, tty_font_instance_data) | |
| 71 #define CONCHECK_TTY_FONT_INSTANCE_DATA(x) \ | |
| 72 CONCHECK_RECORD (x, tty_font_instance_data) | |
| 73 #endif /* NEW_GC */ | |
| 74 | |
| 872 | 75 #define TTY_FONT_INSTANCE_DATA(c) \ |
| 76 ((struct tty_font_instance_data *) (c)->data) | |
| 77 | |
| 78 #define FONT_INSTANCE_TTY_CHARSET(c) (TTY_FONT_INSTANCE_DATA (c)->charset) | |
| 79 | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
3092
diff
changeset
|
80 #endif /* INCLUDED_fontcolor_tty_impl_h_ */ |
