Merge lp:~vanvugt/compiz-core/blacklist into lp:compiz-core

[Daniel van Vugt]

Add a feature for blacklisting certain graphics drivers from being able to
unredirect fullscreen windows. Right now the only known broken drivers are
nouveau and intel on precise (Mesa 8.0). But the blacklist is a regex that
can be adjusted at any time.
(LP: #1089246)

This is almost the same as the upstream one. But it required some modification to work in the 0.9.7 tree. So needs re-approval.

[Sam Spilsbury (smspillaz)]

(Token approve because I missed the last one :)). Thanks for getting this in with tests.

review: Approve

=== modified file 'plugins/opengl/CMakeLists.txt'
--- plugins/opengl/CMakeLists.txt	2012-11-12 06:59:31 +0000
+++ plugins/opengl/CMakeLists.txt	2012-12-13 08:05:23 +0000
@@ -3,8 +3,9 @@
 include (CompizPlugin)
 
 add_subdirectory (src/fsregion)
+add_subdirectory (src/blacklist)
 
 find_package (OpenGL)
 if (OPENGL_FOUND)
-    compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} compiz_opengl_fsregion INCDIRS ${OPENGL_INCLUDE_DIR})
+    compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} compiz_opengl_fsregion compiz_opengl_blacklist INCDIRS ${OPENGL_INCLUDE_DIR})
 endif ()

=== modified file 'plugins/opengl/opengl.xml.in'
--- plugins/opengl/opengl.xml.in	2011-10-13 14:30:20 +0000
+++ plugins/opengl/opengl.xml.in	2012-12-13 08:05:23 +0000
@@ -43,6 +43,11 @@
 		<_long>If available use compression for textures converted from images</_long>
 		<default>false</default>
 	    </option>
+	    <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>
+	    </option>
 	</options>
     </plugin>
 </compiz>

=== added directory 'plugins/opengl/src/blacklist'
=== added file 'plugins/opengl/src/blacklist/CMakeLists.txt'
--- plugins/opengl/src/blacklist/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/blacklist/CMakeLists.txt	2012-12-13 08:05:23 +0000
@@ -0,0 +1,6 @@
+if (COMPIZ_BUILD_TESTING)
+add_subdirectory (tests)
+endif ()
+
+add_library (compiz_opengl_blacklist STATIC blacklist.cpp)
+

