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

Update to libXcomposite 0.4.4. No actual code change.

Browse Source
This commit is contained in:
matthieu 2013-01-05 14:59:39 +00:00
parent 240eb9af41
commit 6b1c26f771
15 changed files with 654 additions and 502 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lib/libXcomposite/ChangeLog
View File

@ -1,3 +1,58 @@
commit 0db73ea70c690eabe581c7293f77ec2be18e1f41
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Jan 2 23:29:00 2013 -0800
libXcomposite 0.4.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit b1e3db243eb118b4b2eb483df4a9ad19dcee17d0
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:15:10 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
commit db1ae0c545b4b359204c33488104d214c91f12bb
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:41 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
commit f6dcd194f87fb7009b8afa482326de044d0e9c24
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 0e1e69c7b71700c50f71b55f74cd12b8569fa966
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 27 18:50:14 2011 -0500
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
commit 8898782b98457292057d249ab9e40cfc2fed7d8d
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Oct 27 22:40:32 2010 -0700

6
lib/libXcomposite/Makefile.am
View File

@ -1,6 +1,6 @@
#
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
#
# 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
@ -10,7 +10,7 @@
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

8
lib/libXcomposite/Makefile.in
View File

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am.
# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -14,9 +14,9 @@
@SET_MAKE@
#
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
#
# 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
@ -26,7 +26,7 @@
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

15
lib/libXcomposite/aclocal.m4 vendored
View File

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.12.3 -*- Autoconf -*-
# generated automatically by aclocal 1.12.5 -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
@ -8779,7 +8779,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.12'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.12.3], [],
m4_if([$1], [1.12.5], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@ -8795,7 +8795,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.12.3])dnl
[AM_AUTOMAKE_VERSION([1.12.5])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
@ -9151,15 +9151,6 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
])
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2012 Free Software Foundation, Inc.

13
lib/libXcomposite/config.guess vendored
View File

@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
timestamp='2012-06-17'
timestamp='2012-09-25'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@ -306,7 +306,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
exit ;;
arm:riscos:*:*|arm:RISCOS:*:*)
arm*:riscos:*:*|arm*:RISCOS:*:*)
echo arm-unknown-riscos
exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@ -805,6 +805,9 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
*:MINGW64*:*)
echo ${UNAME_MACHINE}-pc-mingw64
exit ;;
*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
@ -1205,6 +1208,9 @@ EOF
BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
echo i586-pc-haiku
exit ;;
x86_64:Haiku:*:*)
echo x86_64-unknown-haiku
exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
exit ;;
@ -1334,9 +1340,6 @@ EOF
exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
eval $set_cc_for_build
cat >$dummy.c <<EOF
#ifdef _SEQUENT_

27
lib/libXcomposite/config.sub vendored
View File

@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 Free Software Foundation, Inc.
timestamp='2012-06-17'
timestamp='2012-10-10'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@ -123,7 +123,7 @@ esac
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
knetbsd*-gnu* | netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
@ -156,7 +156,7 @@ case $os in
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-apple | -axis | -knuth | -cray | -microblaze)
-apple | -axis | -knuth | -cray | -microblaze*)
os=
basic_machine=$1
;;
@ -259,8 +259,10 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| be32 | be64 \
| arc \
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
| avr | avr32 \
| be32 | be64 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@ -273,7 +275,7 @@ case $basic_machine in
| le32 | le64 \
| lm32 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
| maxq | mb | microblaze | mcore | mep | metag \
| maxq | mb | microblaze | microblazeel | mcore | mep | metag \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@ -389,7 +391,8 @@ case $basic_machine in
| lm32-* \
| m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
| m88110-* | m88k-* | maxq-* | mcore-* | metag-* \
| microblaze-* | microblazeel-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@ -788,9 +791,13 @@ case $basic_machine in
basic_machine=ns32k-utek
os=-sysv
;;
microblaze)
microblaze*)
basic_machine=microblaze-xilinx
;;
mingw64)
basic_machine=x86_64-pc
os=-mingw64
;;
mingw32)
basic_machine=i386-pc
os=-mingw32
@ -1359,8 +1366,8 @@ case $os in
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* | -cegcc* \
| -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
| -mingw32* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-uclibc* \
| -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
| -linux-newlib* | -linux-musl* | -linux-uclibc* \
| -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

