Mercurial > hg > xemacs-beta
view lwlib/xlwgcs.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
/* Tabs Widget for XEmacs. Copyright (C) 1999 Edward A. Falk 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: Gcs 1.7 */ #ifndef GCS_H #define GCS_H /* Overview of functions provided here: * * AllocFgGC() * Given a foreground pixel & a font, return an appropriate GC * * AllocBackgroundGC() * Given a widget, return a GC for painting the background color * * AllocShadeGC() * Given foreground, background, a contrast value & be_nice_to_colormap * flag, return a GC suitable for rendering in an intermediate color, * as determined by contrast. May return a dither pattern or a * solid color, as appropriate. * * Contrast 0 = background color, 100 = foreground color. It is legal * for contrast to be more than 100 or less than 0. * * AllocGreyGC() * Given widget, foreground, font, contrast & be_nice_to_colormap, * return a shade GC (see above) based on foreground and widget * background. * * AllocTopShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the top shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use brighter * colors. * * AllocBotShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the bottom shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use darker * colors. * * AllocArmShadowGC() * Given widget, contrast & be_nice_to_colormap, return a GC suitable * for rendering the "armed" shadow. * * Contrast 0 = use background pixel. Contrast > 0 = use darker * colors. * * AllocShadowPixel() * Given a widget & scale factor, allocate & return a color darker * or lighter than the background pixel, as determined by scale. * * Scale 100 = use background pixel. Scale > 100 = brighter color, * Scale < 100 = darker color. * * AllocGreyPixel() * Given two pixel values and scale factor, allocate & return a * pixel value between them, according to scale. * * Scale == 0: background color * Scale == 100: foreground color * 0<Scale<100: intermediate color * Scale > 100: more foreground * Scale < 0: more background * * * AllocGreyPixelC() * Given two color values and scale factor, allocate & return a * pixel value between them, according to scale. * * Scale == 0: background color * Scale == 100: foreground color * 0<Scale<100: intermediate color * Scale > 100: more foreground * Scale < 0: more background * * Draw3dBox() * Given box dimensions, shadow width, top shadow GC & bottom shadow GC, * draw a 3-d box. */ #if NeedFunctionPrototypes extern GC AllocFgGC( Widget w, Pixel fg, Font font) ; extern GC AllocBackgroundGC( Widget w, Font font) ; extern GC AllocShadeGC( Widget w, Pixel fg, Pixel bg, Font, int contrast, Bool ) ; extern GC AllocGreyGC( Widget w, Pixel fg, Font, int, Bool ) ; extern GC AllocTopShadowGC( Widget w, int contrast, int ) ; extern GC AllocBotShadowGC( Widget w, int contrast, int ) ; extern GC AllocArmGC( Widget w, int contrast, int) ; extern Pixel AllocShadowPixel(Widget, int scale) ; extern Pixel AllocGreyPixel(Widget, Pixel fg, Pixel bg, int scale) ; extern Pixel AllocGreyPixelC(Widget, XColor *fg, XColor *bg, int scale) ; extern void Draw3dBox(Widget w, int x, int y, int wid, int hgt, int s, GC topgc, GC botgc) ; #else extern GC AllocFgGC() ; extern GC AllocBackgroundGC() ; extern GC AllocShadeGC() ; extern GC AllocGreyGC() ; extern GC AllocTopShadowGC() ; extern GC AllocBotShadowGC() ; extern GC AllocArmGC() ; extern Pixel AllocShadowPixel() ; extern Pixel AllocGreyPixel() ; extern Pixel AllocGreyPixelC() ; extern void Draw3dBox() ; #endif #endif /* GCS_H */