svn merge ^/branches/released .

2 files changed, 1216 insertions, 1220 deletions

diff --git a/libX11/configure.ac b/libX11/configure.ac
index cfb8105c0..d09968b8e 100644
--- a/libX11/configure.ac
+++ b/libX11/configure.ac
@@ -1,490 +1,486 @@
-#                                               -*- Autoconf -*-

-# Process this file with autoconf to produce a configure script.

-

-AC_PREREQ(2.60)

-AC_INIT([libX11],

-        [1.4.1],

-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],

-        libX11)

-AC_CONFIG_SRCDIR([Makefile.am])

-AC_CONFIG_MACRO_DIR([m4])

-AC_CANONICAL_BUILD

-AC_CANONICAL_HOST

-

-AM_INIT_AUTOMAKE([foreign dist-bzip2])

-AM_MAINTAINER_MODE

-AM_CONFIG_HEADER([src/config.h])

-AC_CONFIG_HEADER([include/X11/XlibConf.h])

-

-# Set common system defines for POSIX extensions, such as _GNU_SOURCE

-# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)

-# to avoid autoconf errors.

-AC_USE_SYSTEM_EXTENSIONS

-

-# Require xorg-macros minimum of 1.11 for disabling fop by default

-m4_ifndef([XORG_MACROS_VERSION],

-          [m4_fatal([must install xorg-macros 1.11 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.11)

-XORG_DEFAULT_OPTIONS

-XORG_ENABLE_SPECS

-XORG_WITH_XMLTO(0.0.20)

-XORG_WITH_FOP([no])

-XORG_CHECK_SGML_DOCTOOLS(1.5)

-XORG_PROG_RAWCPP

-

-# Checks for programs.

-AC_PROG_LIBTOOL

-AC_PROG_CC

-PKG_PROG_PKG_CONFIG

-

-if test x"$CC_FOR_BUILD" = x; then

-	if test x"$cross_compiling" = xyes; then

-	       AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)

-	else

-	       CC_FOR_BUILD="$CC"

-	fi

-fi

-AC_SUBST([CC_FOR_BUILD])

-

-if test x"$CPPFLAGS_FOR_BUILD" = x; then

-	if test ! x"$cross_compiling" = xyes; then

-		CPPFLAGS_FOR_BUILD=${CPPFLAGS}

-	fi

-fi

-AC_SUBST(CPPFLAGS_FOR_BUILD)

-

-if test x"$CFLAGS_FOR_BUILD" = x; then

-	if test ! x"$cross_compiling" = xyes; then

-		CFLAGS_FOR_BUILD=${CFLAGS}

-	fi

-fi

-AC_SUBST(CFLAGS_FOR_BUILD)

-

-if test x"$LDFLAGS_FOR_BUILD" = x; then

-	if test ! x"$cross_compiling" = xyes; then

-		LDFLAGS_FOR_BUILD=${LDFLAGS}

-	fi

-fi

-AC_SUBST(LDFLAGS_FOR_BUILD)

-

-# Find perl for "make check" tests in nls/Makefile.am

-AC_ARG_WITH(perl,

-	AC_HELP_STRING([--with-perl=<path>],

-			[path to perl interpreter for build-time tests]),

-	[PERL=$withval ; AC_MSG_CHECKING([perl]) ;

-	 AC_MSG_RESULT([(from --with-perl) $PERL])],

-	AC_CHECK_PROGS([PERL], [perl], [no]))

-AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno)

-

-# Checks for pkg-config packages

-

-# Always required

-X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans xcb >= 1.1.92'

-X11_EXTRA_DEPS="xcb >= 1.1.92"

-

-PKG_PROG_PKG_CONFIG()

-

-AC_SUBST(X11_EXTRA_DEPS)

-

-dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro

-dnl was not expanded, since libX11 with no transport types is rather useless.

-dnl

-dnl If you're seeing an error here, be sure you installed the lib/xtrans module

-dnl first and if it's not in the default location, that you set the ACLOCAL

-dnl environment variable to find it, such as:

-dnl	ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"

-m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])

-

-# Transport selection macro from xtrans.m4

-XTRANS_CONNECTION_FLAGS

-

-# Secure RPC detection macro from xtrans.m4

-XTRANS_SECURE_RPC_FLAGS

-

-# Preferred order to try transports for local connections

-AC_MSG_CHECKING([what order to try transports in for local connections])

-DEFAULT_LOCAL_TRANS=""

-case $host_os in

-	solaris*)

-		# On Solaris 2.6 through 9, named pipes (LOCAL_TRANS) were

-		# faster than Unix domain sockets, but on Solaris 10 & later,

-		# Unix domain sockets are faster now.

-		if test "$UNIXCONN" = "yes" ; then

-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then

-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"

-			fi

-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"

-		fi

-		if test "$LOCALCONN" = "yes" ; then

-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then

-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"

-			fi

-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"

-		fi

-		if test "$TCPCONN" = "yes" ; then

-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then

-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"

-			fi

-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"

-		fi

-		;;

-	linux*)

-		# LOCAL_TRANS is used for abstract sockets.

-		if test "$UNIXCONN" = "yes" ; then

-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then

-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"

-			fi

-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS,UNIX_TRANS"

-		fi

-		if test "$TCPCONN" = "yes" ; then

-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then

-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"

-			fi

-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"

-		fi

-		;;

-	*)

-		if test "$LOCALCONN" = "yes" ; then

-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then

-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"

-			fi

-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"

-		fi

-		if test "$UNIXCONN" = "yes" ; then

-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then

-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"

-			fi

-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"

-		fi

-		if test "$TCPCONN" = "yes" ; then

-			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then

-				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"

-			fi

-			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"

-		fi

-		;;

-esac

-

-AC_ARG_WITH(local-transport-order,

-	AC_HELP_STRING([--with-local-transport-order=LIST], [preference sorted list of transport types to try for local connections]),

-	[LOCAL_TRANSPORT_LIST=$withval],

-	[LOCAL_TRANSPORT_LIST=$DEFAULT_LOCAL_TRANS])

-AC_DEFINE_UNQUOTED([LOCAL_TRANSPORT_LIST], [$LOCAL_TRANSPORT_LIST],

-   [preference sorted list of transport types to try for local connections])

-AC_MSG_RESULT([$LOCAL_TRANSPORT_LIST])

-

-# Check for dlopen

-AC_MSG_CHECKING([if run-time linking is supported])

-AC_SEARCH_LIBS(dlopen,[dl svld])

-if test "x$ac_cv_search_dlopen" = xno; then

-	AC_SEARCH_LIBS(shl_load,[dld])

-	if test "x$ac_cv_search_shl_load" != xno; then

-		AC_DEFINE(HAVE_SHL_LOAD,1,

-			  [Use shl_load to load shared libraries])

-		AC_CHECK_HEADERS([dl.h])

-	fi

-else

-	AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries])

-	AC_CHECK_HEADERS([dlfcn.h])

-fi

-if test x$ac_cv_header_dlcfn_h -o x$ac_cv_header_dl_h; then

-	HAVE_LOADABLE_MODULES=yes

-else

-	HAVE_LOADABLE_MODULES=no

-fi

-AC_MSG_RESULT($HAVE_LOADABLE_MODULES)

-

-AC_MSG_CHECKING([if loadable i18n module support should be enabled])

-AC_ARG_ENABLE(loadable-i18n,

-	      AC_HELP_STRING([--enable-loadable-i18n],

-	       [Controls loadable i18n module support]),

-	       [XLIB_LOADABLE_I18N=$enableval],

-	       [XLIB_LOADABLE_I18N="no"])

-if test x$XLIB_LOADABLE_I18N = xyes; then

-	if test x$HAVE_LOADABLE_MODULES = xno; then

-		AC_MSG_ERROR([Loadable module support is required to enable loadable i18n module support])

-	fi

-	AC_DEFINE(USE_DYNAMIC_LC,1,

-		  [Split some i18n functions into loadable modules])

-	AC_SUBST(I18N_MODULE_LIBS,'${top_builddir}/src/libX11.la')

-fi

-AC_MSG_RESULT($XLIB_LOADABLE_I18N)

-

-AM_CONDITIONAL(XLIB_LOADABLE_I18N, test x$XLIB_LOADABLE_I18N = xyes)

-

-AC_MSG_CHECKING([if loadable Xcursor library support should be enabled])

-AC_ARG_ENABLE(loadable-xcursor,

-	      AC_HELP_STRING([--disable-loadable-xcursor],

-	       [Controls loadable xcursor library support]),

-	       [XLIB_LOADABLE_XCURSOR=$enableval],

-	       [XLIB_LOADABLE_XCURSOR=$HAVE_LOADABLE_MODULES])

-if test x$XLIB_LOADABLE_XCURSOR = xyes; then

-	AC_DEFINE(USE_DYNAMIC_XCURSOR,1,

-		  [Use the X cursor library to load cursors])

-fi

-AC_MSG_RESULT($XLIB_LOADABLE_XCURSOR)

-

-# Checks for header files.

-AC_HEADER_STDC

-AC_CHECK_HEADERS([sys/select.h])

-

-# Checks for typedefs, structures, and compiler characteristics.

-

-# Checks for library functions.

-AC_CHECK_FUNCS([strtol])

-# Used in lcFile.c (see also --enable-xlocaledir settings below)

-XLOCALEDIR_IS_SAFE="no"

-AC_CHECK_FUNC([issetugid], [XLOCALEDIR_IS_SAFE="yes"]

-	AC_DEFINE(HASSETUGID,1,[Has issetugid() function]))

-AC_CHECK_FUNC([getresuid], [XLOCALEDIR_IS_SAFE="yes"]

-	AC_DEFINE(HASGETRESUID,1,[Has getresuid() & getresgid() functions]))

-# Used in Font.c

-AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))

-

-# Checks for system services

-dnl AC_PATH_XTRA

-

-# arch specific things

-WCHAR32="1"

-case $host_os in

-  os2*) os2="true" ; WCHAR32="0" ;;

-  *) ;;

-esac

-AC_SUBST(WCHAR32)

-

-AM_CONDITIONAL(OS2, test x$os2 = xtrue)

-

-AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])

-if test "x$LAUNCHD" = xauto; then

-	unset LAUNCHD

-	AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no], [$PATH$PATH_SEPARATOR/sbin])

-fi

-

-if test "x$LAUNCHD" = xyes ; then

-	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])

-	AC_DEFINE(TRANS_REOPEN, 1, [launchd support available])

-fi

-

-AC_ARG_ENABLE(xthreads,

-              AC_HELP_STRING([--disable-xthreads],

-                [Disable Xlib support for Multithreading]),

-              [xthreads=$enableval],[xthreads=yes])

-

-AC_CHECK_LIB(c, getpwuid_r, [mtsafeapi="yes"], [mtsafeapi="no"])

-

-case x$xthreads in

-xyes)

-	AC_DEFINE(XTHREADS,1,[Whether libX11 is compiled with thread support])

-	if test x$mtsafeapi = xyes

-	then

-	AC_DEFINE(XUSE_MTSAFE_API,1,[Whether libX11 needs to use MT safe API's])

-	fi

-	;;

-*)

-	;;

-esac

-

-AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"])

-AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)

-

-dnl XXX incomplete, please fill this in

-if test x$xthreads = xyes ; then

-    case $host_os in

-    linux*|openbsd*|gnu*|k*bsd*-gnu)

-        XTHREADLIB=-lpthread ;;

-    netbsd*)

-	XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"

-	XTHREADLIB="-lpthread" ;;

-    freebsd*)

-        XTHREAD_CFLAGS="-D_THREAD_SAFE"

-        XTHREADLIB="-pthread" ;;

-    dragonfly*)

-        XTHREADLIB="-pthread" ;;

-    solaris*)

-	XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;

-    esac

-fi

-AC_SUBST(XTHREADLIB)

-AC_SUBST(XTHREAD_CFLAGS)

-

-AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )

-

-#

-# Find keysymdef.h

-#

-AC_MSG_CHECKING([keysym definitions])

-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11

-FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"

-for i in $FILES; do

-    if test -f "$KEYSYMDEFDIR/$i"; then

-            KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"

-    elif test "x$i" = "xkeysymdef.h"; then

