Mercurial > hg > xemacs-beta
view lwlib/xlwmenu.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 | abe6d1db359e |
| children | ade4c7e2c6cb |
line wrap: on
line source
#ifndef INCLUDED_xlwmenu_h_ #define INCLUDED_xlwmenu_h_ /*********************************************************************** * * XlwMenu Widget * ***********************************************************************/ #include "lwlib.h" /* Resource names used by the XlwMenu widget */ #define XtNbuttonForeground "buttonForeground" #define XtCButtonForeground "ButtonForeground" #define XtNhighlightForeground "highlightForeground" #define XtCHighlightForeground "HighlightForeground" #define XtNtitleForeground "titleForeground" #define XtCTitleForeground "TitleForeground" #define XtNmargin "margin" #define XtNhorizontalSpacing "horizontalSpacing" #define XtNverticalSpacing "verticalSpacing" #define XtNarrowSpacing "arrowSpacing" #define XtNmenu "menu" #define XtCMenu "Menu" #define XtNopen "open" #define XtNselect "select" #define XtNmenuBorderWidth "menuBorderWidth" #define XtNhorizontal "horizontal" #define XtCHorizontal "Horizontal" #ifndef XtNcursor #define XtNcursor "cursor" #endif #ifndef XtCCursor #define XtCCursor "Cursor" #endif #ifndef XtNuseBackingStore #define XtNuseBackingStore "useBackingStore" #endif #ifndef XtCUseBackingStore #define XtCUseBackingStore "UseBackingStore" #endif #define XtNbounceDown "bounceDown" #define XtCBounceDown "BounceDown" #define XtNresourceLabels "resourceLabels" #define XtCResourceLabels "ResourceLabels" /* Motif-compatible resource names */ #ifndef XmNshadowThickness # define XmNshadowThickness "shadowThickness" # define XmCShadowThickness "ShadowThickness" # define XmNtopShadowColor "topShadowColor" # define XmCTopShadowColor "TopShadowColor" # define XmNbottomShadowColor "bottomShadowColor" # define XmCBottomShadowColor "BottomShadowColor" # define XmNtopShadowPixmap "topShadowPixmap" # define XmCTopShadowPixmap "TopShadowPixmap" # define XmNbottomShadowPixmap "bottomShadowPixmap" # define XmCBottomShadowPixmap "BottomShadowPixmap" # define XmUNSPECIFIED_PIXMAP 2 # define XmRHorizontalDimension "HorizontalDimension" # define XmNspacing "spacing" # define XmCSpacing "Spacing" # define XmNindicatorSize "indicatorSize" # define XmCIndicatorSize "IndicatorSize" # define XmNselectColor "selectColor" # define XmCSelectColor "SelectColor" # define XmNmarginHeight "marginHeight" # define XmCMarginHeight "MarginHeight" # define XmNmarginWidth "marginWidth" # define XmCMarginWidth "MarginWidth" # define XmRVerticalDimension "VerticalDimension" #endif typedef struct _XlwMenuRec *XlwMenuWidget; typedef struct _XlwMenuClassRec *XlwMenuWidgetClass; extern WidgetClass xlwMenuWidgetClass; void xlw_pop_up_menu (XlwMenuWidget mw, XButtonPressedEvent* event); /* menu accelerator */ void xlw_set_menu (Widget w, widget_value *val); void xlw_push_menu (widget_value *val); int xlw_pop_menu (void); void xlw_set_item (widget_value *val); void xlw_map_menu (Time t); void xlw_display_menu (Time t); void xlw_kill_menus (widget_value *val); widget_value *xlw_get_entries (int allp); int xlw_menu_level (void); #endif /* INCLUDED_xlwmenu_h_ */