From db4ae4fb4b033f30c204d2c9c4579d4e0c299fa6 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 17 Feb 2012 23:36:11 +0100 Subject: [PATCH] xorg: remove "XAANoOffScreenPixmaps" "true" workaround from Xorg.conf --- postplug.d/30xorg | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/postplug.d/30xorg b/postplug.d/30xorg index 871989b..6036882 100644 --- a/postplug.d/30xorg +++ b/postplug.d/30xorg @@ -1,6 +1,6 @@ #!/bin/bash # xorg - xorg plugin for postplug -# Copyright (c) 2004-2011 by Silvan Calarco +# Copyright (c) 2004-2012 by Silvan Calarco # Copyright (c) 2004-2007 by Davide Madrisan if [ $UID != 0 ]; then @@ -315,13 +315,10 @@ if [ "$CONFCREATED" = "1" ]; then esac # Compiz/3d configuration options - if [ "$VIDEODRIVER" != "nvidia" ]; then - sed -i -e '/Section "Device"/a\ - Option "XAANoOffscreenPixmaps" "true"' $XORGCONF - elif [ "$VIDEODRIVER" == "nvidia" ]; then + if [ "$VIDEODRIVER" == "nvidia" ]; then sed -i -e '/Section "Screen"/a\ Option "AddARGBGLXVisuals" "true"\ - Option "DisableGLXRootClipping" "true"' $XORGCONF + Option "DisableGLXRootClipping" "true"' $XORGCONF fi # configure VirtualBox mouse driver @@ -512,9 +509,12 @@ sed -i "/[[:space:]]*InputDevice[[:space:]]*.*PS2Mouse.*/d; \ /[[:space:]]*InputDevice[[:space:]]*.*Synaptics.*/d; \ /[[:space:]]*InputDevice[[:space:]]*.*Alps.*/d" $XORGCONF -# Remove all devices set +# remove all devices set sed -i "/\W*Option \"Device\".*/d" $XORGCONF +# remove obsoleted XAANoOffscreenPixmaps +sed -i '/^[[:space:]]*Option[[:space:]]*"XAANoOffscreenPixmaps" "true"/d' + # Configure keyboard xorg_d_configure_input