-	    AC_MSG_ERROR([Cannot find keysymdef.h])

-    fi

-done

-AC_MSG_RESULT([$KEYSYMDEFS])

-AC_SUBST(KEYSYMDEFS)

-

-AM_CONDITIONAL(UDC, test xfalse = xtrue)

-

-AC_ARG_ENABLE(xcms,

-              AC_HELP_STRING([--disable-xcms],

-                [Disable Xlib support for CMS *EXPERIMENTAL*]),

-              [XCMS=$enableval],[XCMS=yes])

-AM_CONDITIONAL(XCMS, [test x$XCMS = xyes ])

-if test x"$XCMS" = "xyes"; then

-	AC_DEFINE(XCMS,1,[Include support for XCMS])

-fi

-

-AC_ARG_ENABLE(xlocale,

-              AC_HELP_STRING([--disable-xlocale],

-                [Disable Xlib locale implementation *EXPERIMENTAL*]),

-              [XLOCALE=$enableval],[XLOCALE=yes])

-

-AM_CONDITIONAL(XLOCALE, [ test x$XLOCALE = xyes ])

-if test x"$XLOCALE" = "xyes"; then

-	AC_DEFINE(XLOCALE,1,[support for X Locales])

-fi

-

-# This disables XLOCALEDIR.  Set it if you're using BuildLoadableXlibI18n,

-# don't have either issetugid() or getresuid(), and you need to protect

-# clients that are setgid or setuid to an id other than 0.

-AC_MSG_CHECKING([if XLOCALEDIR support should be enabled])

-AC_ARG_ENABLE(xlocaledir,

-	      AC_HELP_STRING([--enable-xlocaledir],

-		[Enable XLOCALEDIR environment variable support]),

-	      [ENABLE_XLOCALEDIR=$enableval],[ENABLE_XLOCALEDIR=$XLOCALEDIR_IS_SAFE])

-if test "x$ENABLE_XLOCALEDIR" = "xno"; then

-	AC_DEFINE(NO_XLOCALEDIR,1,[Disable XLOCALEDIR environment variable])

-fi

-AC_MSG_RESULT($ENABLE_XLOCALEDIR)

-

-AC_ARG_ENABLE(xf86bigfont,

-	      AC_HELP_STRING([--disable-xf86bigfont],

-		[Disable XF86BigFont extension support]),

-	      [XF86BIGFONT=$enableval],[XF86BIGFONT="yes"])

-if test "x$XF86BIGFONT" = "xyes"; then

-    PKG_CHECK_MODULES(BIGFONT, xf86bigfontproto,

-         AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension]),XF86BIGFONT="no")

-    AC_SUBST(BIGFONT_CFLAGS)

-    AC_SUBST(BIGFONT_LIBS)

-fi

-

-AC_ARG_ENABLE(xkb,

-              AC_HELP_STRING([--disable-xkb],

-                [Disable XKB support *EXPERIMENTAL*]),

-              [XKB=$enableval],[XKB=yes])

-

-AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])

-if test x"$XKB" = "xyes"; then

-   XKBPROTO_REQUIRES="kbproto"

-   X11_REQUIRES="${X11_REQUIRES} kbproto inputproto"

-   AC_DEFINE(XKB,1,[Use XKB])

-else

-   XKBPROTO_REQUIRES=""

-fi

-AC_SUBST(XKBPROTO_REQUIRES)

-

-AC_FUNC_MMAP()

-composecache_default=$ac_cv_func_mmap_fixed_mapped

-AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])

-AC_ARG_ENABLE(composecache,

-              AC_HELP_STRING([--disable-composecache],

-                [Disable compose table cache support]),

-              [COMPOSECACHE=$enableval],[COMPOSECACHE=$composecache_default])

-if test x"$COMPOSECACHE" = "xyes"; then

-	AC_DEFINE(COMPOSECACHE,1,[Include compose table cache support])

-fi

-

-dnl Allow checking code with lint, sparse, etc.

-XORG_WITH_LINT

-XORG_LINT_LIBRARY([X11])

-

-X11_DATADIR="${datadir}/X11"

-AX_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])

-AC_SUBST(X11_DATADIR)

-

-X11_LIBDIR="${libdir}/X11"

-AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])

-AC_SUBST(X11_LIBDIR)

-

-PKG_CHECK_MODULES(X11, [$X11_REQUIRES])

-X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS"

-

-#

-# Yes, it would be nice to put the locale data in

-# /usr/share, but the locale stuff includes loadable

-# libraries which must be located in the same directory

-# as the other locale data, so for now, everything lives

-# in ${libdir}

-#

-

-X11_LOCALEDATADIR="${X11_DATADIR}/locale"

-AX_DEFINE_DIR(XLOCALEDATADIR, X11_LOCALEDATADIR, [Location of libX11 locale data])

-AC_SUBST(X11_LOCALEDATADIR)

-

-AC_ARG_WITH(locale-lib-dir,	AS_HELP_STRING([--with-locale-lib-dir=DIR],

- [Directory where locale libraries files are installed (default: $libdir/X11/locale)]),

-				[ X11_LOCALELIBDIR="$withval" ],

-				[ X11_LOCALELIBDIR="${X11_LIBDIR}/locale" ])

-AX_DEFINE_DIR(XLOCALELIBDIR, X11_LOCALELIBDIR, [Location of libX11 locale libraries])

-AC_SUBST(X11_LOCALELIBDIR)

-

-X11_LOCALEDIR="${X11_LOCALEDATADIR}"

-AX_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])

-AC_SUBST(X11_LOCALEDIR)

-

-XKEYSYMDB="${X11_DATADIR}/XKeysymDB"

-AX_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])

-

-XERRORDB="${X11_DATADIR}/XErrorDB"

-AX_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])

-

-XORG_CHECK_MALLOC_ZERO

-

-AC_OUTPUT([Makefile

-           include/Makefile

-	   man/Makefile

-           man/xkb/Makefile

-           src/Makefile

-           src/util/Makefile

-	   src/xcms/Makefile

-	   src/xlibi18n/Makefile

-	   modules/Makefile

-	   modules/im/Makefile

-	   modules/im/ximcp/Makefile

-	   modules/lc/Makefile

-	   modules/lc/def/Makefile

-	   modules/lc/gen/Makefile

-	   modules/lc/Utf8/Makefile

-	   modules/lc/xlocale/Makefile

-	   modules/om/Makefile

-	   modules/om/generic/Makefile

-	   src/xkb/Makefile

-	   nls/Makefile

-	   specs/Makefile

-	   specs/i18n/Makefile

-	   specs/i18n/framework/Makefile

-	   specs/i18n/localedb/Makefile

-	   specs/i18n/trans/Makefile

-	   specs/libX11/Makefile

-	   specs/XIM/Makefile

-	   specs/XKB/Makefile

-	   x11.pc

-	   x11-xcb.pc])

-

-echo ""

-echo "X11 will be built with the following settings:"

-echo " Loadable i18n module support:            "$XLIB_LOADABLE_I18N

-echo " Loadable xcursor library support:        "$XLIB_LOADABLE_XCURSOR

-echo " Threading support:                       "$xthreads

-echo " Use Threads safe API:                    "$mtsafeapi

-echo " Threads stubs in libX11:                 "$thrstubs

-echo " XCMS:                                    "$XCMS

-echo " Internationalization support:            "$XLOCALE

-echo " XF86BigFont support:                     "$XF86BIGFONT

-echo " XKB support:                             "$XKB

-echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR

-echo " Compose table cache enabled:             "$COMPOSECACHE

-echo " Functional specs building enabled:       "$build_specs

-echo ""

+#                                               -*- Autoconf -*-
+# Process this file with autoconf to produce a configure script.
+
+AC_PREREQ(2.60)
+AC_INIT([libX11],
+        [1.4.1],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+        libX11)
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
+
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+# Set common system defines for POSIX extensions, such as _GNU_SOURCE
+# Must be called before any macros that run the compiler (like AC_PROG_LIBTOOL)
+# to avoid autoconf errors.
+AC_USE_SYSTEM_EXTENSIONS
+
+# Require xorg-macros minimum of 1.11 for disabling fop by default
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.11 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.11)
+XORG_DEFAULT_OPTIONS
+XORG_ENABLE_SPECS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP([no])
+XORG_CHECK_SGML_DOCTOOLS(1.5)
+XORG_PROG_RAWCPP
+
+# Checks for programs.
+AC_PROG_LIBTOOL
+PKG_PROG_PKG_CONFIG
+
+if test x"$CC_FOR_BUILD" = x; then
+	if test x"$cross_compiling" = xyes; then
+	       AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
+	else
+	       CC_FOR_BUILD="$CC"
+	fi
+fi
+AC_SUBST([CC_FOR_BUILD])
+
+if test x"$CPPFLAGS_FOR_BUILD" = x; then
+	if test ! x"$cross_compiling" = xyes; then
+		CPPFLAGS_FOR_BUILD=${CPPFLAGS}
+	fi
+fi
+AC_SUBST(CPPFLAGS_FOR_BUILD)
+
+if test x"$CFLAGS_FOR_BUILD" = x; then
+	if test ! x"$cross_compiling" = xyes; then
+		CFLAGS_FOR_BUILD=${CFLAGS}
+	fi
+fi
+AC_SUBST(CFLAGS_FOR_BUILD)
+
+if test x"$LDFLAGS_FOR_BUILD" = x; then
+	if test ! x"$cross_compiling" = xyes; then
+		LDFLAGS_FOR_BUILD=${LDFLAGS}
+	fi
+fi
+AC_SUBST(LDFLAGS_FOR_BUILD)
+
+# Find perl for "make check" tests in nls/Makefile.am
+AC_ARG_WITH(perl,
+	AC_HELP_STRING([--with-perl=<path>],
+			[path to perl interpreter for build-time tests]),
+	[PERL=$withval ; AC_MSG_CHECKING([perl]) ;
+	 AC_MSG_RESULT([(from --with-perl) $PERL])],
+	AC_CHECK_PROGS([PERL], [perl], [no]))
+AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno)
+
+# Checks for pkg-config packages
+
+# Always required
+X11_REQUIRES='xproto >= 7.0.13 xextproto xtrans xcb >= 1.1.92'
+X11_EXTRA_DEPS="xcb >= 1.1.92"
+
+PKG_PROG_PKG_CONFIG()
+
+AC_SUBST(X11_EXTRA_DEPS)
+
+dnl Issue an error if xtrans.m4 was not found and XTRANS_CONNECTION_FLAGS macro
+dnl was not expanded, since libX11 with no transport types is rather useless.
+dnl
+dnl If you're seeing an error here, be sure you installed the lib/xtrans module
+dnl first and if it's not in the default location, that you set the ACLOCAL
+dnl environment variable to find it, such as:
+dnl	ACLOCAL="aclocal -I ${PREFIX}/share/aclocal"
+m4_pattern_forbid([^XTRANS_CONNECTION_FLAGS$])
+
+# Transport selection macro from xtrans.m4
+XTRANS_CONNECTION_FLAGS
+
+# Secure RPC detection macro from xtrans.m4
+XTRANS_SECURE_RPC_FLAGS
+
+# Preferred order to try transports for local connections
+AC_MSG_CHECKING([what order to try transports in for local connections])
+DEFAULT_LOCAL_TRANS=""
+case $host_os in
+	solaris*)
+		# On Solaris 2.6 through 9, named pipes (LOCAL_TRANS) were
+		# faster than Unix domain sockets, but on Solaris 10 & later,
+		# Unix domain sockets are faster now.
+		if test "$UNIXCONN" = "yes" ; then
+			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+			fi
+			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"
+		fi
+		if test "$LOCALCONN" = "yes" ; then
+			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+			fi
+			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"
+		fi
+		if test "$TCPCONN" = "yes" ; then
+			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+			fi
+			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
+		fi
+		;;
+	linux*)
+		# LOCAL_TRANS is used for abstract sockets.
+		if test "$UNIXCONN" = "yes" ; then
+			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+			fi
+			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS,UNIX_TRANS"
+		fi
+		if test "$TCPCONN" = "yes" ; then
+			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+			fi
+			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
+		fi
+		;;
+	*)
+		if test "$LOCALCONN" = "yes" ; then
+			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+			fi
+			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}LOCAL_TRANS"
+		fi
+		if test "$UNIXCONN" = "yes" ; then
+			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+			fi
+			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}UNIX_TRANS"
+		fi
+		if test "$TCPCONN" = "yes" ; then
+			if test ! "x$DEFAULT_LOCAL_TRANS" = "x" ; then
+				DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS},"
+			fi
+			DEFAULT_LOCAL_TRANS="${DEFAULT_LOCAL_TRANS}TCP_TRANS"
+		fi
+		;;
+esac
+
+AC_ARG_WITH(local-transport-order,
+	AC_HELP_STRING([--with-local-transport-order=LIST], [preference sorted list of transport types to try for local connections]),
+	[LOCAL_TRANSPORT_LIST=$withval],
+	[LOCAL_TRANSPORT_LIST=$DEFAULT_LOCAL_TRANS])
+AC_DEFINE_UNQUOTED([LOCAL_TRANSPORT_LIST], [$LOCAL_TRANSPORT_LIST],
+   [preference sorted list of transport types to try for local connections])
+AC_MSG_RESULT([$LOCAL_TRANSPORT_LIST])
+
+# Check for dlopen
+AC_MSG_CHECKING([if run-time linking is supported])
+AC_SEARCH_LIBS(dlopen,[dl svld])
+if test "x$ac_cv_search_dlopen" = xno; then
+	AC_SEARCH_LIBS(shl_load,[dld])
+	if test "x$ac_cv_search_shl_load" != xno; then
+		AC_DEFINE(HAVE_SHL_LOAD,1,
+			  [Use shl_load to load shared libraries])
+		AC_CHECK_HEADERS([dl.h])
+	fi
+else
+	AC_DEFINE(HAVE_DLOPEN,1,[Use dlopen to load shared libraries])
+	AC_CHECK_HEADERS([dlfcn.h])
+fi
+if test x$ac_cv_header_dlcfn_h -o x$ac_cv_header_dl_h; then
+	HAVE_LOADABLE_MODULES=yes
+else
+	HAVE_LOADABLE_MODULES=no
+fi
+AC_MSG_RESULT($HAVE_LOADABLE_MODULES)
+
+AC_MSG_CHECKING([if loadable i18n module support should be enabled])
+AC_ARG_ENABLE(loadable-i18n,
+	      AC_HELP_STRING([--enable-loadable-i18n],
+	       [Controls loadable i18n module support]),
+	       [XLIB_LOADABLE_I18N=$enableval],
+	       [XLIB_LOADABLE_I18N="no"])
+if test x$XLIB_LOADABLE_I18N = xyes; then
+	if test x$HAVE_LOADABLE_MODULES = xno; then
+		AC_MSG_ERROR([Loadable module support is required to enable loadable i18n module support])
+	fi
+	AC_DEFINE(USE_DYNAMIC_LC,1,
+		  [Split some i18n functions into loadable modules])
+	AC_SUBST(I18N_MODULE_LIBS,'${top_builddir}/src/libX11.la')
+fi
+AC_MSG_RESULT($XLIB_LOADABLE_I18N)
+
+AM_CONDITIONAL(XLIB_LOADABLE_I18N, test x$XLIB_LOADABLE_I18N = xyes)
+
+AC_MSG_CHECKING([if loadable Xcursor library support should be enabled])
+AC_ARG_ENABLE(loadable-xcursor,
+	      AC_HELP_STRING([--disable-loadable-xcursor],
+	       [Controls loadable xcursor library support]),
+	       [XLIB_LOADABLE_XCURSOR=$enableval],
+	       [XLIB_LOADABLE_XCURSOR=$HAVE_LOADABLE_MODULES])
+if test x$XLIB_LOADABLE_XCURSOR = xyes; then
+	AC_DEFINE(USE_DYNAMIC_XCURSOR,1,
+		  [Use the X cursor library to load cursors])
+fi
+AC_MSG_RESULT($XLIB_LOADABLE_XCURSOR)
+
+# Checks for header files.
+AC_HEADER_STDC
+AC_CHECK_HEADERS([sys/select.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+
+# Checks for library functions.
+AC_CHECK_FUNCS([strtol])
+# Used in lcFile.c (see also --enable-xlocaledir settings below)
+XLOCALEDIR_IS_SAFE="no"
+AC_CHECK_FUNC([issetugid], [XLOCALEDIR_IS_SAFE="yes"]
+	AC_DEFINE(HASSETUGID,1,[Has issetugid() function]))
+AC_CHECK_FUNC([getresuid], [XLOCALEDIR_IS_SAFE="yes"]
+	AC_DEFINE(HASGETRESUID,1,[Has getresuid() & getresgid() functions]))
+# Used in Font.c
+AC_CHECK_FUNC([shmat], AC_DEFINE(HAS_SHM,1,[Has shm*() functions]))
+
+# Checks for system services
+dnl AC_PATH_XTRA
+
+# arch specific things
+WCHAR32="1"
+case $host_os in
+  os2*) os2="true" ; WCHAR32="0" ;;
+  *) ;;
+esac
+AC_SUBST(WCHAR32)
+
+AM_CONDITIONAL(OS2, test x$os2 = xtrue)
+
+AC_ARG_WITH(launchd, AS_HELP_STRING([--with-launchd], [Build with support for Apple's launchd (default: auto)]), [LAUNCHD=$withval], [LAUNCHD=auto])
+if test "x$LAUNCHD" = xauto; then
+	unset LAUNCHD
+	AC_CHECK_PROG(LAUNCHD, [launchd], [yes], [no], [$PATH$PATH_SEPARATOR/sbin])
+fi
+
+if test "x$LAUNCHD" = xyes ; then
+	AC_DEFINE(HAVE_LAUNCHD, 1, [launchd support available])
+	AC_DEFINE(TRANS_REOPEN, 1, [launchd support available])
+fi
+
+AC_ARG_ENABLE(xthreads,
+              AC_HELP_STRING([--disable-xthreads],
+                [Disable Xlib support for Multithreading]),
+              [xthreads=$enableval],[xthreads=yes])
+
+AC_CHECK_LIB(c, getpwuid_r, [mtsafeapi="yes"], [mtsafeapi="no"])
+
+case x$xthreads in
+xyes)
+	AC_DEFINE(XTHREADS,1,[Whether libX11 is compiled with thread support])
+	if test x$mtsafeapi = xyes
+	then
+	AC_DEFINE(XUSE_MTSAFE_API,1,[Whether libX11 needs to use MT safe API's])
+	fi
+	;;
+*)
+	;;
+esac
+
+AC_CHECK_LIB(c, pthread_self, [thrstubs="no"], [thrstubs="yes"])
+AM_CONDITIONAL(THRSTUBS, test x$thrstubs = xyes)
+
+dnl XXX incomplete, please fill this in
+if test x$xthreads = xyes ; then
+    case $host_os in
+    linux*|openbsd*|gnu*|k*bsd*-gnu)
+        XTHREADLIB=-lpthread ;;
+    netbsd*)
+	XTHREAD_CFLAGS="-D_POSIX_THREAD_SAFE_FUNCTIONS"
+	XTHREADLIB="-lpthread" ;;
+    freebsd*)
+        XTHREAD_CFLAGS="-D_THREAD_SAFE"
+        XTHREADLIB="-pthread" ;;
+    dragonfly*)
+        XTHREADLIB="-pthread" ;;
+    solaris*)
+	XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
+    esac
+fi
+AC_SUBST(XTHREADLIB)
+AC_SUBST(XTHREAD_CFLAGS)
+
+AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+
+#
+# Find keysymdef.h
+#
+AC_MSG_CHECKING([keysym definitions])
+KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
+FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+for i in $FILES; do
+    if test -f "$KEYSYMDEFDIR/$i"; then
+            KEYSYMDEFS="$KEYSYMDEFS $KEYSYMDEFDIR/$i"
+    elif test "x$i" = "xkeysymdef.h"; then
+	    AC_MSG_ERROR([Cannot find keysymdef.h])
+    fi
+done
+AC_MSG_RESULT([$KEYSYMDEFS])
+AC_SUBST(KEYSYMDEFS)
+
+AM_CONDITIONAL(UDC, test xfalse = xtrue)
+
+AC_ARG_ENABLE(xcms,
+              AC_HELP_STRING([--disable-xcms],
+                [Disable Xlib support for CMS *EXPERIMENTAL*]),
+              [XCMS=$enableval],[XCMS=yes])
+AM_CONDITIONAL(XCMS, [test x$XCMS = xyes ])
+if test x"$XCMS" = "xyes"; then
+	AC_DEFINE(XCMS,1,[Include support for XCMS])
+fi
+
+AC_ARG_ENABLE(xlocale,
+              AC_HELP_STRING([--disable-xlocale],
+                [Disable Xlib locale implementation *EXPERIMENTAL*]),
+              [XLOCALE=$enableval],[XLOCALE=yes])
+
+AM_CONDITIONAL(XLOCALE, [ test x$XLOCALE = xyes ])
+if test x"$XLOCALE" = "xyes"; then
+	AC_DEFINE(XLOCALE,1,[support for X Locales])
+fi
+
+# This disables XLOCALEDIR.  Set it if you're using BuildLoadableXlibI18n,
+# don't have either issetugid() or getresuid(), and you need to protect
+# clients that are setgid or setuid to an id other than 0.
+AC_MSG_CHECKING([if XLOCALEDIR support should be enabled])
+AC_ARG_ENABLE(xlocaledir,
+	      AC_HELP_STRING([--enable-xlocaledir],
+		[Enable XLOCALEDIR environment variable support]),
+	      [ENABLE_XLOCALEDIR=$enableval],[ENABLE_XLOCALEDIR=$XLOCALEDIR_IS_SAFE])
+if test "x$ENABLE_XLOCALEDIR" = "xno"; then
+	AC_DEFINE(NO_XLOCALEDIR,1,[Disable XLOCALEDIR environment variable])
+fi
+AC_MSG_RESULT($ENABLE_XLOCALEDIR)
+
+AC_ARG_ENABLE(xf86bigfont,
+	      AC_HELP_STRING([--disable-xf86bigfont],
+		[Disable XF86BigFont extension support]),
+	      [XF86BIGFONT=$enableval],[XF86BIGFONT="yes"])
+if test "x$XF86BIGFONT" = "xyes"; then
+    PKG_CHECK_MODULES(BIGFONT, [xf86bigfontproto >= 1.2.0],
+         AC_DEFINE(XF86BIGFONT,1,[Enable XF86BIGFONT extension]),XF86BIGFONT="no")
+fi
+
+AC_ARG_ENABLE(xkb,
+              AC_HELP_STRING([--disable-xkb],
+                [Disable XKB support *EXPERIMENTAL*]),
+              [XKB=$enableval],[XKB=yes])
+
+AM_CONDITIONAL(XKB, [ test x$XKB = xyes ])
+if test x"$XKB" = "xyes"; then
+   XKBPROTO_REQUIRES="kbproto"
+   X11_REQUIRES="${X11_REQUIRES} kbproto inputproto"
+   AC_DEFINE(XKB,1,[Use XKB])
+else
+   XKBPROTO_REQUIRES=""
+fi
+AC_SUBST(XKBPROTO_REQUIRES)
+
+AC_FUNC_MMAP()
+composecache_default=$ac_cv_func_mmap_fixed_mapped
+AC_CHECK_FUNC(nl_langinfo, , [composecache_default=no])
+AC_ARG_ENABLE(composecache,
+              AC_HELP_STRING([--disable-composecache],
+                [Disable compose table cache support]),
+              [COMPOSECACHE=$enableval],[COMPOSECACHE=$composecache_default])
+if test x"$COMPOSECACHE" = "xyes"; then
+	AC_DEFINE(COMPOSECACHE,1,[Include compose table cache support])
+fi
+
+dnl Allow checking code with lint, sparse, etc.
+XORG_WITH_LINT
+XORG_LINT_LIBRARY([X11])
+
+X11_DATADIR="${datadir}/X11"
+AX_DEFINE_DIR(X11_DATADIR, X11_DATADIR, [Location of libX11 data])
+AC_SUBST(X11_DATADIR)
+
+X11_LIBDIR="${libdir}/X11"
+AX_DEFINE_DIR(X11_LIBDIR, X11_LIBDIR, [Location of libX11 library data])
+AC_SUBST(X11_LIBDIR)
+
+PKG_CHECK_MODULES(X11, [$X11_REQUIRES])
+X11_CFLAGS="$X11_CFLAGS $XTHREAD_CFLAGS"
+
+#
+# Yes, it would be nice to put the locale data in
+# /usr/share, but the locale stuff includes loadable
+# libraries which must be located in the same directory
+# as the other locale data, so for now, everything lives
+# in ${libdir}
+#
+
+X11_LOCALEDATADIR="${X11_DATADIR}/locale"
+AX_DEFINE_DIR(XLOCALEDATADIR, X11_LOCALEDATADIR, [Location of libX11 locale data])
+AC_SUBST(X11_LOCALEDATADIR)
+
+AC_ARG_WITH(locale-lib-dir,	AS_HELP_STRING([--with-locale-lib-dir=DIR],
+ [Directory where locale libraries files are installed (default: $libdir/X11/locale)]),
+				[ X11_LOCALELIBDIR="$withval" ],
+				[ X11_LOCALELIBDIR="${X11_LIBDIR}/locale" ])
+AX_DEFINE_DIR(XLOCALELIBDIR, X11_LOCALELIBDIR, [Location of libX11 locale libraries])
+AC_SUBST(X11_LOCALELIBDIR)
+
+X11_LOCALEDIR="${X11_LOCALEDATADIR}"
+AX_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
+AC_SUBST(X11_LOCALEDIR)
+
+XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
+AX_DEFINE_DIR(XKEYSYMDB, XKEYSYMDB, [Location of keysym database])
+
+XERRORDB="${X11_DATADIR}/XErrorDB"
+AX_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
+
+XORG_CHECK_MALLOC_ZERO
+
+AC_OUTPUT([Makefile
+           include/Makefile
+	   man/Makefile
+           man/xkb/Makefile
+           src/Makefile
+           src/util/Makefile
+	   src/xcms/Makefile
+	   src/xlibi18n/Makefile
+	   modules/Makefile
+	   modules/im/Makefile
+	   modules/im/ximcp/Makefile
+	   modules/lc/Makefile
+	   modules/lc/def/Makefile
+	   modules/lc/gen/Makefile
+	   modules/lc/Utf8/Makefile
+	   modules/lc/xlocale/Makefile
+	   modules/om/Makefile
+	   modules/om/generic/Makefile
+	   src/xkb/Makefile
+	   nls/Makefile
+	   specs/Makefile
+	   specs/i18n/Makefile
+	   specs/i18n/framework/Makefile
+	   specs/i18n/localedb/Makefile
+	   specs/i18n/trans/Makefile
+	   specs/libX11/Makefile
+	   specs/XIM/Makefile
+	   specs/XKB/Makefile
+	   x11.pc
+	   x11-xcb.pc])
+
+echo ""
+echo "X11 will be built with the following settings:"
+echo " Loadable i18n module support:            "$XLIB_LOADABLE_I18N
+echo " Loadable xcursor library support:        "$XLIB_LOADABLE_XCURSOR
+echo " Threading support:                       "$xthreads
+echo " Use Threads safe API:                    "$mtsafeapi
+echo " Threads stubs in libX11:                 "$thrstubs
+echo " XCMS:                                    "$XCMS
+echo " Internationalization support:            "$XLOCALE
+echo " XF86BigFont support:                     "$XF86BIGFONT
+echo " XKB support:                             "$XKB
+echo " XLOCALEDIR environment variable support: "$ENABLE_XLOCALEDIR
+echo " Compose table cache enabled:             "$COMPOSECACHE
+echo " Functional specs building enabled:       "$build_specs
+echo ""
diff --git a/libX11/src/Font.c b/libX11/src/Font.c
index 857136a34..7f56f686b 100644
--- a/libX11/src/Font.c
+++ b/libX11/src/Font.c
@@ -1,730 +1,730 @@
-/*

-

-Copyright 1986, 1998  The Open Group

-Copyright (c) 2000  The XFree86 Project, Inc.

-

-Permission to use, copy, modify, distribute, and sell this software and its

-documentation for any purpose is hereby granted without fee, provided that

-the above copyright notice appear in all copies and that both that

-copyright notice and this permission notice appear in supporting

-documentation.

-

-The above copyright notice and this permission notice shall be included in

-all copies or substantial portions of the Software.

-

-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE

-X CONSORTIUM OR THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,

-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

-SOFTWARE.

-

-Except as contained in this notice, the name of the X Consortium or of the

-XFree86 Project shall not be used in advertising or otherwise to promote the

-sale, use or other dealings in this Software without prior written

-authorization from the X Consortium and the XFree86 Project.

-

-*/

