Mercurial > hg > xemacs-beta
annotate 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 |
| rev | line source |
|---|---|
| 872 | 1 /* mswindows-specific Lisp objects -- header implementation. |
| 2 Copyright (C) 1993, 1994 Free Software Foundation, Inc. | |
| 3 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
| 4 Copyright (C) 1995, 1996, 2002 Ben Wing. | |
| 5 Copyright (C) 1997, Jonathan Harris. | |
| 6 | |
| 7 This file is part of XEmacs. | |
| 8 | |
|
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5176
diff
changeset
|
9 XEmacs is free software: you can redistribute it and/or modify it |
| 872 | 10 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:
5176
diff
changeset
|
11 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:
5176
diff
changeset
|
12 option) any later version. |
| 872 | 13 |
| 14 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 17 for more details. | |
| 18 | |
| 19 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:
5176
diff
changeset
|
20 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
| 872 | 21 |
| 22 /* Synched up with: Not in FSF. */ | |
| 23 | |
| 24 /* Authorship: | |
| 25 | |
| 26 Ultimately based on FSF. | |
| 27 Rewritten by Ben Wing. | |
| 28 Rewritten for mswindows by Jonathan Harris, November 1997 for 21.0. | |
| 29 */ | |
| 30 | |
| 31 | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
872
diff
changeset
|
32 #ifndef INCLUDED_fontcolor_msw_impl_h_ |
|
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
872
diff
changeset
|
33 #define INCLUDED_fontcolor_msw_impl_h_ |
| 872 | 34 |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
872
diff
changeset
|
35 #include "fontcolor-impl.h" |
|
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
872
diff
changeset
|
36 #include "fontcolor-msw.h" |
| 872 | 37 |
| 38 struct mswindows_color_instance_data | |
| 39 { | |
| 40 COLORREF color; | |
| 41 }; | |
| 42 | |
| 43 #define MSWINDOWS_COLOR_INSTANCE_DATA(c) \ | |
| 44 ((struct mswindows_color_instance_data *) (c)->data) | |
| 45 #define COLOR_INSTANCE_MSWINDOWS_COLOR(c) \ | |
| 46 (MSWINDOWS_COLOR_INSTANCE_DATA (c)->color) | |
| 47 | |
| 48 /* The four HFONTS are for the 4 (underlined, strikethrough) | |
| 49 combinations. Only the one at index 0, neither underlined nor | |
| 50 struk through is created with the font instance. Other fonts are | |
| 51 created as necessary during redisplay, using the one at index 0 | |
| 52 as prototype */ | |
| 53 #define MSWINDOWS_NUM_FONT_VARIANTS 4 | |
| 54 struct mswindows_font_instance_data | |
| 55 { | |
| 56 HFONT hfont [MSWINDOWS_NUM_FONT_VARIANTS]; | |
| 57 }; | |
| 58 | |
| 59 #define MSWINDOWS_FONT_INSTANCE_DATA(c) \ | |
| 60 ((struct mswindows_font_instance_data *) (c)->data) | |
| 61 | |
| 62 #define FONT_INSTANCE_MSWINDOWS_HFONT_I(c,i) \ | |
| 63 (MSWINDOWS_FONT_INSTANCE_DATA(c)->hfont[(i)]) | |
| 64 | |
| 65 #define FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT(c,under,strike) \ | |
| 66 FONT_INSTANCE_MSWINDOWS_HFONT_I (c, (!!(strike)<<1)|!!(under)) | |
| 67 | |
| 68 /* If font creation during redisplay fails, then the following | |
| 69 value is used to prevent future attempts to create this font. | |
| 70 Redisplay uses the "main" font when encounters this value */ | |
| 71 #define MSWINDOWS_BAD_HFONT ((HFONT)INVALID_HANDLE_VALUE) | |
| 72 | |
|
5176
8b2f75cecb89
rename objects* (.c, .h and .el files) to fontcolor*
Ben Wing <ben@xemacs.org>
parents:
872
diff
changeset
|
73 #endif /* INCLUDED_fontcolor_msw_impl_h_ */ |