Mercurial > hg > xemacs-beta
annotate lwlib/lwlib-fonts.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 | a6c778975d7d |
| children | 308d34e9f07d |
| rev | line source |
|---|---|
| 3094 | 1 /* Font data structures for X and Xft. |
| 2 | |
| 3 Copyright (C) 2004 Free Software Foundation, Inc. | |
| 4 | |
| 5 Author: Stephen J. Turnbull <stephen@xemacs.org> | |
| 6 Created: 24 Jul 2004 by Stephen J. Turnbull | |
| 7 | |
| 8 This file is part of XEmacs. | |
| 9 | |
| 10 XEmacs is free software; you can redistribute it and/or modify it | |
| 11 under the terms of the GNU General Public License as published by the | |
| 12 Free Software Foundation; either version 2, or (at your option) any | |
| 13 later version. | |
| 14 | |
| 15 XEmacs is distributed in the hope that it will be useful, but WITHOUT | |
| 16 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 17 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 18 for more details. | |
| 19 | |
| 20 You should have received a copy of the GNU General Public License | |
| 21 along with XEmacs; see the file COPYING. If not, write to | |
| 22 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 Boston, MA 02111-1307, USA. */ | |
| 24 | |
| 25 /* Synched up with: Not in GNU Emacs. */ | |
| 26 | |
| 27 #ifndef INCLUDED_lwlib_fonts_h_ | |
| 28 #define INCLUDED_lwlib_fonts_h_ | |
| 29 | |
| 30 /* get headers */ | |
| 31 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
32 #ifdef HAVE_XFT |
| 3094 | 33 #define _XFT_NO_COMPAT_ |
| 34 /* shut up GCC */ | |
| 35 #define face_index face_index_arg | |
| 36 #define glyph_index glyph_index_arg | |
| 37 #include <X11/Xft/Xft.h> | |
| 38 #undef glyph_index | |
| 39 #undef face_index | |
| 40 | |
| 41 #if XFT_MAJOR < 2 | |
| 42 #error Xft versions < 2 not supported | |
| 43 #endif | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
44 #endif /* HAVE_XFT */ |
| 3094 | 45 |
| 46 /* Xt name macros */ | |
| 47 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
48 #ifdef HAVE_XFT |
| 3094 | 49 #ifndef XtNxftFont |
| 50 #define XtNxftFont "xftFont" | |
| 3397 | 51 #define XtCXftFont "XftFont" |
| 3094 | 52 #endif |
| 3397 | 53 #ifndef XtNfcFont |
| 54 #define XtNfcFontName "fcFontName" | |
| 55 #define XtCFcFontName "FcFontName" | |
| 3094 | 56 #endif |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
57 #endif /* HAVE_XFT */ |
| 3094 | 58 |
| 59 /* code 'n' stuff */ | |
| 60 | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
61 #ifdef HAVE_XFT |
| 3094 | 62 #define FCSTRLEN 512 |
| 63 | |
| 64 /* non-Lisp prototypes */ | |
| 65 /* #### change this back to _open_name */ | |
| 66 XftFont *xft_open_font_by_name (Display *dpy, char *name); | |
|
4916
a6c778975d7d
split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing <ben@xemacs.org>
parents:
3397
diff
changeset
|
67 #endif /* HAVE_XFT */ |
| 3094 | 68 |
| 69 #endif /* INCLUDED_lwlib_fonts_h_ */ |