Mercurial > hg > xemacs-beta
view lwlib/xlwmenu.h @ 5648:3f4a234f4672
Support non-ASCII correctly in character classes, test this.
src/ChangeLog addition:
2012-04-21 Aidan Kehoe <kehoea@parhasard.net>
Support non-ASCII correctly in character classes ([:alnum:] and
friends).
* regex.c:
* regex.c (ISBLANK, ISUNIBYTE): New. Make these and friends
independent of the locale, since we want them to be consistent in
XEmacs.
* regex.c (print_partial_compiled_pattern): Print the flags for
charset_mule; don't print non-ASCII as the character values in
ranges, this breaks with locales.
* regex.c (enum):
Define various flags the charset_mule and charset_mule_not opcodes
can now take.
* regex.c (CHAR_CLASS_MAX_LENGTH): Update this.
* regex.c (re_iswctype, re_wctype): New, from GNU.
* regex.c (re_wctype_can_match_non_ascii): New; used when deciding
on whether to use charset_mule or the ASCII-only regex character
set opcode.
* regex.c (regex_compile):
Error correctly on long, non-existent character class names.
Break out the handling of charsets that can match non-ASCII into a
separate clause. Use compile_char_class when compiling character
classes.
* regex.c (compile_char_class): New. Used in regex_compile when
compiling character sets that may match non-ASCII.
* regex.c (re_compile_fastmap):
If there are flags set for charset_mule or charset_mule_not, we
can't use the fastmap (since we need to check syntax table values
that aren't available there).
* regex.c (re_match_2_internal):
Check the new flags passed to the charset_mule{,_not} opcode,
observe them if appropriate.
* regex.h:
* regex.h (enum):
Expose re_wctype_t here, imported from GNU.
tests/ChangeLog addition:
2012-04-21 Aidan Kehoe <kehoea@parhasard.net>
* automated/regexp-tests.el:
* automated/regexp-tests.el (Assert-char-class):
Check that #'string-match errors correctly with an over-long
character class name.
Add tests for character class functionality that supports
non-ASCII characters. These tests expose bugs in GNU Emacs
24.0.94.2, but pass under current XEmacs.
author | Aidan Kehoe <kehoea@parhasard.net> |
---|---|
date | Sat, 21 Apr 2012 18:58:28 +0100 |
parents | ade4c7e2c6cb |
children |
line wrap: on
line source
/* Implements a lightweight menubar widget. Copyright (C) 1992, 1993, 1994 Lucid, Inc. Copyright (C) 1995 Tinker Systems and INS Engineering Corp. This file is part of the Lucid Widget Library. The Lucid Widget Library 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. The Lucid Widget Library 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 the Lucid Widget Library. If not, see <http://www.gnu.org/licenses/>. */ #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_ */