Mercurial > hg > xemacs-beta
annotate src/gui.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 |
rev | line source |
---|---|
428 | 1 /* Generic GUI code. (menubars, scrollbars, toolbars, dialogs) |
2 Copyright (C) 1995 Board of Trustees, University of Illinois. | |
826 | 3 Copyright (C) 1995, 1996, 2002 Ben Wing. |
428 | 4 Copyright (C) 1995 Sun Microsystems, Inc. |
5 | |
6 This file is part of XEmacs. | |
7 | |
5402
308d34e9f07d
Changed bulk of GPLv2 or later files identified by script
Mats Lidell <matsl@xemacs.org>
parents:
5127
diff
changeset
|
8 XEmacs is free software: you can redistribute it and/or modify it |
428 | 9 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:
5127
diff
changeset
|
10 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:
5127
diff
changeset
|
11 option) any later version. |
428 | 12 |
13 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
14 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
15 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
16 for more details. | |
17 | |
18 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:
5127
diff
changeset
|
19 along with XEmacs. If not, see <http://www.gnu.org/licenses/>. */ |
428 | 20 |
21 /* Synched up with: Not in FSF. */ | |
22 | |
23 /* Written by kkm on 12/24/97 */ | |
24 | |
440 | 25 #ifndef INCLUDED_gui_h_ |
26 #define INCLUDED_gui_h_ | |
428 | 27 |
867 | 28 int separator_string_p (const Ibyte *s); |
428 | 29 void get_gui_callback (Lisp_Object, Lisp_Object *, Lisp_Object *); |
1318 | 30 int gui_item_equal_sans_selected (Lisp_Object obj1, Lisp_Object obj2, |
1913 | 31 int depth); |
454 | 32 |
33 | |
34 | |
428 | 35 extern int popup_up_p; |
36 | |
37 /************************************************************************/ | |
38 /* Image Instance Object */ | |
39 /************************************************************************/ | |
40 | |
41 /* This structure describes gui button, | |
42 menu item or submenu properties */ | |
43 struct Lisp_Gui_Item | |
44 { | |
5127
a9c41067dd88
more cleanups, terminology clarification, lots of doc work
Ben Wing <ben@xemacs.org>
parents:
5120
diff
changeset
|
45 NORMAL_LISP_OBJECT_HEADER header; |
428 | 46 Lisp_Object name; /* String */ |
47 Lisp_Object callback; /* Symbol or form */ | |
442 | 48 Lisp_Object callback_ex; /* Form taking context arguments */ |
428 | 49 Lisp_Object suffix; /* String */ |
50 Lisp_Object active; /* Form */ | |
51 Lisp_Object included; /* Form */ | |
52 Lisp_Object config; /* Anything EQable */ | |
53 Lisp_Object filter; /* Form */ | |
54 Lisp_Object style; /* Symbol */ | |
55 Lisp_Object selected; /* Form */ | |
56 Lisp_Object keys; /* String */ | |
57 Lisp_Object accelerator; /* Char or Symbol */ | |
442 | 58 Lisp_Object value; /* Anything you like */ |
428 | 59 }; |
60 | |
5118
e0db3c197671
merge up to latest default branch, doesn't compile yet
Ben Wing <ben@xemacs.org>
parents:
3017
diff
changeset
|
61 DECLARE_LISP_OBJECT (gui_item, Lisp_Gui_Item); |
440 | 62 #define XGUI_ITEM(x) XRECORD (x, gui_item, Lisp_Gui_Item) |
617 | 63 #define wrap_gui_item(p) wrap_record (p, gui_item) |
440 | 64 #define GUI_ITEMP(x) RECORDP (x, gui_item) |
65 #define CHECK_GUI_ITEM(x) CHECK_RECORD (x, gui_item) | |
66 #define CONCHECK_GUI_ITEM(x) CONCHECK_RECORD (x, gui_item) | |
67 | |
454 | 68 int update_gui_item_keywords (Lisp_Object gui_item, Lisp_Object item); |
69 Lisp_Object copy_gui_item (Lisp_Object gui_item); | |
70 Lisp_Object widget_gui_parse_item_keywords (Lisp_Object item); | |
71 int gui_item_add_keyval_pair (Lisp_Object gui_item, | |
72 Lisp_Object key, Lisp_Object val, | |
578 | 73 Error_Behavior errb); |
428 | 74 Lisp_Object gui_parse_item_keywords (Lisp_Object item); |
75 Lisp_Object gui_parse_item_keywords_no_errors (Lisp_Object item); | |
430 | 76 void gui_add_item_keywords_to_plist (Lisp_Object plist, Lisp_Object gui_item); |
1913 | 77 int gui_item_active_p (Lisp_Object); |
78 int gui_item_selected_p (Lisp_Object); | |
442 | 79 Lisp_Object gui_item_list_find_selected (Lisp_Object gui_item_list); |
1318 | 80 int gui_item_included_p (Lisp_Object, Lisp_Object into); |
428 | 81 Lisp_Object gui_item_accelerator (Lisp_Object gui_item); |
82 Lisp_Object gui_name_accelerator (Lisp_Object name); | |
1318 | 83 int gui_item_id_hash (Lisp_Object, Lisp_Object gui_item, int); |
771 | 84 Lisp_Object gui_item_display_flush_left (Lisp_Object gui_item); |
85 Lisp_Object gui_item_display_flush_right (Lisp_Object gui_item); | |
428 | 86 Lisp_Object allocate_gui_item (void); |
87 void gui_item_init (Lisp_Object gui_item); | |
88 Lisp_Object parse_gui_item_tree_children (Lisp_Object list); | |
442 | 89 Lisp_Object copy_gui_item_tree (Lisp_Object arg); |
90 | |
91 extern Lisp_Object Qmenu_no_selection_hook, Qdelete_dialog_box_hook; | |
428 | 92 |
93 /* this is mswindows biased but reasonably safe I think */ | |
94 #define GUI_ITEM_ID_SLOTS 8 | |
95 #define GUI_ITEM_ID_MIN(s) (s * 0x2000) | |
96 #define GUI_ITEM_ID_MAX(s) (0x1FFF + GUI_ITEM_ID_MIN (s)) | |
97 #define GUI_ITEM_ID_BITS(x,s) (((x) & 0x1FFF) + GUI_ITEM_ID_MIN (s)) | |
98 | |
99 #define MAX_MENUITEM_LENGTH 128 | |
100 | |
440 | 101 #endif /* INCLUDED_gui_h_ */ |