Mercurial > hg > xemacs-beta

view src/fontcolor-msw-impl.h @ 5648:3f4a234f4672

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 308d34e9f07d
children
line wrap: on
line source

/* mswindows-specific Lisp objects -- header implementation.
   Copyright (C) 1993, 1994 Free Software Foundation, Inc.
   Copyright (C) 1995 Board of Trustees, University of Illinois.
   Copyright (C) 1995, 1996, 2002 Ben Wing.
   Copyright (C) 1997, Jonathan Harris.

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 3 of the License, 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.  If not, see <http://www.gnu.org/licenses/>. */

/* Synched up with:  Not in FSF. */

/* Authorship:

   Ultimately based on FSF.
   Rewritten by Ben Wing.
   Rewritten for mswindows by Jonathan Harris, November 1997 for 21.0.
 */


#ifndef INCLUDED_fontcolor_msw_impl_h_
#define INCLUDED_fontcolor_msw_impl_h_

#include "fontcolor-impl.h"
#include "fontcolor-msw.h"

struct mswindows_color_instance_data
{
  COLORREF  color;
};

#define MSWINDOWS_COLOR_INSTANCE_DATA(c)	\
	((struct mswindows_color_instance_data *) (c)->data)
#define COLOR_INSTANCE_MSWINDOWS_COLOR(c)	\
	(MSWINDOWS_COLOR_INSTANCE_DATA (c)->color)

/* The four HFONTS are for the 4 (underlined, strikethrough)
   combinations.  Only the one at index 0, neither underlined nor
   struk through is created with the font instance. Other fonts are
   created as necessary during redisplay, using the one at index 0
   as prototype */
#define MSWINDOWS_NUM_FONT_VARIANTS 4
struct mswindows_font_instance_data
{
  HFONT hfont [MSWINDOWS_NUM_FONT_VARIANTS];
};

#define MSWINDOWS_FONT_INSTANCE_DATA(c)	\
	((struct mswindows_font_instance_data *) (c)->data)

#define FONT_INSTANCE_MSWINDOWS_HFONT_I(c,i) \
	(MSWINDOWS_FONT_INSTANCE_DATA(c)->hfont[(i)])

#define FONT_INSTANCE_MSWINDOWS_HFONT_VARIANT(c,under,strike) \
	FONT_INSTANCE_MSWINDOWS_HFONT_I (c, (!!(strike)<<1)|!!(under))

/* If font creation during redisplay fails, then the following
   value is used to prevent future attempts to create this font.
   Redisplay uses the "main" font when encounters this value */
#define MSWINDOWS_BAD_HFONT ((HFONT)INVALID_HANDLE_VALUE)

#endif /* INCLUDED_fontcolor_msw_impl_h_ */