=== added file 'plugins/opengl/src/blacklist/blacklist.cpp'
--- plugins/opengl/src/blacklist/blacklist.cpp	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/blacklist/blacklist.cpp	2012-12-13 08:05:23 +0000
@@ -0,0 +1,67 @@
+/*
+ * Compiz opengl plugin, Blacklist feature
+ *
+ * Copyright (c) 2012 Canonical Ltd.
+ * Author: Daniel van Vugt <[e-mail]>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "blacklist.h"
+#include <cstdio>
+#include <regex.h>
+
+namespace compiz {
+namespace opengl {
+
+bool blacklisted (const char *blacklistRegex, const char *glVendor,
+                  const char *glRenderer, const char *glVersion)
+{
+    bool matches = false;
+
+    if (blacklistRegex && blacklistRegex[0])
+    {
+	regex_t re;
+
+	// Ensure the regex contains something other than spaces, or ignore.
+	const char *p = blacklistRegex;
+	while (*p == ' ')
+	    p++;
+
+	if (*p && !regcomp (&re, blacklistRegex, REG_EXTENDED))
+	{
+	    char driver[1024];
+
+	    snprintf (driver, sizeof driver, "%s\n%s\n%s",
+	              glVendor ?   glVendor   : "",
+	              glRenderer ? glRenderer : "",
+	              glVersion ?  glVersion  : "");
+
+	    if (!regexec (&re, driver, 0, NULL, 0))
+		matches = true;
+
+	    regfree (&re);
+	}
+    }
+
+    return matches;
+}
+
+} // namespace opengl
+} // namespace compiz

=== added file 'plugins/opengl/src/blacklist/blacklist.h'
--- plugins/opengl/src/blacklist/blacklist.h	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/blacklist/blacklist.h	2012-12-13 08:05:23 +0000
@@ -0,0 +1,38 @@
+/*
+ * Compiz opengl plugin, Blacklist function
+ *
+ * Copyright (c) 2012 Canonical Ltd.
+ * Author: Daniel van Vugt <[e-mail]>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef __COMPIZ_OPENGL_BLACKLIST_H
+#define __COMPIZ_OPENGL_BLACKLIST_H
+
+namespace compiz {
+namespace opengl {
+
+bool blacklisted (const char *blacklistRegex, const char *glVendor,
+                  const char *glRenderer, const char *glVersion);
+
+} // namespace opengl
+} // namespace compiz
+
+#endif

=== added directory 'plugins/opengl/src/blacklist/tests'
=== added file 'plugins/opengl/src/blacklist/tests/CMakeLists.txt'
--- plugins/opengl/src/blacklist/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/blacklist/tests/CMakeLists.txt	2012-12-13 08:05:23 +0000
@@ -0,0 +1,9 @@
+include_directories (${GTEST_INCLUDE_DIRS} ..)
+set (exe "compiz_opengl_test_blacklist")
+add_executable (${exe} test-blacklist.cpp)
+target_link_libraries (${exe}
+    compiz_opengl_blacklist
+    ${GTEST_BOTH_LIBRARIES}
+)
+gtest_add_tests (compiz_opengl_test_blacklist "" ${CMAKE_CURRENT_SOURCE_DIR}/test-blacklist.cpp)
+

=== added file 'plugins/opengl/src/blacklist/tests/test-blacklist.cpp'
--- plugins/opengl/src/blacklist/tests/test-blacklist.cpp	1970-01-01 00:00:00 +0000
+++ plugins/opengl/src/blacklist/tests/test-blacklist.cpp	2012-12-13 08:05:23 +0000
@@ -0,0 +1,152 @@
+/*
+ * Compiz opengl plugin, Backlist feature
+ *
+ * Copyright (c) 2012 Canonical Ltd.
+ * Author: Daniel van Vugt <[e-mail]>
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "gtest/gtest.h"
+#include "blacklist.h"
+
+using namespace compiz::opengl;
+
+static const char *recommendedRegex = "(nouveau|Intel).*Mesa 8\\.0";
+
+TEST(DriverBlacklist, QuantalIntelIsGood)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "Intel Open Source Technology Center",
+                               "Mesa DRI Intel(R) Sandybridge Desktop",
+                               "3.0 Mesa 9.0"));
+}
+
+TEST(DriverBlacklist, PreciseIntelIsBad)
+{
+    EXPECT_TRUE  (blacklisted (recommendedRegex,
+                               "Tungsten Graphics, Inc",
+                               "Mesa DRI Intel(R) Sandybridge Desktop",
+                               "3.0 Mesa 8.0.2"));
+}
+
+TEST(DriverBlacklist, QuantalNouveauIsGood)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "nouveau",
+                               "Gallium 0.4 on NV86",
+                               "3.0 Mesa 9.0-devel"));
+}
+
+TEST(DriverBlacklist, PreciseNouveauIsBad)
+{
+    EXPECT_TRUE  (blacklisted (recommendedRegex,
+                               "nouveau",
+                               "Gallium 0.4 on NVA8",
+                               "2.1 Mesa 8.0.2"));
+}
+
+TEST(DriverBlacklist, FglrxIsGood)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "Advanced Micro Devices, Inc.",
+                               "ATI Radeon HD 5450",
+                               "4.2.11627 Compatibility Profile Context"));
+}
+
+TEST(DriverBlacklist, NvidiaIsGood)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "NVIDIA Corporation",
+                               "Quadro 1000M/PCIe/SSE2",
+                               "4.2.0 NVIDIA 304.48"));
+}
+
+TEST(DriverBlacklist, RadeonIsGood1)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "X.Org R300 Project",
+                               "Gallium 0.4 on ATI RV350",
+                               "2.1 Mesa 8.0.2"));
+}
+
+TEST(DriverBlacklist, RadeonIsGood2)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "X.Org",
+                               "Gallium 0.4 on AMD CEDAR",
+                               "2.1 Mesa 8.0.3"));
+}
+
+TEST(DriverBlacklist, RadeonIsGood3)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "X.Org",
+                               "Gallium 0.4 on AMD RS880",
+                               "2.1 Mesa 8.0.2"));
+}
+
+TEST(DriverBlacklist, LLVMpipeIsGood)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "VMware, Inc.",
+                               "Gallium 0.4 on llvmpipe (LLVM 0x300)",
+                               "2.1 Mesa 8.0.4"));
+}
+
+TEST(DriverBlacklist, UnknownIsGood)
+{
+    EXPECT_FALSE (blacklisted (recommendedRegex,
+                               "Acme",
+                               "Graphics Driver",
+                               "4.2 8.0 9.0 123.456"));
+}
+
+TEST(DriverBlacklist, NoBlacklist)
+{
+    EXPECT_FALSE (blacklisted ("",
+                               "Tungsten Graphics, Inc",
+                               "Mesa DRI Intel(R) Sandybridge Desktop",
+                               "3.0 Mesa 8.0.2"));
+    EXPECT_FALSE (blacklisted ("", "foo", "bar", "blah"));
+    EXPECT_FALSE (blacklisted ("", "", "", ""));
+}
+
+TEST(DriverBlacklist, LineContinuation)
+{
+    EXPECT_FALSE (blacklisted ("alpha",       "beta", "gamma", "delta"));
+    EXPECT_FALSE (blacklisted ("betagam",     "beta", "gamma", "delta"));
+    EXPECT_TRUE  (blacklisted ("gamma",       "beta", "gamma", "delta"));
+    EXPECT_TRUE  (blacklisted ("del",         "beta", "gamma", "delta"));
+    EXPECT_TRUE  (blacklisted ("(mag|gam)",   "beta", "gamma", "delta"));
+    EXPECT_TRUE  (blacklisted ("beta.*delt",  "beta", "gamma", "delta"));
+    EXPECT_FALSE (blacklisted ("beta.*felt",  "beta", "gamma", "delta"));
+
+    EXPECT_TRUE  (blacklisted ("beta\ngamma\ndelta", "beta", "gamma", "delta"));
+}
+
+TEST(DriverBlacklist, StraySpaces)
+{
+    EXPECT_FALSE (blacklisted (" ", "Hello world", "and", "goodbye"));
+    EXPECT_FALSE (blacklisted ("  ", " ", "  ", "    "));
+    EXPECT_FALSE (blacklisted (" ",
+                               "Tungsten Graphics, Inc",
+                               "Mesa DRI Intel(R) Sandybridge Desktop",
+                               "3.0 Mesa 8.0.2"));
+}

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2012-12-12 03:47:13 +0000
+++ plugins/opengl/src/paint.cpp	2012-12-13 08:05:23 +0000
@@ -231,6 +231,11 @@
     CompMatch &unredirectable = CompositeScreen::get (screen)->
 	getOption ("unredirect_match")->value ().match ();
 
+    const CompString &blacklist =
+	getOption ("unredirect_driver_blacklist")->value ().s ();
+
+    bool blacklisted = driverIsBlacklisted (blacklist.c_str ());
+
     if (mask & PAINT_SCREEN_TRANSFORMED_MASK)
     {
 	windowMask     = PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK;
@@ -324,6 +329,7 @@
 	     * beneath them and so neither should be unredirected in that case.
 	     */
 	    if (unredirectFS &&
+		!blacklisted &&
 		unredirectable.evaluate (w) &&
 		!(mask & PAINT_SCREEN_TRANSFORMED_MASK) &&
 		!(mask & PAINT_SCREEN_WITH_TRANSFORMED_WINDOWS_MASK) &&

=== modified file 'plugins/opengl/src/privates.h'
--- plugins/opengl/src/privates.h	2012-02-08 10:54:35 +0000
+++ plugins/opengl/src/privates.h	2012-12-13 08:05:23 +0000
@@ -87,6 +87,8 @@
 
 	void updateView ();
 
+	bool driverIsBlacklisted (const char *regex) const;
+
     public:
 
 	GLScreen        *gScreen;
@@ -127,6 +129,8 @@
 
 	Pixmap rootPixmapCopy;
 	CompSize rootPixmapSize;
+
+	const char *glVendor, *glRenderer, *glVersion;
 };
 
 class PrivateGLWindow :

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2012-11-12 09:24:02 +0000
+++ plugins/opengl/src/screen.cpp	2012-12-13 08:05:23 +0000
@@ -26,6 +26,7 @@
  */
 
 #include "privates.h"
