commit: split USE_XFT into HAVE_XFT/USE_XFT
Ben Wing
ben at xemacs.org
Wed Feb 3 03:57:53 EST 2010
changeset: 4916:a6c778975d7d
parent: 4909:87175eb65ff4
user: Ben Wing <ben at xemacs.org>
date: Mon Feb 01 22:00:29 2010 -0600
files: ChangeLog configure configure.ac lwlib/ChangeLog lwlib/lwlib-colors.c lwlib/lwlib-colors.h lwlib/lwlib-fonts.c lwlib/lwlib-fonts.h lwlib/xlwmenu.c lwlib/xlwmenuP.h lwlib/xlwtabs.c lwlib/xlwtabsP.h src/ChangeLog src/Makefile.in.in src/compiler.h src/config.h.in src/console-x-impl.h src/console-x.h src/console-xlike-inc.h src/emacs.c src/faces.c src/font-mgr.h src/frame-x.c src/glyphs-x.c src/inline.c src/objects-x-impl.h src/objects-x.c src/objects-x.h
description:
split USE_XFT into HAVE_XFT/USE_XFT
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-02-01 Ben Wing <ben at xemacs.org>
* configure:
* configure.ac (TAB):
USE_XFT* -> HAVE_XFT*.
lwlib/ChangeLog addition:
2010-02-01 Ben Wing <ben at xemacs.org>
* lwlib-colors.c:
* lwlib-colors.h:
* lwlib-fonts.c:
* lwlib-fonts.h:
* xlwmenu.c:
* xlwmenu.c (xlwMenuResources):
* xlwmenu.c (x_xft_text_width):
* xlwmenu.c (label_button_draw):
* xlwmenu.c (push_button_size):
* xlwmenu.c (push_button_draw):
* xlwmenu.c (make_drawing_gcs):
* xlwmenu.c (extract_font_extents):
* xlwmenu.c (default_font_of_font_list):
* xlwmenu.c (XlwMenuInitialize):
* xlwmenu.c (XlwMenuDestroy):
* xlwmenu.c (XlwMenuSetValues):
* xlwmenuP.h:
* xlwmenuP.h (_XlwMenu_part):
* xlwtabs.c:
* xlwtabs.c (TabsInit):
* xlwtabs.c (TabsDestroy):
* xlwtabs.c (TabsSetValues):
* xlwtabs.c (DrawTab):
* xlwtabs.c (TabWidth):
* xlwtabs.c (TabsAllocFgGC):
* xlwtabs.c (TabsAllocGreyGC):
* xlwtabsP.h:
USE_XFT* -> HAVE_XFT*.
src/ChangeLog addition:
2010-02-01 Ben Wing <ben at xemacs.org>
* Makefile.in.in:
* compiler.h:
* config.h.in:
* console-x-impl.h:
* console-x-impl.h (struct x_frame):
* console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P):
* console-x.h:
* console-xlike-inc.h:
* emacs.c (main_1):
* faces.c (complex_vars_of_faces):
* font-mgr.h:
* frame-x.c (x_delete_frame):
* frame-x.c (x_update_frame_external_traits):
* glyphs-x.c (update_widget_face):
* inline.c:
* objects-x-impl.h:
* objects-x-impl.h (struct x_color_instance_data):
* objects-x-impl.h (struct x_font_instance_data):
* objects-x.c:
* objects-x.c (x_initialize_color_instance):
* objects-x.c (x_initialize_font_instance):
* objects-x.c (x_print_font_instance):
* objects-x.c (x_finalize_font_instance):
* objects-x.c (x_font_instance_truename):
* objects-x.c (vars_of_objects_x):
* objects-x.h:
USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and
redisplay-xlike-inc.c, continue to use USE_XFT, and define
it appropriately in console-xlike-inc.h when both HAVE_XFT
and THIS_IS_X -- even if HAVE_XFT, we don't want to enable
XFT code when included in a *-gtk.c file.
diff -r 87175eb65ff4 -r a6c778975d7d ChangeLog
--- a/ChangeLog Mon Feb 01 06:20:05 2010 -0600
+++ b/ChangeLog Mon Feb 01 22:00:29 2010 -0600
@@ -1,3 +1,9 @@
+2010-02-01 Ben Wing <ben at xemacs.org>
+
+ * configure:
+ * configure.ac (TAB):
+ USE_XFT* -> HAVE_XFT*.
+
2010-01-14 Ben Wing <ben at xemacs.org>
* PROBLEMS:
diff -r 87175eb65ff4 -r a6c778975d7d configure
--- a/configure Mon Feb 01 06:20:05 2010 -0600
+++ b/configure Mon Feb 01 22:00:29 2010 -0600
@@ -1,12 +1,14 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for XEmacs 21.5.
+# Generated by GNU Autoconf 2.65 for XEmacs 21.5.
#
# Report bugs to <xemacs-beta at xemacs.org>.
#
+#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
-# Foundation, Inc.
+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+# Inc.
+#
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -573,7 +575,8 @@
as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-exec 7<&0 </dev/null 6>&1
+test -n "$DJDIR" || exec 7<&0 </dev/null
+exec 6>&1
# Name of the host.
# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
@@ -1986,7 +1989,7 @@
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
LIBS libraries to pass to the linker, e.g. -l<library>
- CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
YACC The `Yet Another C Compiler' implementation to use. Defaults to
@@ -2063,7 +2066,7 @@
if $ac_init_version; then
cat <<\_ACEOF
XEmacs configure 21.5
-generated by GNU Autoconf 2.64
+generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -2156,7 +2159,7 @@
ac_retval=1
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_compile
@@ -2193,7 +2196,7 @@
ac_retval=1
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_cpp
@@ -2328,7 +2331,7 @@
fi
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_run
@@ -2405,7 +2408,7 @@
# left behind by Apple's compiler. We do this before executing the actions.
rm -rf conftest.dSYM conftest_ipa8_conftest.oo
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_try_link
@@ -2800,7 +2803,7 @@
fi
eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
- return $ac_retval
+ as_fn_set_status $ac_retval
} # ac_fn_c_compute_int
cat >config.log <<_ACEOF
@@ -2808,7 +2811,7 @@
running configure, to aid debugging if configure makes a mistake.
It was created by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3061,7 +3064,7 @@
for ac_site_file in "$ac_site_file1" "$ac_site_file2"
do
test "x$ac_site_file" = xNONE && continue
- if test -r "$ac_site_file"; then
+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
$as_echo "$as_me: loading site script $ac_site_file" >&6;}
sed 's/^/| /' "$ac_site_file" >&5
@@ -3070,9 +3073,9 @@
done
if test -r "$cache_file"; then
- # Some versions of bash will fail to source /dev/null (special
- # files actually), so we avoid doing that.
- if test -f "$cache_file"; then
+ # Some versions of bash will fail to source /dev/null (special files
+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
$as_echo "$as_me: loading cache $cache_file" >&6;}
case $cache_file in
@@ -6295,32 +6298,30 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
+ fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
-#include <stdio.h>
-int
-main ()
-{
-FILE *f = fopen ("conftest.out", "w");
- return ferror (f) || fclose (f) != 0;
+
+int
+main ()
+{
;
return 0;
}
_ACEOF
ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out"
+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
# Try to create an executable without -o first, disregard a.out.
# It will help us diagnose broken compilers, and finding out an intuition
# of exeext.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
-$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
+$as_echo_n "checking whether the C compiler works... " >&6; }
ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
# The possible output files:
@@ -6382,10 +6383,10 @@
else
ac_file=''
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
-$as_echo "$ac_file" >&6; }
if test -z "$ac_file"; then :
- $as_echo "$as_me: failed program was:" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+$as_echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
@@ -6393,51 +6394,18 @@
{ as_fn_set_status 77
as_fn_error "C compiler cannot create executables
See \`config.log' for more details." "$LINENO" 5; }; }
-fi
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
+$as_echo_n "checking for C compiler default output file name... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
+$as_echo "$ac_file" >&6; }
ac_exeext=$ac_cv_exeext
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
-$as_echo_n "checking whether the C compiler works... " >&6; }
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
- if { ac_try='./$ac_file'
- { { case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; }; then
- cross_compiling=no
- else
- if test "$cross_compiling" = maybe; then
- cross_compiling=yes
- else
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error "cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." "$LINENO" 5; }
- fi
- fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out
+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
ac_clean_files=$ac_clean_files_save
-# Check that the compiler produces executables we can run. If not, either
-# the compiler is broken, or we cross compile.
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
-$as_echo_n "checking whether we are cross compiling... " >&6; }
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
-$as_echo "$cross_compiling" >&6; }
-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
$as_echo_n "checking for suffix of executables... " >&6; }
if { { ac_try="$ac_link"
@@ -6470,13 +6438,72 @@
as_fn_error "cannot compute suffix of executables: cannot compile and link
See \`config.log' for more details." "$LINENO" 5; }
fi
-rm -f conftest$ac_cv_exeext
+rm -f conftest conftest$ac_cv_exeext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
$as_echo "$ac_cv_exeext" >&6; }
rm -f conftest.$ac_ext
EXEEXT=$ac_cv_exeext
ac_exeext=$EXEEXT
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+#include <stdio.h>
+int
+main ()
+{
+FILE *f = fopen ("conftest.out", "w");
+ return ferror (f) || fclose (f) != 0;
+
+ ;
+ return 0;
+}
+_ACEOF
+ac_clean_files="$ac_clean_files conftest.out"
+# Check that the compiler produces executables we can run. If not, either
+# the compiler is broken, or we cross compile.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
+$as_echo_n "checking whether we are cross compiling... " >&6; }
+if test "$cross_compiling" != yes; then
+ { { ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_link") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }
+ if { ac_try='./conftest$ac_cv_exeext'
+ { { case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
+$as_echo "$ac_try_echo"; } >&5
+ (eval "$ac_try") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; }; then
+ cross_compiling=no
+ else
+ if test "$cross_compiling" = maybe; then
+ cross_compiling=yes
+ else
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error "cannot run C compiled programs.
+If you meant to cross compile, use \`--host'.
+See \`config.log' for more details." "$LINENO" 5; }
+ fi
+ fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
+$as_echo "$cross_compiling" >&6; }
+
+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
+ac_clean_files=$ac_clean_files_save
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
$as_echo_n "checking for suffix of object files... " >&6; }
if test "${ac_cv_objext+set}" = set; then :
@@ -7535,8 +7562,8 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
+ fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
@@ -8083,8 +8110,8 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
+ fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
@@ -8631,8 +8658,8 @@
... rest of stderr output deleted ...
10q' conftest.err >conftest.er1
cat conftest.er1 >&5
- rm -f conftest.er1 conftest.err
- fi
+ fi
+ rm -f conftest.er1 conftest.err
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }
done
@@ -13641,7 +13668,7 @@
with_fontconfig=yes
$as_echo "#define HAVE_FONTCONFIG 1" >>confdefs.h
- $as_echo "#define USE_XFT 1" >>confdefs.h
+ $as_echo "#define HAVE_XFT 1" >>confdefs.h
unset xft_includes_found
fi
@@ -16608,11 +16635,11 @@
test "$with_widgets" = "motif" && $as_echo "#define LWLIB_WIDGETS_MOTIF 1" >>confdefs.h
-test "$with_xft_menubars" = "yes" && $as_echo "#define USE_XFT_MENUBARS 1" >>confdefs.h
-
-test "$with_xft_tabs" = "yes" && $as_echo "#define USE_XFT_TABS 1" >>confdefs.h
-
-test "$with_xft_gauges" = "yes" && $as_echo "#define USE_XFT_GAUGES 1" >>confdefs.h
+test "$with_xft_menubars" = "yes" && $as_echo "#define HAVE_XFT_MENUBARS 1" >>confdefs.h
+
+test "$with_xft_tabs" = "yes" && $as_echo "#define HAVE_XFT_TABS 1" >>confdefs.h
+
+test "$with_xft_gauges" = "yes" && $as_echo "#define HAVE_XFT_GAUGES 1" >>confdefs.h
@@ -21531,7 +21558,7 @@
# values after options handling.
ac_log="
This file was extended by XEmacs $as_me 21.5, which was
-generated by GNU Autoconf 2.64. Invocation command line was
+generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -21571,6 +21598,7 @@
-h, --help print this help, then exit
-V, --version print version number and configuration settings, then exit
+ --config print configuration, then exit
-q, --quiet, --silent
do not print progress messages
-d, --debug don't remove temporary files
@@ -21593,10 +21621,11 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
+ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
XEmacs config.status 21.5
-configured by $0, generated by GNU Autoconf 2.64,
- with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
+configured by $0, generated by GNU Autoconf 2.65,
+ with options \\"\$ac_cs_config\\"
Copyright (C) 2009 Free Software Foundation, Inc.
This config.status script is free software; the Free Software Foundation
@@ -21632,6 +21661,8 @@
ac_cs_recheck=: ;;
--version | --versio | --versi | --vers | --ver | --ve | --v | -V )
$as_echo "$ac_cs_version"; exit ;;
+ --config | --confi | --conf | --con | --co | --c )
+ $as_echo "$ac_cs_config"; exit ;;
--debug | --debu | --deb | --de | --d | -d )
debug=: ;;
--file | --fil | --fi | --f )
@@ -21826,7 +21857,7 @@
t delim
:nl
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more1
s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
p
@@ -21840,7 +21871,7 @@
t nl
:delim
h
-s/\(.\{148\}\).*/\1/
+s/\(.\{148\}\)..*/\1/
t more2
s/["\\]/\\&/g; s/^/"/; s/$/"/
p
diff -r 87175eb65ff4 -r a6c778975d7d configure.ac
--- a/configure.ac Mon Feb 01 06:20:05 2010 -0600
+++ b/configure.ac Mon Feb 01 22:00:29 2010 -0600
@@ -3163,9 +3163,9 @@
dnl #### detect fontconfig properly!!!!
with_fontconfig=yes
AC_DEFINE(HAVE_FONTCONFIG)
- AC_DEFINE(USE_XFT)
+ AC_DEFINE(HAVE_XFT)
dnl Due to interactions with other libraries, must postpone AC_DEFINE
- dnl of USE_XFT_MENUBARS, USE_XFT_TABS, and USE_XFT_GAUGES.
+ dnl of HAVE_XFT_MENUBARS, HAVE_XFT_TABS, and HAVE_XFT_GAUGES.
unset xft_includes_found
fi
fi
@@ -4122,9 +4122,9 @@
test "$with_dialogs" = "motif" && AC_DEFINE(LWLIB_DIALOGS_MOTIF)
test "$with_widgets" = "motif" && AC_DEFINE(LWLIB_WIDGETS_MOTIF)
-test "$with_xft_menubars" = "yes" && AC_DEFINE(USE_XFT_MENUBARS)
-test "$with_xft_tabs" = "yes" && AC_DEFINE(USE_XFT_TABS)
-test "$with_xft_gauges" = "yes" && AC_DEFINE(USE_XFT_GAUGES)
+test "$with_xft_menubars" = "yes" && AC_DEFINE(HAVE_XFT_MENUBARS)
+test "$with_xft_tabs" = "yes" && AC_DEFINE(HAVE_XFT_TABS)
+test "$with_xft_gauges" = "yes" && AC_DEFINE(HAVE_XFT_GAUGES)
dnl ----------------------
dnl Mule-dependent options
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/ChangeLog
--- a/lwlib/ChangeLog Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/ChangeLog Mon Feb 01 22:00:29 2010 -0600
@@ -1,3 +1,34 @@
+2010-02-01 Ben Wing <ben at xemacs.org>
+
+ * lwlib-colors.c:
+ * lwlib-colors.h:
+ * lwlib-fonts.c:
+ * lwlib-fonts.h:
+ * xlwmenu.c:
+ * xlwmenu.c (xlwMenuResources):
+ * xlwmenu.c (x_xft_text_width):
+ * xlwmenu.c (label_button_draw):
+ * xlwmenu.c (push_button_size):
+ * xlwmenu.c (push_button_draw):
+ * xlwmenu.c (make_drawing_gcs):
+ * xlwmenu.c (extract_font_extents):
+ * xlwmenu.c (default_font_of_font_list):
+ * xlwmenu.c (XlwMenuInitialize):
+ * xlwmenu.c (XlwMenuDestroy):
+ * xlwmenu.c (XlwMenuSetValues):
+ * xlwmenuP.h:
+ * xlwmenuP.h (_XlwMenu_part):
+ * xlwtabs.c:
+ * xlwtabs.c (TabsInit):
+ * xlwtabs.c (TabsDestroy):
+ * xlwtabs.c (TabsSetValues):
+ * xlwtabs.c (DrawTab):
+ * xlwtabs.c (TabWidth):
+ * xlwtabs.c (TabsAllocFgGC):
+ * xlwtabs.c (TabsAllocGreyGC):
+ * xlwtabsP.h:
+ USE_XFT* -> HAVE_XFT*.
+
2010-01-28 Jerry James <james at xemacs.org>
* lwlib-internal.h: Add copyright and license boilerplate text
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/lwlib-colors.c
--- a/lwlib/lwlib-colors.c Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/lwlib-colors.c Mon Feb 01 22:00:29 2010 -0600
@@ -328,7 +328,7 @@
#endif
-#ifdef USE_XFT
+#ifdef HAVE_XFT
XftColor
xft_convert_color (Display *dpy, Colormap cmap, Visual *visual, int c, int dim)
@@ -356,6 +356,6 @@
return result;
}
-#endif /* USE_XFT */
+#endif /* HAVE_XFT */
/* end of lwlib-colors.c */
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/lwlib-colors.h
--- a/lwlib/lwlib-colors.h Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/lwlib-colors.h Mon Feb 01 22:00:29 2010 -0600
@@ -39,7 +39,7 @@
int x_allocate_nearest_color (Display *display, Colormap screen_colormap,
Visual *visual, XColor *color_def);
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#define _XFT_NO_COMPAT_
/* shut up GCC */
#define face_index face_index_arg
@@ -54,6 +54,6 @@
XftColor xft_convert_color (Display *dpy, Colormap cmap, Visual *visual,
int c, int dim);
-#endif /* USE_XFT */
+#endif /* HAVE_XFT */
#endif /* INCLUDED_lwlib_colors_h_ */
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/lwlib-fonts.c
--- a/lwlib/lwlib-fonts.c Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/lwlib-fonts.c Mon Feb 01 22:00:29 2010 -0600
@@ -45,7 +45,7 @@
* code for handling Xft
*/
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* helper function to correctly open Xft/core fonts by name
#### Can't we use FcParseName here?
@@ -112,6 +112,6 @@
return res;
}
-#endif /* USE_XFT */
+#endif /* HAVE_XFT */
/* End of lwlib-fonts.c */
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/lwlib-fonts.h
--- a/lwlib/lwlib-fonts.h Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/lwlib-fonts.h Mon Feb 01 22:00:29 2010 -0600
@@ -29,7 +29,7 @@
/* get headers */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#define _XFT_NO_COMPAT_
/* shut up GCC */
#define face_index face_index_arg
@@ -41,11 +41,11 @@
#if XFT_MAJOR < 2
#error Xft versions < 2 not supported
#endif
-#endif /* USE_XFT */
+#endif /* HAVE_XFT */
/* Xt name macros */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#ifndef XtNxftFont
#define XtNxftFont "xftFont"
#define XtCXftFont "XftFont"
@@ -54,16 +54,16 @@
#define XtNfcFontName "fcFontName"
#define XtCFcFontName "FcFontName"
#endif
-#endif /* USE_XFT */
+#endif /* HAVE_XFT */
/* code 'n' stuff */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#define FCSTRLEN 512
/* non-Lisp prototypes */
/* #### change this back to _open_name */
XftFont *xft_open_font_by_name (Display *dpy, char *name);
-#endif /* USE_XFT */
+#endif /* HAVE_XFT */
#endif /* INCLUDED_lwlib_fonts_h_ */
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/xlwmenu.c
--- a/lwlib/xlwmenu.c Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/xlwmenu.c Mon Feb 01 22:00:29 2010 -0600
@@ -46,7 +46,7 @@
#endif /* XmVersion < 1.2 */
#endif
-/* #### we may want to turn off USE_XFT here if !USE_XFT_MENUBARS
+/* #### we may want to turn off HAVE_XFT here if !HAVE_XFT_MENUBARS
In fact, maybe that's the right interface overall? */
#include "lwlib-fonts.h"
#include "lwlib-colors.h"
@@ -98,7 +98,7 @@
#define pmres(name,cls,member) \
Xt_RESOURCE (name, cls, XtRPixmap, Pixmap, offset(member), XtRImmediate, None)
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
/* There are three font list resources, so that we can accept either of
the resources *fontList: or *font:, and so that we can tell the
difference between them being specified, and being defaulted to a
@@ -113,7 +113,7 @@
#else
fontres (XtNfont, XtCFont, XtRFontStruct, XFontStruct *, font,
"XtDefaultFont"),
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
fontres (XtNfcFontName, XtCFcFontName, XtRString, String, fcFontName,
"sans-serif-12:bold"),
/* #### This needs to be fixed to give a proper type and converter for
@@ -191,7 +191,7 @@
static void Drag (Widget w, XEvent *ev, String *params, Cardinal *num_params);
static void Select(Widget w, XEvent *ev, String *params, Cardinal *num_params);
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
static XFontStruct *default_font_of_font_list (XmFontList);
#endif
@@ -330,14 +330,14 @@
/* Size code */
static int
string_width (XlwMenuWidget mw,
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XmString s
#else
char *s
#endif
)
{
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
Dimension width, height;
XmStringExtent (mw->menu.font_list, s, &width, &height);
return width;
@@ -347,7 +347,7 @@
XmbTextExtents (mw->menu.font_set, s, strlen (s), &ri, &rl);
return rl.width;
# else
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XGlyphInfo glyphinfo;
XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) s,
strlen (s), &glyphinfo);
@@ -384,21 +384,21 @@
static int
string_width_u (XlwMenuWidget mw,
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XmString string
#else
char *string
#endif
)
{
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
Dimension width, height;
XmString newstring;
#else
# ifdef USE_XFONTSET
XRectangle ri, rl;
# else /* ! USE_XFONTSET */
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XGlyphInfo glyphinfo;
#else
XCharStruct xcs;
@@ -411,7 +411,7 @@
char *chars;
int i, j;
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
chars = "";
if (!XmStringGetLtoR (string, XmFONTLIST_DEFAULT_TAG, &chars))
chars = "";
@@ -428,7 +428,7 @@
newchars[j++] = chars[i];
newchars[j] = '\0';
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
newstring = XmStringLtoRCreate (newchars, XmFONTLIST_DEFAULT_TAG);
XmStringExtent (mw->menu.font_list, newstring, &width, &height);
XmStringFree (newstring);
@@ -439,7 +439,7 @@
XmbTextExtents (mw->menu.font_set, newchars, j, &ri, &rl);
return rl.width;
# else /* ! USE_XFONTSET */
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) newchars,
j, &glyphinfo);
return glyphinfo.xOff;
@@ -613,7 +613,7 @@
return result;
}
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
static XmString
resource_widget_value (XlwMenuWidget mw, widget_value *val)
@@ -764,7 +764,7 @@
#define MINL(x,y) ((((unsigned long) (x)) < ((unsigned long) (y))) \
? ((unsigned long) (x)) : ((unsigned long) (y)))
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
static int
x_xft_text_width (Display *dpy, XftFont *xft_font, char *run, int len)
{
@@ -782,20 +782,20 @@
string_draw (XlwMenuWidget mw,
Window window,
int x, int y,
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XftColor *color,
XftColor *colorBg,
#else
GC gc,
#endif
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XmString string
#else
char *string
#endif
)
{
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XmStringDraw (XtDisplay (mw), window,
mw->menu.font_list,
string, gc,
@@ -805,7 +805,7 @@
0, /* ???? layout_direction */
0);
#else
-# ifdef USE_XFT_MENUBARS
+# ifdef HAVE_XFT_MENUBARS
Display *display = XtDisplay (mw);
Visual *visual = DefaultVisualOfScreen (XtScreen (mw));
Colormap cmap = mw->core.colormap;
@@ -828,7 +828,7 @@
XDrawString (XtDisplay (mw), window, gc,
x, y + mw->menu.font_ascent, string, strlen (string));
# endif /* USE_XFONTSET */
-# endif /* USE_XFT_MENUBARS */
+# endif /* HAVE_XFT_MENUBARS */
#endif /* NEED_MOTIF */
}
@@ -837,7 +837,7 @@
XlwMenuWidget mw,
Window window,
int x, int y,
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XftColor *color,
XftColor *colorBg,
#else
@@ -848,7 +848,7 @@
int end
)
{
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
Dimension width, height;
XmString newstring;
int c;
@@ -885,7 +885,7 @@
mw->menu.font_set, &string[start], end - start, &ri, &rl);
return rl.width;
# else
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
if (end <= start)
return 0;
else
@@ -937,12 +937,12 @@
string_draw_u (XlwMenuWidget mw,
Window window,
int x, int y,
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XftColor *color, XftColor *colorBg, GC gc,
#else
GC gc,
#endif
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XmString string
#else
char *string
@@ -952,7 +952,7 @@
int i, s = 0;
char *chars;
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
chars = "";
if (!XmStringGetLtoR (string, XmFONTLIST_DEFAULT_TAG, &chars))
chars = "";
@@ -963,7 +963,7 @@
if (chars[i] == '%' && chars[i+1] == '_') {
int w;
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
x += string_draw_range (mw, window, x, y, color, colorBg, chars, s, i);
w = string_draw_range (mw, window, x, y, color, colorBg, chars, i+2, i+3);
#else
@@ -980,19 +980,19 @@
i += 2;
}
}
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
x += string_draw_range (mw, window, x, y, color, colorBg, chars, s, i);
#else
x += string_draw_range (mw, window, x, y, gc, chars, s, i);
#endif
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XtFree (chars);
#endif
}
static void /* XXX */
binding_draw (XlwMenuWidget mw, Window w, int x, int y,
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XftColor *color,
XftColor *colorBg,
#else
@@ -1000,12 +1000,12 @@
#endif
char *value)
{
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XmString xm_value = XmStringCreateLtoR(value, XmSTRING_DEFAULT_CHARSET);
string_draw (mw, w, x, y, gc, xm_value);
XmStringFree (xm_value);
#else
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
string_draw (mw, w, x, y, color, colorBg, value);
#else
string_draw (mw, w, x, y, gc, value);
@@ -1652,7 +1652,7 @@
int y_offset = mw->menu.shadow_thickness + mw->menu.vertical_margin;
GC gc;
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XftColor color, colorBg;
Display *display = XtDisplay (mw);
Colormap cmap = mw->core.colormap;
@@ -1667,7 +1667,7 @@
if (highlighted && (in_menubar || val->contents))
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
pixel = mw->menu.highlight_foreground;
pixelBg = mw->core.background_pixel;
#endif
@@ -1675,7 +1675,7 @@
}
else if (in_menubar || val->contents)
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
pixel = mw->menu.foreground;
pixelBg = mw->core.background_pixel;
#endif
@@ -1683,13 +1683,13 @@
}
else
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
pixel = mw->menu.title_foreground;
pixelBg = mw->core.background_pixel;
#endif
gc = mw->menu.title_gc;
}
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
color = xft_convert_color (display, cmap, visual, pixel, 0);
colorBg = xft_convert_color (display, cmap, visual, pixelBg, 0);
#endif
@@ -1698,7 +1698,7 @@
string_draw_u (mw, /* XXX */
window,
x + label_offset, y + y_offset,
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
&color, &colorBg, gc,
#else
gc,
@@ -1724,7 +1724,7 @@
if (!in_menubar && val->key)
{
int w;
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XmString key = XmStringCreateLtoR (val->key, XmSTRING_DEFAULT_CHARSET);
w = string_width (mw, key);
XmStringFree (key);
@@ -1753,7 +1753,7 @@
shadow_type type;
Boolean menu_pb = in_menubar && (menu_item_type (val) == BUTTON_TYPE);
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XftColor color, colorBg;
Display *display = XtDisplay (mw);
Colormap cmap = mw->core.colormap;
@@ -1771,7 +1771,7 @@
{
if (val->enabled)
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
pixel = mw->menu.highlight_foreground;
pixelBg = mw->core.background_pixel;
#endif
@@ -1779,7 +1779,7 @@
}
else
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
dim = 1;
pixel = mw->menu.foreground;
pixelBg = mw->core.background_pixel;
@@ -1791,7 +1791,7 @@
{
if (val->enabled)
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
pixel = mw->menu.button_foreground;
pixelBg = mw->core.background_pixel;
#endif
@@ -1799,7 +1799,7 @@
}
else
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
dim = 1;
pixel = mw->menu.button_foreground;
pixelBg = mw->core.background_pixel;
@@ -1811,7 +1811,7 @@
{
if (val->enabled)
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
pixel = mw->menu.foreground;
pixelBg = mw->core.background_pixel;
#endif
@@ -1819,7 +1819,7 @@
}
else
{
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
dim = 1;
pixel = mw->menu.foreground;
pixelBg = mw->core.background_pixel;
@@ -1828,7 +1828,7 @@
}
}
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
color = xft_convert_color (display, cmap, visual, pixel, dim);
colorBg = xft_convert_color (display, cmap, visual, pixelBg, 0);
#endif
@@ -1836,7 +1836,7 @@
string_draw_u (mw,
window,
x + label_offset, y + y_offset,
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
&color, &colorBg, gc,
#else
gc,
@@ -1855,7 +1855,7 @@
binding_draw (mw, window,
x + binding_offset + mw->menu.column_spacing,
y + y_offset,
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
&color, &colorBg,
#else
gc,
@@ -2806,16 +2806,16 @@
make_drawing_gcs (XlwMenuWidget mw)
{
XGCValues xgcv;
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
unsigned long flags = (GCForeground | GCBackground);
#else
unsigned long flags = (GCFont | GCForeground | GCBackground);
#endif
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
xgcv.font = default_font_of_font_list (mw->menu.font_list)->fid;
#else
-#ifndef USE_XFT_MENUBARS
+#ifndef HAVE_XFT_MENUBARS
xgcv.font = mw->menu.font->fid;
#endif
#endif
@@ -3064,7 +3064,7 @@
static void
extract_font_extents (XlwMenuWidget mw)
{
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
/* Find the maximal ascent/descent of the fonts in the font list
so that all menu items can be the same height... */
mw->menu.font_ascent = 0;
@@ -3149,7 +3149,7 @@
mw->menu.font_descent = font->descent;
}
# else /* ! USE_XFONTSET */
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
mw->menu.font_ascent = mw->menu.renderFont->ascent;
mw->menu.font_descent = mw->menu.renderFont->descent;
#else
@@ -3160,7 +3160,7 @@
#endif /* NEED_MOTIF */
}
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
static XFontStruct *
default_font_of_font_list (XmFontList font_list)
{
@@ -3230,7 +3230,7 @@
XCreatePixmapFromBitmapData (display, window, (char *) gray_bits,
gray_width, gray_height, 1, 0, 1);
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
/* #### Even if it's a kludge!!!, we should consider doing the same for
X Font Sets. */
/* The menu.font_list slot came from the *fontList resource (Motif standard.)
@@ -3252,7 +3252,7 @@
mw->menu.font_list = mw->menu.fallback_font_list;
#endif
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
/* #### kludge for name change */
if (!mw->menu.fcFontName)
mw->menu.fcFontName = mw->menu.xftFontName;
@@ -3363,7 +3363,7 @@
XFreePixmap (XtDisplay (mw), mw->menu.gray_pixmap);
mw->menu.gray_pixmap = (Pixmap) -1;
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
XftFontClose (XtDisplay (mw), mw->menu.renderFont);
#endif
@@ -3409,12 +3409,12 @@
if (newmw->core.background_pixel != oldmw->core.background_pixel
|| newmw->menu.foreground != oldmw->menu.foreground
/* For the XEditResource protocol, which may want to change the font. */
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
|| newmw->menu.font_list != oldmw->menu.font_list
|| newmw->menu.font_list_2 != oldmw->menu.font_list_2
|| newmw->menu.fallback_font_list != oldmw->menu.fallback_font_list
#else
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
|| newmw->menu.renderFont != oldmw->menu.renderFont
#else
|| newmw->menu.font != oldmw->menu.font
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/xlwmenuP.h
--- a/lwlib/xlwmenuP.h Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/xlwmenuP.h Mon Feb 01 22:00:29 2010 -0600
@@ -4,7 +4,7 @@
#include "xlwmenu.h"
#include <X11/CoreP.h>
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
#include <X11/Xft/Xft.h>
#endif
@@ -27,13 +27,13 @@
{
/* slots set by the resources */
-#if defined(NEED_MOTIF) && !defined(USE_XFT_MENUBARS)
+#if defined(NEED_MOTIF) && !defined(HAVE_XFT_MENUBARS)
XmFontList font_list;
XmFontList font_list_2;
XmFontList fallback_font_list;
#else
XFontStruct * font;
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
String fcFontName;
String xftFontName;
XftFont *renderFont;
@@ -57,7 +57,7 @@
Pixel top_shadow_color;
Pixel bottom_shadow_color;
Pixel select_color;
-#ifdef USE_XFT_MENUBARS
+#ifdef HAVE_XFT_MENUBARS
#endif
Pixmap top_shadow_pixmap;
Pixmap bottom_shadow_pixmap;
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/xlwtabs.c
--- a/lwlib/xlwtabs.c Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/xlwtabs.c Mon Feb 01 22:00:29 2010 -0600
@@ -152,7 +152,7 @@
selectInsensitive, XtRImmediate, True),
res (XtNfont, XtCFont, XtRFontStruct, XFontStruct *,
font, XtRString, XtDefaultFont),
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
/* #### Maybe use "-*-helvetica-bold-r-*-*-*-120-*-*-*-*-iso8859-1" here?
or XtDefaultFont? */
res (XtNfcFontName, XtCFcFontName, XtRString, String,
@@ -430,7 +430,7 @@
static int debug_tabs = 0; /* increase for more verbosity */
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
/* #### duplicated from xlwmenu.c -- CLEAN THIS SHIT UP!
Undeclared so define at top. */
#define MINL(x,y) ((((unsigned long) (x)) < ((unsigned long) (y))) \
@@ -484,7 +484,7 @@
*/
newTw->tabs.tab_height = 2 * newTw->tabs.internalHeight + SHADWID ;
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
/* #### kludge for name change */
if (!newTw->tabs.fcFontName)
newTw->tabs.fcFontName = newTw->tabs.xftFontName;
@@ -501,11 +501,11 @@
newTw->tabs.tab_height += newTw->tabs.renderFont->ascent +
newTw->tabs.renderFont->descent;
#endif /* XFT_USE_HEIGHT_NOT_ASCENT_DESCENT */
-#else /* ! USE_XFT_TABS */
+#else /* ! HAVE_XFT_TABS */
if (newTw->tabs.font != NULL)
newTw->tabs.tab_height += newTw->tabs.font->max_bounds.ascent +
newTw->tabs.font->max_bounds.descent;
-#endif /* ! USE_XFT_TABS */
+#endif /* ! HAVE_XFT_TABS */
/* if size not explicitly set, set it to our preferred size now. */
@@ -579,9 +579,9 @@
TabsDestroy(Widget w)
{
TabsWidget tw = (TabsWidget) w;
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
XftFontClose (XtDisplay (w), tw->tabs.renderFont);
-#endif /* ! USE_XFT_TABS */
+#endif /* ! HAVE_XFT_TABS */
TabsFreeGCs (tw) ;
}
@@ -684,7 +684,7 @@
int i ;
if(
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
tw->tabs.renderFont != curtw->tabs.renderFont ||
#else
tw->tabs.font != curtw->tabs.font ||
@@ -694,7 +694,7 @@
{
tw->tabs.tab_height = 2 * tw->tabs.internalHeight + SHADWID;
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
if (tw->tabs.renderFont != NULL)
#if XFT_USE_HEIGHT_NOT_ASCENT_DESCENT
tw->tabs.tab_height += tw->tabs.renderFont->height;
@@ -702,11 +702,11 @@
tw->tabs.tab_height += tw->tabs.renderFont->ascent +
tw->tabs.renderFont->descent;
#endif /* XFT_USE_HEIGHT_NOT_ASCENT_DESCENT */
-#else /* ! USE_XFT_TABS */
+#else /* ! HAVE_XFT_TABS */
if (tw->tabs.font != NULL)
tw->tabs.tab_height += tw->tabs.font->max_bounds.ascent +
tw->tabs.font->max_bounds.descent;
-#endif /* ! USE_XFT_TABS */
+#endif /* ! HAVE_XFT_TABS */
/* Tab size has changed. Resize all tabs and request a new size */
for(i=0, childP=tw->composite.children;
@@ -723,7 +723,7 @@
if( tw->core.background_pixel != curtw->core.background_pixel ||
tw->core.background_pixmap != curtw->core.background_pixmap ||
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
tw->tabs.renderFont != curtw->tabs.renderFont
#else
tw->tabs.font != curtw->tabs.font
@@ -1644,7 +1644,7 @@
Window win = XtWindow((Widget)tw) ;
String lbl = tab->tabs.label != NULL ?
tab->tabs.label : XtName(child) ;
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
XftColor color;
XftColor colorBG;
Colormap cmap = tw->core.colormap;
@@ -1662,7 +1662,7 @@
if (XtIsSensitive(child))
{
gc = tw->tabs.foregroundGC;
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
color = xft_convert_color (dpy, cmap, visual,
tab->tabs.foreground, 0);
#else
@@ -1684,7 +1684,7 @@
tab->tabs.greyAlloc = True;
}
gc = tw->tabs.greyGC;
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
color = xft_convert_color (dpy, cmap, visual, tab->tabs.grey, 0);
#else
XSetForeground(dpy, gc, tab->tabs.grey);
@@ -1709,14 +1709,14 @@
}
if (lbl != NULL &&
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
tw->tabs.renderFont != NULL
#else
tw->tabs.font != NULL
#endif
)
{
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
XftDraw *xftDraw = XftDrawCreate (dpy, win, visual, cmap);
XftFont *renderFont = tw->tabs.renderFont;
XGlyphInfo glyphinfo;
@@ -1984,7 +1984,7 @@
TabsWidget tw = (TabsWidget)XtParent(w) ;
String lbl = tab->tabs.label != NULL ?
tab->tabs.label : XtName(w);
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
XftFont *font = tw->tabs.renderFont;
#else
XFontStruct *font = tw->tabs.font;
@@ -2003,7 +2003,7 @@
if( lbl != NULL && font != NULL )
{
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
tab->tabs.width += x_xft_text_width (XtDisplay(tw), font,
(FcChar8 *) lbl,
(int)strlen(lbl)) + iw;
@@ -2444,7 +2444,7 @@
values.background = tw->core.background_pixel;
values.font =
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
None;
#else
tw->tabs.font->fid;
@@ -2454,13 +2454,13 @@
tw->tabs.foregroundGC =
XtAllocateGC(w, w->core.depth,
-#ifndef USE_XFT_TABS
+#ifndef HAVE_XFT_TABS
GCFont|
#endif
GCBackground|GCLineStyle,
&values,
GCForeground,
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
GCFont|
#endif
GCSubwindowMode|GCGraphicsExposures|GCDashOffset|
@@ -2475,7 +2475,7 @@
values.background = tw->core.background_pixel;
values.font =
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
None;
#else
tw->tabs.font->fid;
@@ -2488,12 +2488,12 @@
tw->tabs.greyGC =
XtAllocateGC(w, w->core.depth,
-#ifndef USE_XFT_TABS
+#ifndef HAVE_XFT_TABS
GCFont|
#endif
GCBackground|GCStipple|GCFillStyle, &values,
GCForeground,
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
GCFont|
#endif
GCSubwindowMode|GCGraphicsExposures|GCDashOffset|
@@ -2503,14 +2503,14 @@
{
tw->tabs.greyGC =
XtAllocateGC(w, w->core.depth,
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
0L,
#else
GCFont,
#endif
&values,
GCForeground,
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
GCFont|
#endif
GCBackground|GCSubwindowMode|GCGraphicsExposures|GCDashOffset|
diff -r 87175eb65ff4 -r a6c778975d7d lwlib/xlwtabsP.h
--- a/lwlib/xlwtabsP.h Mon Feb 01 06:20:05 2010 -0600
+++ b/lwlib/xlwtabsP.h Mon Feb 01 22:00:29 2010 -0600
@@ -41,7 +41,7 @@
#endif
#include "xlwtabs.h"
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
#include <X11/Xft/Xft.h>
#endif
@@ -73,7 +73,7 @@
typedef struct {
/* resources */
XFontStruct *font ;
-#ifdef USE_XFT_TABS
+#ifdef HAVE_XFT_TABS
XftFont *renderFont;
String fcFontName;
String xftFontName;
diff -r 87175eb65ff4 -r a6c778975d7d src/ChangeLog
--- a/src/ChangeLog Mon Feb 01 06:20:05 2010 -0600
+++ b/src/ChangeLog Mon Feb 01 22:00:29 2010 -0600
@@ -1,3 +1,38 @@
+2010-02-01 Ben Wing <ben at xemacs.org>
+
+ * Makefile.in.in:
+ * compiler.h:
+ * config.h.in:
+ * console-x-impl.h:
+ * console-x-impl.h (struct x_frame):
+ * console-x-impl.h (FRAME_X_TOTALLY_VISIBLE_P):
+ * console-x.h:
+ * console-xlike-inc.h:
+ * emacs.c (main_1):
+ * faces.c (complex_vars_of_faces):
+ * font-mgr.h:
+ * frame-x.c (x_delete_frame):
+ * frame-x.c (x_update_frame_external_traits):
+ * glyphs-x.c (update_widget_face):
+ * inline.c:
+ * objects-x-impl.h:
+ * objects-x-impl.h (struct x_color_instance_data):
+ * objects-x-impl.h (struct x_font_instance_data):
+ * objects-x.c:
+ * objects-x.c (x_initialize_color_instance):
+ * objects-x.c (x_initialize_font_instance):
+ * objects-x.c (x_print_font_instance):
+ * objects-x.c (x_finalize_font_instance):
+ * objects-x.c (x_font_instance_truename):
+ * objects-x.c (vars_of_objects_x):
+ * objects-x.h:
+ USE_XFT* -> HAVE_XFT*. But in objects-xlike-inc.c and
+ redisplay-xlike-inc.c, continue to use USE_XFT, and define
+ it appropriately in console-xlike-inc.h when both HAVE_XFT
+ and THIS_IS_X -- even if HAVE_XFT, we don't want to enable
+ XFT code when included in a *-gtk.c file.
+
+
2010-02-01 Ben Wing <ben at xemacs.org>
* objects-gtk-impl.h:
diff -r 87175eb65ff4 -r a6c778975d7d src/Makefile.in.in
--- a/src/Makefile.in.in Mon Feb 01 06:20:05 2010 -0600
+++ b/src/Makefile.in.in Mon Feb 01 22:00:29 2010 -0600
@@ -133,7 +133,7 @@
#ifdef HAVE_X_WINDOWS
x_objs=console-x.o device-x.o event-Xt.o frame-x.o \
glyphs-x.o objects-x.o redisplay-x.o select-x.o xgccache.o intl-x.o
-#ifdef USE_XFT
+#ifdef HAVE_XFT
x_objs += font-mgr.o
#endif
x_gui_objs=$(gui_objs:.o=-x.o)
diff -r 87175eb65ff4 -r a6c778975d7d src/compiler.h
--- a/src/compiler.h Mon Feb 01 06:20:05 2010 -0600
+++ b/src/compiler.h Mon Feb 01 22:00:29 2010 -0600
@@ -238,7 +238,7 @@
# else
# define USED_IF_MULE(decl) UNUSED (decl)
# endif
-# ifdef USE_XFT
+# ifdef HAVE_XFT
# define USED_IF_XFT(decl) decl
# else
# define USED_IF_XFT(decl) UNUSED (decl)
diff -r 87175eb65ff4 -r a6c778975d7d src/config.h.in
--- a/src/config.h.in Mon Feb 01 06:20:05 2010 -0600
+++ b/src/config.h.in Mon Feb 01 22:00:29 2010 -0600
@@ -217,11 +217,11 @@
#undef HAVE_FCCONFIGSETRESCANINTERVAL
/* Compile with support for Xft? */
-#undef USE_XFT
+#undef HAVE_XFT
/* Per-widget stuff will go away? */
-#undef USE_XFT_MENUBARS
-#undef USE_XFT_TABS
-#undef USE_XFT_GAUGES
+#undef HAVE_XFT_MENUBARS
+#undef HAVE_XFT_TABS
+#undef HAVE_XFT_GAUGES
/* Defines for building X applications */
#ifdef HAVE_X_WINDOWS
diff -r 87175eb65ff4 -r a6c778975d7d src/console-x-impl.h
--- a/src/console-x-impl.h Mon Feb 01 06:20:05 2010 -0600
+++ b/src/console-x-impl.h Mon Feb 01 22:00:29 2010 -0600
@@ -316,7 +316,7 @@
#endif /* XIM_XLIB */
#endif /* HAVE_XIM */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* The Xft Drawable wrapper for this device.
#### Should this be per-device, or per-frame? */
/* This is persistent to take advantage of the ability of Xft's glyph
@@ -386,7 +386,7 @@
#define FRAME_X_GEOM_FREE_ME_PLEASE(f) (FRAME_X_DATA (f)->geom_free_me_please)
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#define FRAME_X_XFTDRAW(f) (FRAME_X_DATA (f)->xftDraw)
#endif
diff -r 87175eb65ff4 -r a6c778975d7d src/console-x.h
--- a/src/console-x.h Mon Feb 01 06:20:05 2010 -0600
+++ b/src/console-x.h Mon Feb 01 22:00:29 2010 -0600
@@ -51,7 +51,7 @@
#include <X11/xpm.h>
#endif
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* shut up GCC */
#define face_index face_index_arg
#define glyph_index glyph_index_arg
diff -r 87175eb65ff4 -r a6c778975d7d src/console-xlike-inc.h
--- a/src/console-xlike-inc.h Mon Feb 01 06:20:05 2010 -0600
+++ b/src/console-xlike-inc.h Mon Feb 01 22:00:29 2010 -0600
@@ -92,6 +92,20 @@
# include "objects-gtk-impl.h"
# endif
#endif /* THIS_IS_GTK */
+
+/* Just because we have XFT support doesn't mean we should use it.
+ In particular, the xlike routines are used by both X and GTK code,
+ but XFT stuff is X-specific. HAVE_XFT will still be defined when
+ the GTK flavor is active, but we don't want to trigger the XFT code
+ in this case. We could just undefine HAVE_XFT but I'd rather make
+ it clearer that something else is going on. --ben */
+
+#if defined (THIS_IS_X) && defined (HAVE_XFT)
+#define USE_XFT
+#define USE_XFT_MENUBARS
+#define USE_XFT_TABS
+#define USE_XFT_GAUGES
+#endif
/***************************************************************************/
/* Common definitions */
diff -r 87175eb65ff4 -r a6c778975d7d src/emacs.c
--- a/src/emacs.c Mon Feb 01 06:20:05 2010 -0600
+++ b/src/emacs.c Mon Feb 01 22:00:29 2010 -0600
@@ -1641,7 +1641,7 @@
#endif
#endif /* HAVE_XIM */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
syms_of_font_mgr();
#endif
@@ -2224,7 +2224,7 @@
vars_of_gui_x ();
#endif
-#ifdef USE_XFT
+#ifdef HAVE_XFT
vars_of_font_mgr ();
#endif
@@ -2354,7 +2354,7 @@
#if defined (HAVE_MENUBARS) || defined (HAVE_SCROLLBARS) || defined (HAVE_X_DIALOGS) || defined (HAVE_TOOLBARS)
reinit_vars_of_gui_x ();
#endif
-#ifdef USE_XFT
+#ifdef HAVE_XFT
reinit_vars_of_font_mgr ();
#endif
#endif /* HAVE_X_WINDOWS */
@@ -2427,7 +2427,7 @@
quite soon, e.g. in complex_vars_of_glyphs_x(). */
inhibit_non_essential_conversion_operations = 0;
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* This uses coding systems. Must be done before faces are init'ed. */
/* not in xft reloaded #3 */
complex_vars_of_font_mgr ();
diff -r 87175eb65ff4 -r a6c778975d7d src/faces.c
--- a/src/faces.c Mon Feb 01 06:20:05 2010 -0600
+++ b/src/faces.c Mon Feb 01 22:00:29 2010 -0600
@@ -2272,12 +2272,12 @@
Lisp_Object device_symbol = Qx;
#endif
-#if defined (USE_XFT) || defined (MULE)
+#if defined (HAVE_XFT) || defined (MULE)
const Ascbyte **fontptr;
const Ascbyte *fonts[] =
{
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/************** Xft fonts *************/
/* Note that fontconfig can search for several font families in one
@@ -2302,7 +2302,7 @@
"-*-*-medium-r-*-*-*-170-*-*-c-*-*-*",
#endif
};
-#endif /* defined (USE_XFT) || defined (MULE) */
+#endif /* defined (HAVE_XFT) || defined (MULE) */
#ifdef MULE
@@ -2333,13 +2333,13 @@
#endif /* MULE */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
for (fontptr = fonts + countof(fonts) - 1; fontptr >= fonts; fontptr--)
inst_list = Fcons (Fcons (list1 (device_symbol),
build_string (*fontptr)),
inst_list);
-#else /* !USE_XFT */
+#else /* !HAVE_XFT */
inst_list =
Fcons
(Fcons
@@ -2420,7 +2420,7 @@
build_string ("-*-lucidatypewriter-medium-r-*-*-*-120-*-*-*-*-*-*")),
inst_list);
-#endif /* !USE_XFT */
+#endif /* !HAVE_XFT */
#endif /* HAVE_X_WINDOWS || HAVE_GTK */
diff -r 87175eb65ff4 -r a6c778975d7d src/font-mgr.h
--- a/src/font-mgr.h Mon Feb 01 06:20:05 2010 -0600
+++ b/src/font-mgr.h Mon Feb 01 22:00:29 2010 -0600
@@ -89,7 +89,7 @@
#endif /* FONTCONFIG_EXPOSE_CONFIG */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#ifndef HAVE_FCCONFIGGETRESCANINTERVAL
/* Older fontconfig versions misspell this function name. */
@@ -164,8 +164,8 @@
DEBUG_XFT2 (level, "checking if %s handles %s\n", font, lang); \
} while (0)
-#else /* USE_XFT */
+#else /* HAVE_XFT */
-#endif /* USE_XFT */
+#endif /* HAVE_XFT */
#endif /* INCLUDED_font_mgr_h_ */
diff -r 87175eb65ff4 -r a6c778975d7d src/frame-x.c
--- a/src/frame-x.c Mon Feb 01 06:20:05 2010 -0600
+++ b/src/frame-x.c Mon Feb 01 22:00:29 2010 -0600
@@ -2606,7 +2606,7 @@
DtDndDropUnregister (FRAME_X_TEXT_WIDGET (f));
#endif /* HAVE_CDE */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* If we have an XftDraw structure, we need to free it here.
We can't ever have an XftDraw without a Display, so we are safe
to free it in here, and we avoid too much playing around with the
@@ -2713,7 +2713,7 @@
{
if (0)
;
-#ifdef USE_XFT
+#ifdef HAVE_XFT
else if (FONT_INSTANCE_X_XFTFONT (XFONT_INSTANCE (font)))
{
Xt_SET_ARG (al[ac], XtNxftFont,
diff -r 87175eb65ff4 -r a6c778975d7d src/glyphs-x.c
--- a/src/glyphs-x.c Mon Feb 01 06:20:05 2010 -0600
+++ b/src/glyphs-x.c Mon Feb 01 22:00:29 2010 -0600
@@ -2376,7 +2376,7 @@
face,
domain));
XFontStruct *fs = FONT_INSTANCE_X_FONT (fi);
-#ifdef USE_XFT
+#ifdef HAVE_XFT
XftFont *rf = FONT_INSTANCE_X_XFTFONT (fi);
if (rf)
@@ -2395,7 +2395,7 @@
lw_add_widget_value_arg (wv, XtNfont, (XtArgVal) fs);
}
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* #### sanity check, should wrap in appropriate ERROR_CHECK macro */
if (!rf && !fs)
warn_when_safe_lispobj
diff -r 87175eb65ff4 -r a6c778975d7d src/inline.c
--- a/src/inline.c Mon Feb 01 06:20:05 2010 -0600
+++ b/src/inline.c Mon Feb 01 22:00:29 2010 -0600
@@ -101,7 +101,7 @@
#ifdef HAVE_X_WINDOWS
#include "glyphs-x.h"
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#include "font-mgr.h"
#endif
#endif
diff -r 87175eb65ff4 -r a6c778975d7d src/objects-x-impl.h
--- a/src/objects-x-impl.h Mon Feb 01 06:20:05 2010 -0600
+++ b/src/objects-x-impl.h Mon Feb 01 22:00:29 2010 -0600
@@ -29,7 +29,7 @@
#include "objects-impl.h"
#include "objects-x.h"
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* for resource name definitions, etc */
#include "../lwlib/lwlib-fonts.h"
#endif
@@ -45,7 +45,7 @@
XColor color;
/* Yes, it looks crazy to have both the XColor and the XftColor, but
pragmatically both are used. */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
XftColor xftColor;
#endif
char dealloc_on_gc;
@@ -54,7 +54,7 @@
#define X_COLOR_INSTANCE_DATA(c) ((struct x_color_instance_data *) (c)->data)
#define COLOR_INSTANCE_X_COLOR(c) (X_COLOR_INSTANCE_DATA (c)->color)
#define XCOLOR_INSTANCE_X_COLOR(c) COLOR_INSTANCE_X_COLOR (XCOLOR_INSTANCE (c))
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#define COLOR_INSTANCE_X_XFTCOLOR(c) (X_COLOR_INSTANCE_DATA (c)->xftColor)
#endif
#define COLOR_INSTANCE_X_DEALLOC(c) (X_COLOR_INSTANCE_DATA (c)->dealloc_on_gc)
@@ -70,7 +70,7 @@
pragmatically both are used (lwlib delegates labels to the widget sets,
which internally use XFontStructs). */
XFontStruct * font;
-#ifdef USE_XFT
+#ifdef HAVE_XFT
XftFont *xftFont;
#endif
@@ -79,7 +79,7 @@
#define X_FONT_INSTANCE_DATA(f) ((struct x_font_instance_data *) (f)->data)
#define FONT_INSTANCE_X_FONT(f) (X_FONT_INSTANCE_DATA (f)->font)
#define XFONT_INSTANCE_X_FONT(c) FONT_INSTANCE_X_FONT (XFONT_INSTANCE (c))
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#define FONT_INSTANCE_X_XFTFONT(f) (X_FONT_INSTANCE_DATA (f)->xftFont)
#endif
diff -r 87175eb65ff4 -r a6c778975d7d src/objects-x.c
--- a/src/objects-x.c Mon Feb 01 06:20:05 2010 -0600
+++ b/src/objects-x.c Mon Feb 01 22:00:29 2010 -0600
@@ -39,7 +39,7 @@
#include "objects-x-impl.h"
#include "elhash.h"
-#ifdef USE_XFT
+#ifdef HAVE_XFT
#include "font-mgr.h"
#endif
@@ -92,7 +92,7 @@
Lisp_Object device, Error_Behavior errb)
{
XColor color;
-#ifdef USE_XFT
+#ifdef HAVE_XFT
XftColor xftColor;
#endif
int result;
@@ -111,7 +111,7 @@
COLOR_INSTANCE_X_DEALLOC (c) = 1;
COLOR_INSTANCE_X_COLOR (c) = color;
-#ifdef USE_XFT
+#ifdef HAVE_XFT
xftColor.pixel = color.pixel;
xftColor.color.red = color.red;
xftColor.color.green = color.green;
@@ -218,13 +218,13 @@
Display *dpy = DEVICE_X_DISPLAY (XDEVICE (device));
Extbyte *extname;
XFontStruct *fs = NULL; /* _F_ont _S_truct */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
XftFont *rf = NULL; /* _R_ender _F_ont (X Render extension) */
#else
#define rf (0)
#endif
-#ifdef USE_XFT
+#ifdef HAVE_XFT
DEBUG_XFT1 (2, "attempting to initialize font spec %s\n",
XSTRING_DATA(f->name));
/* #### serialize (optimize) these later... */
@@ -272,7 +272,7 @@
fear that the finalize method may get fucked. */
f->data = xnew (struct x_font_instance_data);
-#ifdef USE_XFT
+#ifdef HAVE_XFT
FONT_INSTANCE_X_XFTFONT (f) = rf;
if (rf)
/* Have an Xft font, initialize font info from it. */
@@ -379,7 +379,7 @@
!fs->all_chars_exist));
}
-#ifdef USE_XFT
+#ifdef HAVE_XFT
if (debug_xft > 0)
{
int n = 3, d = 5;
@@ -411,7 +411,7 @@
write_fmt_string (printcharfun, " font id: 0x%lx,",
(unsigned long) FONT_INSTANCE_X_FONT (f)->fid);
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* #### What should we do here? For now, print the address. */
if (FONT_INSTANCE_X_XFTFONT (f))
write_fmt_string (printcharfun, " xft font: 0x%lx",
@@ -423,7 +423,7 @@
x_finalize_font_instance (Lisp_Font_Instance *f)
{
-#ifdef USE_XFT
+#ifdef HAVE_XFT
DEBUG_XFT1 (0, "finalizing %s\n", (STRINGP (f->name)
? (char *) XSTRING_DATA (f->name)
: "(unnamed font)"));
@@ -437,7 +437,7 @@
if (FONT_INSTANCE_X_FONT (f))
XFreeFont (dpy, FONT_INSTANCE_X_FONT (f));
-#ifdef USE_XFT
+#ifdef HAVE_XFT
if (FONT_INSTANCE_X_XFTFONT (f))
XftFontClose (dpy, FONT_INSTANCE_X_XFTFONT (f));
#endif
@@ -752,7 +752,7 @@
and otherwise only return when we return something desperate that
doesn't get stored for future use. */
-#ifdef USE_XFT
+#ifdef HAVE_XFT
/* First, try an Xft font. */
if (NILP (FONT_INSTANCE_TRUENAME (f)) && FONT_INSTANCE_X_XFTFONT (f))
{
@@ -779,7 +779,7 @@
/* used to return Qnil here */
}
}
-#endif /* USE_XFT */
+#endif /* HAVE_XFT */
/* OK, fall back to core font. */
if (NILP (FONT_INSTANCE_TRUENAME (f))
@@ -961,7 +961,7 @@
*/ );
x_handle_non_fully_specified_fonts = 0;
-#ifdef USE_XFT
+#ifdef HAVE_XFT
Fprovide (intern ("xft-fonts"));
#endif
}
diff -r 87175eb65ff4 -r a6c778975d7d src/objects-x.h
--- a/src/objects-x.h Mon Feb 01 06:20:05 2010 -0600
+++ b/src/objects-x.h Mon Feb 01 22:00:29 2010 -0600
@@ -32,7 +32,7 @@
#ifdef HAVE_X_WINDOWS
-#ifdef USE_XFT
+#ifdef HAVE_XFT
EXFUN (Ffc_font_real_pattern, 2);
#endif
More information about the XEmacs-Patches
mailing list