517
lib/libXcomposite/configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libXcomposite 0.4.3.
# Generated by GNU Autoconf 2.69 for libXcomposite 0.4.4.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@ -651,11 +651,12 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libXcomposite'
PACKAGE_TARNAME='libXcomposite'
PACKAGE_VERSION='0.4.3'
PACKAGE_STRING='libXcomposite 0.4.3'
PACKAGE_VERSION='0.4.4'
PACKAGE_STRING='libXcomposite 0.4.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
ac_unique_file="Makefile.am"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
@ -753,15 +754,6 @@ FGREP
EGREP
GREP
SED
host_os
host_vendor
host_cpu
host
build_os
build_vendor
build_cpu
build
LIBTOOL
am__fastdepCC_FALSE
am__fastdepCC_TRUE
CCDEPMODE
@ -779,6 +771,15 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
host_os
host_vendor
host_cpu
host
build_os
build_vendor
build_cpu
build
LIBTOOL
MAINT
MAINTAINER_MODE_FALSE
MAINTAINER_MODE_TRUE
@ -847,11 +848,11 @@ ac_subst_files=''
ac_user_opts='
enable_option_checking
enable_maintainer_mode
enable_dependency_tracking
enable_shared
enable_static
with_pic
enable_fast_install
enable_dependency_tracking
with_gnu_ld
with_sysroot
enable_libtool_lock
@ -1415,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libXcomposite 0.4.3 to adapt to many kinds of systems.
\`configure' configures libXcomposite 0.4.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -1485,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libXcomposite 0.4.3:";;
short | recursive ) echo "Configuration of libXcomposite 0.4.4:";;
esac
cat <<\_ACEOF
@ -1496,14 +1497,14 @@ Optional Features:
--enable-maintainer-mode
enable make rules and dependencies not useful (and
sometimes confusing) to the casual installer
--enable-dependency-tracking
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--enable-shared[=PKGS] build shared libraries [default=yes]
--enable-static[=PKGS] build static libraries [default=yes]
--enable-fast-install[=PKGS]
optimize for fast installation [default=yes]
--enable-dependency-tracking
do not reject slow dependency extractors
--disable-dependency-tracking
speeds up one-time build
--disable-libtool-lock avoid locking (might break parallel builds)
--disable-selective-werror
Turn off selective compiler errors. (default:
@ -1610,7 +1611,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libXcomposite configure 0.4.3
libXcomposite configure 0.4.4
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@ -1934,7 +1935,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libXcomposite $as_me 0.4.3, which was
It was created by libXcomposite $as_me 0.4.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@ -2282,6 +2283,11 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
ac_config_headers="$ac_config_headers config.h"
# Initialize Automake
am__api_version='1.12'
ac_aux_dir=
@ -2758,7 +2764,7 @@ fi
# Define the identity of the package.
PACKAGE='libXcomposite'
VERSION='0.4.3'
VERSION='0.4.4'
cat >>confdefs.h <<_ACEOF
@ -2828,7 +2834,17 @@ fi
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
# Initialize libtool
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
macro_version='2.4.2'
macro_revision='1.3337'
@ -2840,10 +2856,213 @@ fi
ac_config_headers="$ac_config_headers config.h"
# Check for progs
ltmain="$ac_aux_dir/ltmain.sh"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
set x $ac_cv_build
shift
build_cpu=$1
build_vendor=$2
shift; shift
# Remember, the first character of IFS is used to create $*,
# except with old shells:
build_os=$*
IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
set x $ac_cv_host
shift
host_cpu=$1
host_vendor=$2
shift; shift
# Remember, the first character of IFS is used to create $*,
# except with old shells:
host_os=$*
IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
# Backslashify metacharacters that are still active within
# double-quoted strings.
sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
# Sed substitution to delay expansion of an escaped shell variable in a
# double_quote_subst'ed string.
delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
# Sed substitution to delay expansion of an escaped single quote.
delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
# Sed substitution to avoid accidental globbing in evaled expressions
no_glob_subst='s/\*/\\\*/g'
ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
$as_echo_n "checking how to print strings... " >&6; }
# Test print first, because it will be a builtin if present.
if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
ECHO='print -r --'
elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
ECHO='printf %s\n'
else
# Use this function as a fallback that always works.
func_fallback_echo ()
{
eval 'cat <<_LTECHO_EOF
$1
_LTECHO_EOF'
}
ECHO='func_fallback_echo'
fi
# func_echo_all arg...
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
$ECHO ""
}
case "$ECHO" in
printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
$as_echo "printf" >&6; } ;;
print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
$as_echo "print -r" >&6; } ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
$as_echo "cat" >&6; } ;;
esac
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
@echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
am__quote=
_am_result=GNU
;;
esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=.include
am__quote="\""
_am_result=BSD
;;
esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
AMDEP_TRUE='#'
AMDEP_FALSE=
fi
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@ -3632,69 +3851,6 @@ ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_c_compiler_gnu
DEPDIR="${am__leading_dot}deps"
ac_config_commands="$ac_config_commands depfiles"
am_make=${MAKE-make}
cat > confinc << 'END'
am__doit:
@echo this is the am__doit target
.PHONY: am__doit
END
# If we don't find an include directive, just comment out the code.
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
$as_echo_n "checking for style of include used by $am_make... " >&6; }
am__include="#"
am__quote=
_am_result=none
# First try GNU make style include.
echo "include confinc" > confmf
# Ignore all kinds of additional output from 'make'.
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=include
am__quote=
_am_result=GNU
;;
esac
# Now try BSD make style include.
if test "$am__include" = "#"; then
echo '.include "confinc"' > confmf
case `$am_make -s -f confmf 2> /dev/null` in #(
*the\ am__doit\ target*)
am__include=.include
am__quote="\""
_am_result=BSD
;;
esac
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
$as_echo "$_am_result" >&6; }
rm -f confinc confmf
# Check whether --enable-dependency-tracking was given.
if test "${enable_dependency_tracking+set}" = set; then :
enableval=$enable_dependency_tracking;
fi
if test "x$enable_dependency_tracking" != xno; then
am_depcomp="$ac_aux_dir/depcomp"
AMDEPBACKSLASH='\'
am__nodep='_no'
fi
if test "x$enable_dependency_tracking" != xno; then
AMDEP_TRUE=
AMDEP_FALSE='#'
else
AMDEP_TRUE='#'
AMDEP_FALSE=
fi
depcc="$CC" am_compiler_list=
@ -3824,171 +3980,6 @@ else
fi
case `pwd` in
*\ * | *\ *)
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5
$as_echo "$as_me: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&2;} ;;
esac
macro_version='2.4.2'
macro_revision='1.3337'
ltmain="$ac_aux_dir/ltmain.sh"
# Make sure we can run config.sub.
$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
$as_echo_n "checking build system type... " >&6; }
if ${ac_cv_build+:} false; then :
$as_echo_n "(cached) " >&6
else
ac_build_alias=$build_alias
test "x$ac_build_alias" = x &&
ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
test "x$ac_build_alias" = x &&
as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
$as_echo "$ac_cv_build" >&6; }
case $ac_cv_build in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
esac
build=$ac_cv_build
ac_save_IFS=$IFS; IFS='-'
set x $ac_cv_build
shift
build_cpu=$1
build_vendor=$2
shift; shift
# Remember, the first character of IFS is used to create $*,
# except with old shells:
build_os=$*
IFS=$ac_save_IFS
case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
$as_echo_n "checking host system type... " >&6; }
if ${ac_cv_host+:} false; then :
$as_echo_n "(cached) " >&6
else
if test "x$host_alias" = x; then
ac_cv_host=$ac_cv_build
else
ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
fi
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5
$as_echo "$ac_cv_host" >&6; }
case $ac_cv_host in
*-*-*) ;;
*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
esac
host=$ac_cv_host
ac_save_IFS=$IFS; IFS='-'
set x $ac_cv_host
shift
host_cpu=$1
host_vendor=$2
shift; shift
# Remember, the first character of IFS is used to create $*,
# except with old shells:
host_os=$*
IFS=$ac_save_IFS
case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac
# Backslashify metacharacters that are still active within
# double-quoted strings.
sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
# Same as above, but do not quote variable references.
double_quote_subst='s/\(["`\\]\)/\\\1/g'
# Sed substitution to delay expansion of an escaped shell variable in a
# double_quote_subst'ed string.
delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
# Sed substitution to delay expansion of an escaped single quote.
delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
# Sed substitution to avoid accidental globbing in evaled expressions
no_glob_subst='s/\*/\\\*/g'
ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
$as_echo_n "checking how to print strings... " >&6; }
# Test print first, because it will be a builtin if present.
if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
ECHO='print -r --'
elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
ECHO='printf %s\n'
else
# Use this function as a fallback that always works.
func_fallback_echo ()
{
eval 'cat <<_LTECHO_EOF
$1
_LTECHO_EOF'
}
ECHO='func_fallback_echo'
fi
# func_echo_all arg...
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
$ECHO ""
}
case "$ECHO" in
printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
$as_echo "printf" >&6; } ;;
print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
$as_echo "print -r" >&6; } ;;
*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
$as_echo "cat" >&6; } ;;
esac
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
$as_echo_n "checking for a sed that does not truncate output... " >&6; }
if ${ac_cv_path_SED+:} false; then :
@ -11403,6 +11394,18 @@ CC="$lt_save_CC"
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5
$as_echo_n "checking for $CC option to accept ISO C99... " >&6; }
if ${ac_cv_prog_cc_c99+:} false; then :
@ -17727,13 +17730,14 @@ fi
# Check compositeext configuration, strip extra digits from package version to
# find the required protocol version
if test "$VERSION" = "" ; then
VERSION=$PACKAGE_VERSION;
fi
COMPOSITEEXT_VERSION=`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`
# Obtain compiler/linker options for depedencies
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCOMPOSITE" >&5
$as_echo_n "checking for XCOMPOSITE... " >&6; }
@ -18462,7 +18466,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libXcomposite $as_me 0.4.3, which was
This file was extended by libXcomposite $as_me 0.4.4, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -18528,7 +18532,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libXcomposite config.status 0.4.3
libXcomposite config.status 0.4.4
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
@ -20297,4 +20301,3 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
fi

