comparison src/objects-xlike-inc.c @ 4962:e813cf16c015

merge
author Ben Wing <ben@xemacs.org>
date Mon, 01 Feb 2010 05:29:05 -0600
parents 19a72041c5ed b3ce27ca7647
children 4aebb0131297
comparison
equal deleted inserted replaced
4961:b90f8cf474e0 4962:e813cf16c015
1 /* Shared object code between X and GTK -- include file. 1 /* Common code between X and GTK -- fonts and colors.
2 Copyright (C) 1991-5, 1997 Free Software Foundation, Inc. 2 Copyright (C) 1991-5, 1997 Free Software Foundation, Inc.
3 Copyright (C) 1995 Sun Microsystems, Inc. 3 Copyright (C) 1995 Sun Microsystems, Inc.
4 Copyright (C) 1996, 2001, 2002, 2003 Ben Wing. 4 Copyright (C) 1996, 2001, 2002, 2003 Ben Wing.
5 5
6 This file is part of XEmacs. 6 This file is part of XEmacs.
20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330, 20 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
21 Boston, MA 02111-1307, USA. */ 21 Boston, MA 02111-1307, USA. */
22 22
23 /* Synched up with: Not in FSF. */ 23 /* Synched up with: Not in FSF. */
24 24
25 /* Before including this file, you need to define either THIS_IS_X or
26 THIS_IS_GTK. */
27
28 /* See comment at top of console-xlike-inc.h for an explanation of
29 how this file works. */
30
25 /* Pango is ready for prime-time now, as far as I understand it. The GTK 31 /* Pango is ready for prime-time now, as far as I understand it. The GTK
26 people should be using that. Oh well. (Aidan Kehoe, Sat Nov 4 12:41:12 32 people should be using that. Oh well. (Aidan Kehoe, Sat Nov 4 12:41:12
27 CET 2006) */ 33 CET 2006) */
34
35 #include "console-xlike-inc.h"
28 36
29 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901) 37 #if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
30 38
31 #ifdef DEBUG_XEMACS 39 #ifdef DEBUG_XEMACS
32 # define DEBUG_OBJECTS(FORMAT, ...) \ 40 # define DEBUG_OBJECTS(FORMAT, ...) \
76 84
77 return hyphen_count; 85 return hyphen_count;
78 } 86 }
79 87
80 static int 88 static int
81 #ifdef THIS_IS_GTK 89 XFUN (font_spec_matches_charset) (struct device * USED_IF_XFT (d),
82 gtk_font_spec_matches_charset (struct device * USED_IF_XFT (d), 90 Lisp_Object charset,
83 Lisp_Object charset, 91 const Ibyte *nonreloc, Lisp_Object reloc,
84 const Ibyte *nonreloc, Lisp_Object reloc, 92 Bytecount offset, Bytecount length,
85 Bytecount offset, Bytecount length, 93 enum font_specifier_matchspec_stages stage)
86 enum font_specifier_matchspec_stages stage)
87 #else
88 x_font_spec_matches_charset (struct device * USED_IF_XFT (d),
89 Lisp_Object charset,
90 const Ibyte *nonreloc, Lisp_Object reloc,
91 Bytecount offset, Bytecount length,
92 enum font_specifier_matchspec_stages stage)
93 #endif
94 { 94 {
95 Lisp_Object registries = Qnil; 95 Lisp_Object registries = Qnil;
96 long i, registries_len; 96 long i, registries_len;
97 const Ibyte *the_nonreloc; 97 const Ibyte *the_nonreloc;
98 Bytecount the_length; 98 Bytecount the_length;
196 Extbyte **names; 196 Extbyte **names;
197 Lisp_Object result = Qnil; 197 Lisp_Object result = Qnil;
198 int count = 0, i; 198 int count = 0, i;
199 DECLARE_EISTRING(ei_single_result); 199 DECLARE_EISTRING(ei_single_result);
200 200
201 names = XListFonts ( 201 names = XListFonts (GET_XLIKE_DISPLAY (XDEVICE (device)),
202 #ifdef THIS_IS_GTK
203 GDK_DISPLAY (),
204 #else
205 DEVICE_X_DISPLAY (XDEVICE (device)),
206 #endif
207 xlfd, MAX_FONT_COUNT, &count); 202 xlfd, MAX_FONT_COUNT, &count);
208 203
209 for (i = 0; i < count; ++i) 204 for (i = 0; i < count; ++i)
210 { 205 {
211 eireset(ei_single_result); 206 eireset(ei_single_result);
664 #endif /* USE_XFT */ 659 #endif /* USE_XFT */
665 660
666 /* find a font spec that matches font spec FONT and also matches 661 /* find a font spec that matches font spec FONT and also matches
667 (the registry of) CHARSET. */ 662 (the registry of) CHARSET. */
668 static Lisp_Object 663 static Lisp_Object
669 #ifdef THIS_IS_GTK 664 XFUN (find_charset_font) (Lisp_Object device, Lisp_Object font,
670 gtk_find_charset_font (Lisp_Object device, Lisp_Object font, 665 Lisp_Object charset,
671 Lisp_Object charset, 666 enum font_specifier_matchspec_stages stage)
672 enum font_specifier_matchspec_stages stage)
673 #else
674 x_find_charset_font (Lisp_Object device, Lisp_Object font, Lisp_Object charset,
675 enum font_specifier_matchspec_stages stage)
676 #endif
677 { 667 {
678 Lisp_Object result = Qnil, registries = Qnil; 668 Lisp_Object result = Qnil, registries = Qnil;
679 int j, hyphen_count, registries_len = 0; 669 int j, hyphen_count, registries_len = 0;
680 Ibyte *hyphening, *new_hyphening; 670 Ibyte *hyphening, *new_hyphening;
681 Bytecount xlfd_length; 671 Bytecount xlfd_length;