Update xcompmgr to version 1.1.9
matthieu
parent
d04c7bf7c1
commit
a37ea9079b
|
|
@ -1,3 +1,102 @@
|
|||
commit 052a0d39908a33e62f4d77b4d9e395f2f3583925
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Nov 12 11:55:23 2022 -0800
|
||||
|
||||
xcompmgr 1.1.9
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 94ac89d540b09841479a30158158a08ecb032a95
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Oct 29 11:39:28 2022 -0700
|
||||
|
||||
Remove unused macros
|
||||
|
||||
Reported by clang:
|
||||
xcompmgr.c:159:9: warning: macro is not used [-Wunused-macros]
|
||||
#define TRANS_OPACITY 0.75
|
||||
^
|
||||
xcompmgr.c:166:9: warning: macro is not used [-Wunused-macros]
|
||||
#define SHADOWS 1
|
||||
^
|
||||
xcompmgr.c:167:9: warning: macro is not used [-Wunused-macros]
|
||||
#define SHARP_SHADOW 0
|
||||
^
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 6f0f20dc0cefe96209f57099a92f7c6ace7cc5fd
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Oct 29 11:37:24 2022 -0700
|
||||
|
||||
Mark usage() as _X_COLD _X_NORETURN
|
||||
|
||||
Suggested by clang:
|
||||
xcompmgr.c:1963:1: warning: function 'usage' could be declared with
|
||||
attribute 'noreturn' [-Wmissing-noreturn]
|
||||
{
|
||||
^
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 815c95d612b6f71dc4651c976b894d9a8f1fa15d
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Oct 29 11:30:47 2022 -0700
|
||||
|
||||
Resolve -Wshadow warnings
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit e816aa66a6f0ec0354595d9ec67182b481aee167
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Thu Jul 28 17:30:21 2022 -0700
|
||||
|
||||
gitlab CI: stop requiring Signed-off-by in commits
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 27656aaf7f23523375bdd64f92018bb6cbe220a5
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Aug 16 18:37:42 2022 -0700
|
||||
|
||||
Remove obsolete casts on malloc & free calls
|
||||
|
||||
Not needed in C89 and later
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 21155dd1386b98fb98a6e27e0d488c87e20b87c2
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Tue Aug 16 18:14:06 2022 -0700
|
||||
|
||||
Reduce variable scope as suggested by cppcheck
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit e69037704430806ab44986bcbad8a480bec01a77
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Feb 19 11:01:05 2022 -0800
|
||||
|
||||
xcompmgr.man: Update bug reporting URL from bugzilla to gitlab
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 9faa66acd3ccdcc42d214e5c76ba9b01d24657f1
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Dec 4 11:19:59 2021 -0800
|
||||
|
||||
Build xz tarballs instead of bzip2
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit 3de80f321d81fc125bf7f7153f7154e991b7874e
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sat Dec 4 11:19:49 2021 -0800
|
||||
|
||||
gitlab CI: add a basic build test
|
||||
|
||||
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
|
||||
commit ccf46116f8fba6a3e32bff6b3c0be420f821828c
|
||||
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
|
||||
Date: Sun Mar 24 15:55:48 2019 -0700
|
||||
|
|
|
|||
|
|
@ -54,8 +54,8 @@ bin_PROGRAMS = xcompmgr$(EXEEXT)
|
|||
subdir = .
|
||||
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
|
||||
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
|
||||
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL \
|
||||
compile config.guess config.sub depcomp install-sh missing
|
||||
$(top_srcdir)/configure COPYING ChangeLog INSTALL compile \
|
||||
config.guess config.sub depcomp install-sh missing
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
|
||||
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
|
||||
|
|
@ -158,9 +158,9 @@ am__relativize = \
|
|||
dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
|
||||
done; \
|
||||
reldir="$$dir2"
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
|
||||
DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.xz
|
||||
GZIP_ENV = --best
|
||||
DIST_TARGETS = dist-bzip2 dist-gzip
|
||||
DIST_TARGETS = dist-xz dist-gzip
|
||||
distuninstallcheck_listfiles = find . -type f -print
|
||||
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
|
||||
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
|
||||
|
|
@ -278,6 +278,7 @@ pdfdir = @pdfdir@
|
|||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
|
|
@ -617,6 +618,7 @@ distdir: $(DISTFILES)
|
|||
dist-gzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-bzip2: distdir
|
||||
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
|
||||
$(am__post_remove_distdir)
|
||||
|
|
@ -624,7 +626,6 @@ dist-bzip2: distdir
|
|||
dist-lzip: distdir
|
||||
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
|
||||
$(am__post_remove_distdir)
|
||||
|
||||
dist-xz: distdir
|
||||
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
|
||||
$(am__post_remove_distdir)
|
||||
|
|
|
|||
|
|
@ -19,9 +19,9 @@ You have another version of autoconf. It may work, but is not guaranteed to.
|
|||
If you have problems, you may need to regenerate the build system entirely.
|
||||
To do so, use the procedure documented by the package, typically 'autoreconf'.])])
|
||||
|
||||
dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
dnl serial 11 (pkg-config-0.29.1)
|
||||
dnl
|
||||
# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
|
||||
# serial 12 (pkg-config-0.29.2)
|
||||
|
||||
dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
|
||||
dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
|
||||
dnl
|
||||
|
|
@ -62,7 +62,7 @@ dnl
|
|||
dnl See the "Since" comment for each macro you use to see what version
|
||||
dnl of the macros you require.
|
||||
m4_defun([PKG_PREREQ],
|
||||
[m4_define([PKG_MACROS_VERSION], [0.29.1])
|
||||
[m4_define([PKG_MACROS_VERSION], [0.29.2])
|
||||
m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
|
||||
[m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
|
||||
])dnl PKG_PREREQ
|
||||
|
|
@ -163,7 +163,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
|
|||
AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
|
||||
|
||||
pkg_failed=no
|
||||
AC_MSG_CHECKING([for $1])
|
||||
AC_MSG_CHECKING([for $2])
|
||||
|
||||
_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
|
||||
_PKG_CONFIG([$1][_LIBS], [libs], [$2])
|
||||
|
|
@ -173,11 +173,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
|
|||
See the pkg-config man page for more details.])
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([no])
|
||||
_PKG_SHORT_ERRORS_SUPPORTED
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
|
||||
else
|
||||
else
|
||||
$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
|
|
@ -194,7 +194,7 @@ installed software in a non-standard prefix.
|
|||
_PKG_TEXT])[]dnl
|
||||
])
|
||||
elif test $pkg_failed = untried; then
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_RESULT([no])
|
||||
m4_default([$4], [AC_MSG_FAILURE(
|
||||
[The pkg-config script could not be found or is too old. Make sure it
|
||||
is in your PATH or set the PKG_CONFIG environment variable to the full
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
#! /bin/sh
|
||||
# Wrapper for compilers which do not understand '-c -o'.
|
||||
|
||||
scriptversion=2012-10-14.11; # UTC
|
||||
scriptversion=2018-03-07.03; # UTC
|
||||
|
||||
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
|
||||
# Copyright (C) 1999-2021 Free Software Foundation, Inc.
|
||||
# Written by Tom Tromey <tromey@cygnus.com>.
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
|
|||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
# As a special exception to the GNU General Public License, if you
|
||||
# distribute this file as part of a program that contains a
|
||||
|
|
@ -53,7 +53,7 @@ func_file_conv ()
|
|||
MINGW*)
|
||||
file_conv=mingw
|
||||
;;
|
||||
CYGWIN*)
|
||||
CYGWIN* | MSYS*)
|
||||
file_conv=cygwin
|
||||
;;
|
||||
*)
|
||||
|
|
@ -67,7 +67,7 @@ func_file_conv ()
|
|||
mingw/*)
|
||||
file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
|
||||
;;
|
||||
cygwin/*)
|
||||
cygwin/* | msys/*)
|
||||
file=`cygpath -m "$file" || echo "$file"`
|
||||
;;
|
||||
wine/*)
|
||||
|
|
@ -255,7 +255,8 @@ EOF
|
|||
echo "compile $scriptversion"
|
||||
exit $?
|
||||
;;
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
|
||||
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
|
||||
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
|
||||
func_cl_wrapper "$@" # Doesn't return...
|
||||
;;
|
||||
esac
|
||||
|
|
@ -339,9 +340,9 @@ exit $ret
|
|||
# Local Variables:
|
||||
# mode: shell-script
|
||||
# sh-indentation: 2
|
||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
||||
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||
# time-stamp-start: "scriptversion="
|
||||
# time-stamp-format: "%:y-%02m-%02d.%02H"
|
||||
# time-stamp-time-zone: "UTC"
|
||||
# time-stamp-time-zone: "UTC0"
|
||||
# time-stamp-end: "; # UTC"
|
||||
# End:
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for xcompmgr 1.1.8.
|
||||
# Generated by GNU Autoconf 2.69 for xcompmgr 1.1.9.
|
||||
#
|
||||
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcompmgr/issues>.
|
||||
# Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcompmgr/-/issues>.
|
||||
#
|
||||
#
|
||||
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
|
||||
|
|
@ -267,7 +267,7 @@ fi
|
|||
$as_echo "$0: be upgraded to zsh 4.3.4 or later."
|
||||
else
|
||||
$as_echo "$0: Please tell bug-autoconf@gnu.org and
|
||||
$0: https://gitlab.freedesktop.org/xorg/app/xcompmgr/issues
|
||||
$0: https://gitlab.freedesktop.org/xorg/app/xcompmgr/-/issues
|
||||
$0: about your system, including any error possibly output
|
||||
$0: before this message. Then install a modern shell, or
|
||||
$0: manually run the script under such a shell if you do
|
||||
|
|
@ -581,9 +581,9 @@ MAKEFLAGS=
|
|||
# Identity of this package.
|
||||
PACKAGE_NAME='xcompmgr'
|
||||
PACKAGE_TARNAME='xcompmgr'
|
||||
PACKAGE_VERSION='1.1.8'
|
||||
PACKAGE_STRING='xcompmgr 1.1.8'
|
||||
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xcompmgr/issues'
|
||||
PACKAGE_VERSION='1.1.9'
|
||||
PACKAGE_STRING='xcompmgr 1.1.9'
|
||||
PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/app/xcompmgr/-/issues'
|
||||
PACKAGE_URL=''
|
||||
|
||||
ac_unique_file="xcompmgr.c"
|
||||
|
|
@ -729,6 +729,7 @@ infodir
|
|||
docdir
|
||||
oldincludedir
|
||||
includedir
|
||||
runstatedir
|
||||
localstatedir
|
||||
sharedstatedir
|
||||
sysconfdir
|
||||
|
|
@ -809,6 +810,7 @@ datadir='${datarootdir}'
|
|||
sysconfdir='${prefix}/etc'
|
||||
sharedstatedir='${prefix}/com'
|
||||
localstatedir='${prefix}/var'
|
||||
runstatedir='${localstatedir}/run'
|
||||
includedir='${prefix}/include'
|
||||
oldincludedir='/usr/include'
|
||||
docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
|
||||
|
|
@ -1061,6 +1063,15 @@ do
|
|||
| -silent | --silent | --silen | --sile | --sil)
|
||||
silent=yes ;;
|
||||
|
||||
-runstatedir | --runstatedir | --runstatedi | --runstated \
|
||||
| --runstate | --runstat | --runsta | --runst | --runs \
|
||||
| --run | --ru | --r)
|
||||
ac_prev=runstatedir ;;
|
||||
-runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
|
||||
| --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
|
||||
| --run=* | --ru=* | --r=*)
|
||||
runstatedir=$ac_optarg ;;
|
||||
|
||||
-sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
|
||||
ac_prev=sbindir ;;
|
||||
-sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
|
||||
|
|
@ -1198,7 +1209,7 @@ fi
|
|||
for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
|
||||
datadir sysconfdir sharedstatedir localstatedir includedir \
|
||||
oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
|
||||
libdir localedir mandir
|
||||
libdir localedir mandir runstatedir
|
||||
do
|
||||
eval ac_val=\$$ac_var
|
||||
# Remove trailing slashes.
|
||||
|
|
@ -1311,7 +1322,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 xcompmgr 1.1.8 to adapt to many kinds of systems.
|
||||
\`configure' configures xcompmgr 1.1.9 to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
|
|
@ -1351,6 +1362,7 @@ Fine tuning of the installation directories:
|
|||
--sysconfdir=DIR read-only single-machine data [PREFIX/etc]
|
||||
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
|
||||
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
|
||||
--runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
|
||||
--libdir=DIR object code libraries [EPREFIX/lib]
|
||||
--includedir=DIR C header files [PREFIX/include]
|
||||
--oldincludedir=DIR C header files for non-gcc [/usr/include]
|
||||
|
|
@ -1381,7 +1393,7 @@ fi
|
|||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of xcompmgr 1.1.8:";;
|
||||
short | recursive ) echo "Configuration of xcompmgr 1.1.9:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
|
|
@ -1427,7 +1439,7 @@ Some influential environment variables:
|
|||
Use these variables to override the choices made by `configure' or to help
|
||||
it to find libraries and programs with nonstandard names/locations.
|
||||
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcompmgr/issues>.
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcompmgr/-/issues>.
|
||||
_ACEOF
|
||||
ac_status=$?
|
||||
fi
|
||||
|
|
@ -1490,7 +1502,7 @@ fi
|
|||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
xcompmgr configure 1.1.8
|
||||
xcompmgr configure 1.1.9
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
|
|
@ -1747,7 +1759,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 xcompmgr $as_me 1.1.8, which was
|
||||
It was created by xcompmgr $as_me 1.1.9, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
|
|
@ -2576,7 +2588,7 @@ fi
|
|||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='xcompmgr'
|
||||
VERSION='1.1.8'
|
||||
VERSION='1.1.9'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
|
|
@ -10400,19 +10412,19 @@ AM_BACKSLASH='\'
|
|||
|
||||
|
||||
pkg_failed=no
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XCOMPMGR" >&5
|
||||
$as_echo_n "checking for XCOMPMGR... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for xcomposite xfixes xdamage xrender xext xproto >= 7.0.25" >&5
|
||||
$as_echo_n "checking for xcomposite xfixes xdamage xrender xext xproto >= 7.0.25... " >&6; }
|
||||
|
||||
if test -n "$XCOMPMGR_CFLAGS"; then
|
||||
pkg_cv_XCOMPMGR_CFLAGS="$XCOMPMGR_CFLAGS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite xfixes xdamage xrender xext\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "xcomposite xfixes xdamage xrender xext") 2>&5
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite xfixes xdamage xrender xext xproto >= 7.0.25\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "xcomposite xfixes xdamage xrender xext xproto >= 7.0.25") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_XCOMPMGR_CFLAGS=`$PKG_CONFIG --cflags "xcomposite xfixes xdamage xrender xext" 2>/dev/null`
|
||||
pkg_cv_XCOMPMGR_CFLAGS=`$PKG_CONFIG --cflags "xcomposite xfixes xdamage xrender xext xproto >= 7.0.25" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
|
|
@ -10424,12 +10436,12 @@ if test -n "$XCOMPMGR_LIBS"; then
|
|||
pkg_cv_XCOMPMGR_LIBS="$XCOMPMGR_LIBS"
|
||||
elif test -n "$PKG_CONFIG"; then
|
||||
if test -n "$PKG_CONFIG" && \
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite xfixes xdamage xrender xext\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "xcomposite xfixes xdamage xrender xext") 2>&5
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"xcomposite xfixes xdamage xrender xext xproto >= 7.0.25\""; } >&5
|
||||
($PKG_CONFIG --exists --print-errors "xcomposite xfixes xdamage xrender xext xproto >= 7.0.25") 2>&5
|
||||
ac_status=$?
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
||||
test $ac_status = 0; }; then
|
||||
pkg_cv_XCOMPMGR_LIBS=`$PKG_CONFIG --libs "xcomposite xfixes xdamage xrender xext" 2>/dev/null`
|
||||
pkg_cv_XCOMPMGR_LIBS=`$PKG_CONFIG --libs "xcomposite xfixes xdamage xrender xext xproto >= 7.0.25" 2>/dev/null`
|
||||
test "x$?" != "x0" && pkg_failed=yes
|
||||
else
|
||||
pkg_failed=yes
|
||||
|
|
@ -10441,7 +10453,7 @@ fi
|
|||
|
||||
|
||||
if test $pkg_failed = yes; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
|
||||
if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
||||
|
|
@ -10450,14 +10462,14 @@ else
|
|||
_pkg_short_errors_supported=no
|
||||
fi
|
||||
if test $_pkg_short_errors_supported = yes; then
|
||||
XCOMPMGR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcomposite xfixes xdamage xrender xext" 2>&1`
|
||||
XCOMPMGR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "xcomposite xfixes xdamage xrender xext xproto >= 7.0.25" 2>&1`
|
||||
else
|
||||
XCOMPMGR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcomposite xfixes xdamage xrender xext" 2>&1`
|
||||
XCOMPMGR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "xcomposite xfixes xdamage xrender xext xproto >= 7.0.25" 2>&1`
|
||||
fi
|
||||
# Put the nasty error message in config.log where it belongs
|
||||
echo "$XCOMPMGR_PKG_ERRORS" >&5
|
||||
|
||||
as_fn_error $? "Package requirements (xcomposite xfixes xdamage xrender xext) were not met:
|
||||
as_fn_error $? "Package requirements (xcomposite xfixes xdamage xrender xext xproto >= 7.0.25) were not met:
|
||||
|
||||
$XCOMPMGR_PKG_ERRORS
|
||||
|
||||
|
|
@ -10468,7 +10480,7 @@ Alternatively, you may set the environment variables XCOMPMGR_CFLAGS
|
|||
and XCOMPMGR_LIBS to avoid the need to call pkg-config.
|
||||
See the pkg-config man page for more details." "$LINENO" 5
|
||||
elif test $pkg_failed = untried; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
|
||||
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
|
||||
|
|
@ -11026,7 +11038,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 xcompmgr $as_me 1.1.8, which was
|
||||
This file was extended by xcompmgr $as_me 1.1.9, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
|
|
@ -11086,13 +11098,13 @@ $config_headers
|
|||
Configuration commands:
|
||||
$config_commands
|
||||
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcompmgr/issues>."
|
||||
Report bugs to <https://gitlab.freedesktop.org/xorg/app/xcompmgr/-/issues>."
|
||||
|
||||
_ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
xcompmgr config.status 1.1.8
|
||||
xcompmgr config.status 1.1.9
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
# Initialize Autoconf
|
||||
AC_PREREQ(2.60)
|
||||
AC_INIT([xcompmgr], [1.1.8],
|
||||
[https://gitlab.freedesktop.org/xorg/app/xcompmgr/issues])
|
||||
AC_INIT([xcompmgr], [1.1.9],
|
||||
[https://gitlab.freedesktop.org/xorg/app/xcompmgr/-/issues])
|
||||
AC_CONFIG_SRCDIR([xcompmgr.c])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
# Initialize Automake
|
||||
AM_INIT_AUTOMAKE([foreign dist-bzip2])
|
||||
AM_INIT_AUTOMAKE([foreign dist-xz])
|
||||
|
||||
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
|
||||
m4_ifndef([XORG_MACROS_VERSION],
|
||||
|
|
@ -17,7 +17,8 @@ m4_ifndef([XORG_MACROS_VERSION],
|
|||
XORG_MACROS_VERSION(1.8)
|
||||
XORG_DEFAULT_OPTIONS
|
||||
|
||||
PKG_CHECK_MODULES(XCOMPMGR, xcomposite xfixes xdamage xrender xext)
|
||||
PKG_CHECK_MODULES(XCOMPMGR,
|
||||
[xcomposite xfixes xdamage xrender xext xproto >= 7.0.25])
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
|
|
|
|||
|
|
@ -222,6 +222,7 @@ pdfdir = @pdfdir@
|
|||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
runstatedir = @runstatedir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
srcdir = @srcdir@
|
||||
|
|
|
|||
|
|
@ -63,7 +63,8 @@ opacity, as with transset(1).
|
|||
.BI \-S
|
||||
Enables synchronous operation. Useful for debugging.
|
||||
.SH BUGS
|
||||
Probably. Please report any you find to http://bugs.freedesktop.org/.
|
||||
Probably. Please report any you find to
|
||||
https://gitlab.freedesktop.org/xorg/app/xcompmgr/.
|
||||
.SH AUTHORS
|
||||
Keith Packard, with contributions from Matthew Allum, Eric Anholt, Dan Doel,
|
||||
Thomas Luebking, Matthew Hawn, Ely Levy, Phil Blundell, and Carl Worth.
|
||||
|
|
|
|||
|
|
@ -156,16 +156,11 @@ static conv *gaussianMap;
|
|||
#define WINDOW_TRANS 1
|
||||
#define WINDOW_ARGB 2
|
||||
|
||||
#define TRANS_OPACITY 0.75
|
||||
|
||||
#define DEBUG_REPAINT 0
|
||||
#define DEBUG_EVENTS 0
|
||||
#define DEBUG_SHAPE 0
|
||||
#define MONITOR_REPAINT 0
|
||||
|
||||
#define SHADOWS 1
|
||||
#define SHARP_SHADOW 0
|
||||
|
||||
typedef enum _compMode {
|
||||
CompSimple, /* looks like a regular X server */
|
||||
CompServerShadows, /* use window alpha for shadow; sharp, but precise */
|
||||
|
|
@ -441,7 +436,6 @@ static unsigned char
|
|||
sum_gaussian (conv *map, double opacity, int x, int y, int width, int height)
|
||||
{
|
||||
int fx, fy;
|
||||
double *g_data;
|
||||
double *g_line = map->data;
|
||||
int g_size = map->size;
|
||||
int center = g_size / 2;
|
||||
|
|
@ -478,7 +472,7 @@ sum_gaussian (conv *map, double opacity, int x, int y, int width, int height)
|
|||
v = 0;
|
||||
for (fy = fy_start; fy < fy_end; fy++)
|
||||
{
|
||||
g_data = g_line;
|
||||
double *g_data = g_line;
|
||||
g_line += g_size;
|
||||
|
||||
for (fx = fx_start; fx < fx_end; fx++)
|
||||
|
|
@ -500,12 +494,12 @@ presum_gaussian (conv *map)
|
|||
Gsize = map->size;
|
||||
|
||||
if (shadowCorner)
|
||||
free ((void *)shadowCorner);
|
||||
free (shadowCorner);
|
||||
if (shadowTop)
|
||||
free ((void *)shadowTop);
|
||||
free (shadowTop);
|
||||
|
||||
shadowCorner = (unsigned char *)(malloc ((Gsize + 1) * (Gsize + 1) * 26));
|
||||
shadowTop = (unsigned char *)(malloc ((Gsize + 1) * 26));
|
||||
shadowCorner = malloc ((Gsize + 1) * (Gsize + 1) * 26);
|
||||
shadowTop = malloc ((Gsize + 1) * 26);
|
||||
|
||||
for (x = 0; x <= Gsize; x++)
|
||||
{
|
||||
|
|
@ -1155,7 +1149,6 @@ repair_win (Display *dpy, win *w)
|
|||
}
|
||||
else
|
||||
{
|
||||
XserverRegion o;
|
||||
parts = XFixesCreateRegion (dpy, NULL, 0);
|
||||
set_ignore (dpy, NextRequest (dpy));
|
||||
XDamageSubtract (dpy, w->damage, None, parts);
|
||||
|
|
@ -1164,7 +1157,7 @@ repair_win (Display *dpy, win *w)
|
|||
w->a.y + w->a.border_width);
|
||||
if (compMode == CompServerShadows)
|
||||
{
|
||||
o = XFixesCreateRegion (dpy, NULL, 0);
|
||||
XserverRegion o = XFixesCreateRegion (dpy, NULL, 0);
|
||||
XFixesCopyRegion (dpy, o, parts);
|
||||
XFixesTranslateRegion (dpy, o, w->shadow_dx, w->shadow_dy);
|
||||
XFixesUnionRegion (dpy, parts, parts, o);
|
||||
|
|
@ -1179,7 +1172,7 @@ static unsigned int
|
|||
get_opacity_prop (Display *dpy, win *w, unsigned int def);
|
||||
|
||||
static void
|
||||
map_win (Display *dpy, Window id, unsigned long sequence, Bool fade)
|
||||
map_win (Display *dpy, Window id, unsigned long sequence, Bool doFade)
|
||||
{
|
||||
win *w = find_win (dpy, id);
|
||||
|
||||
|
|
@ -1201,7 +1194,7 @@ map_win (Display *dpy, Window id, unsigned long sequence, Bool fade)
|
|||
#endif
|
||||
w->damaged = 0;
|
||||
|
||||
if (fade && fadeWindows)
|
||||
if (doFade && fadeWindows)
|
||||
set_fade (dpy, w, 0, get_opacity_percent (dpy, w, 1.0), fade_in_step, NULL, False, True, True);
|
||||
}
|
||||
|
||||
|
|
@ -1266,14 +1259,14 @@ unmap_callback (Display *dpy, win *w, Bool gone)
|
|||
#endif
|
||||
|
||||
static void
|
||||
unmap_win (Display *dpy, Window id, Bool fade)
|
||||
unmap_win (Display *dpy, Window id, Bool doFade)
|
||||
{
|
||||
win *w = find_win (dpy, id);
|
||||
if (!w)
|
||||
return;
|
||||
w->a.map_state = IsUnmapped;
|
||||
#if HAS_NAME_WINDOW_PIXMAP
|
||||
if (w->pixmap && fade && fadeWindows)
|
||||
if (w->pixmap && doFade && fadeWindows)
|
||||
set_fade (dpy, w, w->opacity*1.0/OPAQUE, 0.0, fade_out_step, unmap_callback, False, False, True);
|
||||
else
|
||||
#endif
|
||||
|
|
@ -1398,7 +1391,7 @@ determine_wintype (Display *dpy, Window w)
|
|||
{
|
||||
Window root_return, parent_return;
|
||||
Window *children = NULL;
|
||||
unsigned int nchildren, i;
|
||||
unsigned int nchildren;
|
||||
Atom type;
|
||||
|
||||
type = get_wintype_prop (dpy, w);
|
||||
|
|
@ -1414,7 +1407,7 @@ determine_wintype (Display *dpy, Window w)
|
|||
return winNormalAtom;
|
||||
}
|
||||
|
||||
for (i = 0;i < nchildren;i++)
|
||||
for (unsigned int i = 0; i < nchildren; i++)
|
||||
{
|
||||
type = determine_wintype (dpy, children[i]);
|
||||
if (type != winNormalAtom)
|
||||
|
|
@ -1671,11 +1664,11 @@ destroy_callback (Display *dpy, win *w, Bool gone)
|
|||
#endif
|
||||
|
||||
static void
|
||||
destroy_win (Display *dpy, Window id, Bool gone, Bool fade)
|
||||
destroy_win (Display *dpy, Window id, Bool gone, Bool doFade)
|
||||
{
|
||||
win *w = find_win (dpy, id);
|
||||
#if HAS_NAME_WINDOW_PIXMAP
|
||||
if (w && w->pixmap && fade && fadeWindows)
|
||||
if (w && w->pixmap && doFade && fadeWindows)
|
||||
set_fade (dpy, w, w->opacity*1.0/OPAQUE, 0.0, fade_out_step, destroy_callback, gone, False, True);
|
||||
else
|
||||
#endif
|
||||
|
|
@ -1887,7 +1880,7 @@ error (Display *dpy, XErrorEvent *ev)
|
|||
}
|
||||
|
||||
static void
|
||||
expose_root (Display *dpy, Window root, XRectangle *rects, int nrects)
|
||||
expose_root (Display *dpy, Window rootwin, XRectangle *rects, int nrects)
|
||||
{
|
||||
XserverRegion region = XFixesCreateRegion (dpy, rects, nrects);
|
||||
|
||||
|
|
@ -1960,7 +1953,7 @@ ev_window (XEvent *ev)
|
|||
}
|
||||
#endif
|
||||
|
||||
static void
|
||||
static void _X_COLD _X_NORETURN
|
||||
usage (const char *program)
|
||||
{
|
||||
fprintf (stderr, "%s v%s\n", program, PACKAGE_VERSION);
|
||||
|
|
@ -2061,7 +2054,6 @@ main (int argc, char **argv)
|
|||
Window root_return, parent_return;
|
||||
Window *children;
|
||||
unsigned int nchildren;
|
||||
int i;
|
||||
XRenderPictureAttributes pa;
|
||||
XRectangle *expose_rects = NULL;
|
||||
int size_expose = 0;
|
||||
|
|
@ -2231,7 +2223,7 @@ main (int argc, char **argv)
|
|||
PropertyChangeMask);
|
||||
XShapeSelectInput (dpy, root, ShapeNotifyMask);
|
||||
XQueryTree (dpy, root, &root_return, &parent_return, &children, &nchildren);
|
||||
for (i = 0; i < nchildren; i++)
|
||||
for (unsigned int i = 0; i < nchildren; i++)
|
||||
add_win (dpy, children[i], i ? children[i-1] : None);
|
||||
XFree (children);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue