qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update do libXcomposite 0.4.1

Browse Source
This commit is contained in:
matthieu 2009-10-31 17:45:46 +00:00
parent a9500da24b
commit f043957069
19 changed files with 7217 additions and 4950 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libXcomposite/COPYING
View File

@ -1,4 +1,3 @@
$Id: COPYING,v 1.1.1.1 2006/11/25 16:58:22 matthieu Exp $
Copyright © 2001,2003 Keith Packard

69
lib/libXcomposite/ChangeLog
View File

@ -1,3 +1,72 @@
commit 90c243accfb2dc3d4d85dd57d8aca518dab98842
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 00:28:45 2009 -0700
libXcomposite 0.4.1
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit c302ae79f7819f75628f798d15c980cbf42eec91
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Thu Oct 8 00:23:42 2009 -0700
Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
Also some changes to man/Makefile.am to make it work better with the
AM_SILENT_RULES option that's enabled in XORG_DEFAULT_OPTIONS
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit 3418a26aa83fbba78ad5a214ca7db2984a44190b
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Mon Feb 2 20:34:32 2009 -0800
Add README with pointers to mailing list, bugzilla & git repos
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
commit c469e20fe52db54be01533b0e4748fa011d1ddc4
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Thu Jan 29 15:27:52 2009 -0200
Janitor: Correct make distcheck
Remove extra .gitignore in subdirectories
Correct a sparse warning
commit 16ae68423eb30639d880445c6bbe70d539e4b198
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Mon May 19 17:15:39 2008 +0930
Rename parameters to clarify QueryVersion/QueryExtension.
These parameters are not treated as input. Rename them to make the inner
workings slightly more obvious.
X.Org Bug 14511 <http://bugs.freedesktop.org/show_bug.cgi?id=14511>
commit e59817872ee6aec0544bd56ebb83ded9e4a5851c
Author: Matthieu Herrb <matthieu.herrb@laas.fr>
Date: Sun Mar 9 00:30:40 2008 +0100
nuke RCS Ids
commit 8c046523f304525615cb8c5391711fddb94fcc04
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 15:51:15 2007 -0500
Add missing PHONY line for automatic ChangeLog generation
commit 097228085c98062a439237d7c9170023e69d0543
Author: Keith Packard <keithp@neko.keithp.com>
Date: Tue Jul 3 19:40:52 2007 -0700
Follow composite protocol version to 0.4, although there is no ABI change.
Composite protocol 0.4 changes clipping semantics, but doesn't affect any of
the interfaces. As such, this library version is exactly the same as the 0.3
series, but the documentation includes a description of the semantic change.
commit 2de0bef64b425889d9c060c1ef0ee891b8376469
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed May 2 15:16:27 2007 -0700

7
lib/libXcomposite/Makefile.am
View File

@ -1,5 +1,4 @@
#
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
@ -25,10 +24,12 @@ SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcomposite.pc
EXTRA_DIST = xcomposite.pc.in autogen.sh ChangeLog
EXTRA_DIST = xcomposite.pc.in ChangeLog
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
$(CHANGELOG_CMD)
dist-hook: ChangeLog

26
lib/libXcomposite/Makefile.in
View File

