Merge lp:~timo-jyrinki/compiz/blacklist_remove_double_escape_from_xml into lp:compiz/0.9.9

[Timo Jyrinki]

Remove double escaping ('\\.') from the XML unredirect_driver_blacklist default. (LP: #1091103)

Remove double escaping ('\\.') from the XML unredirect_driver_blacklist default. (LP: #1091103)

It's there in the test code when it's inside C code, but in XML it shouldn't be double escaped?

Unredirection can be tested by getting enough options set in a specific way and a non-vsyncing video player, then opening a tearing test http://www.youtube.com/watch?v=ZCPkOpMHB7g. If unredirect works, tearing is visible.

Tested on AMD Radeon 6670 on precise (where the blacklist is meant to have its only effect) hardware with the string (nouveau|AMD).*Mesa 8\\.0 vs. (nouveau|AMD).*Mesa 8\.0 - with the former the blacklist doesn't disable unredirecting, with the latter it does. Presumptions on AMD hardware are that unredirect_fullscreen_windows is true, unredirect_match is set to '(any)' instead of the default (since the default disables unredirection for common non-vsyncing video players). Additionally the video needs to be downloaded to a player that can use x11/xshm output instead of Xv, since Xv video is automatically vsynced on AMD.

Tested on Intel hardware with the default string vs. the new default (nouveau|Intel).*Mesa 8\.0. Behaves as expected, and youtube can be used on Intel since Intel driver doesn't support tear-free on non-composited Xv output. unredirect_fullscreen_windows should be true, unredirect_match '(any)'. With the double escape removed, blacklist works and disables unredirection on Intel.

[Timo Jyrinki (timo-jyrinki)]

The proposed change results in a build failure (opengl_options.cpp:48:80: error: unknown escape sequence: '\.' [-Werror]), even though if user set it works fine.

Unless other suggestions appear, working on a replacement that removes the escaping altogether from both the xml file and the tests, even though that's of course 'any character' then instead of a dot. There are not many "Mesa 8[anycharacter]0":s other than "Mesa 8.0" in the strings, though.

[Timo Jyrinki (timo-jyrinki)]

(continued in https://code.launchpad.net/~timo-jyrinki/compiz/blacklist_remove_double_escape_from_xml2/+merge/140194)

Unmerged revisions

3531. By Timo Jyrinki on 2012-12-17

Remove double escaping ('\\.') from the XML unredirect_driver_blacklist default. (LP: #1091103)

=== modified file 'plugins/opengl/opengl.xml.in'
--- plugins/opengl/opengl.xml.in	2012-12-12 07:24:34 +0000
+++ plugins/opengl/opengl.xml.in	2012-12-17 06:56:21 +0000
@@ -62,7 +62,7 @@
 	    <option name="unredirect_driver_blacklist" type="string">
 		<_short>Unredirect Driver Blacklist</_short>
 		<_long>If non-empty, specifies a POSIX (extended) regular expression to match against the OpenGL driver strings (newline separated): "GL_VENDOR\nGL_RENDERER\nGL_VERSION". If the regular expression matches a substring of that concatenation then no windows will ever be unredirected while using that particular graphics driver.</_long>
-		<default>(nouveau|Intel).*Mesa 8\\.0</default>
+		<default>(nouveau|Intel).*Mesa 8\.0</default>
 	    </option>
 	</options>
     </plugin>