93
lib/libXcomposite/configure.ac
View File

@ -1,54 +1,52 @@
dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
dnl documentation for any purpose is hereby granted without fee, provided that
dnl the above copyright notice appear in all copies and that both that
dnl copyright notice and this permission notice appear in supporting
dnl documentation, and that the name of Keith Packard not be used in
dnl advertising or publicity pertaining to distribution of the software without
dnl specific, written prior permission. Keith Packard makes no
dnl representations about the suitability of this software for any purpose. It
dnl is provided "as is" without express or implied warranty.
dnl
dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# 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, and that the name of Keith Packard not be used in
# advertising or publicity pertaining to distribution of the software without
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
# PERFORMANCE OF THIS SOFTWARE.
#
# Initialize Autoconf
AC_PREREQ([2.60])
#
# Version should match the current XComposite version. XCompositeQueryVersion
# returns the version from xcompositewire.h, NOT the version we set here.
# But we try to keep these the same. Note that the library has an extra
# digit in the version number to track changes which don't affect the
# protocol, so Xcomposite version l.n.m corresponds to protocol version l.n
# that 'revision' number appears in Xcomposite.h and has to be manually
# synchronized.
#
AC_INIT(libXcomposite, [0.4.4],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXcomposite])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
dnl
dnl Version should match the current XComposite version. XCompositeQueryVersion
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.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXcomposite)
# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
# Initialize libtool
AC_PROG_LIBTOOL
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
AM_CONFIG_HEADER(config.h)
# Check for progs
AC_PROG_CC
AC_PROG_LIBTOOL
XORG_DEFAULT_OPTIONS
XORG_WITH_XMLTO(0.0.20)
@ -59,17 +57,18 @@ AM_CONDITIONAL([INSTALL_MANPAGES],
# Check compositeext configuration, strip extra digits from package version to
# find the required protocol version
if test "$VERSION" = "" ; then
VERSION=$PACKAGE_VERSION;
fi
COMPOSITEEXT_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(COMPOSITEEXT_VERSION)
# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(XCOMPOSITE, [compositeproto >= $COMPOSITEEXT_VERSION] x11)
PKG_CHECK_MODULES(XFIXES, xfixes)
AC_OUTPUT([Makefile
src/Makefile
man/Makefile
xcomposite.pc])
AC_CONFIG_FILES([Makefile
src/Makefile
man/Makefile
xcomposite.pc])
AC_OUTPUT

11
lib/libXcomposite/depcomp
View File

@ -74,6 +74,9 @@ tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
rm -f "$tmpdepfile"
# Avoid interferences from the environment.
gccflag= dashmflag=
# Some modes work just like other modes, but use different flags. We
# parameterize here, but still list the modes in the big case below,
# to make depend.m4 easier to write. Note that we *cannot* use a case
@ -108,7 +111,7 @@ if test "$depmode" = msvc7msys; then
fi
if test "$depmode" = xlc; then
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information.
gccflag=-qmakedep=gcc,-MF
depmode=gcc
fi
@ -142,13 +145,17 @@ gcc3)
;;
gcc)
## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
## why we pick this rather obscure method:
## - Don't want to use -MD because we'd like the dependencies to end
## up in a subdir. Having to rename by hand is ugly.
## (We might end up doing this anyway to support other compilers.)
## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
## -MM, not -M (despite what the docs say).
## -MM, not -M (despite what the docs say). Also, it might not be
## supported by the other compilers which use the 'gcc' depmode.
## - Using -M directly means running the compiler twice (even worse
## than renaming).
if test -z "$gccflag"; then

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

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am.
# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.

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

