diff -u compiz-0.7.9+git20090211/debian/changelog compiz-0.7.9+git20090211/debian/changelog --- compiz-0.7.9+git20090211/debian/changelog +++ compiz-0.7.9+git20090211/debian/changelog @@ -1,3 +1,9 @@ +compiz (1:0.7.9+git20090211-0ubuntu5) jaunty; urgency=low + + * debian/compiz-manager: check_texture_size() Support multiple X screens (LP: #207770) + + -- TJ Sun, 15 Feb 2009 21:00:00 +0000 + compiz (1:0.7.9+git20090211-0ubuntu4) jaunty; urgency=low * debian/patches/070_revert_prop_change: diff -u compiz-0.7.9+git20090211/debian/compiz-manager compiz-0.7.9+git20090211/debian/compiz-manager --- compiz-0.7.9+git20090211/debian/compiz-manager +++ compiz-0.7.9+git20090211/debian/compiz-manager @@ -235,8 +235,11 @@ # Check if the max texture size is large enough compared to the resolution check_texture_size() { - TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed 's/.*=[^0-9]//g') - RESOLUTION=$(xdpyinfo | grep -i dimensions: | sed 's/[^0-9]*pixels.*(.*).*//' | sed 's/[^0-9x]*//') + # Check how many screens we've got and iterate over them + N=$(xdpyinfo | grep -i "number of screens" | sed 's/.*[^0-9]//g') + for i in $(seq 1 $N); do + TEXTURE_LIMIT=$(glxinfo -l | grep GL_MAX_TEXTURE_SIZE | sed -n "$i s/^.*=[^0-9]//g p") + RESOLUTION=$(xdpyinfo | grep -i dimensions: | sed -n -e "$i s/^ *dimensions: *\([0-9]*x[0-9]*\) pixels.*/\1/ p") VRES=$(echo $RESOLUTION | sed 's/.*x//') HRES=$(echo $RESOLUTION | sed 's/x.*//') verbose "Comparing resolution ($RESOLUTION) to maximum 3D texture size ($TEXTURE_LIMIT): "; @@ -245,6 +248,7 @@ return 1; fi verbose "Passed.\n" + done return 0 }