Mercurial > hg > xemacs-beta
view src/fontcolor-msw-impl.h @ 5529:3d1f8f0e690f
Add `function-key-map-parent', for non-console-specific `function-key-map' bindings
src/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* console.c:
* console.c (allocate_console):
* console.c (vars_of_console):
* console.c (complex_vars_of_console):
* lisp.h:
Add a new keymap variable, function-key-map-parent; use it as the
parent of each console-specific function-key-map. This is
appropriate for things like x-compose processing.
lisp/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* gtk-init.el:
* gtk-init.el (make-device-late-gtk-entry-point):
* gtk-init.el (gtk-initialize-compose): Removed.
* keymap.el:
* keymap.el (function-key-map-parent):
* x-init.el (x-initialize-compose): Removed.
* x-init.el (make-device-late-x-entry-point):
Make the bindings for dead-acute and friends in
function-key-map-parent, rather than function-key-map; do this in
keymap.el rather than in window-system-specific code, since the
compose processing is generally useful and not X11-specific.
It's probably reasonable to rename x-compose.el to compose.el at
this point, but I haven't done that.
man/ChangeLog addition:
2011-06-25 Aidan Kehoe <kehoea@parhasard.net>
* lispref/os.texi (Translating Input):
Document the just-added function-key-map-parent.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 25 Jun 2011 14:00:48 +0100 |
parents | 308d34e9f07d |
children |
line wrap: on
line source
/* mswindows-specific Lisp objects -- header implementation. Copyright (C) 1993, 1994 Free Software Foundation, Inc. Copyright (C) 1995 Board of Trustees, University of Illinois. Copyright (C) 1995, 1996, 2002 Ben Wing. Copyright (C) 1997, Jonathan Harris. 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 FSF. */ /* Authorship: Ultimately based on FSF. Rewritten by Ben Wing. Rewritten for mswindows by Jonathan Harris, November 1997 for 21.0. */ #ifndef INCLUDED_fontcolor_msw_impl_h_ #define INCLUDED_fontcolor_msw_impl_h_ #include "fontcolor-impl.h" #include "fontcolor-msw.h" struct mswindows_color_instance_data { COLORREF color; }; #define MSWINDOWS_COLOR_INSTANCE_DATA(c) \ ((struct mswindows_color_instance_data *) (c)->data) #define COLOR_INSTANCE_MSWINDOWS_COLOR(c) \ (MSWINDOWS_COLOR_INSTANCE_DATA (c)->color) /* The four HFONTS are for the 4 (underlined, strikethrough) combinations. Only the one at index 0, neither underlined nor struk through is created with the font instance. Other fonts are created as necessary during redisplay, using the one at index 0 as prototype */ #define MSWINDOWS_NUM_FONT_VARIANTS 4 struct mswindows_font_instance_data { HFONT hfont [MSWINDOWS_NUM_FONT_VARIANTS]; }; #define MSWINDOWS_FONT_INSTANCE_DATA(c) \ ((struct mswindows_font_instance_data *) (c)->data) #define FONT_INSTANCE_MSWINDOWS_HFONT_I(c,i) \ (MSWINDOWS_FONT_INSTANCE_DATA(c)->hfont[(i)]) #define FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT(c,under,strike) \ FONT_INSTANCE_MSWINDOWS_HFONT_I (c, (!!(strike)<<1)|!!(under)) /* If font creation during redisplay fails, then the following value is used to prevent future attempts to create this font. Redisplay uses the "main" font when encounters this value */ #define MSWINDOWS_BAD_HFONT ((HFONT)INVALID_HANDLE_VALUE) #endif /* INCLUDED_fontcolor_msw_impl_h_ */