Mercurial > hg > xemacs-beta
view src/fontcolor-msw-impl.h @ 5634:2014ff433daf
Support hash COLLECTIONs, #'{all,try}-completion{s,}; add #'test-completion
src/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
Add #'test-completion, API from GNU.
Accept hash table COLLECTIONs in it and in the other
completion-oriented functions, #'try-completion,
#'all-completions, and those Lisp functions implemented in terms
of them.
* lisp.h: Update the prototype of map_obarray(), making FN
compatible with the FUNCTION argument of elisp_maphash();
* abbrev.c (abbrev_match_mapper):
* abbrev.c (record_symbol):
* doc.c (verify_doc_mapper):
* symbols.c (mapatoms_1):
* symbols.c (apropos_mapper):
Update these mapper functions to reflect the new argument to
map_obarray().
* symbols.c (map_obarray):
Call FN with two arguments, the string name of the symbol, and the
symbol itself, for API (mapper) compatibility with
elisp_maphash().
* minibuf.c (map_completion): New. Map a maphash_function_t across
a non function COLLECTION, as appropriate for #'try-completion and
friends.
* minibuf.c (map_completion_list): New. Map a maphash_function_t
across a pseudo-alist, as appropriate for the completion
functions.
* minibuf.c (ignore_completion_p): PRED needs to be called with
two args if and only if the collection is a hash table. Implement
this.
* minibuf.c (try_completion_mapper): New. The loop body of
#'try-completion, refactored out.
* minibuf.c (Ftry_completion): Use try_completion_mapper(),
map_completion().
* minibuf.c (all_completions_mapper): New. The loop body of
#'all-completions, refactored out.
* minibuf.c (Fall_completions): Use all_completions_mapper(),
map_completion().
* minibuf.c (test_completion_mapper): New. The loop body of
#'test-completion.
* minibuf.c (Ftest_completion): New, API from GNU.
* minibuf.c (syms_of_minibuf): Make Ftest_completion available.
tests/ChangeLog addition:
2012-01-01 Aidan Kehoe <kehoea@parhasard.net>
* automated/completion-tests.el: New.
Test #'try-completion, #'all-completion and #'test-completion with
list, vector and hash-table COLLECTION arguments.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 01 Jan 2012 15:18:52 +0000 |
| 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_ */