-

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#include "Xlibint.h"

-

-#if defined(XF86BIGFONT) && !defined(MUSTCOPY)

-#define USE_XF86BIGFONT

-#endif

-#ifdef USE_XF86BIGFONT

-#include <sys/types.h>

-#ifdef HAS_SHM

-#include <sys/ipc.h>

-#include <sys/shm.h>

-#endif

-

-#include <stdio.h>

-#include <stdlib.h>

-#include <X11/extensions/xf86bigfstr.h>

-#endif

-

-#include "Xlcint.h"

-#include "XlcPubI.h"

-

-

-static XFontStruct *_XQueryFont(

-    Display*		/* dpy */,

-    Font		/* fid */,

-    unsigned long	/* seq */

-);

-

-#ifdef USE_XF86BIGFONT

-

-/* Private data for this extension. */

-typedef struct {

-    XExtCodes *codes;

-    CARD32 serverSignature;

-    CARD32 serverCapabilities;

-} XF86BigfontCodes;

-

-/* Additional bit masks that can be set in serverCapabilities */

-#define CAP_VerifiedLocal 256

-

-static XF86BigfontCodes *_XF86BigfontCodes(

-    Display*		/* dpy */

-);

-

-static XFontStruct *_XF86BigfontQueryFont(

-    Display*		/* dpy */,

-    XF86BigfontCodes*	/* extcodes */,

-    Font		/* fid */,

-    unsigned long	/* seq */

-);

-

-void _XF86BigfontFreeFontMetrics(

-    XFontStruct*	/* fs */

-);

-

-#endif /* USE_XF86BIGFONT */

-

-

-XFontStruct *XLoadQueryFont(

-   register Display *dpy,

-   _Xconst char *name)

-{

-    XFontStruct *font_result;

-    register long nbytes;

-    Font fid;

-    xOpenFontReq *req;

-    unsigned long seq;

-#ifdef USE_XF86BIGFONT

-    XF86BigfontCodes *extcodes = _XF86BigfontCodes(dpy);

-#endif

-

-    if (_XF86LoadQueryLocaleFont(dpy, name, &font_result, (Font *)0))

-      return font_result;

-    LockDisplay(dpy);

-    GetReq(OpenFont, req);

-    seq = dpy->request;

-    nbytes = req->nbytes  = name ? strlen(name) : 0;

-    req->fid = fid = XAllocID(dpy);

-    req->length += (nbytes+3)>>2;

-    Data (dpy, name, nbytes);

-    font_result = NULL;

-#ifdef USE_XF86BIGFONT

-    if (extcodes) {

-	font_result = _XF86BigfontQueryFont(dpy, extcodes, fid, seq);

-	seq = 0;

-    }

-#endif

-    if (!font_result)

-	font_result = _XQueryFont(dpy, fid, seq);

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return font_result;

-}

-

-XFontStruct *XQueryFont (

-    register Display *dpy,

-    Font fid)

-{

-    XFontStruct *font_result;

-#ifdef USE_XF86BIGFONT

-    XF86BigfontCodes *extcodes = _XF86BigfontCodes(dpy);

-#endif

-

-    LockDisplay(dpy);

-    font_result = NULL;

-#ifdef USE_XF86BIGFONT

-    if (extcodes) {

-	font_result = _XF86BigfontQueryFont(dpy, extcodes, fid, 0L);

-    }

-#endif

-    if (!font_result)

-	font_result = _XQueryFont(dpy, fid, 0L);

-    UnlockDisplay(dpy);

-    SyncHandle();

-    return font_result;

-}

-

-int

-XFreeFont(

-    register Display *dpy,

-    XFontStruct *fs)

-{

-    register xResourceReq *req;

-    register _XExtension *ext;

-

-    LockDisplay(dpy);

-    /* call out to any extensions interested */

-    for (ext = dpy->ext_procs; ext; ext = ext->next)

-	if (ext->free_Font) (*ext->free_Font)(dpy, fs, &ext->codes);

-    GetResReq (CloseFont, fs->fid, req);

-    UnlockDisplay(dpy);

-    SyncHandle();

-    if (fs->per_char) {

-#ifdef USE_XF86BIGFONT

-	_XF86BigfontFreeFontMetrics(fs);

-#else

-	Xfree ((char *) fs->per_char);

-#endif

-    }

-    _XFreeExtData(fs->ext_data);

-    if (fs->properties)

-	Xfree ((char *) fs->properties);

-    Xfree ((char *) fs);

-    return 1;

-}

-

-

-static XFontStruct *

-_XQueryFont (

-    register Display *dpy,

-    Font fid,

-    unsigned long seq)

