From 5780b844f3043f9933e16368a2029d47e60b5297 Mon Sep 17 00:00:00 2001 From: raveit Date: Mon, 3 Jun 2013 15:00:25 +0200 Subject: [PATCH] fix compiz-decorator-gtk --- compiz-decorator-gtk | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/compiz-decorator-gtk b/compiz-decorator-gtk index c4b6cb1..a5a70d6 100755 --- a/compiz-decorator-gtk +++ b/compiz-decorator-gtk @@ -1,29 +1,18 @@ #!/bin/bash +compiz=`ps ax | grep 'compiz --replace' | grep -v 'grep' | awk '{print $5}'` + theme=`gsettings get org.mate.Marco.general theme | cut -d\' -f2` -echo "$theme" -function runGTK() { - gtk-window-decorator --replace --marco-theme "$theme" $@ -} -ISSW=`glxinfo | grep "Software Rasterizer" -c` - -# Try with direct rendering -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runCompiz $@ -fi - -# Try again with indirect rendering -export LIBGL_ALWAYS_INDIRECT=1 - -HAVETFP=`glxinfo | grep texture_from_pixmap -c` - -if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then - runGTK $@ +if [ "$compiz" = "compiz" ] ; then + gtk-window-decorator --replace --marco-theme "$theme" & + echo "$compiz with GTK windows-decorator" + echo "GTK theme is $theme" + else + exit 0 fi +exit 0