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

[Sam Spilsbury]

Fix bug 874854

=== modified file 'plugins/composite/include/composite/composite.h'
--- plugins/composite/include/composite/composite.h	2011-03-11 12:15:30 +0000
+++ plugins/composite/include/composite/composite.h	2011-10-15 11:23:26 +0000
@@ -30,7 +30,7 @@
 
 #include <X11/extensions/Xcomposite.h>
 
-#define COMPIZ_COMPOSITE_ABI 2
+#define COMPIZ_COMPOSITE_ABI 3
 
 #include <core/pluginclasshandler.h>
 #include <core/timer.h>
@@ -91,6 +91,26 @@
 class CompositeScreen;
 class CompositeWindow;
 
+namespace compiz
+{
+namespace composite
+{
+class PaintHandler {
+public:
+    virtual ~PaintHandler () {};
+
+    virtual void paintOutputs (CompOutput::ptrList &outputs,
+			       unsigned int        mask,
+			       const CompRegion    &region) = 0;
+
+    virtual bool hasVSync () { return false; };
+
+    virtual void prepareDrawing () {};
+    virtual bool compositingActive () { return false; };
+};
+}
+}
+
 /**
  * Wrapable function interface for CompositeScreen
  */
@@ -129,28 +149,30 @@
 	 * evaluated for repainting
 	 */
 	virtual const CompWindowList & getWindowPaintList ();
+
+	/**
+	 * Hookable function to register a new paint handler, overload
+	 * and insert your own paint handler if you want to prevent
+	 * another one from being loaded
+	 */
+	virtual bool registerPaintHandler (compiz::composite::PaintHandler *pHnd);
+
+	/**
+	 * Hookable function to notify unregistration of a paint handler
+	 *
+	 */
+	virtual void unregisterPaintHandler ();
 };
 
 
 class CompositeScreen :