@ -1,183 +1,270 @@
.\" ** 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"
'\" t
.\" Title: Xcomposite
.\" Author: Keith Packard <keithp@keithp.com>
.\" Generator: DocBook XSL Stylesheets vsnapshot_9276 <http://docbook.sf.net/>
.\" Date: <pubdate>23 April 2007</pubdate>
.\" Manual: X Composite Extension Library
.\" Source: __vendorversion__
.\" Language: English
.\"
.TH "XCOMPOSITE" "__libmansuffix__" "<pubdate>23 April 2007</pubdate>" "__vendorversion__" "X Composite Extension Library"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.\" http://bugs.debian.org/507673
.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.ie \n(.g .ds Aq \(aq
.el .ds Aq '
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
.\" disable hyphenation
.nh
.\" disable justification (adjust text to left margin only)
.ad l
.\" -----------------------------------------------------------------
.\" * MAIN CONTENT STARTS HERE *
.\" -----------------------------------------------------------------
.SH "NAME"
Xcomposite \- X Composite Extension library
.SH "SYNOPSIS"
.PP
\fB#include <X11/extensions/Xcomposite.h>\fR
.HP 30
\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
\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
\fBint\ \fBXCompositeVersion\fR\fR\fB(\fR\fBvoid);\fR
.HP 30
\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
\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
\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
\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
\fBXserverRegion\ \fBXCompositeCreateRegionFromBorderClip\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
.HP 34
\fBPixmap\ \fBXCompositeNameWindowPixmap\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
.HP 34
\fBWindow\ \fBXCompositeGetOverlayWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
.HP 36
\fBvoid\ \fBXCompositeReleaseOverlayWindow\fR\fR\fB(\fR\fBDisplay\ *\fR\fB\fIdpy\fR\fR\fB, \fR\fBWindow\ \fR\fB\fIwindow\fR\fR\fB);\fR
.sp
.ft B
.nf
#include <X11/extensions/Xcomposite\&.h>
.fi
.ft
.HP \w'Bool\ XCompositeQueryExtension('u
.BI "Bool XCompositeQueryExtension(Display\ *" "dpy" ", int\ *" "event_base_return" ", int\ *" "error_base_return" ");"
.HP \w'Status\ XCompositeQueryVersion('u
.BI "Status XCompositeQueryVersion(Display\ *" "dpy" ", int\ *" "major_version_return" ", int\ *" "minor_version_return" ");"
.HP \w'int\ XCompositeVersion('u
.BI "int XCompositeVersion(void);"
.HP \w'void\ XCompositeRedirectWindow('u
.BI "void XCompositeRedirectWindow(Display\ *" "dpy" ", Window\ " "window" ", int\ " "update" ");"
.HP \w'void\ XCompositeRedirectSubwindows('u
.BI "void XCompositeRedirectSubwindows(Display\ *" "dpy" ", Window\ " "window" ", int\ " "update" ");"
.HP \w'void\ XCompositeUnredirectWindow('u
.BI "void XCompositeUnredirectWindow(Display\ *" "dpy" ", Window\ " "window" ", int\ " "update" ");"
.HP \w'void\ XCompositeUnredirectSubwindows('u
.BI "void XCompositeUnredirectSubwindows(Display\ *" "dpy" ", Window\ " "window" ", int\ " "update" ");"
.HP \w'XserverRegion\ XCompositeCreateRegionFromBorderClip('u
.BI "XserverRegion XCompositeCreateRegionFromBorderClip(Display\ *" "dpy" ", Window\ " "window" ");"
.HP \w'Pixmap\ XCompositeNameWindowPixmap('u
.BI "Pixmap XCompositeNameWindowPixmap(Display\ *" "dpy" ", Window\ " "window" ");"
.HP \w'Window\ XCompositeGetOverlayWindow('u
.BI "Window XCompositeGetOverlayWindow(Display\ *" "dpy" ", Window\ " "window" ");"
.HP \w'void\ XCompositeReleaseOverlayWindow('u
.BI "void XCompositeReleaseOverlayWindow(Display\ *" "dpy" ", Window\ " "window" ");"
.SH "DESCRIPTION"
.PP
The composite extension provides several related mechanisms:
.TP
.PP
Per\-hierarchy storage
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.
.TP
.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
Automatic shadow update
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.
.TP
.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
Composite Overlay Window
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.
.TP
.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
Parent window clipping
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.
.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.
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.
The off\-screen storage includes the window contents, its borders and the contents of all descendants\&.
.SH "ARGUMENTS"
.PP
.TP
.PP
\fIdisplay\fR
.RS 4
Pointer to the
\fBDisplay\fR
structure returned from
\fBXOpenDisplay\fR
for the connection to the X server.
.TP
for the connection to the X server\&.
.RE
.PP
\fIevent_base_return\fR
Pointer to integer where the base value for Composite Extension events will be stored.
.TP
.RS 4
Pointer to integer where the base value for Composite Extension events will be stored\&.
.RE
.PP
\fIerror_base_return\fR
Pointer to integer where the base value for Composite Extension errors will be stored.
.TP
.RS 4
Pointer to integer where the base value for Composite Extension errors will be stored\&.
.RE
.PP
\fImajor_version_return\fR
Pointer to integer where the major version of the Composite Extension supported by the X server will be stored.
.TP
.RS 4
Pointer to integer where the major version of the Composite Extension supported by the X server will be stored\&.
.RE
.PP
\fIminor_version_return\fR
Pointer to integer where the minor version of the Composite Extension supported by the X server will be stored.
.TP
.RS 4
Pointer to integer where the minor version of the Composite Extension supported by the X server will be stored\&.
.RE
.PP
\fIwindow\fR
Specifies the window ID to operate on.
.TP
.RS 4
Specifies the window ID to operate on\&.
.RE
.PP
\fIupdate\fR
Specifies the mode for updating the window contents. Must be either
.RS 4
Specifies the mode for updating the window contents\&. Must be either
\fBCompositeRedirectAutomatic\fR
or
\fBCompositeRedirectManual\fR.
\fBCompositeRedirectManual\fR\&.
.RE
.SH "FUNCTIONS"
.PP
.TP
.PP
\fBXCompositeQueryExtension\fR
.RS 4
\fBXCompositeQueryExtension\fR
determines if the Composite Extension is available on the given display. It returns
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.
.TP
\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
\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.
.TP
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
\fBXCompositeVersion\fR
.RS 4
\fBXCompositeVersion\fR
returns the version of the X Composite library. The version number is encoded as:
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.
.TP
For example, version 1\&.4\&.6 would be encoded as the integer 10406\&.
.RE
.PP
\fBXCompositeRedirectWindow\fR
.RS 4
\fBXCompositeRedirectWindow\fR
requests the X server to direct the hierarchy starting at
\fIwindow\fR
to off\-screen storage. The
to off\-screen storage\&. The
\fIupdate\fR
argument specifies whether the contents are mirrored to the parent window automatically or not. Only one client at a time may specify an update type of
argument specifies whether the contents are mirrored to the parent window automatically or not\&. Only one client at a time may specify an update type of
\fBCompositeRedirectManual\fR, another attempt will result in a
BadAccess
error. When all clients enabling redirection terminate, the redirection will automatically be disabled.
error\&. When all clients enabling redirection terminate, the redirection will automatically be disabled\&.
.sp
The root window may not be redirected. Doing so results in a
The root window may not be redirected\&. Doing so results in a
BadMatch
error. Specifying an invalid window id will result in a
error\&. Specifying an invalid window id will result in a
BadWindow
error.
.TP
error\&.
.RE
.PP
\fBXCompositeRedirectSubwindows\fR
.RS 4
\fBXCompositeRedirectSubwindows\fR
requests the X server to redirect hierarchies starting at all current and future children of
\fIwindow\fR
as in
\fBXCompositeRedirectWindow\fR. If
\fBXCompositeRedirectWindow\fR\&. If
\fIupdate\fR
is
\fBCompositeRedirectManual\fR, then painting of the window background during window manipulation and ClearArea requests is inhibited.
.TP
\fBCompositeRedirectManual\fR, then painting of the window background during window manipulation and ClearArea requests is inhibited\&.
.RE
.PP
\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
\fIwindow\fR\&. If the specified window was not selected for redirection by the current client, a
BadValue
error results.
.TP
error results\&.
.RE
.PP
\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
\fIwindow\fR\&. If the specified window was not selected for sub\-redirection by the current client, a
BadValue
error results.
.TP
error results\&.
.RE
.PP
\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.
.TP
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
\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
\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
BadMatch
error if
\fIwindow\fR
is not redirected or is not visible.
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.
.TP
The X server must support at least version 0\&.2 of the Composite Extension for
\fBXCompositeNameWindowPixmap\fR\&.
.RE
.PP
\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.
\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\&.
.sp
The Composite Overlay Window for a particular screen will be unmapped when all clients who have called this function have either called
\fBXCompositeReleaseOverlayWindow\fR
for that screen, or terminated their connection to the X server.
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.
.TP
The X server must support at least version 0\&.3 of the Composite Extension for
\fBXCompositeGetOverlayWindow\fR\&.
.RE
.PP
\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.
\fIwindow\fR\&. A screen\*(Aqs 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.
.SH "AUTHOR"
Keith Packard <keithp@keithp.com>, Deron Johnson <deron.johnson@sun.com>.
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\&>
.RS 4
Extension specification and implementation
.RE
.PP
\fBDeron Johnson\fR <\&deron\&.johnson@sun\&.com\&>
.RS 4
Overlay Window specification and implementation
.RE

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

@ -192,7 +192,7 @@ contents of all descendants.
<varlistentry>
<term><parameter>display</parameter></term>
<listitem><para>
Pointer to the <type>Display</type> structure returned from
Pointer to the <type>Display</type> structure returned from
<function>XOpenDisplay</function> for the connection to the X server.
</para></listitem>
</varlistentry>
@ -246,11 +246,11 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeQueryExtension</function></term>
<listitem><para>
<function>XCompositeQueryExtension</function> determines if the
Composite Extension is available on the given display. It returns
<constant>True</constant> if the extension is supported, otherwise
<constant>False</constant>. If the extension is present, the base
values for events and errors are returned, and can be used to
<function>XCompositeQueryExtension</function> determines if the
Composite Extension is available on the given display. It returns
<constant>True</constant> if the extension is supported, otherwise
<constant>False</constant>. 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.
</para></listitem>
</varlistentry>
@ -258,12 +258,12 @@ contents of all descendants.
<term><function>XCompositeQueryVersion</function></term>
<listitem><para>
<function>XCompositeQueryVersion</function> determines if the X Server
supports a version of the X Composite Extension which is compatible
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
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
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.
</para></listitem>
@ -271,7 +271,7 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeVersion</function></term>
<listitem><para>
<function>XCompositeVersion</function> returns the version of the
<function>XCompositeVersion</function> returns the version of the
X Composite library. The version number is encoded as:
<blockquote><para><code language="C">
(major * 10000) + (minor * 100) + revision
@ -284,18 +284,18 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeRedirectWindow</function></term>
<listitem><para>
<function>XCompositeRedirectWindow</function> requests the X server
to direct the hierarchy starting at <parameter>window</parameter> to
off-screen storage.
The <parameter>update</parameter> argument specifies whether
<function>XCompositeRedirectWindow</function> requests the X server
to direct the hierarchy starting at <parameter>window</parameter> to
off-screen storage.
The <parameter>update</parameter> argument specifies whether
the contents are mirrored to the parent window automatically or not.
Only one client at a time may specify an update type of
<constant>CompositeRedirectManual</constant>, another attempt will
result in a <errorname>BadAccess</errorname> error. When all clients
Only one client at a time may specify an update type of
<constant>CompositeRedirectManual</constant>, another attempt will
result in a <errorname>BadAccess</errorname> error. When all clients
enabling redirection terminate, the redirection will automatically be
disabled.
</para><para>
The root window may not be redirected. Doing so results in a
The root window may not be redirected. Doing so results in a
<errorname>BadMatch</errorname> error. Specifying an invalid
window id will result in a <errorname>BadWindow</errorname> error.
</para></listitem>
@ -303,20 +303,20 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeRedirectSubwindows</function></term>
<listitem><para>
<function>XCompositeRedirectSubwindows</function> requests the X
server to redirect hierarchies starting at all current and future
children of <parameter>window</parameter> as in
<function>XCompositeRedirectWindow</function>.
If <parameter>update</parameter> is
<constant>CompositeRedirectManual</constant>, then painting of the
window background during window manipulation and ClearArea requests
<function>XCompositeRedirectSubwindows</function> requests the X
server to redirect hierarchies starting at all current and future
children of <parameter>window</parameter> as in
<function>XCompositeRedirectWindow</function>.
If <parameter>update</parameter> is
<constant>CompositeRedirectManual</constant>, then painting of the
window background during window manipulation and ClearArea requests
is inhibited.
</para></listitem>
</varlistentry>
<varlistentry>
<term><function>XCompositeUnredirectWindow</function></term>
<listitem><para>
<function>XCompositeUnredirectWindow</function> requests the X
<function>XCompositeUnredirectWindow</function> requests the X
server to terminate redirection of <parameter>window</parameter>.
If the specified window was not selected for redirection by the
current client, a <errorname>BadValue</errorname> error results.
@ -325,7 +325,7 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeUnredirectSubwindows</function></term>
<listitem><para>
<function>XCompositeUnredirectWindow</function> requests the X
<function>XCompositeUnredirectWindow</function> requests the X
server to terminate redirection of all children of
<parameter>window</parameter>.
If the specified window was not selected for sub-redirection by the
@ -349,12 +349,12 @@ contents of all descendants.
<listitem><para>
<function>XCompositeNameWindowPixmap</function> creates and returns
a pixmap id that serves as a reference to the off-screen storage for
<parameter>window</parameter>. 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
<parameter>window</parameter>. 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
the current window contents. Generates a
<errorname>BadMatch</errorname> error if <parameter>window</parameter>
is not redirected or is not visible.
</para><para>
@ -366,15 +366,15 @@ contents of all descendants.
<term><function>XCompositeGetOverlayWindow</function></term>
<listitem><para>
<function>XCompositeGetOverlayWindow</function> returns the window ID
of the Composite Overlay Window for
the screen specified by the argument <parameter>window</parameter>.
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
of the Composite Overlay Window for
the screen specified by the argument <parameter>window</parameter>.
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.
</para><para>
The Composite Overlay Window for a particular screen will be
unmapped when all clients who have called this function have
The Composite Overlay Window for a particular screen will be
unmapped when all clients who have called this function have
either called <function>XCompositeReleaseOverlayWindow</function>
for that screen, or terminated their connection to the X server.
</para><para>
@ -385,9 +385,9 @@ contents of all descendants.
<varlistentry>
<term><function>XCompositeReleaseOverlayWindow</function></term>
<listitem><para>
This request specifies that the client is no longer using the
Composite Overlay Window on the screen specified by the
argument <parameter>window</parameter>. A screen&apos;s Composite
This request specifies that the client is no longer using the
Composite Overlay Window on the screen specified by the
argument <parameter>window</parameter>. A screen&apos;s Composite
Overlay Window is unmapped when there are no longer any clients using it.
</para><para>
The X server must support at least version 0.3 of the Composite

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

@ -1,8 +1,8 @@
#
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:58:22 matthieu Exp $
#
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
#
# 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
@ -12,7 +12,7 @@
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@ -35,4 +35,4 @@ libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS)
libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libXcompositeincludedir = $(includedir)/X11/extensions
libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h
libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h

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

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.12.3 from Makefile.am.
# Makefile.in generated by automake 1.12.5 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2012 Free Software Foundation, Inc.
@ -16,9 +16,9 @@
#
# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:58:22 matthieu Exp $
#
#
# Copyright © 2003 Keith Packard, Noah Levitt
#
#
# 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
@ -28,7 +28,7 @@
# specific, written prior permission. Keith Packard makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
#
#
# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
@ -323,7 +323,7 @@ libXcomposite_la_SOURCES = \
libXcomposite_la_LIBADD = $(XCOMPOSITE_LIBS)
libXcomposite_la_LDFLAGS = -version-number 1:0:0 -no-undefined
libXcompositeincludedir = $(includedir)/X11/extensions
libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h
libXcompositeinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xcomposite.h
all: all-am
.SUFFIXES:

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

@ -1,5 +1,5 @@
/*
* $Id: Xcomposite.c,v 1.3 2010/07/17 15:07:18 matthieu Exp $
* $Id: Xcomposite.c,v 1.4 2013/01/05 14:59:39 matthieu Exp $
*
* Copyright © 2006 Sun Microsystems
*
@ -52,7 +52,7 @@ const char XCompositeExtensionName[] = COMPOSITE_NAME;
* XCompositeExtRemoveDisplay - remove the indicated display from the
* extension object. (Replaces XextRemoveDisplay.)
*/
static int
static int
XCompositeExtRemoveDisplay (XCompositeExtInfo *extinfo, Display *dpy)
{
XCompositeExtDisplayInfo *info, *prev;
@ -111,13 +111,13 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
info->codes = XInitExtension (dpy, ext_name);
/*
* if the server has the extension, then we can initialize the
* if the server has the extension, then we can initialize the
* appropriate function vectors
*/
if (info->codes) {
xCompositeQueryVersionReply rep;
xCompositeQueryVersionReq *req;
XESetCloseDisplay (dpy, info->codes->extension,
XESetCloseDisplay (dpy, info->codes->extension,
XCompositeCloseDisplay);
/*
* Get the version info
@ -128,7 +128,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
req->compositeReqType = X_CompositeQueryVersion;
req->majorVersion = COMPOSITE_MAJOR;
req->minorVersion = COMPOSITE_MINOR;
if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
if (!_XReply (dpy, (xReply *) &rep, 0, xTrue))
{
UnlockDisplay (dpy);
SyncHandle ();
@ -171,7 +171,7 @@ XCompositeExtAddDisplay (XCompositeExtInfo *extinfo,
* XextFindDisplay.)
*/
static XCompositeExtDisplayInfo *
XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
Display *dpy)
{
XCompositeExtDisplayInfo *info;
@ -179,7 +179,7 @@ XCompositeExtFindDisplay (XCompositeExtInfo *extinfo,
/*
* see if this was the most recently accessed display
*/
if ((info = extinfo->cur) && info->display == dpy)
if ((info = extinfo->cur) && info->display == dpy)
return info;
/*
@ -205,30 +205,30 @@ XCompositeFindDisplay (Display *dpy)
info = XCompositeExtFindDisplay (&XCompositeExtensionInfo, dpy);
if (!info)
info = XCompositeExtAddDisplay (&XCompositeExtensionInfo, dpy,
info = XCompositeExtAddDisplay (&XCompositeExtensionInfo, dpy,
XCompositeExtensionName);
return info;
}
Bool
Bool
XCompositeQueryExtension (Display *dpy,
int *event_base_return,
int *error_base_return)
{
XCompositeExtDisplayInfo *info = XCompositeFindDisplay (dpy);
if (XCompositeHasExtension(info))
if (XCompositeHasExtension(info))
{
*event_base_return = info->codes->first_event;
*error_base_return = info->codes->first_error;
return True;
}
}
else
return False;
}
Status
Status
XCompositeQueryVersion (Display *dpy,
int *major_version_return,
int *minor_version_return)
@ -372,7 +372,7 @@ XCompositeGetOverlayWindow (Display *dpy, Window window)
SyncHandle ();
return 0;
}
UnlockDisplay (dpy);
SyncHandle ();