From 55935efe32c6e9ce83ced5abd4c8ba89ccaf4d00 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Sun, 19 Sep 2004 20:16:01 +0000
Subject: [PATCH] Remove compositor for now.
(Old svn revision: 11957)
---
Makefile.in | 2 -
config.h.in | 3 -
configure | 187 ++-------
configure.ac | 24 +-
defaults/Makefile.in | 2 -
doc/C/Makefile.in | 2 -
doc/C/images/Makefile.in | 2 -
doc/Makefile.in | 2 -
doc/fr/Makefile.in | 2 -
doc/fr/images/Makefile.in | 2 -
doc/it/Makefile.in | 2 -
doc/it/images/Makefile.in | 2 -
icons/48x48/Makefile.in | 2 -
icons/Makefile.in | 2 -
icons/scalable/Makefile.in | 2 -
ltmain.sh | 3 +
mcs-plugin/Makefile.in | 2 -
src/Makefile.am | 2 -
src/Makefile.in | 4 -
src/client.h | 23 --
src/compositor.c | 655 --------------------------------
src/compositor.h | 45 ---
src/display.c | 47 ---
src/display.h | 33 --
src/main.c | 16 +-
src/screen.h | 7 -
themes/Makefile.in | 2 -
themes/default-4.0/Makefile.in | 2 -
themes/default.keys/Makefile.in | 2 -
themes/default/Makefile.in | 2 -
themes/opta/Makefile.in | 2 -
themes/symphony/Makefile.in | 2 -
themes/waza/Makefile.in | 2 -
33 files changed, 50 insertions(+), 1039 deletions(-)
delete mode 100644 src/compositor.c
delete mode 100644 src/compositor.h
diff --git a/Makefile.in b/Makefile.in
index 15603e253..9da804f68 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,8 +87,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/config.h.in b/config.h.in
index 64d86692e..e2e726061 100644
--- a/config.h.in
+++ b/config.h.in
@@ -15,9 +15,6 @@
/* Define to 1 if you have the `bind_textdomain_codeset' function. */
#undef HAVE_BIND_TEXTDOMAIN_CODESET
-/* Define to enable compositor */
-#undef HAVE_COMPOSITOR
-
/* Define to 1 if you have the `daemon' function. */
#undef HAVE_DAEMON
diff --git a/configure b/configure
index aa6832665..52a59c6fa 100755
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_CYGWIN_TRUE HAVE_CYGWIN_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS LIBXPM_CFLAGS LIBXPM_LDFLAGS LIBXPM_LIBS PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_REQUIRED_VERSION LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCE4MCS_MANAGER_CFLAGS LIBXFCE4MCS_MANAGER_LIBS LIBXFCE4MCS_MANAGER_REQUIRED_VERSION LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION RANDR_LIBS COMPOSITOR_CFLAGS COMPOSITOR_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP HAVE_CYGWIN_TRUE HAVE_CYGWIN_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS localedir X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBX11_CFLAGS LIBX11_LDFLAGS LIBX11_LIBS LIBXPM_CFLAGS LIBXPM_LDFLAGS LIBXPM_LIBS PKG_CONFIG GTK_CFLAGS GTK_LIBS GTK_REQUIRED_VERSION LIBXFCE4MCS_CLIENT_CFLAGS LIBXFCE4MCS_CLIENT_LIBS LIBXFCE4MCS_CLIENT_REQUIRED_VERSION LIBXFCE4MCS_MANAGER_CFLAGS LIBXFCE4MCS_MANAGER_LIBS LIBXFCE4MCS_MANAGER_REQUIRED_VERSION LIBXFCE4UTIL_CFLAGS LIBXFCE4UTIL_LIBS LIBXFCE4UTIL_REQUIRED_VERSION LIBXFCEGUI4_CFLAGS LIBXFCEGUI4_LIBS LIBXFCEGUI4_REQUIRED_VERSION XFCE_MCS_MANAGER_CFLAGS XFCE_MCS_MANAGER_LIBS XFCE_MCS_MANAGER_REQUIRED_VERSION XFCE_MCS_MANAGER_PLUGINSDIR LIBSTARTUP_NOTIFICATION_CFLAGS LIBSTARTUP_NOTIFICATION_LIBS LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION RANDR_LIBS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1045,8 +1045,6 @@ Optional Features:
Disable checking for startup notification library
--enable-randr try to use the randr extension
--disable-randr don't try to use the randr extension
- --enable-compositor enable compositor in xfwm4
- --disable-compositor disable compositor in xfwm4
--enable-debug=yes|no|full
Build with debugging support
--disable-debug Include no debugging support default
@@ -1824,7 +1822,7 @@ fi
# Define the identity of the package.
PACKAGE=xfwm4
- VERSION=4.1.11
+ VERSION=4.1.12
cat >>confdefs.h <<_ACEOF
@@ -5399,7 +5397,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5402 "configure"' > conftest.$ac_ext
+ echo '#line 5400 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6493,7 +6491,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:6496:" \
+echo "$as_me:6494:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7527,11 +7525,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7530: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7528: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7534: \$? = $ac_status" >&5
+ echo "$as_me:7532: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7760,11 +7758,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7763: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7761: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7767: \$? = $ac_status" >&5
+ echo "$as_me:7765: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7820,11 +7818,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7823: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7821: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7827: \$? = $ac_status" >&5
+ echo "$as_me:7825: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9154,7 +9152,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 9157 "configure"' > conftest.$ac_ext
+ echo '#line 9155 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10025,7 +10023,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10028 "configure"
+#line 10026 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -10123,7 +10121,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 10126 "configure"
+#line 10124 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12302,11 +12300,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12305: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12303: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12309: \$? = $ac_status" >&5
+ echo "$as_me:12307: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12362,11 +12360,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12365: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12363: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12369: \$? = $ac_status" >&5
+ echo "$as_me:12367: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12873,7 +12871,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12876 "configure"' > conftest.$ac_ext
+ echo '#line 12874 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13744,7 +13742,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13747 "configure"
+#line 13745 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13842,7 +13840,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13845 "configure"
+#line 13843 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14669,11 +14667,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14672: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14670: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14676: \$? = $ac_status" >&5
+ echo "$as_me:14674: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -14729,11 +14727,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14732: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14730: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14736: \$? = $ac_status" >&5
+ echo "$as_me:14734: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16043,7 +16041,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 16046 "configure"' > conftest.$ac_ext
+ echo '#line 16044 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16784,11 +16782,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16787: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16785: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16791: \$? = $ac_status" >&5
+ echo "$as_me:16789: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17017,11 +17015,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17020: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17018: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17024: \$? = $ac_status" >&5
+ echo "$as_me:17022: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -17077,11 +17075,11 @@ else
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:17080: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17078: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17084: \$? = $ac_status" >&5
+ echo "$as_me:17082: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18411,7 +18409,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18414 "configure"' > conftest.$ac_ext
+ echo '#line 18412 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -19282,7 +19280,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19285 "configure"
+#line 19283 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19380,7 +19378,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19383 "configure"
+#line 19381 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24980,121 +24978,6 @@ fi
fi
-# Check whether --enable-compositor or --disable-compositor was given.
-if test "${enable_compositor+set}" = set; then
- enableval="$enable_compositor"
-
-else
- enable_compositor=yes
-fi;
-
-if test x"$enable_compositor" = x"yes"; then
- if $PKG_CONFIG --exists xcomposite xfixes xdamage xrender 2> /dev/null; then
-
- succeeded=no
-
- if test -z "$PKG_CONFIG"; then
- # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $PKG_CONFIG in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-
- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
- ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
- echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
- echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
- fi
-
- if test "$PKG_CONFIG" = "no" ; then
- echo "*** The pkg-config script could not be found. Make sure it is"
- echo "*** in your path, or set the PKG_CONFIG environment variable"
- echo "*** to the full path to pkg-config."
- echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
- else
- PKG_CONFIG_MIN_VERSION=0.9.0
- if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
- echo "$as_me:$LINENO: checking for xcomposite >= 1.0 xfixes xdamage xrender" >&5
-echo $ECHO_N "checking for xcomposite >= 1.0 xfixes xdamage xrender... $ECHO_C" >&6
-
- if $PKG_CONFIG --exists "xcomposite >= 1.0 xfixes xdamage xrender" ; then
- echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
- succeeded=yes
-
- echo "$as_me:$LINENO: checking COMPOSITOR_CFLAGS" >&5
-echo $ECHO_N "checking COMPOSITOR_CFLAGS... $ECHO_C" >&6
- COMPOSITOR_CFLAGS=`$PKG_CONFIG --cflags "xcomposite >= 1.0 xfixes xdamage xrender"`
- echo "$as_me:$LINENO: result: $COMPOSITOR_CFLAGS" >&5
-echo "${ECHO_T}$COMPOSITOR_CFLAGS" >&6
-
- echo "$as_me:$LINENO: checking COMPOSITOR_LIBS" >&5
-echo $ECHO_N "checking COMPOSITOR_LIBS... $ECHO_C" >&6
- COMPOSITOR_LIBS=`$PKG_CONFIG --libs "xcomposite >= 1.0 xfixes xdamage xrender"`
- echo "$as_me:$LINENO: result: $COMPOSITOR_LIBS" >&5
-echo "${ECHO_T}$COMPOSITOR_LIBS" >&6
- else
- COMPOSITOR_CFLAGS=""
- COMPOSITOR_LIBS=""
- ## If we have a custom action on failure, don't print errors, but
- ## do set a variable so people can do so.
- COMPOSITOR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xcomposite >= 1.0 xfixes xdamage xrender"`
- echo $COMPOSITOR_PKG_ERRORS
- fi
-
-
-
- else
- echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
- echo "*** See http://www.freedesktop.org/software/pkgconfig"
- fi
- fi
-
- if test $succeeded = yes; then
- :
- else
- { { echo "$as_me:$LINENO: error: Library requirements (xcomposite >= 1.0 xfixes xdamage xrender) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
-echo "$as_me: error: Library requirements (xcomposite >= 1.0 xfixes xdamage xrender) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_COMPOSITOR 1
-_ACEOF
-
- fi
-fi
# Check whether --enable-debug or --disable-debug was given.
@@ -25999,8 +25882,6 @@ s,@LIBSTARTUP_NOTIFICATION_CFLAGS@,$LIBSTARTUP_NOTIFICATION_CFLAGS,;t t
s,@LIBSTARTUP_NOTIFICATION_LIBS@,$LIBSTARTUP_NOTIFICATION_LIBS,;t t
s,@LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@,$LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION,;t t
s,@RANDR_LIBS@,$RANDR_LIBS,;t t
-s,@COMPOSITOR_CFLAGS@,$COMPOSITOR_CFLAGS,;t t
-s,@COMPOSITOR_LIBS@,$COMPOSITOR_LIBS,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
diff --git a/configure.ac b/configure.ac
index ca7d68792..746b413fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([src/main.c])
AC_PREREQ(2.52)
-AM_INIT_AUTOMAKE([xfwm4], [4.1.11])
+AM_INIT_AUTOMAKE([xfwm4], [4.1.12])
AM_CONFIG_HEADER([config.h])
@@ -84,17 +84,17 @@ AC_SUBST([RANDR_LIBS])
dnl
dnl Xcomposite and related extensions
dnl
-AC_ARG_ENABLE([compositor],
-AC_HELP_STRING([--enable-compositor], [enable compositor in xfwm4])
-AC_HELP_STRING([--disable-compositor], [disable compositor in xfwm4]),
- [], [enable_compositor=yes])
-
-if test x"$enable_compositor" = x"yes"; then
- if $PKG_CONFIG --exists xcomposite xfixes xdamage xrender 2> /dev/null; then
- PKG_CHECK_MODULES(COMPOSITOR, xcomposite >= 1.0 xfixes xdamage xrender)
- AC_DEFINE([HAVE_COMPOSITOR], [1], [Define to enable compositor])
- fi
-fi
+dnl AC_ARG_ENABLE([compositor],
+dnl AC_HELP_STRING([--enable-compositor], [enable compositor in xfwm4])
+dnl AC_HELP_STRING([--disable-compositor], [disable compositor in xfwm4]),
+dnl [], [enable_compositor=yes])
+dnl
+dnl if test x"$enable_compositor" = x"yes"; then
+dnl if $PKG_CONFIG --exists xcomposite xfixes xdamage xrender 2> /dev/null; then
+dnl PKG_CHECK_MODULES(COMPOSITOR, xcomposite >= 1.0 xfixes xdamage xrender)
+dnl AC_DEFINE([HAVE_COMPOSITOR], [1], [Define to enable compositor])
+dnl fi
+dnl fi
dnl Check for debugging support
BM_DEBUG_SUPPORT
diff --git a/defaults/Makefile.in b/defaults/Makefile.in
index 3c9bd81d9..e903b5e9c 100644
--- a/defaults/Makefile.in
+++ b/defaults/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/doc/C/Makefile.in b/doc/C/Makefile.in
index b2140d2f4..2887b6071 100644
--- a/doc/C/Makefile.in
+++ b/doc/C/Makefile.in
@@ -75,8 +75,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/doc/C/images/Makefile.in b/doc/C/images/Makefile.in
index 583d91154..b2f705098 100644
--- a/doc/C/images/Makefile.in
+++ b/doc/C/images/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/doc/Makefile.in b/doc/Makefile.in
index c0747aa0a..d702a8766 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -73,8 +73,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/doc/fr/Makefile.in b/doc/fr/Makefile.in
index 9e117bf5f..f9419f03a 100644
--- a/doc/fr/Makefile.in
+++ b/doc/fr/Makefile.in
@@ -75,8 +75,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/doc/fr/images/Makefile.in b/doc/fr/images/Makefile.in
index 7c8cf2887..850e5a611 100644
--- a/doc/fr/images/Makefile.in
+++ b/doc/fr/images/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/doc/it/Makefile.in b/doc/it/Makefile.in
index 6fb37e484..b66e15b8e 100644
--- a/doc/it/Makefile.in
+++ b/doc/it/Makefile.in
@@ -75,8 +75,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/doc/it/images/Makefile.in b/doc/it/images/Makefile.in
index f56824284..7452098b2 100644
--- a/doc/it/images/Makefile.in
+++ b/doc/it/images/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/icons/48x48/Makefile.in b/icons/48x48/Makefile.in
index d6156c482..ed438ec64 100644
--- a/icons/48x48/Makefile.in
+++ b/icons/48x48/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/icons/Makefile.in b/icons/Makefile.in
index f05ca25f3..e79be5c5d 100644
--- a/icons/Makefile.in
+++ b/icons/Makefile.in
@@ -71,8 +71,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/icons/scalable/Makefile.in b/icons/scalable/Makefile.in
index dc84c65e5..b5daf68b3 100644
--- a/icons/scalable/Makefile.in
+++ b/icons/scalable/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/ltmain.sh b/ltmain.sh
index c13e957f7..23f82e3b7 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -33,6 +33,9 @@ basename="s,^.*/,,g"
# function.
progpath="$0"
+# RH: define SED for historic ltconfig's generated by Libtool 1.3
+[ -z "$SED" ] && SED=sed
+
# The name of this program:
progname=`echo "$progpath" | $SED $basename`
modename="$progname"
diff --git a/mcs-plugin/Makefile.in b/mcs-plugin/Makefile.in
index bf829dc82..e8fbe5922 100644
--- a/mcs-plugin/Makefile.in
+++ b/mcs-plugin/Makefile.in
@@ -116,8 +116,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/src/Makefile.am b/src/Makefile.am
index 6fa788031..758e8d2b3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,7 +61,6 @@ xfwm4_CFLAGS = \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXPM_CFLAGS@ \
@LIBSTARTUP_NOTIFICATION_CFLAGS@ \
- @COMPOSITOR_CFLAGS@ \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DDATADIR=\"$(datadir)\" \
@@ -73,7 +72,6 @@ xfwm4_LDADD = \
@LIBXFCEGUI4_LIBS@ \
@LIBXPM_LIBS@ \
@LIBSTARTUP_NOTIFICATION_LIBS@ \
- @COMPOSITOR_LIBS@ \
@RANDR_LIBS@
xfwm4_LDFLAGS = \
diff --git a/src/Makefile.in b/src/Makefile.in
index 687400a13..7512bc6ef 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -125,8 +125,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
@@ -324,7 +322,6 @@ xfwm4_CFLAGS = \
@LIBXFCEGUI4_CFLAGS@ \
@LIBXPM_CFLAGS@ \
@LIBSTARTUP_NOTIFICATION_CFLAGS@ \
- @COMPOSITOR_CFLAGS@ \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
-DDATADIR=\"$(datadir)\" \
@@ -336,7 +333,6 @@ xfwm4_LDADD = \
@LIBXFCEGUI4_LIBS@ \
@LIBXPM_LIBS@ \
@LIBSTARTUP_NOTIFICATION_LIBS@ \
- @COMPOSITOR_LIBS@ \
@RANDR_LIBS@
xfwm4_LDFLAGS = \
diff --git a/src/client.h b/src/client.h
index 59150257b..89cfc613b 100644
--- a/src/client.h
+++ b/src/client.h
@@ -35,12 +35,6 @@
#include <X11/cursorfont.h>
#include <X11/extensions/shape.h>
-#ifdef HAVE_COMPOSITOR
-#include <X11/extensions/Xcomposite.h>
-#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xrender.h>
-#endif /* HAVE_COMPOSITOR */
-
#include <glib.h>
#include <gtk/gtk.h>
#include <libxfcegui4/libxfcegui4.h>
@@ -258,23 +252,6 @@ struct _Client
/* Startup notification */
char *startup_id;
#endif /* HAVE_LIBSTARTUP_NOTIFICATION */
-
-#ifdef HAVE_COMPOSITOR
- Damage damage;
- XserverRegion last_painted_extents;
-
- Picture picture;
- XserverRegion border_size;
-
-#if HAVE_NAME_WINDOW_PIXMAP
- Pixmap name_window_pixmap;
-#endif /* HAVE_NAME_WINDOW_PIXMAP */
-
- unsigned int managed : 1;
- unsigned int damaged : 1;
- unsigned int viewable : 1;
-
-#endif /* HAVE_COMPOSITOR */
};
extern Client *clients;
diff --git a/src/compositor.c b/src/compositor.c
deleted file mode 100644
index a2a45d70c..000000000
--- a/src/compositor.c
+++ /dev/null
@@ -1,655 +0,0 @@
-/* $Id$
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- 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, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- xcompmgr - (c) 2003 Keith Packard
- metacity - (c) 2003, 2004 Red Hat, Inc.
- xfwm4 - (c) 2004 Olivier Fourdan
-
- */
-
-/* THIS CODE IS NOT FINISHED YET, IT WON'T COMPILE, PLEASE BE PATIENT */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <X11/Xlib.h>
-#include <glib.h>
-
-#include "display.h"
-#include "screen.h"
-#include "client.h"
-#include "frame.h"
-
-#ifdef HAVE_COMPOSITOR
-
-#define SHADOW_OFFSET 12
-#define FRAME_INTERVAL_MILLISECONDS ((int)(1000.0/40.0))
-
-static void
-compositorWindowFree (Client *c)
-{
- Display *dpy;
-
- g_return_if_fail (c != NULL);
-
- dpy = clientGetXDisplay (c);
- XDamageDestroy (dpy, c->damage);
-
-#if HAVE_NAME_WINDOW_PIXMAP
- if (c->name_window_pixmap != None)
- {
- XFreePixmap (dpy, c->name_window_pixmap);
- }
-#endif
-}
-
-static void
-compositorRemoveRepairIdle (DisplayInfo *display_info)
-{
- if (display_info->repair_idle != 0)
- {
- g_source_remove (display_info->repair_idle);
- display_info->repair_idle = 0;
- }
-
- if (display_info->repair_timeout != 0)
- {
- g_source_remove (display_info->repair_timeout);
- display_info->repair_timeout = 0;
- }
-}
-
-static XserverRegion
-compositorWindowExtents (Client *c)
-{
- XRectangle r;
- Display *dpy;
-
- g_return_if_fail (c != NULL);
-
- dpy = clientGetXDisplay (c);
- g_return_if_fail (dpy != NULL);
-
- r.x = c->x;
- r.y = c->y;
- r.width = c->width;
- r.height = c->height;
-
- r.width += SHADOW_OFFSET;
- r.height += SHADOW_OFFSET;
-
- return XFixesCreateRegion (dpy, &r, 1);
-}
-
-static void
-compositorWindowGetPaintBounds (Client *c, int *x, int *y, int *w, int *h)
-{
- g_return_if_fail (c != NULL);
-
-#ifdef HAVE_NAME_WINDOW_PIXMAP
- if (c->name_window_pixmap != None)
- {
- *x = frameX(c);
- *y = frameY(c);
- *w = frameWidth(c);
- *h = frameHeight(c);
- }
- else
-#endif
- {
- *x = c->x + c->border_width;
- *y = c->y + c->border_width;
- *w = c->width;
- *h = c->height;
- }
-}
-
-static void
-compositorPaintScreen (ScreenInfo *screen_info, XserverRegion damage_region)
-{
- XserverRegion region;
- Picture buffer_picture;
- Pixmap buffer_pixmap;
- Display *dpy;
- XRenderPictFormat *format;
- GList *index;
- GC gc;
- gint screen_width;
- gint screen_height;
- gint screen_number;
- Window xroot;
-
- dpy = myScreenGetXDisplay (screen_info);
- screen_width = gdk_screen_get_width (screen_info->gscr);
- screen_height = gdk_screen_get_height (screen_info->gscr);
- screen_number = screen_info->screen;
- xroot = screen_info->xroot;
-
- if (damage_region == None)
- {
- XRectangle r;
-
- r.x = 0;
- r.y = 0;
- r.width = screen_width;
- r.height = screen_height;
- region = XFixesCreateRegion (dpy, &r, 1);
- }
- else
- {
- region = XFixesCreateRegion (dpy, NULL, 0);
- XFixesCopyRegion (dpy, region, damage_region);
- }
-
-
- buffer_pixmap = XCreatePixmap (dpy, xroot, screen_width, screen_height,
- DefaultDepth (dpy, screen_number));
-
- gc = XCreateGC (dpy, buffer_pixmap, 0, NULL);
- XSetForeground (dpy, gc, WhitePixel (dpy, screen_info->screen));
- XFixesSetGCClipRegion (dpy, gc, 0, 0, region);
- XFillRectangle (dpy, buffer_pixmap, gc, 0, 0, screen_width, screen_height);
- format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen_number));
- buffer_picture = XRenderCreatePicture (dpy, buffer_pixmap, format, 0, 0);
- XFixesSetPictureClipRegion (dpy, buffer_picture, 0, 0, region);
-
- for (index = screen_info->windows_stack; index; index = g_list_next (index))
- {
- XRenderColor shadow_color;
- Client *c = (Client *) index->data;
- int x, y, w, h;
-
- shadow_color.red = 0;
- shadow_color.green = 0;
- shadow_color.blue = 0;
- shadow_color.alpha = 0x90c0;
-
- if ((!c->viewable) || (c->picture == None))
- {
- continue;
- }
-
- if (c->last_painted_extents)
- {
- XFixesDestroyRegion (dpy, c->last_painted_extents);
- }
- c->last_painted_extents = compositorWindowExtents (c);
-
- compositorWindowGetPaintBounds (c, &x, &y, &w, &h);
- if (FLAG_TEST (c->xfwm_flags, XFWM_FLAG_MOVING_RESIZING))
- {
- g_print ("move/rezise\n");
- XRenderComposite (dpy, PictOpOver, c->picture,
- screen_info->trans_picture, buffer_picture,
- 0, 0, 0, 0, x, y, w, h);
- }
- else
- {
- /* Draw window normally */
- /* TBD: create a drop shadow */
- g_print ("normal\n");
- XRenderFillRectangle (dpy, PictOpOver, buffer_picture,
- &shadow_color,
- frameX(c) + SHADOW_OFFSET,
- frameY(c) + SHADOW_OFFSET,
- frameWidth(c), frameHeight(c));
-
- XRenderComposite (dpy, PictOpSrc, c->picture,
- None, buffer_picture,
- 0, 0, 0, 0, x, y, w, h);
- }
- }
-
- /* Copy buffer to root window */
- XFixesSetPictureClipRegion (dpy, screen_info->root_picture, 0, 0, region);
- XRenderComposite (dpy, PictOpSrc, buffer_picture, None,
- screen_info->root_picture,
- 0, 0, 0, 0, 0, 0, screen_width, screen_height);
-
- XFixesDestroyRegion (dpy, region);
- XFreePixmap (dpy, buffer_pixmap);
- XRenderFreePicture (dpy, buffer_picture);
- XFreeGC (dpy, gc);
-}
-
-static void
-compositorDoRepair (DisplayInfo *display_info)
-{
- GSList *screens;
-
- g_return_if_fail (display_info);
-
- for (screens = display_info->screens; screens; screens = g_slist_next (screens))
- {
- ScreenInfo *screen_info = (ScreenInfo *) screens->data;
- if (screen_info->damage_region != None)
- {
- compositorPaintScreen (screen_info, screen_info->damage_region);
- XFixesDestroyRegion (display_info->dpy, screen_info->damage_region);
- screen_info->damage_region = None;
- }
- }
- compositorRemoveRepairIdle (display_info);
-}
-
-static gboolean
-compositorRepairIdleFunc (gpointer data)
-{
- DisplayInfo *display_info = (DisplayInfo *) data;
-
- display_info->repair_idle = 0;
- compositorDoRepair (display_info);
-
- return FALSE;
-}
-
-static gboolean
-compositorRepairTimeoutFunc (gpointer data)
-{
- DisplayInfo *display_info = (DisplayInfo *) data;
-
- display_info->repair_timeout = 0;
- compositorDoRepair (display_info);
-
- return FALSE;
-}
-
-static void
-compositorEnsureRepairIdle (DisplayInfo *display_info)
-{
- if (display_info->repair_idle != 0)
- {
- return;
- }
- display_info->repair_idle = g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
- compositorRepairIdleFunc,
- display_info, NULL);
- display_info->repair_timeout = g_timeout_add (FRAME_INTERVAL_MILLISECONDS,
- compositorRepairTimeoutFunc,
- display_info);
-}
-
-static void
-compositorMergeAndDestroyDamageRegion (ScreenInfo *screen_info, XserverRegion region)
-{
- DisplayInfo *display_info = screen_info->display_info;
-
- if (screen_info->damage_region != None)
- {
- XFixesUnionRegion (display_info->dpy,
- screen_info->damage_region,
- region, screen_info->damage_region);
- XFixesDestroyRegion (display_info->dpy, region);
- }
- else
- {
- screen_info->damage_region = region;
- }
-
- compositorEnsureRepairIdle (display_info);
-}
-
-static void
-compositorMergeDamageRegion (ScreenInfo *screen_info, XserverRegion region)
-{
- DisplayInfo *display_info = screen_info->display_info;
-
- if (screen_info->damage_region != None)
- {
- screen_info->damage_region = XFixesCreateRegion (display_info->dpy, NULL, 0);
- }
- XFixesUnionRegion (display_info->dpy,
- screen_info->damage_region,
- region, screen_info->damage_region);
-
- compositorEnsureRepairIdle (display_info);
-}
-
-static void
-compositorHandleDamageNotify (DisplayInfo *display_info, XDamageNotifyEvent *ev)
-{
- Client *c;
- XserverRegion region;
-
- c = myDisplayGetClientFromWindow (display_info, ev->drawable, ANY);
- if (!c)
- {
- return;
- }
-
- region = XFixesCreateRegion (display_info->dpy, NULL, 0);
-
- gdk_error_trap_push ();
- XDamageSubtract (display_info->dpy, c->damage, None, region);
- gdk_error_trap_pop ();
-
- XFixesTranslateRegion (display_info->dpy, region, frameX (c), frameY (c));
-
- compositorMergeAndDestroyDamageRegion (c->screen_info, region);
-}
-
-static void
-compositorHandleConfigureNotify (DisplayInfo *display_info, XConfigureEvent *ev)
-{
- Client *c;
- XserverRegion region;
-
- c = myDisplayGetClientFromWindow (display_info, ev->window, ANY);
- if (!c)
- {
- return;
- }
-
- if (c->screen_info->xroot != ev->event)
- {
- return;
- }
-
- if (c->last_painted_extents)
- {
- compositorMergeAndDestroyDamageRegion (c->screen_info, c->last_painted_extents);
- c->last_painted_extents = None;
- }
-
- region = compositorWindowExtents (c);
- compositorMergeDamageRegion (c->screen_info, region);
- XFixesDestroyRegion (display_info->dpy, region);
-}
-
-static void
-compositorHandleExpose (DisplayInfo *display_info, XExposeEvent *ev)
-{
- ScreenInfo *screen_info = NULL;
- XserverRegion region;
- XRectangle r;
-
- screen_info = myDisplayGetScreenFromRoot (display_info, ev->window);
- if (!(screen_info) || (screen_info->root_picture == None))
- {
- return;
- }
-
- r.x = 0;
- r.y = 0;
- r.width = gdk_screen_get_width (screen_info->gscr);;
- r.height = gdk_screen_get_height (screen_info->gscr);;
- region = XFixesCreateRegion (display_info->dpy, &r, 1);
-
- compositorMergeAndDestroyDamageRegion (screen_info, region);
-}
-
-static void
-compositorHandleMap (DisplayInfo *display_info, XMapEvent *ev)
-{
- ScreenInfo *screen_info = NULL;
- Client *c;
-
- screen_info = myDisplayGetScreenFromRoot (display_info, ev->event);
- if (!(screen_info) || (screen_info->root_picture == None))
- {
- return;
- }
-
- c = myDisplayGetClientFromWindow (display_info, ev->window, ANY);
- if (c)
- {
- c->viewable = TRUE;
- }
-}
-
-static void
-compositorHandleUnmap (DisplayInfo *display_info, XUnmapEvent *ev)
-{
- ScreenInfo *screen_info = NULL;
- Client *c;
-
- screen_info = myDisplayGetScreenFromRoot (display_info, ev->event);
- if (!(screen_info) || (screen_info->root_picture == None))
- {
- return;
- }
-
- c = myDisplayGetClientFromWindow (display_info, ev->window, ANY);
- if (c)
- {
- c->viewable = FALSE;
-
- if (c->last_painted_extents)
- {
- compositorMergeAndDestroyDamageRegion (screen_info, c->last_painted_extents);
- c->last_painted_extents = None;
- }
- }
-}
-#endif /* HAVE_COMPOSITOR */
-
-void
-compositorHandleEvent (DisplayInfo *display_info, XEvent *ev)
-{
-#ifdef HAVE_COMPOSITOR
- if (!(display_info->enable_compositor))
- {
- return;
- }
- if (ev->type == (display_info->damage_event_base + XDamageNotify))
- {
- compositorHandleDamageNotify (display_info, (XDamageNotifyEvent*) ev);
- }
- else if (ev->type == ConfigureNotify)
- {
- compositorHandleConfigureNotify (display_info, (XConfigureEvent*) ev);
- }
- else if (ev->type == Expose)
- {
- compositorHandleExpose (display_info, (XExposeEvent*) ev);
- }
- else if (ev->type == UnmapNotify)
- {
- compositorHandleUnmap (display_info, (XUnmapEvent*) ev);
- }
- else if (ev->type == MapNotify)
- {
- compositorHandleMap (display_info, (XMapEvent*) ev);
- }
-#endif /* HAVE_COMPOSITOR */
-}
-
-void
-compositorAddWindow (Client *c, gboolean viewable)
-{
-#ifdef HAVE_COMPOSITOR
- Damage damage;
- XRenderPictFormat *format;
- XRenderPictureAttributes pa;
- XserverRegion region;
- DisplayInfo *display_info;
- ScreenInfo *screen_info;
-
- g_return_if_fail (c != NULL);
-
- if (!(display_info->enable_compositor))
- {
- return;
- }
- screen_info = c->screen_info;
- display_info = screen_info->display_info;
-
- gdk_error_trap_push ();
- damage = XDamageCreate (display_info->dpy, c->window, XDamageReportNonEmpty);
- gdk_error_trap_pop ();
-
- if (damage == None)
- {
- return;
- }
-
- c->damage = damage;
-#if HAVE_NAME_WINDOW_PIXMAP
- if (display_info->have_name_window_pixmap)
- {
- gdk_error_trap_push ();
- c->name_window_pixmap = XCompositeNameWindowPixmap (display_info->dpy,
- c->window);
- gdk_error_trap_pop ();
- }
-#endif /* HAVE_NAME_WINDOW_PIXMAP */
-
- /* viewable == mapped for the root window, since root can't be unmapped */
- c->viewable = viewable;
-
- pa.subwindow_mode = IncludeInferiors;
-
- format = XRenderFindVisualFormat (display_info->dpy, c->visual);
-#if HAVE_NAME_WINDOW_PIXMAP
- c->picture = XRenderCreatePicture (display_info->dpy,
- (c->name_window_pixmap != None ? c->name_window_pixmap : c->window),
- format, CPSubwindowMode, &pa);
-#else
- c->picture = XRenderCreatePicture (display_info->dpy, c->window,
- format, CPSubwindowMode, &pa);
-#endif /* HAVE_NAME_WINDOW_PIXMAP */
-
- region = compositorWindowExtents (c);
- compositorMergeAndDestroyDamageRegion (screen_info, region);
-#endif /* HAVE_COMPOSITOR */
-}
-
-void
-compositorRemoveWindow (Client *c)
-{
-#ifdef HAVE_COMPOSITOR
- DisplayInfo *display_info;
- ScreenInfo *screen_info;
-
- g_return_if_fail (c != NULL);
-
- if (!(display_info->enable_compositor))
- {
- return;
- }
- screen_info = c->screen_info;
- display_info = screen_info->display_info;
-
- if (c->last_painted_extents)
- {
- compositorMergeAndDestroyDamageRegion (screen_info,
- c->last_painted_extents);
- c->last_painted_extents = None;
- }
-#endif /* HAVE_COMPOSITOR */
-}
-
-void
-compositorManageScreen (ScreenInfo *screen_info)
-{
-#ifdef HAVE_COMPOSITOR
- DisplayInfo *display_info;
- XRenderPictureAttributes pa;
- XRectangle r;
- XRenderColor c;
- XRenderPictFormat *visual_format;
-
- if (!(display_info->enable_compositor))
- {
- return;
- }
-
- display_info = screen_info->display_info;
-
- XCompositeRedirectSubwindows (display_info->dpy, screen_info->xroot, CompositeRedirectManual);
- pa.subwindow_mode = IncludeInferiors;
- visual_format = XRenderFindVisualFormat (display_info->dpy,
- DefaultVisual (display_info->dpy,
- screen_info->screen));
- screen_info->root_picture = XRenderCreatePicture (display_info->dpy, screen_info->xroot,
- visual_format, CPSubwindowMode, &pa);
-
- screen_info->trans_pixmap = XCreatePixmap (display_info->dpy, screen_info->xroot, 1, 1, 8);
-
- pa.repeat = True;
- visual_format = XRenderFindStandardFormat (display_info->dpy, PictStandardA8);
- screen_info->trans_picture = XRenderCreatePicture (display_info->dpy, screen_info->trans_pixmap,
- visual_format, CPRepeat, &pa);
-
- c.red = c.green = c.blue = 0;
- c.alpha = 0xc0c0;
- XRenderFillRectangle (display_info->dpy, PictOpSrc, screen_info->trans_picture, &c, 0, 0, 1, 1);
-
- /* Damage the whole screen */
- r.x = 0;
- r.y = 0;
- r.width = gdk_screen_get_width (screen_info->gscr);;
- r.height = gdk_screen_get_height (screen_info->gscr);;
- compositorMergeAndDestroyDamageRegion (screen_info, XFixesCreateRegion (display_info->dpy, &r, 1));
-#endif /* HAVE_COMPOSITOR */
-}
-
-void
-compositorUnmanageScreen (ScreenInfo *screen_info)
-{
-#ifdef HAVE_COMPOSITOR
- DisplayInfo *display_info;
- GList *index;
-
- if (!(display_info->enable_compositor))
- {
- return;
- }
-
- display_info = screen_info->display_info;
-
- XRenderFreePicture (display_info->dpy, screen_info->root_picture);
- screen_info->root_picture = None;
- XRenderFreePicture (display_info->dpy, screen_info->trans_picture);
- screen_info->trans_picture = None;
- XFreePixmap (display_info->dpy, screen_info->trans_pixmap);
- screen_info->trans_pixmap = None;
-
- for (index = screen_info->windows_stack; index; index = g_list_next (index))
- {
- Client *c = (Client *) index->data;
- // compositorRemoveWindow (c);
- }
-#endif /* HAVE_COMPOSITOR */
-}
-
-void
-compositorDamageClient (Client *c)
-{
-#ifdef HAVE_COMPOSITOR
- DisplayInfo *display_info;
- ScreenInfo *screen_info;
- Window xwindow;
-
- g_return_if_fail (c != NULL);
-
- if (!(display_info->enable_compositor))
- {
- return;
- }
-
- screen_info = c->screen_info;
- display_info = screen_info->display_info;
-
- if (screen_info->root_picture == None)
- {
- return;
- }
-
- compositorMergeAndDestroyDamageRegion (screen_info, compositorWindowExtents (c));
-#endif /* HAVE_COMPOSITOR */
-}
diff --git a/src/compositor.h b/src/compositor.h
deleted file mode 100644
index 9b79c211e..000000000
--- a/src/compositor.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Id$
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- 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, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
- xcompmgr - (c) 2003 Keith Packard
- metacity - (c) 2003, 2004 Red Hat, Inc.
- xfwm4 - (c) 2004 Olivier Fourdan
-
- */
-
-/* THIS CODE IS NOT FINISHED YET, IT WON'T COMPILE, PLEASE BE PATIENT */
-
-#ifndef INC_COMPOSITOR_H
-#define INC_COMPOSITOR_H
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <X11/Xlib.h>
-
-#include "display.h"
-#include "screen.h"
-#include "client.h"
-
-void compositorHandleEvent (DisplayInfo *, XEvent *);
-void compositorAddWindow (Client *, gboolean);
-void compositorRemoveWindow (Client *);
-void compositorManageScreen (ScreenInfo *);
-void compositorUnmanageScreen (ScreenInfo *);
-void compositorDamageClient (Client *);
-
-#endif /* INC_COMPOSITOR_H */
diff --git a/src/display.c b/src/display.c
index 5c6283370..73d03b74e 100644
--- a/src/display.c
+++ b/src/display.c
@@ -61,53 +61,6 @@ myDisplayInit (GdkDisplay *gdisplay)
XSetErrorHandler (handleXError);
-#ifdef HAVE_COMPOSITOR
- if (!XCompositeQueryExtension (display->dpy,
- &display->composite_event_base,
- &display->composite_error_base))
- {
- display->have_composite = FALSE;
- display->composite_event_base = 0;
- display->composite_error_base = 0;
- }
- else
- {
- display->have_composite = TRUE;
- }
- if (!XDamageQueryExtension (display->dpy,
- &display->damage_event_base,
- &display->damage_error_base))
- {
- display->have_damage = FALSE;
- display->damage_event_base = 0;
- display->damage_error_base = 0;
- }
- else
- {
- display->have_damage = TRUE;
- }
- if (!XFixesQueryExtension (display->dpy,
- &display->fixes_event_base,
- &display->fixes_error_base))
- {
- display->have_fixes = FALSE;
- display->fixes_event_base = 0;
- display->fixes_error_base = 0;
- }
- else
- {
- display->have_fixes = TRUE;
- }
-
- display->repair_idle = 0;
- display->repair_timeout = 0;
-
- display->enable_compositor =
- (display->have_composite && display->have_damage && display->have_fixes);
-#else /* HAVE_COMPOSITOR */
- display->enable_compositor = FALSE;
-#endif /* HAVE_COMPOSITOR */
-
display->shape =
XShapeQueryExtension (display->dpy, &display->shape_event, &dummy);
diff --git a/src/display.h b/src/display.h
index 6b55903ef..e04ce0090 100644
--- a/src/display.h
+++ b/src/display.h
@@ -29,17 +29,6 @@
#include <X11/cursorfont.h>
#include <X11/extensions/shape.h>
-#ifdef HAVE_COMPOSITOR
-#include <X11/extensions/Xcomposite.h>
-#include <X11/extensions/Xdamage.h>
-#include <X11/extensions/Xrender.h>
-#if COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 2
-#ifndef HAVE_NAME_WINDOW_PIXMAP
-#define HAVE_NAME_WINDOW_PIXMAP 1
-#endif /* HAVE_NAME_WINDOW_PIXMAP */
-#endif /* COMPOSITE_MAJOR > 0 || COMPOSITE_MINOR >= 2 */
-#endif /* HAVE_COMPOSITOR */
-
#include <gtk/gtk.h>
#include <glib.h>
#include <libxfcegui4/libxfcegui4.h>
@@ -85,28 +74,6 @@ struct _DisplayInfo
int dbl_click_time;
int xgrabcount;
int nb_screens;
- gboolean enable_compositor;
-
-#ifdef HAVE_COMPOSITOR
- int composite_error_base;
- int composite_event_base;
- int damage_error_base;
- int damage_event_base;
- int fixes_error_base;
- int fixes_event_base;
-
- gboolean have_composite;
- gboolean have_damage;
- gboolean have_fixes;
-
- guint repair_idle;
- guint repair_timeout;
-
-#if HAVE_NAME_WINDOW_PIXMAP
- gboolean have_name_window_pixmap;
-#endif /* HAVE_NAME_WINDOW_PIXMAP */
-
-#endif /* HAVE_COMPOSITOR */
};
DisplayInfo * myDisplayInit (GdkDisplay *);
diff --git a/src/main.c b/src/main.c
index 7b099ceaf..601c12d88 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,7 +57,7 @@
#include "startup_notification.h"
#include "spinning_cursor.h"
-#define BASE_EVENT_MASK \
+#define MAIN_EVENT_MASK \
SubstructureNotifyMask|\
StructureNotifyMask|\
SubstructureRedirectMask|\
@@ -67,12 +67,6 @@
PropertyChangeMask|\
ColormapNotify
-#ifdef HAVE_COMPOSITOR
-#define MAIN_EVENT_MASK BASE_EVENT_MASK|ExposureMask
-#else
-#define MAIN_EVENT_MASK BASE_EVENT_MASK
-#endif /* HAVE_COMPOSITOR */
-
static DisplayInfo *display_info = NULL;
gboolean xfwm4_quit = FALSE;
gboolean xfwm4_reload = FALSE;
@@ -304,14 +298,6 @@ initialize (int argc, char **argv)
display_info = myDisplayInit (gdk_display_get_default ());
-#ifdef HAVE_COMPOSITOR
- if (!display_info->enable_compositor)
- {
- g_warning (_("%s: Cannot find required extensions "
- "for compositing manager"), g_get_prgname ());
- }
-#endif /* HAVE_COMPOSITOR */
-
initModifiers (display_info->dpy);
act.sa_handler = handleSignal;
diff --git a/src/screen.h b/src/screen.h
index 93aa3af95..33daeb1f3 100644
--- a/src/screen.h
+++ b/src/screen.h
@@ -112,13 +112,6 @@ struct _ScreenInfo
GSList *startup_sequences;
guint startup_sequence_timeout;
#endif
-
-#ifdef HAVE_COMPOSITOR
- XID root_picture;
- XID damage_region;
- XID trans_pixmap;
- XID trans_picture;
-#endif /* HAVE_COMPOSITOR */
};
ScreenInfo * myScreenInit (DisplayInfo *,
diff --git a/themes/Makefile.in b/themes/Makefile.in
index 0e9217a84..2bb66e3a0 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -74,8 +74,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/themes/default-4.0/Makefile.in b/themes/default-4.0/Makefile.in
index 3b424eafd..5872dab55 100644
--- a/themes/default-4.0/Makefile.in
+++ b/themes/default-4.0/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/themes/default.keys/Makefile.in b/themes/default.keys/Makefile.in
index 064fd4e11..9901a79ef 100644
--- a/themes/default.keys/Makefile.in
+++ b/themes/default.keys/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/themes/default/Makefile.in b/themes/default/Makefile.in
index e3a09a4f0..ee65e5be0 100644
--- a/themes/default/Makefile.in
+++ b/themes/default/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/themes/opta/Makefile.in b/themes/opta/Makefile.in
index 118085e64..26554cac6 100644
--- a/themes/opta/Makefile.in
+++ b/themes/opta/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/themes/symphony/Makefile.in b/themes/symphony/Makefile.in
index 6de091897..104999ea3 100644
--- a/themes/symphony/Makefile.in
+++ b/themes/symphony/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
diff --git a/themes/waza/Makefile.in b/themes/waza/Makefile.in
index 480a519a8..c5e647e9e 100644
--- a/themes/waza/Makefile.in
+++ b/themes/waza/Makefile.in
@@ -66,8 +66,6 @@ CATOBJEXT = @CATOBJEXT@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
-COMPOSITOR_CFLAGS = @COMPOSITOR_CFLAGS@
-COMPOSITOR_LIBS = @COMPOSITOR_LIBS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
--
GitLab