-    public WrapableHandler<CompositeScreenInterface, 4>,
+    public WrapableHandler<CompositeScreenInterface, 6>,
     public PluginClassHandler<CompositeScreen, CompScreen, COMPIZ_COMPOSITE_ABI>,
     public CompOption::Class
 {
     public:
 
-	class PaintHandler {
-	    public:
-		virtual ~PaintHandler () {};
-
-		virtual void paintOutputs (CompOutput::ptrList &outputs,
-					   unsigned int        mask,
-					   const CompRegion    &region) = 0;
-
-		virtual bool hasVSync () { return false; };
-
-		virtual void prepareDrawing () {};
-	};
+
 
     public:
 	CompositeScreen (CompScreen *s);
@@ -159,12 +181,6 @@
 	CompOption::Vector & getOptions ();
         bool setOption (const CompString &name, CompOption::Value &value);
 
-	/** 
-	 * Register a dispatch PaintHandler for a rendering plugin
-	 */	
-	bool registerPaintHandler (PaintHandler *pHnd);
-        void unregisterPaintHandler ();
-
 	bool compositingActive ();
 
 	/**
@@ -220,6 +236,9 @@
 	WRAPABLE_HND (3, CompositeScreenInterface, const CompWindowList &,
 		      getWindowPaintList);
 
+	WRAPABLE_HND (4, CompositeScreenInterface, bool, registerPaintHandler, compiz::composite::PaintHandler *);
+	WRAPABLE_HND (5, CompositeScreenInterface, void, unregisterPaintHandler);
+
 	friend class PrivateCompositeDisplay;
 
     private:

=== modified file 'plugins/composite/src/privates.h'
--- plugins/composite/src/privates.h	2011-10-13 14:28:30 +0000
+++ plugins/composite/src/privates.h	2011-10-15 11:23:26 +0000
@@ -107,8 +107,7 @@
 
 	CompTimer paintTimer;
 
-	bool active;
-	CompositeScreen::PaintHandler *pHnd;
+	compiz::composite::PaintHandler *pHnd;
 
 	CompositeFPSLimiterMode FPSLimiterMode;
 	int frameTimeAccumulator;

=== modified file 'plugins/composite/src/screen.cpp'
--- plugins/composite/src/screen.cpp	2011-10-13 14:28:30 +0000
+++ plugins/composite/src/screen.cpp	2011-10-15 11:23:26 +0000
@@ -285,7 +285,6 @@
     idle (true),
     timeLeft (0),
     slowAnimations (false),
-    active (false),
     pHnd (NULL),
     FPSLimiterMode (CompositeFPSLimiterModeDefault),
     frameTimeAccumulator (0),
@@ -383,11 +382,15 @@
 
 
 bool
-CompositeScreen::registerPaintHandler (PaintHandler *pHnd)
+CompositeScreen::registerPaintHandler (compiz::composite::PaintHandler *pHnd)
 {
-    Display *dpy = screen->dpy ();
-
-    if (priv->active)
+    Display *dpy;
+
+    WRAPABLE_HND_FUNC_RETURN (4, bool, registerPaintHandler, pHnd);
+
+    dpy =  screen->dpy ();
+
+    if (priv->pHnd)
 	return false;
 
     CompScreen::checkForError (dpy);
@@ -414,7 +417,6 @@
     }
 
     priv->pHnd = pHnd;
-    priv->active = true;
 
     showOutputWindow ();
 
@@ -428,7 +430,11 @@
 void
 CompositeScreen::unregisterPaintHandler ()
 {
-    Display *dpy = screen->dpy ();
+    Display *dpy;
+
+    WRAPABLE_HND_FUNC (5, unregisterPaintHandler)
+
+    dpy = screen->dpy ();
 
     foreach (CompWindow *w, screen->windows ())
     {
@@ -444,7 +450,6 @@
 				    CompositeRedirectManual);
 
     priv->pHnd = NULL;
-    priv->active = false;
     priv->paintTimer.stop ();
 
     hideOutputWindow ();
@@ -453,7 +458,10 @@
 bool
 CompositeScreen::compositingActive ()
 {
-    return priv->active;
+    if (priv->pHnd)
+	return priv->pHnd->compositingActive ();
+
+    return false;
 }
 
 void
@@ -506,7 +514,7 @@
 CompositeScreen::showOutputWindow ()
 {
 #ifdef USE_COW
-    if (useCow && priv->active)
+    if (useCow && priv->pHnd)
     {
 	Display       *dpy = screen->dpy ();
 	XserverRegion region;
@@ -556,7 +564,7 @@
 CompositeScreen::updateOutputWindow ()
 {
 #ifdef USE_COW
-    if (useCow && priv->active)
+    if (useCow && priv->pHnd)
     {
 	Display       *dpy = screen->dpy ();
 	XserverRegion region;
@@ -1023,6 +1031,14 @@
 CompositeScreenInterface::getWindowPaintList ()
     WRAPABLE_DEF (getWindowPaintList)
 
+bool
+CompositeScreenInterface::registerPaintHandler (compiz::composite::PaintHandler *pHnd)
+    WRAPABLE_DEF (registerPaintHandler, pHnd);
+
+void
+CompositeScreenInterface::unregisterPaintHandler ()
+    WRAPABLE_DEF (unregisterPaintHandler);
+
 const CompRegion &
 CompositeScreen::currentDamage () const
 {

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-10-11 14:55:47 +0000
+++ plugins/decor/src/decor.cpp	2011-10-15 11:23:26 +0000
@@ -2840,6 +2840,27 @@
     atoms.push_back (requestFrameExtentsAtom);
 }
 
+void
+DecorWindow::updateHandlers ()
+{
+    if (dScreen->cmActive)
+    {
+	gWindow = GLWindow::get (window);
+	cWindow = CompositeWindow::get (window);
+
+	CompositeWindowInterface::setHandler (cWindow);
+	GLWindowInterface::setHandler (gWindow);
+    }
+    else
+    {
+	CompositeWindowInterface::setHandler (cWindow, false);
+	GLWindowInterface::setHandler (gWindow, false);
+
+	gWindow = NULL;
+	cWindow = NULL;
+    }
+}
+
 /*
  * DecorScreen::decoratorStartTimeout
  *
@@ -2852,9 +2873,39 @@
     if (!dmWin)
 	screen->runCommand (optionGetCommand ());
 
+    /* Update all the windows */
+    foreach (CompWindow *w, screen->windows ())
+    {
+	DECOR_WINDOW (w);
+
+	dw->updateHandlers ();
+
+	dw->updateSwitcher ();
+
+	if (!w->overrideRedirect () || dw->isSwitcher)
+	    dw->updateDecoration ();
+
+	if (w->shaded () || w->isViewable ())
+	    dw->update (true);
+    }
+
     return false;
 }
 