-{

-    register XFontStruct *fs;

-    register long nbytes;

-    xQueryFontReply reply;

-    register xResourceReq *req;

-    register _XExtension *ext;

-    _XAsyncHandler async;

-    _XAsyncErrorState async_state;

-

-    if (seq) {

-	async_state.min_sequence_number = seq;

-	async_state.max_sequence_number = seq;

-	async_state.error_code = BadName;

-	async_state.major_opcode = X_OpenFont;

-	async_state.minor_opcode = 0;

-	async_state.error_count = 0;

-	async.next = dpy->async_handlers;

-	async.handler = _XAsyncErrorHandler;

-	async.data = (XPointer)&async_state;

-	dpy->async_handlers = &async;

-    }

-    GetResReq(QueryFont, fid, req);

-    if (!_XReply (dpy, (xReply *) &reply,

-       ((SIZEOF(xQueryFontReply) - SIZEOF(xReply)) >> 2), xFalse)) {

-	if (seq)

-	    DeqAsyncHandler(dpy, &async);

-	return (XFontStruct *)NULL;

-    }

-    if (seq)

-	DeqAsyncHandler(dpy, &async);

-    if (! (fs = (XFontStruct *) Xmalloc (sizeof (XFontStruct)))) {

-	_XEatData(dpy, (unsigned long)(reply.nFontProps * SIZEOF(xFontProp) +

-				       reply.nCharInfos * SIZEOF(xCharInfo)));

-	return (XFontStruct *)NULL;

-    }

-    fs->ext_data 		= NULL;

-    fs->fid 			= fid;

-    fs->direction 		= reply.drawDirection;

-    fs->min_char_or_byte2	= reply.minCharOrByte2;

-    fs->max_char_or_byte2 	= reply.maxCharOrByte2;

-    fs->min_byte1 		= reply.minByte1;

-    fs->max_byte1 		= reply.maxByte1;

-    fs->default_char 		= reply.defaultChar;

-    fs->all_chars_exist 	= reply.allCharsExist;

-    fs->ascent 			= cvtINT16toInt (reply.fontAscent);

-    fs->descent 		= cvtINT16toInt (reply.fontDescent);

-

-#ifdef MUSTCOPY

-    {

-	xCharInfo *xcip;

-

-	xcip = (xCharInfo *) &reply.minBounds;

-	fs->min_bounds.lbearing = cvtINT16toShort(xcip->leftSideBearing);

-	fs->min_bounds.rbearing = cvtINT16toShort(xcip->rightSideBearing);

-	fs->min_bounds.width = cvtINT16toShort(xcip->characterWidth);

-	fs->min_bounds.ascent = cvtINT16toShort(xcip->ascent);

-	fs->min_bounds.descent = cvtINT16toShort(xcip->descent);

-	fs->min_bounds.attributes = xcip->attributes;

-

-	xcip = (xCharInfo *) &reply.maxBounds;

-	fs->max_bounds.lbearing = cvtINT16toShort(xcip->leftSideBearing);

-	fs->max_bounds.rbearing =  cvtINT16toShort(xcip->rightSideBearing);

-	fs->max_bounds.width =  cvtINT16toShort(xcip->characterWidth);

-	fs->max_bounds.ascent =  cvtINT16toShort(xcip->ascent);

-	fs->max_bounds.descent =  cvtINT16toShort(xcip->descent);

-	fs->max_bounds.attributes = xcip->attributes;

-    }

-#else

-    /* XXX the next two statements won't work if short isn't 16 bits */

-    fs->min_bounds = * (XCharStruct *) &reply.minBounds;

-    fs->max_bounds = * (XCharStruct *) &reply.maxBounds;

-#endif /* MUSTCOPY */

-

-    fs->n_properties = reply.nFontProps;

-    /*

-     * if no properties defined for the font, then it is bad

-     * font, but shouldn't try to read nothing.

-     */

-    fs->properties = NULL;

-    if (fs->n_properties > 0) {

-	    nbytes = reply.nFontProps * sizeof(XFontProp);

-	    fs->properties = (XFontProp *) Xmalloc ((unsigned) nbytes);

-	    nbytes = reply.nFontProps * SIZEOF(xFontProp);

-	    if (! fs->properties) {

-		Xfree((char *) fs);

-		_XEatData(dpy, (unsigned long)

-			  (nbytes + reply.nCharInfos * SIZEOF(xCharInfo)));

-		return (XFontStruct *)NULL;

-	    }

-	    _XRead32 (dpy, (long *)fs->properties, nbytes);

-    }

-    /*

-     * If no characters in font, then it is a bad font, but

-     * shouldn't try to read nothing.

-     */

-    /* have to unpack charinfos on some machines (CRAY) */

-    fs->per_char = NULL;

-    if (reply.nCharInfos > 0){

-	nbytes = reply.nCharInfos * sizeof(XCharStruct);

-	if (! (fs->per_char = (XCharStruct *) Xmalloc ((unsigned) nbytes))) {

-	    if (fs->properties) Xfree((char *) fs->properties);

-	    Xfree((char *) fs);

-	    _XEatData(dpy, (unsigned long)

-			    (reply.nCharInfos * SIZEOF(xCharInfo)));

-	    return (XFontStruct *)NULL;

-	}

-

-#ifdef MUSTCOPY

-	{

-	    register XCharStruct *cs = fs->per_char;

-	    register int i;

-

-	    for (i = 0; i < reply.nCharInfos; i++, cs++) {

-		xCharInfo xcip;

-

-		_XRead(dpy, (char *)&xcip, SIZEOF(xCharInfo));

-		cs->lbearing = cvtINT16toShort(xcip.leftSideBearing);

-		cs->rbearing = cvtINT16toShort(xcip.rightSideBearing);

-		cs->width =  cvtINT16toShort(xcip.characterWidth);

-		cs->ascent =  cvtINT16toShort(xcip.ascent);

-		cs->descent =  cvtINT16toShort(xcip.descent);

-		cs->attributes = xcip.attributes;

-	    }

-	}

-#else

-	nbytes = reply.nCharInfos * SIZEOF(xCharInfo);

-	_XRead16 (dpy, (char *)fs->per_char, nbytes);

-#endif

-    }

-

-    /* call out to any extensions interested */

-    for (ext = dpy->ext_procs; ext; ext = ext->next)

-	if (ext->create_Font) (*ext->create_Font)(dpy, fs, &ext->codes);

-    return fs;

-}

-

-#ifdef USE_XF86BIGFONT

-

-/* Magic cookie for finding the right XExtData structure on the display's

-   extension list. */

-static int XF86BigfontNumber = 1040697125;

-

-static int

-_XF86BigfontFreeCodes (

-    XExtData *extension)

-{

-    /* Don't Xfree(extension->private_data) because it is on the same malloc

-       chunk as extension. */

-    /* Don't Xfree(extension->private_data->codes) because this is shared with

-       the display's ext_procs list. */

-    return 0;

-}

-

-static XF86BigfontCodes *

-_XF86BigfontCodes (

-    register Display *dpy)

-{

-    XEDataObject dpy_union;

-    XExtData *pData;

-    XF86BigfontCodes *pCodes;

-    char *envval;

-

-    dpy_union.display = dpy;

-

-    /* If the server is known to support the XF86Bigfont extension,

-     * return the extension codes. If the server is known to not support

-     * the extension, don't bother checking again.

-     */

-    pData = XFindOnExtensionList(XEHeadOfExtensionList(dpy_union),

-				 XF86BigfontNumber);

-    if (pData)

-	return (XF86BigfontCodes *) pData->private_data;

-

-    pData = (XExtData *) Xmalloc(sizeof(XExtData) + sizeof(XF86BigfontCodes));

-    if (!pData) {

-	/* Out of luck. */

-	return (XF86BigfontCodes *) NULL;

-    }

-

-    /* See if the server supports the XF86Bigfont extension. */

-    envval = getenv("XF86BIGFONT_DISABLE"); /* Let the user disable it. */

-    if (envval != NULL && envval[0] != '\0')

-	pCodes = NULL;

-    else {

-	XExtCodes *codes = XInitExtension(dpy, XF86BIGFONTNAME);

-	if (codes == NULL)

-	    pCodes = NULL;

-	else {

-	    pCodes = (XF86BigfontCodes *) &pData[1];

-	    pCodes->codes = codes;

-	}

-    }

-    pData->number = XF86BigfontNumber;

-    pData->private_data = (XPointer) pCodes;

-    pData->free_private = _XF86BigfontFreeCodes;

-    XAddToExtensionList(XEHeadOfExtensionList(dpy_union), pData);

-    if (pCodes) {

-	int result;

-

-	/* See if the server supports the XF86BigfontQueryFont request. */

-	xXF86BigfontQueryVersionReply reply;

-	register xXF86BigfontQueryVersionReq *req;

-

-	LockDisplay(dpy);

-

-	GetReq(XF86BigfontQueryVersion, req);

-	req->reqType = pCodes->codes->major_opcode;

-	req->xf86bigfontReqType = X_XF86BigfontQueryVersion;

-

-	result = _XReply (dpy, (xReply *) &reply,

-		(SIZEOF(xXF86BigfontQueryVersionReply) - SIZEOF(xReply)) >> 2,

-		xFalse);

-

-	UnlockDisplay(dpy);

-    	SyncHandle();

-

-	if(!result)

-	    goto ignore_extension;

-

-	/* No need to provide backward compatibility with version 1.0. It

-	   was never widely distributed. */

-	if (!(reply.majorVersion > 1

-	      || (reply.majorVersion == 1 && reply.minorVersion >= 1)))

-	    goto ignore_extension;

-

-	pCodes->serverSignature = reply.signature;

-	pCodes->serverCapabilities = reply.capabilities;

-    }

-    return pCodes;

-

-  ignore_extension:

-    /* No need to Xfree(pCodes) or Xfree(pCodes->codes), see

-       _XF86BigfontFreeCodes comment. */

-    pCodes = (XF86BigfontCodes *) NULL;

-    pData->private_data = (XPointer) pCodes;

-    return pCodes;

-}

-

-static int

-_XF86BigfontFreeNop (

-    XExtData *extension)

-{

-    return 0;

-}

-

-static XFontStruct *

-_XF86BigfontQueryFont (

-    register Display *dpy,

-    XF86BigfontCodes *extcodes,

-    Font fid,

-    unsigned long seq)

