Mercurial > hg > xemacs-beta
view lwlib/lwlib-colors.h @ 5801:0e9f791cc655
Support `function-key-map' in #'read-char{,-exclusive}, sync API with GNU
lisp/ChangeLog addition:
2014-07-02 Aidan Kehoe <kehoea@parhasard.net>
* cmdloop.el:
* cmdloop.el (read-char-1): New.
* cmdloop.el (read-char, read-char-exclusive):
Use #'read-char-1 in these function; sync their API with that of
GNU, respect `function-key-map' where we didn't before, add
initial support for Quail input methods.
* keymap.el (next-key-event):
Accept EVENT and PROMPT arguments, as does #'next-command-event.
* keymap.el (event-apply-modifiers):
Use #'functionp here, no need to exclude lambdas from
`function-key-map'.
* keymap.el (synthesize-keysym):
Correct this function's docstring.
src/ChangeLog addition:
2014-07-02 Aidan Kehoe <kehoea@parhasard.net>
* event-stream.c (Fnext_command_event):
Only snooze displaying keystrokes if PROMPT is nil. If prompt is
non-nil, our callers want to see it.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Wed, 02 Jul 2014 16:32:19 +0100 |
| parents | 308d34e9f07d |
| children | cb65bfaf7110 |
line wrap: on
line source
/* Color data structures for X and Xft. Copyright (C) 2004 Free Software Foundation, Inc. Author: Stephen J. Turnbull <stephen@xemacs.org> Created: 24 Jul 2004 by Stephen J. Turnbull 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 GNU Emacs. */ #ifndef INCLUDED_lwlib_colors_h_ #define INCLUDED_lwlib_colors_h_ #include <X11/Xlib.h> /* WIDGET is an Xt widget, VISUAL and DEPTH are return values */ void visual_info_from_widget (Widget widget, Visual **visual, int *depth); /* basic version from xlwmenu.c */ int FIXME_allocate_nearest_color (Display *display, Colormap screen_colormap, XColor *color_def); /* haired-up version from ../src/fontcolor-x.c */ int x_allocate_nearest_color (Display *display, Colormap screen_colormap, Visual *visual, XColor *color_def); #ifdef HAVE_XFT #define _XFT_NO_COMPAT_ /* shut up GCC */ #define face_index face_index_arg #define glyph_index glyph_index_arg #include <X11/Xft/Xft.h> #undef glyph_index #undef face_index #if XFT_MAJOR < 2 #error Xft versions < 2 not supported #endif XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual, int c, int dim); #endif /* HAVE_XFT */ #endif /* INCLUDED_lwlib_colors_h_ */