+bool
+DecorScreen::registerPaintHandler (compiz::composite::PaintHandler *p)
+{
+    cmActive = true;
+    return cScreen->registerPaintHandler (p);
+}
+
+void
+DecorScreen::unregisterPaintHandler ()
+{
+    cmActive = false;
+    return cScreen->unregisterPaintHandler ();
+}
+
 /*
  * DecorScreen::DecorScreen
  *
@@ -2927,6 +2978,7 @@
 			  0);
 
     ScreenInterface::setHandler (s);
+    CompositeScreenInterface::setHandler (cScreen);
     screen->updateSupportedWmHints ();
 }
 
@@ -2975,22 +3027,19 @@
 
     window->resizeNotifySetEnabled (this, false);
 
-    if (dScreen->cmActive)
+    if (!dScreen->decoratorStart.active ())
     {
-	gWindow = GLWindow::get (w);
-        cWindow = CompositeWindow::get (w);
-	CompositeWindowInterface::setHandler (cWindow);
-	GLWindowInterface::setHandler (gWindow);
+	updateHandlers ();
+
+	updateSwitcher ();
+
+	if (!w->overrideRedirect () || isSwitcher)
+	    updateDecoration ();
+
+	if (w->shaded () || w->isViewable ())
+	    update (true);
     }
 
-    updateSwitcher ();
-
-    if (!w->overrideRedirect () || isSwitcher)
-	updateDecoration ();
-
-    if (w->shaded () || w->isViewable ())
-	update (true);
-
     window->resizeNotifySetEnabled (this, true);
 }
 

=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2011-09-09 15:20:10 +0000
+++ plugins/decor/src/decor.h	2011-10-15 11:23:26 +0000
@@ -130,6 +130,7 @@
 
 class DecorScreen :
     public ScreenInterface,
+    public CompositeScreenInterface,
     public PluginClassHandler<DecorScreen,CompScreen>,
     public DecorOptions
 {
@@ -151,6 +152,9 @@
 
 	void updateDefaultShadowProperty ();
 
+	bool registerPaintHandler (compiz::composite::PaintHandler *pHnd);
+	void unregisterPaintHandler ();
+
     public:
 
 	CompositeScreen *cScreen;
@@ -231,6 +235,7 @@
 	bool resizeTimeout ();
 
 	void updateSwitcher ();
+	void updateHandlers ();
 
 	static bool matchType (CompWindow *w, unsigned int decorType);
 	static bool matchState (CompWindow *w, unsigned int decorState);

=== modified file 'plugins/move/src/move.cpp'
--- plugins/move/src/move.cpp	2011-10-11 09:36:19 +0000
+++ plugins/move/src/move.cpp	2011-10-15 11:23:26 +0000
@@ -703,8 +703,23 @@
     moveOpacity = (optionGetOpacity () * OPAQUE) / 100;
 }
 
+bool
+MoveScreen::registerPaintHandler(compiz::composite::PaintHandler *pHnd)
+{
+    hasCompositing = true;
+    cScreen->registerPaintHandler (pHnd);
+}
+
+void
+MoveScreen::unregisterPaintHandler()
+{
+    hasCompositing = false;
+    cScreen->unregisterPaintHandler ();
+}
+
 MoveScreen::MoveScreen (CompScreen *screen) :
     PluginClassHandler<MoveScreen,CompScreen> (screen),
+    cScreen (CompositeScreen::get (screen)),
     w (0),
     region (NULL),
     status (RectangleOut),
@@ -713,7 +728,6 @@
     hasCompositing (false),
     yConstrained (false)
 {
-
     updateOpacity ();
 
     for (unsigned int i = 0; i < NUM_KEYS; i++)
@@ -721,9 +735,12 @@
 				   XStringToKeysym (mKeys[i].name));
 
     moveCursor = XCreateFontCursor (screen->dpy (), XC_fleur);
-    if (CompositeScreen::get (screen))
+    if (cScreen)
+    {
+	CompositeScreenInterface::setHandler (cScreen);
 	hasCompositing =
-	    CompositeScreen::get (screen)->compositingActive ();
+	    cScreen->compositingActive ();
+    }
 
     optionSetOpacityNotify (boost::bind (&MoveScreen::updateOpacity, this));
 

=== modified file 'plugins/move/src/move.h'
--- plugins/move/src/move.h	2011-09-29 03:29:41 +0000
+++ plugins/move/src/move.h	2011-10-15 11:23:26 +0000
@@ -51,6 +51,7 @@
 
 class MoveScreen :
     public ScreenInterface,
+    public CompositeScreenInterface,
     public PluginClassHandler<MoveScreen,CompScreen>,
     public MoveOptions
 {
@@ -58,6 +59,8 @@
 	MoveScreen (CompScreen *screen);
 	~MoveScreen ();
 
+	CompositeScreen *cScreen;
+
 	void updateOpacity ();
 
 	void handleEvent (XEvent *);
@@ -65,6 +68,9 @@
 				const char *event,
 				CompOption::Vector &options);
 
+	bool registerPaintHandler (compiz::composite::PaintHandler *pHnd);
+	void unregisterPaintHandler ();
+
 	CompWindow *w;
 	int        savedX;
 	int        savedY;

=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2011-09-19 12:35:49 +0000
+++ plugins/opengl/include/opengl/opengl.h	2011-10-15 11:23:26 +0000
@@ -35,7 +35,7 @@
 #include <opengl/texture.h>
 #include <opengl/fragment.h>
 
-#define COMPIZ_OPENGL_ABI 3
+#define COMPIZ_OPENGL_ABI 4
 
 #include <core/pluginclasshandler.h>
 
@@ -239,6 +239,8 @@
 {
     public:
 
+	virtual bool glInitContext (XVisualInfo *);
+
 	/**
 	 * Hookable function used for plugins to use openGL to draw on an output
 	 *
@@ -303,7 +305,7 @@
 
 
 class GLScreen :
-    public WrapableHandler<GLScreenInterface, 5>,
+    public WrapableHandler<GLScreenInterface, 6>,
     public PluginClassHandler<GLScreen, CompScreen, COMPIZ_OPENGL_ABI>,
     public CompOption::Class
 {
@@ -383,19 +385,20 @@
 	 */
 	const float * projectionMatrix ();
 