-{

-    register XFontStruct *fs;

-    register long nbytes;

-    xXF86BigfontQueryFontReply reply;

-    register xXF86BigfontQueryFontReq *req;

-    register _XExtension *ext;

-    _XAsyncHandler async1;

-    _XAsyncErrorState async1_state;

-    _XAsyncHandler async2;

-    _XAsyncErrorState async2_state;

-

-    if (seq) {

-	async1_state.min_sequence_number = seq;

-	async1_state.max_sequence_number = seq;

-	async1_state.error_code = BadName;

-	async1_state.major_opcode = X_OpenFont;

-	async1_state.minor_opcode = 0;

-	async1_state.error_count = 0;

-	async1.next = dpy->async_handlers;

-	async1.handler = _XAsyncErrorHandler;

-	async1.data = (XPointer)&async1_state;

-	dpy->async_handlers = &async1;

-    }

-

-    GetReq(XF86BigfontQueryFont, req);

-    req->reqType = extcodes->codes->major_opcode;

-    req->xf86bigfontReqType = X_XF86BigfontQueryFont;

-    req->id = fid;

-    req->flags = (extcodes->serverCapabilities & XF86Bigfont_CAP_LocalShm

-		  ? XF86Bigfont_FLAGS_Shm : 0);

-

-    /* The function _XQueryFont benefits from a "magic" error handler for

-       BadFont coming from a X_QueryFont request. (See function _XReply.)

-       We have to establish an error handler ourselves. */

-    async2_state.min_sequence_number = dpy->request;

-    async2_state.max_sequence_number = dpy->request;

-    async2_state.error_code = BadFont;

-    async2_state.major_opcode = extcodes->codes->major_opcode;

-    async2_state.minor_opcode = X_XF86BigfontQueryFont;

-    async2_state.error_count = 0;

-    async2.next = dpy->async_handlers;

-    async2.handler = _XAsyncErrorHandler;

-    async2.data = (XPointer)&async2_state;

-    dpy->async_handlers = &async2;

-

-    if (!_XReply (dpy, (xReply *) &reply,

-       ((SIZEOF(xXF86BigfontQueryFontReply) - SIZEOF(xReply)) >> 2), xFalse)) {

-	DeqAsyncHandler(dpy, &async2);

-	if (seq)

-	    DeqAsyncHandler(dpy, &async1);

-	return (XFontStruct *)NULL;

-    }

-    DeqAsyncHandler(dpy, &async2);

-    if (seq)

-	DeqAsyncHandler(dpy, &async1);

-    if (! (fs = (XFontStruct *) Xmalloc (sizeof (XFontStruct)))) {

-	_XEatData(dpy,

-	          reply.nFontProps * SIZEOF(xFontProp)

-	          + (reply.nCharInfos > 0 && reply.shmid == (CARD32)(-1)

-	             ? reply.nUniqCharInfos * SIZEOF(xCharInfo)

-	               + (reply.nCharInfos+1)/2 * 2 * sizeof(CARD16)

-	             : 0));

-	return (XFontStruct *)NULL;

-    }

-    fs->ext_data 		= NULL;

-    fs->fid 			= fid;

-    fs->direction 		= reply.drawDirection;

-    fs->min_char_or_byte2	= reply.minCharOrByte2;

-    fs->max_char_or_byte2 	= reply.maxCharOrByte2;

-    fs->min_byte1 		= reply.minByte1;

-    fs->max_byte1 		= reply.maxByte1;

-    fs->default_char 		= reply.defaultChar;

-    fs->all_chars_exist 	= reply.allCharsExist;

-    fs->ascent 			= cvtINT16toInt (reply.fontAscent);

-    fs->descent 		= cvtINT16toInt (reply.fontDescent);

-

-    /* XXX the next two statements won't work if short isn't 16 bits */

-    fs->min_bounds = * (XCharStruct *) &reply.minBounds;

-    fs->max_bounds = * (XCharStruct *) &reply.maxBounds;

-

-    fs->n_properties = reply.nFontProps;

-    /*

-     * if no properties defined for the font, then it is bad

-     * font, but shouldn't try to read nothing.

-     */

-    fs->properties = NULL;

-    if (fs->n_properties > 0) {

-	nbytes = reply.nFontProps * sizeof(XFontProp);

-	fs->properties = (XFontProp *) Xmalloc ((unsigned) nbytes);

-	nbytes = reply.nFontProps * SIZEOF(xFontProp);

-	if (! fs->properties) {

-	    Xfree((char *) fs);

-	    _XEatData(dpy,

-		      nbytes

-		      + (reply.nCharInfos > 0 && reply.shmid == (CARD32)(-1)

-		         ? reply.nUniqCharInfos * SIZEOF(xCharInfo)

-		           + (reply.nCharInfos+1)/2 * 2 * sizeof(CARD16)

-		         : 0));

-	    return (XFontStruct *)NULL;

-	}

-	_XRead32 (dpy, (long *)fs->properties, nbytes);

-    }

-

-    fs->per_char = NULL;

-    if (reply.nCharInfos > 0) {

-	/* fprintf(stderr, "received font metrics, nCharInfos = %d, nUniqCharInfos = %d, shmid = %d\n", reply.nCharInfos, reply.nUniqCharInfos, reply.shmid); */

-	if (reply.shmid == (CARD32)(-1)) {

-	    xCharInfo* pUniqCI;

-	    CARD16* pIndex2UniqIndex;

-	    int i;

-

-	    nbytes = reply.nUniqCharInfos * SIZEOF(xCharInfo)

-	             + (reply.nCharInfos+1)/2 * 2 * sizeof(CARD16);

-	    pUniqCI = (xCharInfo *) Xmalloc (nbytes);

-	    if (!pUniqCI) {

-		if (fs->properties) Xfree((char *) fs->properties);

-		Xfree((char *) fs);

-		_XEatData(dpy, nbytes);

-		return (XFontStruct *)NULL;

-	    }

-	    if (! (fs->per_char = (XCharStruct *) Xmalloc (reply.nCharInfos * sizeof(XCharStruct)))) {

-		Xfree((char *) pUniqCI);

-		if (fs->properties) Xfree((char *) fs->properties);

-		Xfree((char *) fs);

-		_XEatData(dpy, nbytes);

-		return (XFontStruct *)NULL;

-	    }

-	    _XRead16 (dpy, (char *) pUniqCI, nbytes);

-	    pIndex2UniqIndex = (CARD16*) (pUniqCI + reply.nUniqCharInfos);

-	    for (i = 0; i < reply.nCharInfos; i++) {

-		if (pIndex2UniqIndex[i] >= reply.nUniqCharInfos) {

-		    fprintf(stderr, "_XF86BigfontQueryFont: server returned wrong data\n");

-		    Xfree((char *) pUniqCI);

-		    if (fs->properties) Xfree((char *) fs->properties);

-		    Xfree((char *) fs);

-		    return (XFontStruct *)NULL;

-		}

-		/* XXX the next statement won't work if short isn't 16 bits */

-		fs->per_char[i] = * (XCharStruct *) &pUniqCI[pIndex2UniqIndex[i]];

-	    }

-	    Xfree((char *) pUniqCI);

-	} else {

-#ifdef HAS_SHM

-	    XExtData *pData;

-	    XEDataObject fs_union;

-	    char *addr;

-

-	    pData = (XExtData *) Xmalloc(sizeof(XExtData));

-	    if (!pData) {

-		if (fs->properties) Xfree((char *) fs->properties);

-		Xfree((char *) fs);

-		return (XFontStruct *)NULL;

-	    }

-

-	    /* In some cases (e.g. an ssh daemon forwarding an X session to

-	       a remote machine) it is possible that the X server thinks we

-	       are running on the same machine (because getpeername() and

-	       LocalClient() cannot know about the forwarding) but we are

-	       not really local. Therefore, when we attach the first shared

-	       memory segment, we verify that we are on the same machine as

-	       the X server by checking that 1. shmat() succeeds, 2. the

-	       segment has a sufficient size, 3. it contains the X server's

-	       signature. Then we set the CAP_VerifiedLocal bit to indicate

-	       the verification was successful. */

-

-	    if ((addr = shmat(reply.shmid, NULL, SHM_RDONLY)) == (char *)-1) {

-		if (extcodes->serverCapabilities & CAP_VerifiedLocal)

-		    fprintf(stderr, "_XF86BigfontQueryFont: could not attach shm segment\n");

-	        Xfree((char *) pData);

-	        if (fs->properties) Xfree((char *) fs->properties);

-	        Xfree((char *) fs);

-		/* Stop requesting shared memory transport from now on. */

-		extcodes->serverCapabilities &= ~ XF86Bigfont_CAP_LocalShm;

-	        return (XFontStruct *)NULL;

-	    }

-

-	    if (!(extcodes->serverCapabilities & CAP_VerifiedLocal)) {

-		struct shmid_ds buf;

-		if (!(shmctl(reply.shmid, IPC_STAT, &buf) >= 0

-		      && buf.shm_segsz >= reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct) + sizeof(CARD32)

-		      && *(CARD32 *)(addr + reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct)) == extcodes->serverSignature)) {

-		    shmdt(addr);

-		    Xfree((char *) pData);

-		    if (fs->properties) Xfree((char *) fs->properties);

-		    Xfree((char *) fs);

-		    /* Stop requesting shared memory transport from now on. */

-		    extcodes->serverCapabilities &= ~ XF86Bigfont_CAP_LocalShm;

-		    return (XFontStruct *)NULL;

-		}

-		extcodes->serverCapabilities |= CAP_VerifiedLocal;

-	    }

-

-	    pData->number = XF86BigfontNumber;

-	    pData->private_data = (XPointer) addr;

-	    pData->free_private = _XF86BigfontFreeNop;

-	    fs_union.font = fs;

-	    XAddToExtensionList(XEHeadOfExtensionList(fs_union), pData);

-

-	    fs->per_char = (XCharStruct *) (addr + reply.shmsegoffset);

-#else

-	    fprintf(stderr, "_XF86BigfontQueryFont: try recompiling libX11 with HasShm, Xserver has shm support\n");

-	    if (fs->properties) Xfree((char *) fs->properties);

-	    Xfree((char *) fs);

-	    /* Stop requesting shared memory transport from now on. */

-	    extcodes->serverCapabilities &= ~ XF86Bigfont_CAP_LocalShm;

-	    return (XFontStruct *)NULL;

-#endif

-	}

-    }

-

-    /* call out to any extensions interested */

-    for (ext = dpy->ext_procs; ext; ext = ext->next)

-	if (ext->create_Font) (*ext->create_Font)(dpy, fs, &ext->codes);

-    return fs;

-}

-

-void

-_XF86BigfontFreeFontMetrics (XFontStruct *fs)

-{

-#ifdef HAS_SHM

-    XExtData *pData;

-    XEDataObject fs_union;

-

-    fs_union.font = fs;

-    if ((pData = XFindOnExtensionList(XEHeadOfExtensionList(fs_union),

-				      XF86BigfontNumber)))

-	shmdt ((char *) pData->private_data);

-    else

-	Xfree ((char *) fs->per_char);

-#else

-    Xfree ((char *) fs->per_char);

-#endif

-}

-

-#endif /* USE_XF86BIGFONT */

-

-int _XF86LoadQueryLocaleFont(

-   Display *dpy,

-   _Xconst char *name,

-   XFontStruct **xfp,

-   Font *fidp)

-{

-    int l;

-    const char *charset, *p;

-    char buf[256];

-    XFontStruct *fs;

-    XLCd lcd;

-

-    if (!name)

-	return 0;

-    l = strlen(name);

-    if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-')

-	return 0;

-    charset = NULL;

-    /* next three lines stolen from _XkbGetCharset() */

-    lcd = _XlcCurrentLC();

-    if ((lcd = _XlcCurrentLC()) != 0)

-	charset = XLC_PUBLIC(lcd, encoding_name);

-    if (!charset || (p = strrchr(charset, '-')) == 0 || p == charset || p[1] == 0 || (p[1] == '*' && p[2] == 0)) {

-	/* prefer latin1 if no encoding found */

-	charset = "ISO8859-1";

-	p = charset + 7;

-    }

-    if (l - 2 - (p - charset) < 0)

-	return 0;

-    if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))

-	return 0;

-    if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)

-	return 0;

-    strcpy(buf, name);

-    strcpy(buf + l - 1, p + 1);

-    fs = XLoadQueryFont(dpy, buf);

-    if (!fs)

-	return 0;

-    if (xfp) {

-	*xfp = fs;

-	if (fidp)

-	    *fidp = fs->fid;

-    } else if (fidp) {

-	if (fs->per_char) {

-#ifdef USE_XF86BIGFONT

-	    _XF86BigfontFreeFontMetrics(fs);

-#else

-	    Xfree ((char *) fs->per_char);

-#endif

-	}

-	_XFreeExtData(fs->ext_data);

-	if (fs->properties)

-	    Xfree ((char *) fs->properties);

-	*fidp = fs->fid;

-	Xfree ((char *) fs);

-    } else {

-	XFreeFont(dpy, fs);

-    }

-    return 1;

-}

