Mercurial > hg > xemacs-beta
annotate src/fontcolor-tty-impl.h @ 5872:f9e59cd39a9a
Clean up #'read-quoted-char, support help-event-list there.
lisp/changeLog addition:
2015-03-14 Aidan Kehoe <kehoea@parhasard.net>
* simple.el (quoted-insert):
Update the docstring here, syncing GNU's, especially mentioning
read-quoted-char-radix.
* cmdloop.el:
* cmdloop.el (read-quoted-char-radix): Move this up here, outside
the functions.
* cmdloop.el (read-function-key-map): New label, reading and
replacing characters from function-key-map if appropriate.
* cmdloop.el (read-quoted-char): Multiple changes:
-- Take advantage of help-event-list, but be careful not to have
any keystrokes with character equivalents in it, so the user can
type C-q C-h and have the expected result.
-- Use function-key-map, as does #'read-char and
#'read-exclusive-char, helpful for character composition under
X11.
-- Pop up the help window ourselves if, e.g. F1 arrives on a TTY
via function-key-map, event-stream won't have done it.
-- Error if no keystroke that can be converted into a character is
specified, don't just insert ?\x00 as we used to and as does GNU
-- Use #'digit-char-p instead of reimplementing it.
-- Fix a bug of mine where I wasn't consistent about treating
character codes as Unicode.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Tue, 17 Mar 2015 12:22:50 +0000 |
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_ */ |