@ -14,7 +14,6 @@
@SET_MAKE@
#
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
@ -103,7 +102,6 @@ am__remove_distdir = \
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
@ -120,9 +118,11 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
COMPOSITEEXT_VERSION = @COMPOSITEEXT_VERSION@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -132,6 +132,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -142,6 +143,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
INSTALL_DATA = @INSTALL_DATA@
@ -162,6 +164,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -172,6 +175,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@ -179,13 +183,9 @@ VERSION = @VERSION@
XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@
XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@
XMLTO = @XMLTO@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -202,23 +202,31 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -226,7 +234,7 @@ target_alias = @target_alias@
SUBDIRS = src man
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xcomposite.pc
EXTRA_DIST = xcomposite.pc.in autogen.sh ChangeLog
EXTRA_DIST = xcomposite.pc.in ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
@ -690,8 +698,10 @@ uninstall-info: uninstall-info-recursive
uninstall-pkgconfigDATA
.PHONY: ChangeLog
ChangeLog:
(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
$(CHANGELOG_CMD)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.

31
lib/libXcomposite/README
View File

@ -1,10 +1,25 @@
RandR
X RandR Extension
Version 1.0
2002-10-4
libXcomposite - client library for the Composite extension to the X11 protocol
This package contains header files and documentation for the X RandR
extension. Library and server implementations are separate.
All questions regarding this software should be directed at the
Xorg mailing list:
http://lists.freedesktop.org/mailman/listinfo/xorg
Please submit bug reports to the Xorg bugzilla:
https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
The master development code repository can be found at:
git://anongit.freedesktop.org/git/xorg/lib/libXcomposite
http://cgit.freedesktop.org/xorg/lib/libXcomposite
For patch submission instructions, see:
http://www.x.org/wiki/Development/Documentation/SubmittingPatches
For more information on the git code manager, see:
http://wiki.x.org/wiki/GitPage
Keith Packard
keithp@keithp.com

805
lib/libXcomposite/aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

12
lib/libXcomposite/autogen.sh
View File

@ -1,12 +0,0 @@
#! /bin/sh
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
autoreconf -v --install || exit 1
cd $ORIGDIR || exit $?
$srcdir/configure --enable-maintainer-mode "$@"

10453
lib/libXcomposite/configure vendored
View File

File diff suppressed because it is too large Load Diff

17
lib/libXcomposite/configure.ac
View File

@ -1,6 +1,4 @@
dnl
dnl $Id: configure.ac,v 1.1.1.2 2007/09/30 06:12:46 matthieu Exp $
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@ -27,23 +25,29 @@ AC_PREREQ([2.57])
dnl
dnl Version should match the current XComposite version. XCompositeQueryVersion
dnl returns the version from xcompositewire.h, NOT the version we set here. But we
dnl try to keep these the same. Note that the library has an extra
dnl returns the version from xcompositewire.h, NOT the version we set here.
dnl But we try to keep these the same. Note that the library has an extra
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xcomposite version l.n.m corresponds to protocol version l.n
dnl that 'revision' number appears in Xcomposite.h and has to be manually
dnl synchronized.
dnl
AC_INIT(libXcomposite, 0.4.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite)
AC_INIT(libXcomposite, 0.4.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXcomposite)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
AC_ARG_VAR([XMLTO], [Path to xmlto command])
AC_PATH_PROG([XMLTO], [xmlto])
AM_CONDITIONAL([HAVE_XMLTO], [test "x$XMLTO" != "x"])
@ -63,9 +67,6 @@ PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11 xfix
AC_SUBST(XCOMPOSITE_CFLAGS)
AC_SUBST(XCOMPOSITE_LIBS)
XORG_MANPAGE_SECTIONS
XORG_RELEASE_VERSION
AC_OUTPUT([Makefile
src/Makefile
man/Makefile

10
lib/libXcomposite/include/X11/extensions/Xcomposite.h
View File

@ -1,6 +1,4 @@
/*
* $Id: Xcomposite.h,v 1.1.1.1 2006/11/25 16:58:23 matthieu Exp $
*
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its
@ -60,11 +58,13 @@
_XFUNCPROTOBEGIN
Bool XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep);
Bool XCompositeQueryExtension (Display *dpy,
int *event_base_return,
int *error_base_return);
Status XCompositeQueryVersion (Display *dpy,
int *major_versionp,
int *minor_versionp);
int *major_version_return,
int *minor_version_return);
int XCompositeVersion (void);

270
lib/libXcomposite/ltmain.sh
View File

@ -1,8 +1,8 @@
# ltmain.sh - Provide generalized library-building support services.
# NOTE: Changing this file will not affect anything until you rerun configure.
#
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
# 2007, 2008 Free Software Foundation, Inc.
# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
#
# This program is free software; you can redistribute it and/or modify
@ -43,14 +43,22 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
VERSION=1.5.22
TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
VERSION=1.5.26
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# See if we are running on zsh, and set the options which allow our
# commands through without removal of \ escapes.
if test -n "${ZSH_VERSION+set}" ; then
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# Check that we have a working $echo.
if test "X$1" = X--no-reexec; then
@ -105,11 +113,19 @@ esac
# These must not be set unconditionally because not all systems understand
# e.g. LANG=C (notably SCO).
# We save the old values to restore during execute mode.
if test "${LC_ALL+set}" = set; then
save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
fi
if test "${LANG+set}" = set; then
save_LANG="$LANG"; LANG=C; export LANG
lt_env=
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${$lt_var+set}\" = set; then
save_$lt_var=\$$lt_var
lt_env=\"$lt_var=\$$lt_var \$lt_env\"
$lt_var=C
export $lt_var
fi"
done
if test -n "$lt_env"; then
lt_env="env $lt_env"
fi
# Make sure IFS has a sensible default
@ -136,6 +152,8 @@ duplicate_deps=no
preserve_args=
lo2o="s/\\.lo\$/.${objext}/"
o2lo="s/\\.${objext}\$/.lo/"
extracted_archives=
extracted_serial=0
#####################################
# Shell function definitions:
@ -196,7 +214,13 @@ func_win32_libid ()
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
$EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
win32_nmres=`eval $NM -f posix -A $1 | \
$SED -n -e '1,100{/ I /{s,.*,import,;p;q;};}'`
$SED -n -e '1,100{
/ I /{
s,.*,import,
p
q
}
}'`
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@ -327,7 +351,17 @@ func_extract_archives ()
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
my_xdir="$my_gentop/$my_xlib"
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
*" $my_xlib_u "*)
extracted_serial=`expr $extracted_serial + 1`
my_xlib_u=lt$extracted_serial-$my_xlib ;;
*) break ;;
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
my_xdir="$my_gentop/$my_xlib_u"
$show "${rm}r $my_xdir"
$run ${rm}r "$my_xdir"
@ -454,11 +488,12 @@ do
;;
--version)
$echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
$echo
$echo "Copyright (C) 2005 Free Software Foundation, Inc."
$echo "This is free software; see the source for copying conditions. There is NO"
$echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
echo "\
$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
Copyright (C) 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
exit $?
;;
@ -755,9 +790,11 @@ if test -z "$show_help"; then
*.class) xform=class ;;
*.cpp) xform=cpp ;;
*.cxx) xform=cxx ;;
*.f90) xform=f90 ;;
*.[fF][09]?) xform=[fF][09]. ;;
*.for) xform=for ;;
*.java) xform=java ;;
*.obj) xform=obj ;;
*.sx) xform=sx ;;
esac
libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
@ -926,7 +963,7 @@ EOF
$run $rm "$lobj" "$output_obj"
$show "$command"
if $run eval "$command"; then :
if $run eval $lt_env "$command"; then :
else
test -n "$output_obj" && $run $rm $removelist
exit $EXIT_FAILURE
@ -998,7 +1035,7 @@ EOF
command="$command$suppress_output"
$run $rm "$obj" "$output_obj"
$show "$command"
if $run eval "$command"; then :
if $run eval $lt_env "$command"; then :
else
$run $rm $removelist
exit $EXIT_FAILURE
@ -1131,6 +1168,7 @@ EOF
thread_safe=no
vinfo=
vinfo_number=no
single_module="${wl}-single_module"
func_infer_tag $base_compile
@ -1138,8 +1176,9 @@ EOF
for arg
do
case $arg in
-all-static | -static)
if test "X$arg" = "X-all-static"; then
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
$echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
fi
@ -1147,12 +1186,20 @@ EOF
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
else
;;
-static)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=built
;;
-static-libtool-libs)
if test -z "$pic_flag" && test -n "$link_static_flag"; then
dlopen_self=$dlopen_self_static
fi
prefer_static_libs=yes
;;
esac
build_libtool_libs=no
build_old_libs=yes
break
@ -1600,7 +1647,7 @@ EOF
continue
;;
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
compiler_flags="$compiler_flags $arg"
compile_command="$compile_command $arg"
finalize_command="$finalize_command $arg"
@ -1608,6 +1655,11 @@ EOF
continue
;;
-multi_module)
single_module="${wl}-multi_module"
continue
;;
-module)
module=yes
continue
@ -1621,10 +1673,11 @@ EOF
# -m* pass through architecture-specific compiler args for GCC
# -m*, -t[45]*, -txscale* pass through architecture-specific
# compiler args for GCC
# -pg pass through profiling flag for GCC
# -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
# -F/path gives path to uninstalled frameworks, gcc on darwin
# @file GCC response files
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*|-pg| \
-t[45]*|-txscale*|@*)
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
@ -1652,9 +1705,9 @@ EOF
-no-install)
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
# The PATH hackery in wrapper scripts is required on Windows
# in order for the loader to find any dlls it needs.
# and Darwin in order for the loader to find any dlls it needs.
$echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
$echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
fast_install=no
@ -1713,7 +1766,7 @@ EOF
continue
;;
-static)
-static | -static-libtool-libs)
# The effects of -static are defined in a previous loop.
# We used to do the same as -all-static on platforms that
# didn't have a PIC flag, but the assumption that the effects
@ -2074,17 +2127,6 @@ EOF
;;
esac
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
if test "$linkmode,$pass" = "lib,link"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
deplibs="$tmp_deplibs"
fi
if test "$linkmode,$pass" = "lib,link" ||
test "$linkmode,$pass" = "prog,scan"; then
libs="$deplibs"
@ -2106,7 +2148,7 @@ EOF
lib=
found=no
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
if test "$linkmode,$pass" = "prog,link"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
@ -2122,7 +2164,12 @@ EOF
continue
fi
name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
if test "$linkmode" = lib; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
fi
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
lib="$searchdir/lib${name}${search_ext}"
@ -2503,7 +2550,9 @@ EOF
if test "$linkmode,$pass" = "prog,link"; then
if test -n "$library_names" &&
{ test "$prefer_static_libs" = no || test -z "$old_library"; }; then
{ { test "$prefer_static_libs" = no ||
test "$prefer_static_libs,$installed" = "built,yes"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
# Make sure the rpath contains only unique directories.
@ -2916,12 +2965,18 @@ EOF
# we do not want to link against static libs,
# but need to link against shared
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
eval deplibdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
if test -n "$deplibrary_names" ; then
for tmp in $deplibrary_names ; do
depdepl=$tmp
done
if test -f "$path/$depdepl" ; then
if test -f "$deplibdir/$depdepl" ; then
depdepl="$deplibdir/$depdepl"
elif test -f "$path/$depdepl" ; then
depdepl="$path/$depdepl"
else
# Can't find it, oh well...
depdepl=
fi
# do not add paths which are already there
case " $newlib_search_path " in
@ -3069,9 +3124,10 @@ EOF
case $linkmode in
oldlib)
if test -n "$deplibs"; then
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
fi
case " $deplibs" in
*\ -l* | *\ -L*)
$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
@ -3199,7 +3255,7 @@ EOF
# which has an extra 1 added just for fun
#
case $version_type in
darwin|linux|osf|windows)
darwin|linux|osf|windows|none)
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_revision"
@ -3210,9 +3266,10 @@ EOF
age="0"
;;
irix|nonstopux)
current=`expr $number_major + $number_minor - 1`
current=`expr $number_major + $number_minor`
age="$number_minor"
revision="$number_minor"
lt_irix_increment=no
;;
esac
;;
@ -3271,7 +3328,8 @@ EOF
versuffix="$major.$age.$revision"
# Darwin ld doesn't like 0 for these options...
minor_current=`expr $current + 1`
verstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
;;
freebsd-aout)
@ -3285,8 +3343,11 @@ EOF
;;
irix | nonstopux)
if test "X$lt_irix_increment" = "Xno"; then
major=`expr $current - $age`
else
major=`expr $current - $age + 1`
fi
case $version_type in
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
@ -3437,11 +3498,11 @@ EOF
fi
# Eliminate all temporary directories.
for path in $notinst_path; do
lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
done
#for path in $notinst_path; do
# lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
# deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
# dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
#done
if test -n "$xrpath"; then
# If the user specified any rpath flags, then add them.
@ -3542,13 +3603,12 @@ EOF
int main() { return 0; }
EOF
$rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
if test "$?" -eq 0 ; then
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
ldd_output=`ldd conftest`
for i in $deplibs; do
name=`expr $i : '-l\(.*\)'`
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" -ne "0"; then
if test "$name" != "" && test "$name" != "0"; then
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
*" $i "*)
@ -3587,9 +3647,7 @@ EOF
# If $name is empty we are operating on a -L argument.
if test "$name" != "" && test "$name" != "0"; then
$rm conftest
$LTCC $LTCFLAGS -o conftest conftest.c $i
# Did it work?
if test "$?" -eq 0 ; then
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
case " $predeps $postdeps " in
@ -3907,7 +3965,10 @@ EOF
test -n "$hardcode_libdirs"; then
libdir="$hardcode_libdirs"
if test -n "$hardcode_libdir_flag_spec_ld"; then
eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
case $archive_cmds in
*\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
*) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
esac
else
eval dep_rpath=\"$hardcode_libdir_flag_spec\"
fi
@ -4217,9 +4278,10 @@ EOF
;;
obj)
if test -n "$deplibs"; then
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
fi
case " $deplibs" in
*\ -l* | *\ -L*)
$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 ;;
esac
if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
@ -4266,12 +4328,14 @@ EOF
reload_conv_objs=
gentop=
# reload_cmds runs $LD directly, so let us get rid of
# -Wl from whole_archive_flag_spec
# -Wl from whole_archive_flag_spec and hope we can get by with
# turning comma into space..
wl=
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
else
gentop="$output_objdir/${obj}x"
generated="$generated $gentop"
@ -4719,16 +4783,16 @@ static const void *lt_preloaded_setup() {
case $host in
*cygwin* | *mingw* )
if test -f "$output_objdir/${outputname}.def" ; then
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
else
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
fi
;;
* )
compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
;;
esac
;;
@ -4743,13 +4807,13 @@ static const void *lt_preloaded_setup() {
# really was required.
# Nullify the symbol file.
compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
fi
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
# Replace the output file specification.
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
link_command="$compile_command$compile_rpath"
# We have no uninstalled library dependencies, so finalize right now.
@ -4836,7 +4900,7 @@ static const void *lt_preloaded_setup() {
if test "$fast_install" != no; then
link_command="$finalize_var$compile_command$finalize_rpath"
if test "$fast_install" = yes; then
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
else
# fast_install is set to needless
relink_command=
@ -4873,7 +4937,7 @@ static const void *lt_preloaded_setup() {
fi
done
relink_command="(cd `pwd`; $relink_command)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
fi
# Quote $echo for shipping.
@ -5280,6 +5344,20 @@ EOF
Xsed='${SED} -e 1s/^X//'
sed_quote_subst='$sed_quote_subst'
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
# Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
# is contrary to our usage. Disable this feature.
alias -g '\${1+\"\$@\"}'='\"\$@\"'
setopt NO_GLOB_SUBST
else
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
fi
BIN_SH=xpg4; export BIN_SH # for Tru64
DUALCASE=1; export DUALCASE # for MKS sh
# The HP-UX ksh and POSIX shell print the target directory to stdout
# if CDPATH is set.
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
@ -5422,7 +5500,7 @@ else
;;
esac
$echo >> $output "\
\$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
\$echo \"\$0: cannot exec \$program \$*\"
exit $EXIT_FAILURE
fi
else
@ -5608,7 +5686,7 @@ fi\
done
# Quote the link command for shipping.
relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
if test "$hardcode_automatic" = yes ; then
relink_command=
fi
@ -5957,9 +6035,9 @@ relink_command=\"$relink_command\""
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
else
relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
fi
$echo "$modename: warning: relinking \`$file'" 1>&2
@ -6168,7 +6246,7 @@ relink_command=\"$relink_command\""
file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
outputname="$tmpdir/$file"
# Replace the output file specification.
relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
$show "$relink_command"
if $run eval "$relink_command"; then :
@ -6345,9 +6423,11 @@ relink_command=\"$relink_command\""
if test -f "$dir/$objdir/$dlname"; then
dir="$dir/$objdir"
else
if test ! -f "$dir/$dlname"; then
$echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
exit $EXIT_FAILURE
fi
fi
;;
*.lo)
@ -6410,12 +6490,12 @@ relink_command=\"$relink_command\""
fi
# Restore saved environment variables
if test "${save_LC_ALL+set}" = set; then
LC_ALL="$save_LC_ALL"; export LC_ALL
fi
if test "${save_LANG+set}" = set; then
LANG="$save_LANG"; export LANG
fi
for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
eval "if test \"\${save_$lt_var+set}\" = set; then
$lt_var=\$save_$lt_var; export $lt_var
fi"
done
# Now prepare to actually exec the command.
exec_cmd="\$cmd$args"
@ -6788,7 +6868,9 @@ The following components of LINK-COMMAND are treated specially:
-release RELEASE specify package release information
-rpath LIBDIR the created library will eventually be installed in LIBDIR
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
-static do not do any dynamic linking of libtool libraries
-static do not do any dynamic linking of uninstalled libtool libraries
-static-libtool-libs
do not do any dynamic linking of libtool libraries
-version-info CURRENT[:REVISION[:AGE]]
specify library version info [each variable defaults to 0]

22
lib/libXcomposite/man/Makefile.am
View File

@ -19,8 +19,10 @@ Xcomposite_man_aliases = \
XCompositeGetOverlayWindow \
XCompositeReleaseOverlayWindow
Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
$(Xcomposite_shadowmen)
EXTRA_DIST = $(libman_PRE) $(libman_xml)
@ -29,17 +31,8 @@ CLEANFILES = $(libman_DATA)
MAINTAINERCLEANFILES = $(libman_PRE)
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
BUILT_SOURCES = shadows.DONE
shadows.DONE:
-rm -f $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
(for i in $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $$i; \
done)
touch shadows.DONE
CLEANFILES += shadows.DONE
$(Xcomposite_shadowmen):
$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
# Substitute system-specific values in man pages
@ -62,7 +55,7 @@ MAN_SUBSTS = \
SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
Xcomposite.$(LIB_MAN_SUFFIX): Xcomposite.man
sed $(MAN_SUBSTS) < ${srcdir}/Xcomposite.man > Xcomposite.${LIB_MAN_SUFFIX}
$(AM_V_GEN)sed $(MAN_SUBSTS) < ${srcdir}/Xcomposite.man > Xcomposite.${LIB_MAN_SUFFIX}
# Generate nroff sources from DocBook/xml
@ -70,8 +63,9 @@ dist-hook: $(libman_PRE)
if HAVE_XMLTO
.xml.man:
$(XMLTO) man $< && mv $*.__libmansuffix__ $@
$(AM_V_GEN)$(XMLTO) man $< && mv $*.__libmansuffix__ $@
else
.xml.man:
@echo "WARNING: configure did not find xmlto, cannot create $@ without it"
endif

49
lib/libXcomposite/man/Makefile.in
View File

@ -73,9 +73,11 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
COMPOSITEEXT_VERSION = @COMPOSITEEXT_VERSION@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -85,6 +87,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -95,6 +98,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
INSTALL_DATA = @INSTALL_DATA@
@ -115,6 +119,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -125,6 +130,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@ -132,13 +138,9 @@ VERSION = @VERSION@
XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@
XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@
XMLTO = @XMLTO@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -155,23 +157,31 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
@ -193,16 +203,14 @@ Xcomposite_man_aliases = \
XCompositeGetOverlayWindow \
XCompositeReleaseOverlayWindow
Xcomposite_shadowmen = $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
$(Xcomposite_shadowmen)
EXTRA_DIST = $(libman_PRE) $(libman_xml)
CLEANFILES = $(libman_DATA) shadows.DONE
CLEANFILES = $(libman_DATA)
MAINTAINERCLEANFILES = $(libman_PRE)
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
BUILT_SOURCES = shadows.DONE
# Substitute system-specific values in man pages
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
@ -220,8 +228,7 @@ MAN_SUBSTS = \
-e 's|__filemansuffix__|$(FILE_MAN_SUFFIX)|g'
SUFFIXES = .$(LIB_MAN_SUFFIX) .man .xml
all: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) all-am
all: all-am
.SUFFIXES:
.SUFFIXES: .$(LIB_MAN_SUFFIX) .man .xml
@ -319,15 +326,13 @@ distdir: $(DISTFILES)
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
check-am: all-am
check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(libmandir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) install-am
install: install-am
install-exec: install-exec-am
install-data: install-data-am
uninstall: uninstall-am
@ -352,7 +357,6 @@ distclean-generic:
maintainer-clean-generic:
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
clean: clean-am
@ -412,22 +416,19 @@ uninstall-am: uninstall-info-am uninstall-libmanDATA
uninstall-info-am uninstall-libmanDATA
shadows.DONE:
-rm -f $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@)
(for i in $(Xcomposite_man_aliases:=.@LIB_MAN_SUFFIX@) ; do \
echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $$i; \
done)
touch shadows.DONE
# Generate man page shadow files (Replaces InstallManPageAliases from Imake)
$(Xcomposite_shadowmen):
$(AM_V_GEN) echo .so man$(LIB_MAN_DIR_SUFFIX)/Xcomposite.$(LIB_MAN_SUFFIX) > $@
Xcomposite.$(LIB_MAN_SUFFIX): Xcomposite.man
sed $(MAN_SUBSTS) < ${srcdir}/Xcomposite.man > Xcomposite.${LIB_MAN_SUFFIX}
$(AM_V_GEN)sed $(MAN_SUBSTS) < ${srcdir}/Xcomposite.man > Xcomposite.${LIB_MAN_SUFFIX}
# Generate nroff sources from DocBook/xml
dist-hook: $(libman_PRE)
@HAVE_XMLTO_TRUE@.xml.man:
@HAVE_XMLTO_TRUE@ $(XMLTO) man $< && mv $*.__libmansuffix__ $@
@HAVE_XMLTO_TRUE@ $(AM_V_GEN)$(XMLTO) man $< && mv $*.__libmansuffix__ $@
@HAVE_XMLTO_FALSE@.xml.man:
@HAVE_XMLTO_FALSE@ @echo "WARNING: configure did not find xmlto, cannot create $@ without it"
# Tell versions [3.59,3.63) of GNU make to not export all variables.

163
lib/libXcomposite/man/Xcomposite.man
View File

@ -1,11 +1,8 @@
.\" Title: Xcomposite
.\" Author: Keith Packard <keithp@keithp.com>
.\" Generator: DocBook XSL Stylesheets v1.72.0 <http://docbook.sf.net/>
.\" Date: <pubdate>23 April 2007</pubdate>
.\" Manual: X Composite Extension Library
.\" Source: __vendorversion__
.\"
.TH "XCOMPOSITE" "__libmansuffix__" "<pubdate>23 April 2007</pubdate>" "__vendorversion__" "X Composite Extension Library"
.\" ** You probably do not want to edit this file directly **
.\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
.\" Instead of manually editing it, you probably should edit the DocBook XML
.\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
.TH "XCOMPOSITE" "__libmansuffix__" "23 April 2007" "__vendorversion__" "X Composite Extension Library"
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
@ -13,138 +10,101 @@
.SH "NAME"
Xcomposite \- X Composite Extension library
.SH "SYNOPSIS"
.sp
.ft B
.nf
#include <X11/extensions/Xcomposite.h>
.fi
.ft
.PP
\fB#include <X11/extensions/Xcomposite.h>\fR
.HP 30
.BI "Bool XCompositeQueryExtension(Display\ *" "dpy" ", int\ *" "event_basep" ", int\ *" "error_basep" ");"
\fBBool\ \fBXCompositeQueryExtension\fR\fR\fB(\fR\fB\fBDisplay\ *\fR\fR\fB\fIdpy\fR\fR\fB, \fR\fBint\ *\fR\fB\fIevent_base_return\fR\fR\fB, \fR\fBint\ *\fR\fB\fIerror_base_return\fR\fR\fB);\fR
.HP 30
.BI "Status XCompositeQueryVersion(Display\ *" "dpy" ", int\ *" "major_versionp" ", int\ *" "minor_versionp" ");"
\fBStatus\ \fBXCompositeQueryVersion\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBint\ *\fR\fB\fImajor_version_return\fR\fR\fB, \fR\fBint\ *\fR\fB\fIminor_version_return\fR\fR\fB);\fR
.HP 22
.BI "int XCompositeVersion(void);"
\fBint\ \fBXCompositeVersion\fR\fR\fB(\fR\fBvoid);\fR
.HP 30
.BI "void XCompositeRedirectWindow(Display\ *" "dpy" ", Window\ " "window" ", int\ " "update" ");"
\fBvoid\ \fBXCompositeRedirectWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB, \fR\fBint\ \fR\fB\fIupdate\fR\fR\fB);\fR
.HP 34
.BI "void XCompositeRedirectSubwindows(Display\ *" "dpy" ", Window\ " "window" ", int\ " "update" ");"
\fBvoid\ \fBXCompositeRedirectSubwindows\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB, \fR\fBint\ \fR\fB\fIupdate\fR\fR\fB);\fR
.HP 32
.BI "void XCompositeUnredirectWindow(Display\ *" "dpy" ", Window\ " "window" ", int\ " "update" ");"
\fBvoid\ \fBXCompositeUnredirectWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB, \fR\fBint\ \fR\fB\fIupdate\fR\fR\fB);\fR
.HP 36
.BI "void XCompositeUnredirectSubwindows(Display\ *" "dpy" ", Window\ " "window" ", int\ " "update" ");"
\fBvoid\ \fBXCompositeUnredirectSubwindows\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB, \fR\fBint\ \fR\fB\fIupdate\fR\fR\fB);\fR
.HP 51
.BI "XserverRegion XCompositeCreateRegionFromBorderClip(Display\ *" "dpy" ", Window\ " "window" ");"
\fBXserverRegion\ \fBXCompositeCreateRegionFromBorderClip\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
.HP 34
.BI "Pixmap XCompositeNameWindowPixmap(Display\ *" "dpy" ", Window\ " "window" ");"
\fBPixmap\ \fBXCompositeNameWindowPixmap\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
.HP 34
.BI "Window XCompositeGetOverlayWindow(Display\ *" "dpy" ", Window\ " "window" ");"
\fBWindow\ \fBXCompositeGetOverlayWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
.HP 36
.BI "void XCompositeReleaseOverlayWindow(Display\ *" "dpy" ", Window\ " "window" ");"
\fBvoid\ \fBXCompositeReleaseOverlayWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
.SH "DESCRIPTION"
.PP
The composite extension provides several related mechanisms:
.PP
.TP
Per\-hierarchy storage
.RS 4
The rendering of an entire hierarchy of windows is redirected to off\-screen storage. The pixels of that hierarchy are available whenever it is viewable. Storage is automatically reallocated when the top level window changes size. Contents beyond the geometry of the top window are not preserved.
.RE
.PP
.TP
Automatic shadow update
.RS 4
When a hierarchy is rendered off\-screen, the X server provides an automatic mechanism for presenting those contents within the parent window. The implementation is free to make this update lag behind actual rendering operations by an unspecified amount of time. This automatic update mechanism may be disabled so that the parent window contents can be completely determined by an external application.
.RE
.PP
.TP
Composite Overlay Window
.RS 4
Version 0.3 of the protocol adds the Composite Overlay Window, which provides compositing managers with a surface on which to draw without interference. This window is always above normal windows and is always below the screen saver window. It is an InputOutput window whose width and height are the screen dimensions. Its visual is the root visual and its border width is zero. Attempts to redirect it using the composite extension are ignored. This window does not appear in the reply of the QueryTree request. It is also an override redirect window. These last two features make it invisible to window managers and other X11 clients. The only way to access the XID of this window is via the CompositeGetOverlayWindow request. Initially, the Composite Overlay Window is unmapped.
.RE
.PP
.TP
Parent window clipping
.RS 4
Version 0.4 of the protocol modifies the semantics of parent window clipping in the presence of manual redirected children. With this version, the area in the parent covered by manual redirected children is left in the parent clip list instead of being removed as in older versions.
.RE
.PP
Per\-hierarchy storage may be created for individual windows or for all children of a window. Manual shadow update may be selected by only a single application for each window; manual update may also be selected on a per\-window basis or for each child of a window. Detecting when to update may be done with the Damage extension.
.PP
The off\-screen storage includes the window contents, its borders and the contents of all descendants.
.SH "ARGUMENTS"
.PP
.PP
.TP
\fIdisplay\fR
.RS 4
Pointer to the
\fBDisplay\fR
structure returned from
\fBXOpenDisplay\fR
for the connection to the X server.
.RE
.PP
\fIevent_basep\fR
.RS 4
.TP
\fIevent_base_return\fR
Pointer to integer where the base value for Composite Extension events will be stored.
.RE
.PP
\fIerror_basep\fR
.RS 4
.TP
\fIerror_base_return\fR
Pointer to integer where the base value for Composite Extension errors will be stored.
.RE
.PP
\fImajor_versionp\fR
.RS 4
.TP
\fImajor_version_return\fR
Pointer to integer where the major version of the Composite Extension supported by the X server will be stored.
.RE
.PP
\fIminor_versionp\fR
.RS 4
.TP
\fIminor_version_return\fR
Pointer to integer where the minor version of the Composite Extension supported by the X server will be stored.
.RE
.PP
.TP
\fIwindow\fR
.RS 4
Specifies the window ID to operate on.
.RE
.PP
.TP
\fIupdate\fR
.RS 4
Specifies the mode for updating the window contents. Must be either
\fBCompositeRedirectAutomatic\fR
or
\fBCompositeRedirectManual\fR.
.RE
.SH "FUNCTIONS"
.PP
.PP
.TP
\fBXCompositeQueryExtension\fR
.RS 4
\fBXCompositeQueryExtension\fR
determines if the Composite Extension is available on the given display. It returns
\fBTrue\fR
if the extension is supported, otherwise
\fBFalse\fR. If the extension is present, the base values for events and errors are returned, and can be used to decode incoming event and error values.
.RE
.PP
.TP
\fBXCompositeQueryVersion\fR
.RS 4
\fBXCompositeQueryVersion\fR
determines if the X Server supports a version of the X Composite Extension which is compatible with the client library. A non\-zero Status is returned if a compatible version of the extension is supported, otherwise a zero Status is returned. If the extension is supported, the major and minor version numbers are returned to indicate the level of Composite Extension support. No other XComposite functions (except XCompositeQueryExtension) may be called before this function. If a client violates this rule, the effects of all subsequent XComposite calls that it makes are undefined.
.RE
.PP
.TP
\fBXCompositeVersion\fR
.RS 4
\fBXCompositeVersion\fR
returns the version of the X Composite library. The version number is encoded as:
(major * 10000) + (minor * 100) + revision
.sp
For example, version 1.4.6 would be encoded as the integer 10406.
.RE
.PP
.TP
\fBXCompositeRedirectWindow\fR
.RS 4
\fBXCompositeRedirectWindow\fR
requests the X server to direct the hierarchy starting at
\fIwindow\fR
@ -160,11 +120,8 @@ BadMatch
error. Specifying an invalid window id will result in a
BadWindow
error.
.RE
.PP
.TP
\fBXCompositeRedirectSubwindows\fR
.RS 4
\fBXCompositeRedirectSubwindows\fR
requests the X server to redirect hierarchies starting at all current and future children of
\fIwindow\fR
@ -173,38 +130,26 @@ as in
\fIupdate\fR
is
\fBCompositeRedirectManual\fR, then painting of the window background during window manipulation and ClearArea requests is inhibited.
.RE
.PP
.TP
\fBXCompositeUnredirectWindow\fR
.RS 4
\fBXCompositeUnredirectWindow\fR
requests the X server to terminate redirection of
\fIwindow\fR. If the specified window was not selected for redirection by the current client, a
BadValue
error results.
.RE
.PP
.TP
\fBXCompositeUnredirectSubwindows\fR
.RS 4
\fBXCompositeUnredirectWindow\fR
requests the X server to terminate redirection of all children of
\fIwindow\fR. If the specified window was not selected for sub\-redirection by the current client, a
BadValue
error results.
.RE
.PP
.TP
\fBXCompositeCreateRegionFromBorderClip\fR
.RS 4
\fBXCompositeCreateRegionFromBorderClip\fR
creates a region containing the "usual" border clip value; that is the area of the window clipped against siblings and the parent. This region can be used to restrict rendering to suitable areas while updating only a single window. The region is copied at the moment the request is executed; future changes to the window hierarchy will not be reflected in this region.
.RE
.PP
.TP
\fBXCompositeNameWindowPixmap\fR
.RS 4
\fBXCompositeNameWindowPixmap\fR
creates and returns a pixmap id that serves as a reference to the off\-screen storage for
\fIwindow\fR. This pixmap will remain allocated until freed, even if the window is unmapped, reconfigured or destroyed. However, the window will get a new pixmap allocated each time it is mapped or resized, so this function will need to be reinvoked for the client to continue to refer to the storage holding the current window contents. Generates a
@ -215,11 +160,8 @@ is not redirected or is not visible.
.sp
The X server must support at least version 0.2 of the Composite Extension for
\fBXCompositeNameWindowPixmap\fR.
.RE
.PP
.TP
\fBXCompositeGetOverlayWindow\fR
.RS 4
\fBXCompositeGetOverlayWindow\fR
returns the window ID of the Composite Overlay Window for the screen specified by the argument
\fIwindow\fR. This function notifies the X server that the client wishes to use the Composite Overlay Window of this screen. If this Composite Overlay Window has not yet been mapped, it is mapped by this request.
@ -230,25 +172,12 @@ for that screen, or terminated their connection to the X server.
.sp
The X server must support at least version 0.3 of the Composite Extension for
\fBXCompositeGetOverlayWindow\fR.
.RE
.PP
.TP
\fBXCompositeReleaseOverlayWindow\fR
.RS 4
This request specifies that the client is no longer using the Composite Overlay Window on the screen specified by the argument
\fIwindow\fR. A screen's Composite Overlay Window is unmapped when there are no longer any clients using it.
.sp
The X server must support at least version 0.3 of the Composite Extension for
\fBXCompositeReleaseOverlayWindow\fR.
.RE
.SH "AUTHORS"
.PP
\fBKeith Packard\fR <\&keithp@keithp.com\&>
.sp -1n
.IP "" 4
Extension specification and implementation
.PP
\fBDeron Johnson\fR <\&deron.johnson@sun.com\&>
.sp -1n
.IP "" 4
Overlay Window specification and implementation
.SH "AUTHOR"
Keith Packard <keithp@keithp.com>, Deron Johnson <deron.johnson@sun.com>.

16
lib/libXcomposite/man/Xcomposite.xml
View File

@ -66,14 +66,14 @@
<funcprototype>
<funcdef>Bool <function>XCompositeQueryExtension</function></funcdef>
<paramdef><type>Display *</type><parameter>dpy</parameter></paramdef>
<paramdef>int *<parameter>event_basep</parameter></paramdef>
<paramdef>int *<parameter>error_basep</parameter></paramdef>
<paramdef>int *<parameter>event_base_return</parameter></paramdef>
<paramdef>int *<parameter>error_base_return</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>Status <function>XCompositeQueryVersion</function></funcdef>
<paramdef>Display *<parameter>dpy</parameter></paramdef>
<paramdef>int *<parameter>major_versionp</parameter></paramdef>
<paramdef>int *<parameter>minor_versionp</parameter></paramdef>
<paramdef>int *<parameter>major_version_return</parameter></paramdef>
<paramdef>int *<parameter>minor_version_return</parameter></paramdef>
</funcprototype>
<funcprototype>
<funcdef>int <function>XCompositeVersion</function></funcdef>
@ -203,28 +203,28 @@ contents of all descendants.
</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>event_basep</parameter></term>
<term><parameter>event_base_return</parameter></term>
<listitem><para>
Pointer to integer where the base value for Composite Extension events
will be stored.
</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>error_basep</parameter></term>
<term><parameter>error_base_return</parameter></term>
<listitem><para>
Pointer to integer where the base value for Composite Extension errors
will be stored.
</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>major_versionp</parameter></term>
<term><parameter>major_version_return</parameter></term>
<listitem><para>
Pointer to integer where the major version of the Composite Extension
supported by the X server will be stored.
</para></listitem>
</varlistentry>
<varlistentry>
<term><parameter>minor_versionp</parameter></term>
<term><parameter>minor_version_return</parameter></term>
<listitem><para>
Pointer to integer where the minor version of the Composite Extension
supported by the X server will be stored.

3
lib/libXcomposite/src/Makefile.am
View File

@ -21,7 +21,8 @@
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/include
lib_LTLIBRARIES = libXcomposite.la

21
lib/libXcomposite/src/Makefile.in
View File

@ -119,9 +119,11 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CHANGELOG_CMD = @CHANGELOG_CMD@
COMPOSITEEXT_VERSION = @COMPOSITEEXT_VERSION@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CWARNFLAGS = @CWARNFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
@ -131,6 +133,7 @@ DEFS = @DEFS@
DEPDIR = @DEPDIR@
DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DSYMUTIL = @DSYMUTIL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
@ -141,6 +144,7 @@ F77 = @F77@
FFLAGS = @FFLAGS@
FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
GREP = @GREP@
HAVE_XMLTO_FALSE = @HAVE_XMLTO_FALSE@
HAVE_XMLTO_TRUE = @HAVE_XMLTO_TRUE@
INSTALL_DATA = @INSTALL_DATA@
@ -161,6 +165,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
NMEDIT = @NMEDIT@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@ -171,6 +176,7 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
@ -178,13 +184,9 @@ VERSION = @VERSION@
XCOMPOSITE_CFLAGS = @XCOMPOSITE_CFLAGS@
XCOMPOSITE_LIBS = @XCOMPOSITE_LIBS@
XMLTO = @XMLTO@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
@ -201,28 +203,37 @@ build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
datarootdir = @datarootdir@
distcleancheck_listfiles = @distcleancheck_listfiles@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
htmldir = @htmldir@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
AM_CFLAGS = $(XCOMPOSITE_CFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include
AM_CFLAGS = $(CWARNFLAGS) $(XCOMPOSITE_CFLAGS) $(X_CFLAGS)
AM_CPPFLAGS = -I$(top_srcdir)/include
lib_LTLIBRARIES = libXcomposite.la
libXcomposite_la_SOURCES = \
xcompositeint.h \

20
lib/libXcomposite/src/Xcomposite.c
View File

@ -1,5 +1,5 @@
/*
* $Id: Xcomposite.c,v 1.1.1.1 2006/11/25 16:58:23 matthieu Exp $
* $Id: Xcomposite.c,v 1.2 2009/10/31 17:45:46 matthieu Exp $
*
* Copyright © 2006 Sun Microsystems
*
@ -133,7 +133,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
UnlockDisplay (dpy);
SyncHandle ();
Xfree(info);
return 0;
return NULL;
}
info->major_version = rep.majorVersion;
info->minor_version = rep.minorVersion;
@ -211,14 +211,16 @@ XCompositeFindDisplay (Display *dpy)
Bool
XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
XCompositeQueryExtension (Display *dpy,
int *event_base_return,
int *error_base_return)
{
XCompositeExtDisplayInfo *info = XCompositeFindDisplay (dpy);
if (XCompositeHasExtension(info))
{
*event_basep = info->codes->first_event;
*error_basep = info->codes->first_error;
*event_base_return = info->codes->first_event;
*error_base_return = info->codes->first_error;
return True;
}
else
@ -227,14 +229,14 @@ XCompositeQueryExtension (Display *dpy, int *event_basep, int *error_basep)
Status
XCompositeQueryVersion (Display *dpy,
int *major_versionp,
int *minor_versionp)
int *major_version_return,
int *minor_version_return)
{
XCompositeExtDisplayInfo *info = XCompositeFindDisplay (dpy);
XCompositeCheckExtension (dpy, info, 0);
*major_versionp = info->major_version;
*minor_versionp = info->minor_version;
*major_version_return = info->major_version;
*minor_version_return = info->minor_version;
return 1;
}

2
lib/libXcomposite/src/xcompositeint.h
View File

@ -1,6 +1,4 @@
/*
* $Id: xcompositeint.h,v 1.1.1.1 2006/11/25 16:58:23 matthieu Exp $
*
* Copyright © 2006 Sun Microsystems
*
* Permission to use, copy, modify, distribute, and sell this software and its