+/*
+
+Copyright 1986, 1998  The Open Group
+Copyright (c) 2000  The XFree86 Project, Inc.
+
+Permission to use, copy, modify, distribute, and sell this software and its
+documentation for any purpose is hereby granted without fee, provided that
+the above copyright notice appear in all copies and that both that
+copyright notice and this permission notice appear in supporting
+documentation.
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM OR THE XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium or of the
+XFree86 Project shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization from the X Consortium and the XFree86 Project.
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#include "Xlibint.h"
+
+#if defined(XF86BIGFONT) && !defined(MUSTCOPY)
+#define USE_XF86BIGFONT
+#endif
+#ifdef USE_XF86BIGFONT
+#include <sys/types.h>
+#ifdef HAS_SHM
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <X11/extensions/xf86bigfproto.h>
+#endif
+
+#include "Xlcint.h"
+#include "XlcPubI.h"
+
+
+static XFontStruct *_XQueryFont(
+    Display*		/* dpy */,
+    Font		/* fid */,
+    unsigned long	/* seq */
+);
+
+#ifdef USE_XF86BIGFONT
+
+/* Private data for this extension. */
+typedef struct {
+    XExtCodes *codes;
+    CARD32 serverSignature;
+    CARD32 serverCapabilities;
+} XF86BigfontCodes;
+
+/* Additional bit masks that can be set in serverCapabilities */
+#define CAP_VerifiedLocal 256
+
+static XF86BigfontCodes *_XF86BigfontCodes(
+    Display*		/* dpy */
+);
+
+static XFontStruct *_XF86BigfontQueryFont(
+    Display*		/* dpy */,
+    XF86BigfontCodes*	/* extcodes */,
+    Font		/* fid */,
+    unsigned long	/* seq */
+);
+
+void _XF86BigfontFreeFontMetrics(
+    XFontStruct*	/* fs */
+);
+
+#endif /* USE_XF86BIGFONT */
+
+
+XFontStruct *XLoadQueryFont(
+   register Display *dpy,
+   _Xconst char *name)
+{
+    XFontStruct *font_result;
+    register long nbytes;
+    Font fid;
+    xOpenFontReq *req;
+    unsigned long seq;
+#ifdef USE_XF86BIGFONT
+    XF86BigfontCodes *extcodes = _XF86BigfontCodes(dpy);
+#endif
+
+    if (_XF86LoadQueryLocaleFont(dpy, name, &font_result, (Font *)0))
+      return font_result;
+    LockDisplay(dpy);
+    GetReq(OpenFont, req);
+    seq = dpy->request;
+    nbytes = req->nbytes  = name ? strlen(name) : 0;
+    req->fid = fid = XAllocID(dpy);
+    req->length += (nbytes+3)>>2;
+    Data (dpy, name, nbytes);
+    font_result = NULL;
+#ifdef USE_XF86BIGFONT
+    if (extcodes) {
+	font_result = _XF86BigfontQueryFont(dpy, extcodes, fid, seq);
+	seq = 0;
+    }
+#endif
+    if (!font_result)
+	font_result = _XQueryFont(dpy, fid, seq);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return font_result;
+}
+
+XFontStruct *XQueryFont (
+    register Display *dpy,
+    Font fid)
+{
+    XFontStruct *font_result;
+#ifdef USE_XF86BIGFONT
+    XF86BigfontCodes *extcodes = _XF86BigfontCodes(dpy);
+#endif
+
+    LockDisplay(dpy);
+    font_result = NULL;
+#ifdef USE_XF86BIGFONT
+    if (extcodes) {
+	font_result = _XF86BigfontQueryFont(dpy, extcodes, fid, 0L);
+    }
+#endif
+    if (!font_result)
+	font_result = _XQueryFont(dpy, fid, 0L);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    return font_result;
+}
+
+int
+XFreeFont(
+    register Display *dpy,
+    XFontStruct *fs)
+{
+    register xResourceReq *req;
+    register _XExtension *ext;
+
+    LockDisplay(dpy);
+    /* call out to any extensions interested */
+    for (ext = dpy->ext_procs; ext; ext = ext->next)
+	if (ext->free_Font) (*ext->free_Font)(dpy, fs, &ext->codes);
+    GetResReq (CloseFont, fs->fid, req);
+    UnlockDisplay(dpy);
+    SyncHandle();
+    if (fs->per_char) {
+#ifdef USE_XF86BIGFONT
+	_XF86BigfontFreeFontMetrics(fs);
+#else
+	Xfree ((char *) fs->per_char);
+#endif
+    }
+    _XFreeExtData(fs->ext_data);
+    if (fs->properties)
+	Xfree ((char *) fs->properties);
+    Xfree ((char *) fs);
+    return 1;
+}
+
+
+static XFontStruct *
+_XQueryFont (
+    register Display *dpy,
+    Font fid,
+    unsigned long seq)
+{
+    register XFontStruct *fs;
+    register long nbytes;
+    xQueryFontReply reply;
+    register xResourceReq *req;
+    register _XExtension *ext;
+    _XAsyncHandler async;
+    _XAsyncErrorState async_state;
+
+    if (seq) {
+	async_state.min_sequence_number = seq;
+	async_state.max_sequence_number = seq;
+	async_state.error_code = BadName;
+	async_state.major_opcode = X_OpenFont;
+	async_state.minor_opcode = 0;
+	async_state.error_count = 0;
+	async.next = dpy->async_handlers;
+	async.handler = _XAsyncErrorHandler;
+	async.data = (XPointer)&async_state;
+	dpy->async_handlers = &async;
+    }
+    GetResReq(QueryFont, fid, req);
+    if (!_XReply (dpy, (xReply *) &reply,
+       ((SIZEOF(xQueryFontReply) - SIZEOF(xReply)) >> 2), xFalse)) {
+	if (seq)
+	    DeqAsyncHandler(dpy, &async);
+	return (XFontStruct *)NULL;
+    }
+    if (seq)
+	DeqAsyncHandler(dpy, &async);
+    if (! (fs = (XFontStruct *) Xmalloc (sizeof (XFontStruct)))) {
+	_XEatData(dpy, (unsigned long)(reply.nFontProps * SIZEOF(xFontProp) +
+				       reply.nCharInfos * SIZEOF(xCharInfo)));
+	return (XFontStruct *)NULL;
+    }
+    fs->ext_data 		= NULL;
+    fs->fid 			= fid;
+    fs->direction 		= reply.drawDirection;
+    fs->min_char_or_byte2	= reply.minCharOrByte2;
+    fs->max_char_or_byte2 	= reply.maxCharOrByte2;
+    fs->min_byte1 		= reply.minByte1;
+    fs->max_byte1 		= reply.maxByte1;
+    fs->default_char 		= reply.defaultChar;
+    fs->all_chars_exist 	= reply.allCharsExist;
+    fs->ascent 			= cvtINT16toInt (reply.fontAscent);
+    fs->descent 		= cvtINT16toInt (reply.fontDescent);
+
+#ifdef MUSTCOPY
+    {
+	xCharInfo *xcip;
+
+	xcip = (xCharInfo *) &reply.minBounds;
+	fs->min_bounds.lbearing = cvtINT16toShort(xcip->leftSideBearing);
+	fs->min_bounds.rbearing = cvtINT16toShort(xcip->rightSideBearing);
+	fs->min_bounds.width = cvtINT16toShort(xcip->characterWidth);
+	fs->min_bounds.ascent = cvtINT16toShort(xcip->ascent);
+	fs->min_bounds.descent = cvtINT16toShort(xcip->descent);
+	fs->min_bounds.attributes = xcip->attributes;
+
+	xcip = (xCharInfo *) &reply.maxBounds;
+	fs->max_bounds.lbearing = cvtINT16toShort(xcip->leftSideBearing);
+	fs->max_bounds.rbearing =  cvtINT16toShort(xcip->rightSideBearing);
+	fs->max_bounds.width =  cvtINT16toShort(xcip->characterWidth);
+	fs->max_bounds.ascent =  cvtINT16toShort(xcip->ascent);
+	fs->max_bounds.descent =  cvtINT16toShort(xcip->descent);
+	fs->max_bounds.attributes = xcip->attributes;
+    }
+#else
+    /* XXX the next two statements won't work if short isn't 16 bits */
+    fs->min_bounds = * (XCharStruct *) &reply.minBounds;
+    fs->max_bounds = * (XCharStruct *) &reply.maxBounds;
+#endif /* MUSTCOPY */
+
+    fs->n_properties = reply.nFontProps;
+    /*
+     * if no properties defined for the font, then it is bad
+     * font, but shouldn't try to read nothing.
+     */
+    fs->properties = NULL;
+    if (fs->n_properties > 0) {
+	    nbytes = reply.nFontProps * sizeof(XFontProp);
+	    fs->properties = (XFontProp *) Xmalloc ((unsigned) nbytes);
+	    nbytes = reply.nFontProps * SIZEOF(xFontProp);
+	    if (! fs->properties) {
+		Xfree((char *) fs);
+		_XEatData(dpy, (unsigned long)
+			  (nbytes + reply.nCharInfos * SIZEOF(xCharInfo)));
+		return (XFontStruct *)NULL;
+	    }
+	    _XRead32 (dpy, (long *)fs->properties, nbytes);
+    }
+    /*
+     * If no characters in font, then it is a bad font, but
+     * shouldn't try to read nothing.
+     */
+    /* have to unpack charinfos on some machines (CRAY) */
+    fs->per_char = NULL;
+    if (reply.nCharInfos > 0){
+	nbytes = reply.nCharInfos * sizeof(XCharStruct);
+	if (! (fs->per_char = (XCharStruct *) Xmalloc ((unsigned) nbytes))) {
+	    if (fs->properties) Xfree((char *) fs->properties);
+	    Xfree((char *) fs);
+	    _XEatData(dpy, (unsigned long)
+			    (reply.nCharInfos * SIZEOF(xCharInfo)));
+	    return (XFontStruct *)NULL;
+	}
+
+#ifdef MUSTCOPY
+	{
+	    register XCharStruct *cs = fs->per_char;
+	    register int i;
+
+	    for (i = 0; i < reply.nCharInfos; i++, cs++) {
+		xCharInfo xcip;
+
+		_XRead(dpy, (char *)&xcip, SIZEOF(xCharInfo));
+		cs->lbearing = cvtINT16toShort(xcip.leftSideBearing);
+		cs->rbearing = cvtINT16toShort(xcip.rightSideBearing);
+		cs->width =  cvtINT16toShort(xcip.characterWidth);
+		cs->ascent =  cvtINT16toShort(xcip.ascent);
+		cs->descent =  cvtINT16toShort(xcip.descent);
+		cs->attributes = xcip.attributes;
+	    }
+	}
+#else
+	nbytes = reply.nCharInfos * SIZEOF(xCharInfo);
+	_XRead16 (dpy, (char *)fs->per_char, nbytes);
+#endif
+    }
+
+    /* call out to any extensions interested */
+    for (ext = dpy->ext_procs; ext; ext = ext->next)
+	if (ext->create_Font) (*ext->create_Font)(dpy, fs, &ext->codes);
+    return fs;
+}
+
+#ifdef USE_XF86BIGFONT
+
+/* Magic cookie for finding the right XExtData structure on the display's
+   extension list. */
+static int XF86BigfontNumber = 1040697125;
+
+static int
+_XF86BigfontFreeCodes (
+    XExtData *extension)
+{
+    /* Don't Xfree(extension->private_data) because it is on the same malloc
+       chunk as extension. */
+    /* Don't Xfree(extension->private_data->codes) because this is shared with
+       the display's ext_procs list. */
+    return 0;
+}
+
+static XF86BigfontCodes *
+_XF86BigfontCodes (
+    register Display *dpy)
+{
+    XEDataObject dpy_union;
+    XExtData *pData;
+    XF86BigfontCodes *pCodes;
+    char *envval;
+
+    dpy_union.display = dpy;
+
+    /* If the server is known to support the XF86Bigfont extension,
+     * return the extension codes. If the server is known to not support
+     * the extension, don't bother checking again.
+     */
+    pData = XFindOnExtensionList(XEHeadOfExtensionList(dpy_union),
+				 XF86BigfontNumber);
+    if (pData)
+	return (XF86BigfontCodes *) pData->private_data;
+
+    pData = (XExtData *) Xmalloc(sizeof(XExtData) + sizeof(XF86BigfontCodes));
+    if (!pData) {
+	/* Out of luck. */
+	return (XF86BigfontCodes *) NULL;
+    }
+
+    /* See if the server supports the XF86Bigfont extension. */
+    envval = getenv("XF86BIGFONT_DISABLE"); /* Let the user disable it. */
+    if (envval != NULL && envval[0] != '\0')
+	pCodes = NULL;
+    else {
+	XExtCodes *codes = XInitExtension(dpy, XF86BIGFONTNAME);
+	if (codes == NULL)
+	    pCodes = NULL;
+	else {
+	    pCodes = (XF86BigfontCodes *) &pData[1];
+	    pCodes->codes = codes;
+	}
+    }
+    pData->number = XF86BigfontNumber;
+    pData->private_data = (XPointer) pCodes;
+    pData->free_private = _XF86BigfontFreeCodes;
+    XAddToExtensionList(XEHeadOfExtensionList(dpy_union), pData);
+    if (pCodes) {
+	int result;
+
+	/* See if the server supports the XF86BigfontQueryFont request. */
+	xXF86BigfontQueryVersionReply reply;
+	register xXF86BigfontQueryVersionReq *req;
+
+	LockDisplay(dpy);
+
+	GetReq(XF86BigfontQueryVersion, req);
+	req->reqType = pCodes->codes->major_opcode;
+	req->xf86bigfontReqType = X_XF86BigfontQueryVersion;
+
+	result = _XReply (dpy, (xReply *) &reply,
+		(SIZEOF(xXF86BigfontQueryVersionReply) - SIZEOF(xReply)) >> 2,
+		xFalse);
+
+	UnlockDisplay(dpy);
+    	SyncHandle();
+
+	if(!result)
+	    goto ignore_extension;
+
+	/* No need to provide backward compatibility with version 1.0. It
+	   was never widely distributed. */
+	if (!(reply.majorVersion > 1
+	      || (reply.majorVersion == 1 && reply.minorVersion >= 1)))
+	    goto ignore_extension;
+
+	pCodes->serverSignature = reply.signature;
+	pCodes->serverCapabilities = reply.capabilities;
+    }
+    return pCodes;
+
+  ignore_extension:
+    /* No need to Xfree(pCodes) or Xfree(pCodes->codes), see
+       _XF86BigfontFreeCodes comment. */
+    pCodes = (XF86BigfontCodes *) NULL;
+    pData->private_data = (XPointer) pCodes;
+    return pCodes;
+}
+
+static int
+_XF86BigfontFreeNop (
+    XExtData *extension)
+{
+    return 0;
+}
+
+static XFontStruct *
+_XF86BigfontQueryFont (
+    register Display *dpy,
+    XF86BigfontCodes *extcodes,
+    Font fid,
+    unsigned long seq)
+{
+    register XFontStruct *fs;
+    register long nbytes;
+    xXF86BigfontQueryFontReply reply;
+    register xXF86BigfontQueryFontReq *req;
+    register _XExtension *ext;
+    _XAsyncHandler async1;
+    _XAsyncErrorState async1_state;
+    _XAsyncHandler async2;
+    _XAsyncErrorState async2_state;
+
+    if (seq) {
+	async1_state.min_sequence_number = seq;
+	async1_state.max_sequence_number = seq;
+	async1_state.error_code = BadName;
+	async1_state.major_opcode = X_OpenFont;
+	async1_state.minor_opcode = 0;
+	async1_state.error_count = 0;
+	async1.next = dpy->async_handlers;
+	async1.handler = _XAsyncErrorHandler;
+	async1.data = (XPointer)&async1_state;
+	dpy->async_handlers = &async1;
+    }
+
+    GetReq(XF86BigfontQueryFont, req);
+    req->reqType = extcodes->codes->major_opcode;
+    req->xf86bigfontReqType = X_XF86BigfontQueryFont;
+    req->id = fid;
+    req->flags = (extcodes->serverCapabilities & XF86Bigfont_CAP_LocalShm
+		  ? XF86Bigfont_FLAGS_Shm : 0);
+
+    /* The function _XQueryFont benefits from a "magic" error handler for
+       BadFont coming from a X_QueryFont request. (See function _XReply.)
+       We have to establish an error handler ourselves. */
+    async2_state.min_sequence_number = dpy->request;
+    async2_state.max_sequence_number = dpy->request;
+    async2_state.error_code = BadFont;
+    async2_state.major_opcode = extcodes->codes->major_opcode;
+    async2_state.minor_opcode = X_XF86BigfontQueryFont;
+    async2_state.error_count = 0;
+    async2.next = dpy->async_handlers;
+    async2.handler = _XAsyncErrorHandler;
+    async2.data = (XPointer)&async2_state;
+    dpy->async_handlers = &async2;
+
+    if (!_XReply (dpy, (xReply *) &reply,
+       ((SIZEOF(xXF86BigfontQueryFontReply) - SIZEOF(xReply)) >> 2), xFalse)) {
+	DeqAsyncHandler(dpy, &async2);
+	if (seq)
+	    DeqAsyncHandler(dpy, &async1);
+	return (XFontStruct *)NULL;
+    }
+    DeqAsyncHandler(dpy, &async2);
+    if (seq)
+	DeqAsyncHandler(dpy, &async1);
+    if (! (fs = (XFontStruct *) Xmalloc (sizeof (XFontStruct)))) {
+	_XEatData(dpy,
+	          reply.nFontProps * SIZEOF(xFontProp)
+	          + (reply.nCharInfos > 0 && reply.shmid == (CARD32)(-1)
+	             ? reply.nUniqCharInfos * SIZEOF(xCharInfo)
+	               + (reply.nCharInfos+1)/2 * 2 * sizeof(CARD16)
+	             : 0));
+	return (XFontStruct *)NULL;
+    }
+    fs->ext_data 		= NULL;
+    fs->fid 			= fid;
+    fs->direction 		= reply.drawDirection;
+    fs->min_char_or_byte2	= reply.minCharOrByte2;
+    fs->max_char_or_byte2 	= reply.maxCharOrByte2;
+    fs->min_byte1 		= reply.minByte1;
+    fs->max_byte1 		= reply.maxByte1;
+    fs->default_char 		= reply.defaultChar;
+    fs->all_chars_exist 	= reply.allCharsExist;
+    fs->ascent 			= cvtINT16toInt (reply.fontAscent);
+    fs->descent 		= cvtINT16toInt (reply.fontDescent);
+
+    /* XXX the next two statements won't work if short isn't 16 bits */
+    fs->min_bounds = * (XCharStruct *) &reply.minBounds;
+    fs->max_bounds = * (XCharStruct *) &reply.maxBounds;
+
+    fs->n_properties = reply.nFontProps;
+    /*
+     * if no properties defined for the font, then it is bad
+     * font, but shouldn't try to read nothing.
+     */
+    fs->properties = NULL;
+    if (fs->n_properties > 0) {
+	nbytes = reply.nFontProps * sizeof(XFontProp);
+	fs->properties = (XFontProp *) Xmalloc ((unsigned) nbytes);
+	nbytes = reply.nFontProps * SIZEOF(xFontProp);
+	if (! fs->properties) {
+	    Xfree((char *) fs);
+	    _XEatData(dpy,
+		      nbytes
+		      + (reply.nCharInfos > 0 && reply.shmid == (CARD32)(-1)
+		         ? reply.nUniqCharInfos * SIZEOF(xCharInfo)
+		           + (reply.nCharInfos+1)/2 * 2 * sizeof(CARD16)
+		         : 0));
+	    return (XFontStruct *)NULL;
+	}
+	_XRead32 (dpy, (long *)fs->properties, nbytes);
+    }
+
+    fs->per_char = NULL;
+    if (reply.nCharInfos > 0) {
+	/* fprintf(stderr, "received font metrics, nCharInfos = %d, nUniqCharInfos = %d, shmid = %d\n", reply.nCharInfos, reply.nUniqCharInfos, reply.shmid); */
+	if (reply.shmid == (CARD32)(-1)) {
+	    xCharInfo* pUniqCI;
+	    CARD16* pIndex2UniqIndex;
+	    int i;
+
+	    nbytes = reply.nUniqCharInfos * SIZEOF(xCharInfo)
+	             + (reply.nCharInfos+1)/2 * 2 * sizeof(CARD16);
+	    pUniqCI = (xCharInfo *) Xmalloc (nbytes);
+	    if (!pUniqCI) {
+		if (fs->properties) Xfree((char *) fs->properties);
+		Xfree((char *) fs);
+		_XEatData(dpy, nbytes);
+		return (XFontStruct *)NULL;
+	    }
+	    if (! (fs->per_char = (XCharStruct *) Xmalloc (reply.nCharInfos * sizeof(XCharStruct)))) {
+		Xfree((char *) pUniqCI);
+		if (fs->properties) Xfree((char *) fs->properties);
+		Xfree((char *) fs);
+		_XEatData(dpy, nbytes);
+		return (XFontStruct *)NULL;
+	    }
+	    _XRead16 (dpy, (char *) pUniqCI, nbytes);
+	    pIndex2UniqIndex = (CARD16*) (pUniqCI + reply.nUniqCharInfos);
+	    for (i = 0; i < reply.nCharInfos; i++) {
+		if (pIndex2UniqIndex[i] >= reply.nUniqCharInfos) {
+		    fprintf(stderr, "_XF86BigfontQueryFont: server returned wrong data\n");
+		    Xfree((char *) pUniqCI);
+		    if (fs->properties) Xfree((char *) fs->properties);
+		    Xfree((char *) fs);
+		    return (XFontStruct *)NULL;
+		}
+		/* XXX the next statement won't work if short isn't 16 bits */
+		fs->per_char[i] = * (XCharStruct *) &pUniqCI[pIndex2UniqIndex[i]];
+	    }
+	    Xfree((char *) pUniqCI);
+	} else {
+#ifdef HAS_SHM
+	    XExtData *pData;
+	    XEDataObject fs_union;
+	    char *addr;
+
+	    pData = (XExtData *) Xmalloc(sizeof(XExtData));
+	    if (!pData) {
+		if (fs->properties) Xfree((char *) fs->properties);
+		Xfree((char *) fs);
+		return (XFontStruct *)NULL;
+	    }
+
+	    /* In some cases (e.g. an ssh daemon forwarding an X session to
+	       a remote machine) it is possible that the X server thinks we
+	       are running on the same machine (because getpeername() and
+	       LocalClient() cannot know about the forwarding) but we are
+	       not really local. Therefore, when we attach the first shared
+	       memory segment, we verify that we are on the same machine as
+	       the X server by checking that 1. shmat() succeeds, 2. the
+	       segment has a sufficient size, 3. it contains the X server's
+	       signature. Then we set the CAP_VerifiedLocal bit to indicate
+	       the verification was successful. */
+
+	    if ((addr = shmat(reply.shmid, NULL, SHM_RDONLY)) == (char *)-1) {
+		if (extcodes->serverCapabilities & CAP_VerifiedLocal)
+		    fprintf(stderr, "_XF86BigfontQueryFont: could not attach shm segment\n");
+	        Xfree((char *) pData);
+	        if (fs->properties) Xfree((char *) fs->properties);
+	        Xfree((char *) fs);
+		/* Stop requesting shared memory transport from now on. */
+		extcodes->serverCapabilities &= ~ XF86Bigfont_CAP_LocalShm;
+	        return (XFontStruct *)NULL;
+	    }
+
+	    if (!(extcodes->serverCapabilities & CAP_VerifiedLocal)) {
+		struct shmid_ds buf;
+		if (!(shmctl(reply.shmid, IPC_STAT, &buf) >= 0
+		      && buf.shm_segsz >= reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct) + sizeof(CARD32)
+		      && *(CARD32 *)(addr + reply.shmsegoffset + reply.nCharInfos * sizeof(XCharStruct)) == extcodes->serverSignature)) {
+		    shmdt(addr);
+		    Xfree((char *) pData);
+		    if (fs->properties) Xfree((char *) fs->properties);
+		    Xfree((char *) fs);
+		    /* Stop requesting shared memory transport from now on. */
+		    extcodes->serverCapabilities &= ~ XF86Bigfont_CAP_LocalShm;
+		    return (XFontStruct *)NULL;
+		}
+		extcodes->serverCapabilities |= CAP_VerifiedLocal;
+	    }
+
+	    pData->number = XF86BigfontNumber;
+	    pData->private_data = (XPointer) addr;
+	    pData->free_private = _XF86BigfontFreeNop;
+	    fs_union.font = fs;
+	    XAddToExtensionList(XEHeadOfExtensionList(fs_union), pData);
+
+	    fs->per_char = (XCharStruct *) (addr + reply.shmsegoffset);
+#else
+	    fprintf(stderr, "_XF86BigfontQueryFont: try recompiling libX11 with HasShm, Xserver has shm support\n");
+	    if (fs->properties) Xfree((char *) fs->properties);
+	    Xfree((char *) fs);
+	    /* Stop requesting shared memory transport from now on. */
+	    extcodes->serverCapabilities &= ~ XF86Bigfont_CAP_LocalShm;
+	    return (XFontStruct *)NULL;
+#endif
+	}
+    }
+
+    /* call out to any extensions interested */
+    for (ext = dpy->ext_procs; ext; ext = ext->next)
+	if (ext->create_Font) (*ext->create_Font)(dpy, fs, &ext->codes);
+    return fs;
+}
+
+void
+_XF86BigfontFreeFontMetrics (XFontStruct *fs)
+{
+#ifdef HAS_SHM
+    XExtData *pData;
+    XEDataObject fs_union;
+
+    fs_union.font = fs;
+    if ((pData = XFindOnExtensionList(XEHeadOfExtensionList(fs_union),
+				      XF86BigfontNumber)))
+	shmdt ((char *) pData->private_data);
+    else
+	Xfree ((char *) fs->per_char);
+#else
+    Xfree ((char *) fs->per_char);
+#endif
+}
+
+#endif /* USE_XF86BIGFONT */
+
+int _XF86LoadQueryLocaleFont(
+   Display *dpy,
+   _Xconst char *name,
+   XFontStruct **xfp,
+   Font *fidp)
+{
+    int l;
+    const char *charset, *p;
+    char buf[256];
+    XFontStruct *fs;
+    XLCd lcd;
+
+    if (!name)
+	return 0;
+    l = strlen(name);
+    if (l < 2 || name[l - 1] != '*' || name[l - 2] != '-')
+	return 0;
+    charset = NULL;
+    /* next three lines stolen from _XkbGetCharset() */
+    lcd = _XlcCurrentLC();
+    if ((lcd = _XlcCurrentLC()) != 0)
+	charset = XLC_PUBLIC(lcd, encoding_name);
+    if (!charset || (p = strrchr(charset, '-')) == 0 || p == charset || p[1] == 0 || (p[1] == '*' && p[2] == 0)) {
+	/* prefer latin1 if no encoding found */
+	charset = "ISO8859-1";
+	p = charset + 7;
+    }
+    if (l - 2 - (p - charset) < 0)
+	return 0;
+    if (_XlcNCompareISOLatin1(name + l - 2 - (p - charset), charset, p - charset))
+	return 0;
+    if (strlen(p + 1) + l - 1 >= sizeof(buf) - 1)
+	return 0;
+    strcpy(buf, name);
+    strcpy(buf + l - 1, p + 1);
+    fs = XLoadQueryFont(dpy, buf);
+    if (!fs)
+	return 0;
+    if (xfp) {
+	*xfp = fs;
+	if (fidp)
+	    *fidp = fs->fid;
+    } else if (fidp) {
+	if (fs->per_char) {
+#ifdef USE_XF86BIGFONT
+	    _XF86BigfontFreeFontMetrics(fs);
+#else
+	    Xfree ((char *) fs->per_char);
+#endif
+	}
+	_XFreeExtData(fs->ext_data);
+	if (fs->properties)
+	    Xfree ((char *) fs->properties);
+	*fidp = fs->fid;
+	Xfree ((char *) fs);
+    } else {
+	XFreeFont(dpy, fs);
+    }
+    return 1;
+}