-	WRAPABLE_HND (0, GLScreenInterface, bool, glPaintOutput,
+	WRAPABLE_HND (0, GLScreenInterface, bool, glInitContext, XVisualInfo *);
+	WRAPABLE_HND (1, GLScreenInterface, bool, glPaintOutput,
 		      const GLScreenPaintAttrib &, const GLMatrix &,
 		      const CompRegion &, CompOutput *, unsigned int);
-	WRAPABLE_HND (1, GLScreenInterface, void, glPaintTransformedOutput,
+	WRAPABLE_HND (2, GLScreenInterface, void, glPaintTransformedOutput,
 		      const GLScreenPaintAttrib &,
 		      const GLMatrix &, const CompRegion &, CompOutput *,
 		      unsigned int);
-	WRAPABLE_HND (2, GLScreenInterface, void, glApplyTransform,
+	WRAPABLE_HND (3, GLScreenInterface, void, glApplyTransform,
 		      const GLScreenPaintAttrib &, CompOutput *, GLMatrix *);
 
-	WRAPABLE_HND (3, GLScreenInterface, void, glEnableOutputClipping,
+	WRAPABLE_HND (4, GLScreenInterface, void, glEnableOutputClipping,
 		      const GLMatrix &, const CompRegion &, CompOutput *);
-	WRAPABLE_HND (4, GLScreenInterface, void, glDisableOutputClipping);
+	WRAPABLE_HND (5, GLScreenInterface, void, glDisableOutputClipping);
 
 	friend class GLTexture;
 

=== 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-15 11:23:26 +0000
@@ -362,7 +362,7 @@
 				  const CompRegion &region,
 				  CompOutput       *output)
 {
-    WRAPABLE_HND_FUNC (3, glEnableOutputClipping, transform, region, output)
+    WRAPABLE_HND_FUNC (4, glEnableOutputClipping, transform, region, output)
 
     GLdouble h = screen->height ();
 
@@ -419,7 +419,7 @@
 				    CompOutput                *output,
 				    unsigned int              mask)
 {
-    WRAPABLE_HND_FUNC (1, glPaintTransformedOutput, sAttrib, transform,
+    WRAPABLE_HND_FUNC (2, glPaintTransformedOutput, sAttrib, transform,
 		       region, output, mask)
 
     GLMatrix sTransform = transform;
@@ -466,7 +466,7 @@
 			 CompOutput                *output,
 			 unsigned int              mask)
 {
-    WRAPABLE_HND_FUNC_RETURN (0, bool, glPaintOutput, sAttrib, transform,
+    WRAPABLE_HND_FUNC_RETURN (1, bool, glPaintOutput, sAttrib, transform,
 			      region, output, mask)
 
     GLMatrix sTransform = transform;
@@ -591,7 +591,7 @@
 void
 GLWindow::glDrawGeometry ()
 {
-    WRAPABLE_HND_FUNC (4, glDrawGeometry)
+    WRAPABLE_HND_FUNC (5, glDrawGeometry)
 
     int     texUnit = priv->geometry.texUnits;
     int     currentTexUnit = 0;
@@ -716,7 +716,7 @@
 			 unsigned int                maxGridWidth,
 			 unsigned int                maxGridHeight)
 {
-    WRAPABLE_HND_FUNC (2, glAddGeometry, matrix, region, clip)
+    WRAPABLE_HND_FUNC (3, glAddGeometry, matrix, region, clip)
 
     BoxRec full;
     int    nMatrix = matrix.size ();

=== 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-15 11:23:26 +0000
@@ -49,7 +49,7 @@
 
 class PrivateGLScreen :
     public ScreenInterface,
-    public CompositeScreen::PaintHandler,
+    public compiz::composite::PaintHandler,
     public OpenglOptions
 {
     public:
@@ -70,6 +70,8 @@
 
 	void prepareDrawing ();
 
+	bool compositingActive ();
+
 	void controlSwapVideoSync ();
 	void waitForVideoSync ();
 
@@ -122,6 +124,7 @@
 	bool hasCompositing;
 
 	GLIcon defaultIcon;
+	CompTimer initContext;
 };
 
 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-15 11:23:26 +0000
@@ -82,73 +82,18 @@
 
 CompOutput *targetOutput = NULL;
 
-GLScreen::GLScreen (CompScreen *s) :
-    PluginClassHandler<GLScreen, CompScreen, COMPIZ_OPENGL_ABI> (s),
-    priv (new PrivateGLScreen (this))
+bool
+GLScreen::glInitContext (XVisualInfo *visinfo)
 {
-    Display		 *dpy = s->dpy ();
-    XVisualInfo		 templ;
-    XVisualInfo		 *visinfo;
-    GLXFBConfig		 *fbConfigs;
-    int			 defaultDepth, nvisinfo, nElements, value, i;
-    const char		 *glxExtensions, *glExtensions;
+    Display		 *dpy = screen->dpy ();
+    const char		 *glExtensions;
     GLfloat		 globalAmbient[]  = { 0.1f, 0.1f,  0.1f, 0.1f };
     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 };
-    XWindowAttributes    attr;
     const char           *glRenderer;
     CompOption::Vector o (0);
-
-    if (indirectRendering)
-    {
-	/* force Mesa libGL into indirect rendering mode, because
-	   glXQueryExtensionsString is context-independant */
-	setenv ("LIBGL_ALWAYS_INDIRECT", "1", True);
-    }
-
-    if (!XGetWindowAttributes (dpy, s->root (), &attr))
-    {
-	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
-    }
-
-    templ.visualid = XVisualIDFromVisual (attr.visual);
-
-    visinfo = XGetVisualInfo (dpy, VisualIDMask, &templ, &nvisinfo);
-    if (!nvisinfo)
-    {
-	compLogMessage ("opengl", CompLogLevelFatal,
-			"Couldn't get visual info for default visual");
-	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
-    }
-
-    defaultDepth = visinfo->depth;
-
-    glXGetConfig (dpy, visinfo, GLX_USE_GL, &value);
-    if (!value)
-    {
-	compLogMessage ("opengl", CompLogLevelFatal,
-			"Root visual is not a GL visual");
-	XFree (visinfo);
-	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
-    }
-
-    glXGetConfig (dpy, visinfo, GLX_DOUBLEBUFFER, &value);
-    if (!value)
-    {
-	compLogMessage ("opengl", CompLogLevelFatal,
-			"Root visual is not a double buffered GL visual");
-	XFree (visinfo);
-	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
-    }
+    WRAPABLE_HND_FUNC_RETURN (0, bool, glInitContext, visinfo);
 
     priv->ctx = glXCreateContext (dpy, visinfo, NULL, !indirectRendering);
     if (!priv->ctx)
@@ -158,82 +103,12 @@
 	XFree (visinfo);
 
 	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
+	return false;
     }
 
     XFree (visinfo);
-    glxExtensions = glXQueryExtensionsString (dpy, s->screenNum ());
-
-    if (!strstr (glxExtensions, "GLX_SGIX_fbconfig"))
-    {
-	compLogMessage ("opengl", CompLogLevelFatal,
-			"GLX_SGIX_fbconfig is missing");
-	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
-    }
-
-    priv->getProcAddress = (GL::GLXGetProcAddressProc)
-	getProcAddress ("glXGetProcAddressARB");
-    GL::bindTexImage = (GL::GLXBindTexImageProc)
-	getProcAddress ("glXBindTexImageEXT");
-    GL::releaseTexImage = (GL::GLXReleaseTexImageProc)
-	getProcAddress ("glXReleaseTexImageEXT");
-    GL::queryDrawable = (GL::GLXQueryDrawableProc)
-	getProcAddress ("glXQueryDrawable");
-    GL::getFBConfigs = (GL::GLXGetFBConfigsProc)
-	getProcAddress ("glXGetFBConfigs");
-    GL::getFBConfigAttrib = (GL::GLXGetFBConfigAttribProc)
-	getProcAddress ("glXGetFBConfigAttrib");
-    GL::createPixmap = (GL::GLXCreatePixmapProc)
-	getProcAddress ("glXCreatePixmap");
-    GL::destroyPixmap = (GL::GLXDestroyPixmapProc)
-    	getProcAddress ("glXDestroyPixmap");
-
-    if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap") ||
-        !GL::bindTexImage || !GL::releaseTexImage)
-    {
-	compLogMessage ("opengl", CompLogLevelFatal,
-			"GLX_EXT_texture_from_pixmap is missing");
-	GL::textureFromPixmap = false;
-    }
-    else
-	GL::textureFromPixmap = true;
-
-    if (!GL::queryDrawable     ||
-	!GL::getFBConfigs      ||
-	!GL::getFBConfigAttrib ||
-	!GL::createPixmap      ||
-	!GL::destroyPixmap)
-    {
-	compLogMessage ("opengl", CompLogLevelFatal,
-			"fbconfig functions missing");
-	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
-    }
-
-    if (strstr (glxExtensions, "GLX_MESA_copy_sub_buffer"))
-	GL::copySubBuffer = (GL::GLXCopySubBufferProc)
-	    getProcAddress ("glXCopySubBufferMESA");
-
-    if (strstr (glxExtensions, "GLX_SGI_video_sync"))
-    {
-	GL::getVideoSync = (GL::GLXGetVideoSyncProc)
-	    getProcAddress ("glXGetVideoSyncSGI");
-
-	GL::waitVideoSync = (GL::GLXWaitVideoSyncProc)
-	    getProcAddress ("glXWaitVideoSyncSGI");
-    }
-
-    if (strstr (glxExtensions, "GLX_SGI_swap_control"))
-    {
-	GL::swapInterval = (GL::GLXSwapIntervalProc)
-	    getProcAddress ("glXSwapIntervalSGI");
-    }
-
-    glXMakeCurrent (dpy, CompositeScreen::get (s)->output (), priv->ctx);
+
+    glXMakeCurrent (dpy, CompositeScreen::get (screen)->output (), priv->ctx);
 
     glExtensions = (const char *) glGetString (GL_EXTENSIONS);
     if (!glExtensions)
@@ -241,8 +116,7 @@
 	compLogMessage ("opengl", CompLogLevelFatal,
 			"No valid GL extensions string found.");
 	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
+	return false;
     }
 
     glRenderer = (const char *) glGetString (GL_RENDERER);
@@ -254,11 +128,10 @@
 			CompLogLevelFatal,
 			"Software rendering detected");
 	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
+	return false;
     }
 
-    if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two"))    
+    if (strstr (glExtensions, "GL_ARB_texture_non_power_of_two"))
 	GL::textureNonPowerOfTwo = true;
 
     glGetIntegerv (GL_MAX_TEXTURE_SIZE, &GL::maxTextureSize);
@@ -284,8 +157,7 @@
 	compLogMessage ("opengl", CompLogLevelFatal,
 			"Support for non power of two textures missing");
 	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
-	setFailed ();
-	return;
+	return false;
     }
 
     if (strstr (glExtensions, "GL_ARB_texture_env_combine"))
@@ -371,6 +243,182 @@
     if (strstr (glExtensions, "GL_ARB_texture_compression"))
 	GL::textureCompression = true;
 
+    glClearColor (0.0, 0.0, 0.0, 1.0);
+    glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+    glEnable (GL_CULL_FACE);
+    glDisable (GL_BLEND);
+    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+    glColor4usv (defaultColor);
+    glEnableClientState (GL_VERTEX_ARRAY);
+    glEnableClientState (GL_TEXTURE_COORD_ARRAY);
+
+    if (GL::textureEnvCombine && GL::maxTextureUnits >= 2)
+    {
+	GL::canDoSaturated = true;
+	if (GL::textureEnvCrossbar && GL::maxTextureUnits >= 4)
+	    GL::canDoSlightlySaturated = true;
+    }
+
+    priv->updateView ();
+
+    glLightModelfv (GL_LIGHT_MODEL_AMBIENT, globalAmbient);
+
+    glEnable (GL_LIGHT0);
+    glLightfv (GL_LIGHT0, GL_AMBIENT, ambientLight);
+    glLightfv (GL_LIGHT0, GL_DIFFUSE, diffuseLight);
+    glLightfv (GL_LIGHT0, GL_POSITION, light0Position);
+
+    glColorMaterial (GL_FRONT, GL_AMBIENT_AND_DIFFUSE);
+
+    glNormal3f (0.0f, 0.0f, -1.0f);
+
+    priv->lighting = false;
+
+
+    priv->filter[NOTHING_TRANS_FILTER] = GLTexture::Fast;
+    priv->filter[SCREEN_TRANS_FILTER]  = GLTexture::Good;
+    priv->filter[WINDOW_TRANS_FILTER]  = GLTexture::Good;
+
+    if (GL::textureFromPixmap)
+	registerBindPixmap (TfpTexture::bindPixmapToTexture);
+
+    return false;
+}
+
+
+GLScreen::GLScreen (CompScreen *s) :
+    PluginClassHandler<GLScreen, CompScreen, COMPIZ_OPENGL_ABI> (s),
+    priv (new PrivateGLScreen (this))
+{
+    Display		 *dpy = s->dpy ();
+    XVisualInfo		 templ;
+    XVisualInfo		 *visinfo;
+    GLXFBConfig		 *fbConfigs;
+    int			 defaultDepth, nvisinfo, nElements, value, i;
+    const char		 *glxExtensions;
+    XWindowAttributes    attr;
+    CompOption::Vector o (0);
+
+    if (indirectRendering)
+    {
+	/* force Mesa libGL into indirect rendering mode, because
+	   glXQueryExtensionsString is context-independant */
+	setenv ("LIBGL_ALWAYS_INDIRECT", "1", True);
+    }
+
+    if (!XGetWindowAttributes (dpy, s->root (), &attr))
+    {
+	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
+	setFailed ();
+	return;
+    }
+
+    templ.visualid = XVisualIDFromVisual (attr.visual);
+
+    visinfo = XGetVisualInfo (dpy, VisualIDMask, &templ, &nvisinfo);
+    if (!nvisinfo)
+    {
+	compLogMessage ("opengl", CompLogLevelFatal,
+			"Couldn't get visual info for default visual");
+	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
+	setFailed ();
+	return;
+    }
+
+    defaultDepth = visinfo->depth;
+
+    glXGetConfig (dpy, visinfo, GLX_USE_GL, &value);
+    if (!value)
+    {
+	compLogMessage ("opengl", CompLogLevelFatal,
+			"Root visual is not a GL visual");
+	XFree (visinfo);
+	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
+	setFailed ();
+	return;
+    }
+
+    glXGetConfig (dpy, visinfo, GLX_DOUBLEBUFFER, &value);
+    if (!value)
+    {
+	compLogMessage ("opengl", CompLogLevelFatal,
+			"Root visual is not a double buffered GL visual");
+	XFree (visinfo);
+	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
+	setFailed ();
+	return;
+    }
+
+    glxExtensions = glXQueryExtensionsString (dpy, s->screenNum ());
+
+    if (!strstr (glxExtensions, "GLX_SGIX_fbconfig"))
+    {
+	compLogMessage ("opengl", CompLogLevelFatal,
+			"GLX_SGIX_fbconfig is missing");
+	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
+	setFailed ();
+	return;
+    }
+
+    priv->getProcAddress = (GL::GLXGetProcAddressProc)
+	getProcAddress ("glXGetProcAddressARB");
+    GL::bindTexImage = (GL::GLXBindTexImageProc)
+	getProcAddress ("glXBindTexImageEXT");
+    GL::releaseTexImage = (GL::GLXReleaseTexImageProc)
+	getProcAddress ("glXReleaseTexImageEXT");
+    GL::queryDrawable = (GL::GLXQueryDrawableProc)
+	getProcAddress ("glXQueryDrawable");
+    GL::getFBConfigs = (GL::GLXGetFBConfigsProc)
+	getProcAddress ("glXGetFBConfigs");
+    GL::getFBConfigAttrib = (GL::GLXGetFBConfigAttribProc)
+	getProcAddress ("glXGetFBConfigAttrib");
+    GL::createPixmap = (GL::GLXCreatePixmapProc)
+	getProcAddress ("glXCreatePixmap");
+    GL::destroyPixmap = (GL::GLXDestroyPixmapProc)
+    	getProcAddress ("glXDestroyPixmap");
+
+    if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap") ||
+        !GL::bindTexImage || !GL::releaseTexImage)
+    {
+	compLogMessage ("opengl", CompLogLevelFatal,
+			"GLX_EXT_texture_from_pixmap is missing");
+	GL::textureFromPixmap = false;
+    }
+    else
+	GL::textureFromPixmap = true;
+
+    if (!GL::queryDrawable     ||
+	!GL::getFBConfigs      ||
+	!GL::getFBConfigAttrib ||
+	!GL::createPixmap      ||
+	!GL::destroyPixmap)
+    {
+	compLogMessage ("opengl", CompLogLevelFatal,
+			"fbconfig functions missing");
+	screen->handleCompizEvent ("opengl", "fatal_fallback", o);
+	setFailed ();
+	return;
+    }
+
+    if (strstr (glxExtensions, "GLX_MESA_copy_sub_buffer"))
+	GL::copySubBuffer = (GL::GLXCopySubBufferProc)
+	    getProcAddress ("glXCopySubBufferMESA");
+
+    if (strstr (glxExtensions, "GLX_SGI_video_sync"))
+    {
+	GL::getVideoSync = (GL::GLXGetVideoSyncProc)
+	    getProcAddress ("glXGetVideoSyncSGI");
+
+	GL::waitVideoSync = (GL::GLXWaitVideoSyncProc)
+	    getProcAddress ("glXWaitVideoSyncSGI");
+    }
+
+    if (strstr (glxExtensions, "GLX_SGI_swap_control"))
+    {
+	GL::swapInterval = (GL::GLXSwapIntervalProc)
+	    getProcAddress ("glXSwapIntervalSGI");
+    }
+
     fbConfigs = (*GL::getFBConfigs) (dpy, s->screenNum (), &nElements);
 
     for (i = 0; i <= MAX_DEPTH; i++)