+#include "blacklist/blacklist.h"
 
 #include <dlfcn.h>
 #include <math.h>
@@ -81,6 +82,8 @@
     unsigned int unthrottledFrames = 0;
 }
 
+using namespace compiz::opengl;
+
 CompOutput *targetOutput = NULL;
 
 bool
@@ -92,7 +95,6 @@
     GLfloat		 ambientLight[]   = { 0.0f, 0.0f,  0.0f, 0.0f };
     GLfloat		 diffuseLight[]   = { 0.9f, 0.9f,  0.9f, 0.9f };
     GLfloat		 light0Position[] = { -0.5f, 0.5f, -9.0f, 1.0f };
-    const char           *glRenderer;
     CompOption::Vector o (0);
 
     priv->ctx = glXCreateContext (dpy, visinfo, NULL, True);
@@ -131,7 +133,14 @@
 	return false;
     }
 
-    glRenderer = (const char *) glGetString (GL_RENDERER);
+    const char *glVendor = (const char *) glGetString (GL_VENDOR);
+    const char *glRenderer = (const char *) glGetString (GL_RENDERER);
+    const char *glVersion = (const char *) glGetString (GL_VERSION);
+
+    priv->glVendor = glVendor;
+    priv->glRenderer = glRenderer;
+    priv->glVersion = glVersion;
+
     if (glRenderer != NULL &&
 	(strcmp (glRenderer, "Software Rasterizer") == 0 ||
 	 strcmp (glRenderer, "Mesa X11") == 0))
@@ -591,7 +600,10 @@
     bindPixmap (),
     hasCompositing (false),
     rootPixmapCopy (None),
-    rootPixmapSize ()
+    rootPixmapSize (),
+    glVendor (NULL),
+    glRenderer (NULL),
+    glVersion (NULL)
 {
     ScreenInterface::setHandler (screen);
 }
@@ -1291,6 +1303,12 @@
     }
 }
 
+bool
+PrivateGLScreen::driverIsBlacklisted (const char *regex) const
+{
+    return blacklisted (regex, glVendor, glRenderer, glVersion);
+}
+
 GLTexture::BindPixmapHandle
 GLScreen::registerBindPixmap (GLTexture::BindPixmapProc proc)
 {