Merge lp:~compiz-team/compiz-core/compiz-core.fix_720679 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fix bug 720679

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'plugins/opengl/src/paint.cpp'
--- plugins/opengl/src/paint.cpp	2011-09-29 03:29:41 +0000
+++ plugins/opengl/src/paint.cpp	2011-10-12 12:12:25 +0000
@@ -118,7 +118,7 @@
 	    pBox++;
 	}
 
-	glVertexPointer (2, GL_FLOAT, sizeof (GLfloat) * 2, data + 2);
+	glVertexPointer (2, GL_FLOAT, sizeof (GLfloat) * 2, data);
 
 	glColor4us (0, 0, 0, std::numeric_limits<unsigned short>::max ());
 	glDrawArrays (GL_QUADS, 0, nBox * 4);

=== modified file 'plugins/opengl/src/privates.h'
--- plugins/opengl/src/privates.h	2011-09-16 00:51:33 +0000
+++ plugins/opengl/src/privates.h	2011-10-12 12:12:25 +0000
@@ -122,6 +122,9 @@
 	bool hasCompositing;
 
 	GLIcon defaultIcon;
+
+	Pixmap rootPixmapCopy;
+	CompSize rootPixmapSize;
 };
 
 class PrivateGLWindow :

=== modified file 'plugins/opengl/src/screen.cpp'
--- plugins/opengl/src/screen.cpp	2011-09-16 06:51:02 +0000
+++ plugins/opengl/src/screen.cpp	2011-10-12 12:12:25 +0000
@@ -564,13 +564,18 @@
     outputRegion (),
     pendingCommands (false),
     bindPixmap (),
-    hasCompositing (false)
+    hasCompositing (false),
+    rootPixmapCopy (None),
+    rootPixmapSize ()
 {
     ScreenInterface::setHandler (screen);
 }
 
 PrivateGLScreen::~PrivateGLScreen ()
 {
+    if (rootPixmapCopy)
+	XFreePixmap (screen->dpy (), rootPixmapCopy);
+
 }
 
 GLushort defaultColor[4] = { 0xffff, 0xffff, 0xffff, 0xffff };
@@ -597,6 +602,10 @@
     screen->handleEvent (event);
 
     switch (event->type) {
+	case ConfigureNotify:
+	    if (event->xconfigure.window == screen->root ())
+		updateScreenBackground ();
+	    break;
 	case PropertyNotify:
 	    if (event->xproperty.atom == Atoms::xBackground[0] ||
 		event->xproperty.atom == Atoms::xBackground[1])
@@ -631,6 +640,14 @@
 		{
 		    it->second->damaged = true;
 		}
+
+		/* XXX: It would be nice if we could also update
+		 * the background of the root window when the root
+		 * window pixmap changes, but unfortunately XDamage
+		 * reports damage events any time a child of the root
+		 * window gets a damage event, which means that we'd
+		 * be recopying the root window pixmap all the time
+		 * which is no good, so don't do that */
 	    }
 	    break;
     }
@@ -820,13 +837,64 @@
 	backgroundTextures.clear ();
     }
 
-    if (backgroundTextures.empty () && backgroundImage)
+    if (backgroundTextures.empty ())
     {
 	CompSize   size;
-	CompString fileName (backgroundImage);
-	CompString pname ("");
-
-	backgroundTextures = GLTexture::readImageToTexture (fileName, pname, size);
+	if (backgroundImage)
+	{
+	    CompString fileName (backgroundImage);
+	    CompString pname ("");
+
+	    backgroundTextures = GLTexture::readImageToTexture (fileName, pname, size);
+	}
+	else
+	{
+	    /* Try to get the root window background */
+	    XGCValues gcv;
+	    GC        gc;
+
+	    gcv.graphics_exposures = false;
+	    gcv.subwindow_mode = IncludeInferiors;
+	    gc = XCreateGC (screen->dpy (), screen->root (),
+			    GCGraphicsExposures | GCSubwindowMode, &gcv);
+
+	    if (rootPixmapSize.width () != screen->width () ||
+		rootPixmapSize.height () != screen->height ())
+	    {
+		if (rootPixmapCopy)
+		    XFreePixmap (screen->dpy (), rootPixmapCopy);
+
+		rootPixmapSize = CompSize (screen->width (), screen->height ());
+
+		rootPixmapCopy = XCreatePixmap (screen->dpy (), screen->root (),
+						rootPixmapSize.width (), rootPixmapSize.height (),
+						DefaultDepth (screen->dpy (), DefaultScreen (screen->dpy ())));
+
+		backgroundTextures =
+		GLTexture::bindPixmapToTexture (rootPixmapCopy, rootPixmapSize.width (), rootPixmapSize.height (),
+						DefaultDepth (screen->dpy (), DefaultScreen (screen->dpy ())));
+
+		if (backgroundTextures.empty ())
+		{
+		    compLogMessage ("core", CompLogLevelWarn,
+				    "Couldn't bind background pixmap 0x%x to "
+				    "texture", (int) screen->width ());
+		}
+	    }
+
+	    if (rootPixmapCopy)
+	    {
+		XCopyArea (screen->dpy (), screen->root (), rootPixmapCopy, gc,
+			   0, 0, screen->width (), screen->height (), 0, 0);
+		XSync (screen->dpy (), false);
+	    }
+	    else
+	    {
+		backgroundTextures.clear ();
+	    }
+
+	    XFreeGC(dpy, gc);  
+	}
     }
 
     if (!backgroundTextures.empty ())