Mercurial > hg > xemacs-beta
view src/glyphs-msw.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 glyphs and related. Copyright (C) 1998 Andy Piper 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. */ #ifndef INCLUDED_glyphs_msw_h_ #define INCLUDED_glyphs_msw_h_ #ifdef HAVE_MS_WINDOWS #include "syswindows.h" #include "glyphs.h" /**************************************************************************** * Image-Instance Object * ****************************************************************************/ struct mswindows_image_instance_data { HBITMAP *bitmaps; HICON icon; int real_width, real_height; }; #define MSWINDOWS_IMAGE_INSTANCE_DATA(i) \ ((struct mswindows_image_instance_data *) (i)->data) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[0]) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i,slice) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps[slice]) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->bitmaps) #define IMAGE_INSTANCE_MSWINDOWS_MASK(i) \ (* (HBITMAP *) &(IMAGE_INSTANCE_PIXMAP_MASK (i))) /* Make it lvalue */ #define IMAGE_INSTANCE_MSWINDOWS_ICON(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->icon) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_WIDTH(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_width) #define IMAGE_INSTANCE_MSWINDOWS_BITMAP_REAL_HEIGHT(i) \ (MSWINDOWS_IMAGE_INSTANCE_DATA (i)->real_height) #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP(i) \ IMAGE_INSTANCE_MSWINDOWS_BITMAP (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE(i, slice) \ IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICE (XIMAGE_INSTANCE (i, slice)) #define XIMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES(i) \ IMAGE_INSTANCE_MSWINDOWS_BITMAP_SLICES (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_MSWINDOWS_MASK(i) \ IMAGE_INSTANCE_MSWINDOWS_MASK (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_MSWINDOWS_ICON(i) \ IMAGE_INSTANCE_MSWINDOWS_ICON (XIMAGE_INSTANCE (i)) int mswindows_resize_dibitmap_instance (Lisp_Image_Instance *ii, struct frame *f, int newx, int newy); HBITMAP mswindows_create_resized_bitmap (Lisp_Image_Instance *ii, struct frame *f, int newx, int newy); HBITMAP mswindows_create_resized_mask (Lisp_Image_Instance *ii, struct frame *f, int newx, int newy); void mswindows_initialize_image_instance_icon (Lisp_Image_Instance *image, int cursor); #define WIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ (HWND) (IMAGE_INSTANCE_SUBWINDOW_ID (i)) #define XWIDGET_INSTANCE_MSWINDOWS_HANDLE(i) \ WIDGET_INSTANCE_MSWINDOWS_HANDLE (XIMAGE_INSTANCE (i)) struct mswindows_subwindow_data { HWND clip_window; }; #define MSWINDOWS_SUBWINDOW_DATA(i) \ ((struct mswindows_subwindow_data *) (i)->data) #define IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \ (MSWINDOWS_SUBWINDOW_DATA (i)->clip_window) #define XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA(i) \ MSWINDOWS_SUBWINDOW_DATA (XIMAGE_INSTANCE (i)) #define XIMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW(i) \ IMAGE_INSTANCE_MSWINDOWS_CLIPWINDOW (XIMAGE_INSTANCE (i)) #define DOMAIN_MSWINDOWS_HANDLE(domain) \ ((IMAGE_INSTANCEP (domain) && \ XIMAGE_INSTANCE_MSWINDOWS_SUBWINDOW_DATA (domain)) ? \ XWIDGET_INSTANCE_MSWINDOWS_HANDLE (domain) : \ FRAME_MSWINDOWS_HANDLE (DOMAIN_XFRAME (domain))) #endif /* HAVE_MS_WINDOWS */ #endif /* INCLUDED_glyphs_msw_h_ */