xemacs-beta: lwlib/lwlib-fonts.h annotate

annotate lwlib/lwlib-fonts.h @ 5628:81fee4aee9b6

text_width methods interface cleanup. -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2011-12-28 Didier Verna <didier@xemacs.org> * console-impl.h (struct console_methods): Have the text_width methods expect a frame instead of a window pointer. * console-stream.c (stream_text_width): * redisplay-msw.c (mswindows_text_width): * redisplay-tty.c (tty_text_width): * redisplay-xlike-inc.c (XLIKE_text_width): Update accordingly. * redisplay-msw.c (mswindows_output_string): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay.c (redisplay_window_text_width_ichar_string): * redisplay.c (redisplay_text_width_string): Update the callers. This also fixes an uncertainty about always getting a window from a domain.

author	Didier Verna <didier@xemacs.org>
date	Wed, 28 Dec 2011 11:21:38 +0100
parents	308d34e9f07d
children

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

Mercurial > hg > xemacs-beta

annotate lwlib/lwlib-fonts.h @ 5628:81fee4aee9b6