[compiz] fix compiz-decorator-gtk

Wolfgang Ulbrich raveit65 at fedoraproject.org
Mon Jun 3 13:01:12 UTC 2013


commit 5780b844f3043f9933e16368a2029d47e60b5297
Author: raveit <chat-to-me at raveit.de>
Date:   Mon Jun 3 15:00:25 2013 +0200

    fix compiz-decorator-gtk

 compiz-decorator-gtk |   29 +++++++++--------------------
 1 files 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
 
-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`
+compiz=`ps ax | grep 'compiz --replace' | grep -v 'grep' | awk '{print $5}'`
 
-# Try with direct rendering
-HAVETFP=`glxinfo | grep texture_from_pixmap -c`
-
-if ( [ $ISSW == 0 ] && [ $HAVETFP -gt 2 ] ); then 
-	runCompiz $@
-fi
+theme=`gsettings get org.mate.Marco.general theme | cut -d\' -f2`
 
-# 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
 


More information about the scm-commits mailing list