Mercurial > hg > xemacs-beta
view src/extw-Xlib.c @ 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 | 2aa9cd456ae7 |
children |
line wrap: on
line source
/* Common code between client and shell widgets; not Xt-specific. Copyright (C) 1993, 1994 Sun Microsystems, Inc. This 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. This 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 this library. If not, see <http://www.gnu.org/licenses/>. */ /* Synched up with: Not in FSF. */ /* Written by Ben Wing, September 1993. */ #ifdef emacs #include <config.h> #ifndef EXTERNAL_WIDGET ERROR! This ought not be getting compiled if EXTERNAL_WIDGET is undefined #endif #endif #include <X11/Xlib.h> #include "extw-Xlib.h" int extw_which_side; static int atoms_initialized; Atom a_EXTW_QUERY_GEOMETRY, a_EXTW_GEOMETRY_MANAGER, a_EXTW_WIDGET_GEOMETRY, a_EXTW_NOTIFY; void extw_initialize_atoms(Display *display) { if (!atoms_initialized) { a_EXTW_QUERY_GEOMETRY = XInternAtom(display, "EXTW_QUERY_GEOMETRY", False); a_EXTW_GEOMETRY_MANAGER = XInternAtom(display, "EXTW_GEOMETRY_MANAGER", False); a_EXTW_WIDGET_GEOMETRY = XInternAtom(display, "EXTW_WIDGET_GEOMETRY", False); a_EXTW_NOTIFY = XInternAtom(display, "EXTW_NOTIFY", False); atoms_initialized = 1; } } /* send a notification to the other-side widget. */ void extw_send_notify_3(Display *display, Window win, en_extw_notify type, long data0, long data1, long data2) { XClientMessageEvent xev; xev.type = ClientMessage; xev.message_type = a_EXTW_NOTIFY; xev.format = 32; xev.display = display; xev.window = win; xev.data.l[0] = extw_which_side; xev.data.l[1] = type; xev.data.l[2] = data0; xev.data.l[3] = data1; xev.data.l[4] = data2; /* UGGGHHHH! All I want to do is ensure that the ClientMessage gets received. Unfortunately X doesn't provide any simple way to do that but instead has this event_mask bogosity in XSendEvent. */ XSendEvent(display, win, False, extw_which_side == extw_shell_send ? 0 : StructureNotifyMask, (XEvent *) &xev); }