@@ -501,45 +549,7 @@
 	return;
     }
 
-    glClearColor (0.0, 0.0, 0.0, 1.0);
-    glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-    glEnable (GL_CULL_FACE);
-    glDisable (GL_BLEND);
-    glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
-    glColor4usv (defaultColor);
-    glEnableClientState (GL_VERTEX_ARRAY);
-    glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-
-    if (GL::textureEnvCombine && GL::maxTextureUnits >= 2)
-    {
-	GL::canDoSaturated = true;
-	if (GL::textureEnvCrossbar && GL::maxTextureUnits >= 4)
-	    GL::canDoSlightlySaturated = true;
-    }
-
-    priv->updateView ();
-
-    glLightModelfv (GL_LIGHT_MODEL_AMBIENT, globalAmbient);
-
-    glEnable (GL_LIGHT0);
-    glLightfv (GL_LIGHT0, GL_AMBIENT, ambientLight);
-    glLightfv (GL_LIGHT0, GL_DIFFUSE, diffuseLight);
-    glLightfv (GL_LIGHT0, GL_POSITION, light0Position);
-
-    glColorMaterial (GL_FRONT, GL_AMBIENT_AND_DIFFUSE);
-
-    glNormal3f (0.0f, 0.0f, -1.0f);
-
-    priv->lighting = false;
-
-
-    priv->filter[NOTHING_TRANS_FILTER] = GLTexture::Fast;
-    priv->filter[SCREEN_TRANS_FILTER]  = GLTexture::Good;
-    priv->filter[WINDOW_TRANS_FILTER]  = GLTexture::Good;
-
-    if (GL::textureFromPixmap)
-	registerBindPixmap (TfpTexture::bindPixmapToTexture);
-
+    priv->initContext.start (boost::bind (&GLScreen::glInitContext, this, visinfo), 0, 0);
 }
 
 GLScreen::~GLScreen ()
