Mercurial > hg > xemacs-beta
view src/font-mgr.h @ 4906:6ef8256a020a
implement equalp in C, fix case-folding, add equal() method for keymaps
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* cl-extra.el:
* cl-extra.el (cl-string-vector-equalp): Removed.
* cl-extra.el (cl-bit-vector-vector-equalp): Removed.
* cl-extra.el (cl-vector-array-equalp): Removed.
* cl-extra.el (cl-hash-table-contents-equalp): Removed.
* cl-extra.el (equalp): Removed.
* cl-extra.el (cl-mapcar-many):
Comment out the whole `equalp' implementation for the moment;
remove once we're sure the C implementation works.
* cl-macs.el:
* cl-macs.el (equalp):
Simplify the compiler-macro for `equalp' -- once it's in C,
we don't need to try so hard to expand it.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* abbrev.c (abbrev_match_mapper):
* buffer.h (CANON_TABLE_OF):
* buffer.h:
* editfns.c (Fchar_equal):
* minibuf.c (scmp_1):
* text.c (qxestrcasecmp_i18n):
* text.c (qxestrncasecmp_i18n):
* text.c (qxetextcasecmp):
* text.c (qxetextcasecmp_matching):
Create new macro CANONCASE that converts to a canonical mapping
and use it to do caseless comparisons instead of DOWNCASE.
* alloc.c:
* alloc.c (cons_equal):
* alloc.c (vector_equal):
* alloc.c (string_equal):
* bytecode.c (compiled_function_equal):
* chartab.c (char_table_entry_equal):
* chartab.c (char_table_equal):
* data.c (weak_list_equal):
* data.c (weak_box_equal):
* data.c (ephemeron_equal):
* device-msw.c (equal_devmode):
* elhash.c (hash_table_equal):
* events.c (event_equal):
* extents.c (properties_equal):
* extents.c (extent_equal):
* faces.c:
* faces.c (face_equal):
* faces.c (face_hash):
* floatfns.c (float_equal):
* fns.c:
* fns.c (bit_vector_equal):
* fns.c (plists_differ):
* fns.c (Fplists_eq):
* fns.c (Fplists_equal):
* fns.c (Flax_plists_eq):
* fns.c (Flax_plists_equal):
* fns.c (internal_equal):
* fns.c (internal_equalp):
* fns.c (internal_equal_0):
* fns.c (syms_of_fns):
* glyphs.c (image_instance_equal):
* glyphs.c (glyph_equal):
* glyphs.c (glyph_hash):
* gui.c (gui_item_equal):
* lisp.h:
* lrecord.h (struct lrecord_implementation):
* marker.c (marker_equal):
* number.c (bignum_equal):
* number.c (ratio_equal):
* number.c (bigfloat_equal):
* objects.c (color_instance_equal):
* objects.c (font_instance_equal):
* opaque.c (equal_opaque):
* opaque.c (equal_opaque_ptr):
* rangetab.c (range_table_equal):
* specifier.c (specifier_equal):
Add a `foldcase' param to the equal() method and use it to implement
`equalp' comparisons. Also add to plists_differ(), although we
don't currently use it here.
Rewrite internal_equalp(). Implement cross-type vector comparisons.
Don't implement our own handling of numeric promotion -- just use
the `=' primitive.
Add internal_equal_0(), which takes a `foldcase' param and calls
either internal_equal() or internal_equalp().
* buffer.h:
When given a 0 for buffer (which is the norm when functions don't
have a specific buffer available), use the current buffer's table,
not `standard-case-table'; otherwise the current settings are
ignored.
* casetab.c:
* casetab.c (set_case_table):
When handling old-style vectors of 256 in `set-case-table' don't
overwrite the existing table! Instead create a new table and
populate.
* device-msw.c (sync_printer_with_devmode):
* lisp.h:
* text.c (lisp_strcasecmp_ascii):
Rename lisp_strcasecmp to lisp_strcasecmp_ascii and use
lisp_strcasecmp_i18n for caseless comparisons in some places.
* elhash.c:
Delete unused lisp_string_hash and lisp_string_equal().
* events.h:
* keymap-buttons.h:
* keymap.h:
* keymap.c (keymap_lookup_directly):
* keymap.c (keymap_store):
* keymap.c (FROB):
* keymap.c (key_desc_list_to_event):
* keymap.c (describe_map_mapper):
* keymap.c (INCLUDE_BUTTON_ZERO):
New file keymap-buttons.h; use to handle buttons 1-26 in place of
duplicating code 26 times.
* frame-gtk.c (allocate_gtk_frame_struct):
* frame-msw.c (mswindows_init_frame_1):
Fix some comments about internal_equal() in redisplay that don't
apply any more.
* keymap-slots.h:
* keymap.c:
New file keymap-slots.h. Use it to notate the slots in a keymap
structure, similar to frameslots.h or coding-system-slots.h.
* keymap.c (MARKED_SLOT):
* keymap.c (keymap_equal):
* keymap.c (keymap_hash):
Implement.
tests/ChangeLog addition:
2010-02-01 Ben Wing <ben@xemacs.org>
* automated/case-tests.el:
* automated/case-tests.el (uni-mappings):
* automated/search-tests.el:
Delete old pristine-case-table code. Rewrite the Unicode torture
test to take into account whether overlapping mappings exist for
more than one character, and not doing the upcase/downcase
comparisons in such cases.
* automated/lisp-tests.el (foo):
* automated/lisp-tests.el (string-variable):
* automated/lisp-tests.el (featurep):
Replace Assert (equal ... with Assert-equal; same for other types
of equality. Replace some awkward equivalents of Assert-equalp
with Assert-equalp. Add lots of equalp tests.
* automated/case-tests.el:
* automated/regexp-tests.el:
* automated/search-tests.el:
Fix up the comments at the top of the files. Move rules about where
to put tests into case-tests.el.
* automated/test-harness.el:
* automated/test-harness.el (test-harness-aborted-summary-template): New.
* automated/test-harness.el (test-harness-from-buffer):
* automated/test-harness.el (batch-test-emacs):
Fix Assert-test-not. Create Assert-not-equal and variants.
Delete the doc strings from all these convenience functions to avoid
excessive repetition; instead use one copy in a comment.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Mon, 01 Feb 2010 01:02:40 -0600 |
parents | 75975fd0b7fc |
children | a6c778975d7d e0db3c197671 |
line wrap: on
line source
/* Lisp font data structures for X and Xft. Copyright (C) 2003 Eric Knauel and Matthias Neubauer Copyright (C) 2005 Eric Knauel Copyright (C) 2004, 2005 Free Software Foundation, Inc. Authors: Eric Knauel <knauel@informatik.uni-tuebingen.de> Matthias Neubauer <neubauer@informatik.uni-freiburg.de> Stephen J. Turnbull <stephen@xemacs.org> Created: 27 Oct 2003 Updated: 05 Mar 2005 by Stephen J. Turnbull 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 GNU Emacs. */ /* This module provides the Lisp interface to fonts in X11, including Xft, but (at least at first) not GTK+ or Qt. It should be renamed to fonts-x.h. Sealevel code should be in ../lwlib/lwlib-fonts.h or ../lwlib/lwlib-colors.h. */ #ifndef INCLUDED_font_mgr_h_ #define INCLUDED_font_mgr_h_ #include "../lwlib/lwlib-fonts.h" #include "../lwlib/lwlib-colors.h" extern Fixnum debug_xft; /* Standard for fontconfig. Use a macro to show we're not guessing. */ #define Qfc_font_name_encoding Qutf_8 #define XE_XLFD_MAKE_LISP_STRING(s) (make_string(s, strlen(s))) struct fc_pattern { struct LCRECORD_HEADER header; FcPattern *fcpatPtr; }; typedef struct fc_pattern fc_pattern; DECLARE_LRECORD(fc_pattern, struct fc_pattern); #define XFCPATTERN(x) XRECORD (x, fc_pattern, struct fc_pattern) #define wrap_fcpattern(p) wrap_record (p, fc_pattern) #define FCPATTERNP(x) RECORDP (x, fc_pattern) #define CHECK_FCPATTERN(x) CHECK_RECORD (x, fc_pattern) #define CONCHECK_FCPATTERN(x) CONCHECK_RECORD (x, fc_pattern) #define XFCPATTERN_PTR(x) (XFCPATTERN(x)->fcpatPtr) #define FONTCONFIG_EXPOSE_CONFIG #ifdef FONTCONFIG_EXPOSE_CONFIG struct fc_config { struct LCRECORD_HEADER header; FcConfig *fccfgPtr; }; typedef struct fc_config fc_config; DECLARE_LRECORD(fc_config, struct fc_config); #define XFCCONFIG(x) XRECORD (x, fc_config, struct fc_config) #define wrap_fcconfig(p) wrap_record (p, fc_config) #define FCCONFIGP(x) RECORDP (x, fc_config) #define CHECK_FCCONFIG(x) CHECK_RECORD (x, fc_config) #define CONCHECK_FCCONFIG(x) CONCHECK_RECORD (x, fc_config) #define XFCCONFIG_PTR(x) (XFCCONFIG(x)->fccfgPtr) #endif /* FONTCONFIG_EXPOSE_CONFIG */ #ifdef USE_XFT #ifndef HAVE_FCCONFIGGETRESCANINTERVAL /* Older fontconfig versions misspell this function name. */ #define FcConfigGetRescanInterval FcConfigGetRescanInverval #endif /* */ #ifndef HAVE_FCCONFIGSETRESCANINTERVAL /* Older fontconfig versions misspell this function name. */ #define FcConfigSetRescanInterval FcConfigSetRescanInverval #endif /* */ /* The format of a fontname (as returned by fontconfig) is not well-documented, But the character repertoire is represented in an ASCII-compatible way. See fccharset.c (FcCharSetUnparse). So we can use UTF-8 for long names. Currently we have a hack where different versions of the unparsed name are used in different contexts fairly arbitrarily. I don't think this is close to coherency; even without the charset and lang properties fontconfig names are too unwieldy to use. We need to rethink the approach here. I think probably Lisp_Font_Instance.name should contain the font name as specified to Lisp (almost surely much shorter than shortname, even, and most likely wildcarded), while Lisp_Font_Instance.truename should contain the longname. For now, I'm going to #ifdef the return values defaulting to short. -- sjt */ /* DEBUGGING STUFF */ /* print message to stderr: one internal-format string argument */ #define DEBUG_XFT0(level,s) \ if (debug_xft > level) stderr_out (s) /* print message to stderr: one formatted argument */ #define DEBUG_XFT1(level,format,x1) \ if (debug_xft > level) stderr_out (format, x1) /* print message to stderr: two formatted arguments */ #define DEBUG_XFT2(level,format,x1,x2) \ if (debug_xft > level) stderr_out (format, x1, x2) /* print message to stderr: three formatted arguments */ #define DEBUG_XFT3(level,format,x1,x2,x3) \ if (debug_xft > level) stderr_out (format, x1, x2, x3) /* print message to stderr: four formatted arguments */ #define DEBUG_XFT4(level,format,x1,x2,x3,x4) \ if (debug_xft > level) stderr_out (format, x1, x2, x3, x4) /* print an Xft pattern to stderr LEVEL is the debug level (to compare to debug_xft) FORMAT is a newline-terminated printf format with one %s for the pattern and must be internal format (eg, pure ASCII) PATTERN is an FcPattern *. */ #define PRINT_XFT_PATTERN(level,format,pattern) \ do { \ DECLARE_EISTRING (eistrpxft_name); \ Extbyte *name = (Extbyte *) FcNameUnparse (pattern); \ \ eicpy_ext(eistrpxft_name, \ name ? name : "FONT WITH NULL NAME", \ Qfc_font_name_encoding); \ DEBUG_XFT1 (level, format, eidata(eistrpxft_name)); \ free (name); \ } while (0) /* print a progress message LEVEL is the debug level (to compare to debug_xft) FONT is the Xft font name in Mule internal encoding (from an eistring). LANG is the language being checked for support (must be ASCII). */ #define CHECKING_LANG(level,font,lang) \ do { \ DEBUG_XFT2 (level, "checking if %s handles %s\n", font, lang); \ } while (0) #else /* USE_XFT */ #endif /* USE_XFT */ #endif /* INCLUDED_font_mgr_h_ */