Mercurial > hg > xemacs-beta
view lwlib/xlwtabsP.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: TabsP.h 1.8 */ /* * TabsP.h - Private definitions for Index Tabs widget */ #ifndef _TabsP_h #define _TabsP_h /*********************************************************************** * * Tabs Widget Private Data * ***********************************************************************/ #include <X11/IntrinsicP.h> #ifdef NEED_MOTIF #include <Xm/XmP.h> #include <Xm/ManagerP.h> #endif #include "xlwtabs.h" #ifdef HAVE_XFT_TABS #include <X11/Xft/Xft.h> #endif /* New fields for the Tabs widget class record */ typedef struct {XtPointer extension;} TabsClassPart; /* Full class record declaration */ typedef struct _TabsClassRec { CoreClassPart core_class; CompositeClassPart composite_class; ConstraintClassPart constraint_class; #ifdef NEED_MOTIF XmManagerClassPart manager_class; #endif TabsClassPart tabs_class; } TabsClassRec; extern TabsClassRec tabsClassRec; /**************************************************************** * * instance record declaration * ****************************************************************/ /* New fields for the Tabs widget record */ typedef struct { /* resources */ XFontStruct *font ; #ifdef HAVE_XFT_TABS XftFont *renderFont; String fcFontName; String xftFontName; #endif Dimension internalHeight, internalWidth ; Widget topWidget ; XtCallbackList callbacks ; XtCallbackList popdownCallbacks ; Boolean selectInsensitive ; Boolean be_nice_to_cmap ; int top_shadow_contrast ; int bot_shadow_contrast ; int insensitive_contrast ; /* private state */ Widget hilight ; GC foregroundGC ; GC backgroundGC ; GC greyGC ; GC topGC ; GC botGC ; Dimension tab_height ; /* height of tabs (all the same) */ /* Note: includes top shadow only */ Dimension tab_total ; /* total height of all tabs */ Dimension child_width, child_height; /* child size, including borders */ Dimension max_cw, max_ch ; /* max child preferred size */ Cardinal numRows ; Cardinal realRows; /* XEmacs addition */ XtGeometryMask last_query_mode; Boolean needs_layout ; Pixmap grey50 ; /* TODO: cache this elsewhere */ } TabsPart; typedef struct _TabsRec { CorePart core; CompositePart composite; ConstraintPart constraint; #ifdef NEED_MOTIF XmManagerPart manager; #endif TabsPart tabs; } TabsRec; /**************************************************************** * * Constraint record declaration * ****************************************************************/ typedef struct _TabsConstraintsPart { /* resources */ String label ; Pixmap left_bitmap ; Pixel foreground ; Boolean resizable ; /* private state */ Pixel grey ; Boolean greyAlloc ; Boolean visible; /* XEmacs change */ Dimension width ; /* tab width */ Position x,y ; /* tab base position */ short row ; /* tab row */ Position l_x, l_y ; /* label position */ Position lbm_x, lbm_y ; /* bitmap position */ unsigned int lbm_width, lbm_height, lbm_depth ; } TabsConstraintsPart ; typedef struct _TabsConstraintsRec { #ifdef NEED_MOTIF XmManagerConstraintPart manager; #endif TabsConstraintsPart tabs ; } TabsConstraintsRec, *TabsConstraints ; #endif /* _TabsP_h */