Mercurial > hg > xemacs-beta
view src/menubar.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 | cd0abfdb9e9d |
children | 308d34e9f07d |
line wrap: on
line source
/* Define generic menubar support. Copyright (C) 1995 Board of Trustees, University of Illinois. 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 2, 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; see the file COPYING. If not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Synched up with: Not in FSF. */ /* #### Still needs some device-abstraction work. */ #ifndef INCLUDED_menubar_h_ #define INCLUDED_menubar_h_ #ifdef HAVE_MENUBARS #include "gui.h" void update_frame_menubars (struct frame *f); void free_frame_menubars (struct frame *f); Lisp_Object menu_parse_submenu_keywords (Lisp_Object desc, Lisp_Object gui_item); Lisp_Object current_frame_menubar (const struct frame *f); EXFUN (Fmenu_find_real_submenu, 2); extern Lisp_Object Vmenu_accelerator_prefix; extern Lisp_Object Vmenu_accelerator_modifiers; extern Lisp_Object Vmenu_accelerator_enabled; extern Lisp_Object Vmenu_accelerator_map; extern Lisp_Object Qmenu_force; extern Lisp_Object Qmenu_fallback; extern Lisp_Object Qmenu_quit; extern Lisp_Object Qmenu_up; extern Lisp_Object Qmenu_down; extern Lisp_Object Qmenu_left; extern Lisp_Object Qmenu_right; extern Lisp_Object Qmenu_select; extern Lisp_Object Qmenu_escape; /* #### kluuuuuuuuuuuuuuuuuuuuuuuuuuuudge! The author of the accelerator code didn't know what the hell he was doing. Someone needs to abstract this properly. */ #if defined (HAVE_X_WINDOWS) && defined (LWLIB_MENUBARS_LUCID) extern int x_kludge_lw_menu_active (void); struct command_builder; Lisp_Object command_builder_find_menu_accelerator (struct command_builder *builder); Lisp_Object command_builder_operate_menu_accelerator (struct command_builder *builder); #endif extern int popup_menu_up_p; extern int menubar_show_keybindings; extern int popup_menu_titles; extern int in_menu_callback; #endif /* HAVE_MENUBARS */ #endif /* INCLUDED_menubar_h_ */