Mercurial > hg > xemacs-beta
annotate src/keymap.h @ 5015:d95c102a96d3
cleanups for specifier font stages, from ben-unicode-internal (preparation for eliminating shadowed warnings)
-------------------- ChangeLog entries follow: --------------------
src/ChangeLog addition:
2010-02-08 Ben Wing <ben@xemacs.org>
* faces.c:
* faces.c (face_property_matching_instance):
* faces.c (ensure_face_cachel_contains_charset):
* faces.h (FACE_FONT):
* lisp.h:
* lisp.h (enum font_specifier_matchspec_stages):
* objects-msw.c:
* objects-msw.c (mswindows_font_spec_matches_charset):
* objects-msw.c (mswindows_find_charset_font):
* objects-tty.c:
* objects-tty.c (tty_font_spec_matches_charset):
* objects-tty.c (tty_find_charset_font):
* objects-xlike-inc.c:
* objects-xlike-inc.c (XFUN):
* objects-xlike-inc.c (xft_find_charset_font):
* objects.c:
* objects.c (font_instantiate):
* objects.c (FROB):
* specifier.c:
* specifier.c (charset_matches_specifier_tag_set_p):
* specifier.c (call_charset_predicate):
* specifier.c (define_specifier_tag):
* specifier.c (Fdefine_specifier_tag):
* specifier.c (setup_charset_initial_specifier_tags):
* specifier.c (specifier_instance_from_inst_list):
* specifier.c (FROB):
* specifier.c (vars_of_specifier):
* specifier.h:
Rename the specifier-font-matching stages in preparation for
eliminating shadowed warnings, some other related fixes from
ben-unicode-internal.
1. Rename raw enums:
initial -> STAGE_INITIAL
final -> STAGE_FINAL
impossible -> NUM_MATCHSPEC_STAGES
2. Move `enum font_specifier_matchspec_stages' from
specifier.h to lisp.h.
3. Whitespace changes to match coding standards.
4. Eliminate unused second argument STAGE in charset predicates
that don't use it -- the code that calls the charset predicates
is now smart enough to supply the right number of arguments
automatically.
5. Add some long(ish) comments and authorial notices, esp. in
objects.c.
6. In specifier.c, change Vcharset_tag_lists from a vector over
leading bytes to a hash table over charsets. This change is
unnecessary currently but doesn't hurt and will be required
when we merge in Unicode-internal.
7. In specifier.c, extract out the code that calls charset predicates
into a function call_charset_predicate().
| author | Ben Wing <ben@xemacs.org> |
|---|---|
| date | Mon, 08 Feb 2010 16:51:25 -0600 |
| parents | 6ef8256a020a |
| children | b5df3737028a |
| rev | line source |
|---|---|
| 428 | 1 /* prototypes for keymap-hacking |
| 2 Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. | |
| 3 | |
| 4 This file is part of XEmacs. | |
| 5 | |
| 6 XEmacs is free software; you can redistribute it and/or modify it | |
| 7 under the terms of the GNU General Public License as published by the | |
| 8 Free Software Foundation; either version 2, or (at your option) any | |
| 9 later version. | |
| 10 | |
| 11 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 12 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 13 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 14 for more details. | |
| 15 | |
| 16 You should have received a copy of the GNU General Public License | |
| 17 along with XEmacs; see the file COPYING. If not, write to | |
| 18 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 19 Boston, MA 02111-1307, USA. */ | |
| 20 | |
| 21 /* Synched up with: Not in FSF. */ | |
| 22 | |
| 23 | |
| 440 | 24 #ifndef INCLUDED_keymap_h_ |
| 25 #define INCLUDED_keymap_h_ | |
| 428 | 26 |
| 440 | 27 typedef struct Lisp_Keymap Lisp_Keymap; |
| 28 | |
| 29 DECLARE_LRECORD (keymap, Lisp_Keymap); | |
| 30 #define XKEYMAP(x) XRECORD (x, keymap, Lisp_Keymap) | |
| 617 | 31 #define wrap_keymap(p) wrap_record (p, keymap) |
| 428 | 32 #define KEYMAPP(x) RECORDP (x, keymap) |
| 33 #define CHECK_KEYMAP(x) CHECK_RECORD (x, keymap) | |
| 34 #define CONCHECK_KEYMAP(x) CONCHECK_RECORD (x, keymap) | |
| 35 | |
| 36 EXFUN (Fkeymap_prompt, 2); | |
| 37 EXFUN (Fkeymapp, 1); | |
| 38 EXFUN (Fmake_keymap, 1); | |
| 39 EXFUN (Fwhere_is_internal, 5); | |
| 40 | |
| 41 extern Lisp_Object Qalt, Qcontrol, Qhyper, Qmeta, Qshift, Qsuper; | |
|
4906
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4272
diff
changeset
|
42 |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4272
diff
changeset
|
43 #define FROB(num) \ |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4272
diff
changeset
|
44 extern Lisp_Object Qbutton##num; |
|
6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
Ben Wing <ben@xemacs.org>
parents:
4272
diff
changeset
|
45 #include "keymap-buttons.h" |
| 428 | 46 extern Lisp_Object Vmeta_prefix_char; |
| 47 | |
| 48 Lisp_Object get_keymap (Lisp_Object object, int errorp, int autoload); | |
| 49 Lisp_Object event_binding (Lisp_Object event0, int accept_default); | |
| 50 Lisp_Object event_binding_in (Lisp_Object event0, Lisp_Object keymap, | |
| 51 int accept_default); | |
| 52 | |
| 53 Lisp_Object munging_key_map_event_binding (Lisp_Object event0, | |
| 54 enum munge_me_out_the_door munge); | |
| 55 int relevant_keymaps_to_search (Lisp_Object keys, | |
| 56 int max_maps, Lisp_Object maps[]); | |
| 57 void describe_map_tree (Lisp_Object startmap, int partial, | |
| 58 Lisp_Object shadow, Lisp_Object prefix, | |
| 59 int mice_only_p, Lisp_Object buffer); | |
| 60 | |
| 61 void key_desc_list_to_event (Lisp_Object list, Lisp_Object event, | |
| 62 int allow_menu_events); | |
| 63 | |
| 1204 | 64 int event_matches_key_specifier_p (Lisp_Object event, |
| 428 | 65 Lisp_Object key_specifier); |
| 66 | |
| 440 | 67 #endif /* INCLUDED_keymap_h_ */ |