@@ -877,6 +887,10 @@
 }
 
 bool
+GLScreenInterface::glInitContext (XVisualInfo *visinfo)
+    WRAPABLE_DEF (glInitContext, visinfo);
+
+bool
 GLScreenInterface::glPaintOutput (const GLScreenPaintAttrib &sAttrib,
 			          const GLMatrix            &transform,
 			          const CompRegion          &region,
@@ -1102,20 +1116,20 @@
 
     glFlush ();
 
-    //
-    // FIXME: Actually fix the composite plugin to be more efficient;
-    // If GL::swapInterval == NULL && GL::waitVideoSync != NULL then the
-    // composite plugin should not be imposing any framerate restriction
-    // (ie. blocking the CPU) at all. Because the framerate will be controlled
-    // and optimized here:
-    //
+    /*
+     * FIXME: Actually fix the composite plugin to be more efficient;
+     * If GL::swapInterval == NULL && GL::waitVideoSync != NULL then the
+     * composite plugin should not be imposing any framerate restriction
+     * (ie. blocking the CPU) at all. Because the framerate will be controlled
+     * and optimized here:
+     */
     if (mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)
     {
-	//
-	// controlSwapVideoSync is much faster than waitForVideoSync because
-	// it won't block the CPU. The waiting is offloaded to the GPU.
-	// Unfortunately it only works with glXSwapBuffers in most drivers.
-	//
+	/*
+	 * controlSwapVideoSync is much faster than waitForVideoSync because
+	 * it won't block the CPU. The waiting is offloaded to the GPU.
+	 * Unfortunately it only works with glXSwapBuffers in most drivers.
+	 */
 	GL::controlSwapVideoSync (optionGetSyncToVblank ());
 	glXSwapBuffers (screen->dpy (), cScreen->output ());
     }
@@ -1183,12 +1197,18 @@
    return (GL::waitVideoSync && optionGetSyncToVblank ());
 }
 
+bool
+PrivateGLScreen::compositingActive ()
+{
+    return true;
+}
+
 void
 PrivateGLScreen::prepareDrawing ()
 {
     if (pendingCommands)
     {
-	// glFlush! glFinish would block the CPU, which is bad.
+	/* glFlush! glFinish would block the CPU, which is bad. */
 	glFlush ();
 	pendingCommands = false;
     }