Mercurial > hg > xemacs-beta
annotate lwlib/lwlib-fonts.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 |
---|---|
3094 | 1 /* Font data structures for X and Xft. |
2 | |
3 Copyright (C) 2004 Free Software Foundation, Inc. | |
4 | |
5 Author: Stephen J. Turnbull <stephen@xemacs.org> | |
6 Created: 24 Jul 2004 by Stephen J. Turnbull | |
7 | |
8 This file is part of XEmacs. | |
9 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
4916
diff
changeset
|
10 XEmacs is free software: you can redistribute it and/or modify it |
3094 | 11 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:
4916
diff
changeset
|
12 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:
4916
diff
changeset
|
13 option) any later version. |
3094 | 14 |
15 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
18 for more details. | |
19 | |
20 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:
4916
diff
changeset
|
21 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
3094 | 22 |
23 /* Synched up with: Not in GNU Emacs. */ | |
24 | |
25 #ifndef INCLUDED_lwlib_fonts_h_ | |
26 #define INCLUDED_lwlib_fonts_h_ | |
27 | |
28 /* get headers */ | |
29 | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
30 #ifdef HAVE_XFT |
3094 | 31 #define _XFT_NO_COMPAT_ |
32 /* shut up GCC */ | |
33 #define face_index face_index_arg | |
34 #define glyph_index glyph_index_arg | |
35 #include <X11/Xft/Xft.h> | |
36 #undef glyph_index | |
37 #undef face_index | |
38 | |
39 #if XFT_MAJOR < 2 | |
40 #error Xft versions < 2 not supported | |
41 #endif | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
42 #endif /* HAVE_XFT */ |
3094 | 43 |
44 /* Xt name macros */ | |
45 | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
46 #ifdef HAVE_XFT |
3094 | 47 #ifndef XtNxftFont |
48 #define XtNxftFont "xftFont" | |
3397 | 49 #define XtCXftFont "XftFont" |
3094 | 50 #endif |
3397 | 51 #ifndef XtNfcFont |
52 #define XtNfcFontName "fcFontName" | |
53 #define XtCFcFontName "FcFontName" | |
3094 | 54 #endif |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
55 #endif /* HAVE_XFT */ |
3094 | 56 |
57 /* code 'n' stuff */ | |
58 | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
59 #ifdef HAVE_XFT |
3094 | 60 #define FCSTRLEN 512 |
61 | |
62 /* non-Lisp prototypes */ | |
63 /* #### change this back to _open_name */ | |
64 XftFont *xft_open_font_by_name (Display *dpy, char *name); | |
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
65 #endif /* HAVE_XFT */ |
3094 | 66 |
67 #endif /* INCLUDED_lwlib_fonts_h_ */ |