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

[Sam Spilsbury]

Bug 873389

[Robert Carr (robertcarr)]

+1

review: Approve

=== modified file 'plugins/composite/src/privates.h'
--- plugins/composite/src/privates.h	2011-10-08 11:38:21 +0000
+++ plugins/composite/src/privates.h	2011-10-15 07:07:10 +0000
@@ -114,12 +114,6 @@
 	int frameTimeAccumulator;
 
 	CompWindowList withDestroyedWindows;
-
-	Window         cmSnOwner;
-	Atom           cmSnAtom;
-	Atom           netCmHandoffAtom;
-	bool           netCmHandoffSupported;
-	bool           mInit;
 };
 
 class PrivateCompositeWindow : WindowInterface

=== modified file 'plugins/composite/src/screen.cpp'
--- plugins/composite/src/screen.cpp	2011-10-08 11:38:21 +0000
+++ plugins/composite/src/screen.cpp	2011-10-15 07:07:10 +0000
@@ -199,7 +199,6 @@
     priv (new PrivateCompositeScreen (this))
 {
     int	compositeMajor, compositeMinor;
-    XSetWindowAttributes attr;
 
     if (!XQueryExtension (s->dpy (), COMPOSITE_NAME,
 			  &priv->compositeOpcode,
@@ -249,27 +248,23 @@
 
     priv->slowAnimations = false;
 
-    attr.override_redirect = true;
-    attr.event_mask        = PropertyChangeMask;
-
-    priv->cmSnOwner =
-	XCreateWindow (screen->dpy (), screen->root (),
-		       -100, -100, 1, 1, 0,
-		       CopyFromParent, CopyFromParent,
-		       CopyFromParent,
-		       CWOverrideRedirect | CWEventMask,
-		       &attr);
+    if (!priv->init ())
+    {
+        setFailed ();
+    }
 
 }
 
 CompositeScreen::~CompositeScreen ()
 {
     priv->paintTimer.stop ();
+
 #ifdef USE_COW
     if (useCow)
 	XCompositeReleaseOverlayWindow (screen->dpy (),
 					screen->root ());
 #endif
+
     delete priv;
 }
 
@@ -294,21 +289,12 @@
     pHnd (NULL),
     FPSLimiterMode (CompositeFPSLimiterModeDefault),
     frameTimeAccumulator (0),
-    withDestroyedWindows (),
-    cmSnOwner (0),
-    netCmHandoffAtom (XInternAtom (screen->dpy (), "_COMPIZ_NET_CM_HANDOFF", 0)),
-    netCmHandoffSupported (false),
-    mInit (false)
+    withDestroyedWindows ()
 {
-    std::ostringstream oss;
     gettimeofday (&lastRedraw, 0);
     // wrap outputChangeNotify
     ScreenInterface::setHandler (screen);
 
-    oss << "_NET_WM_CM_S%d" << std::dec << screen->screenNum ();
-
-    cmSnAtom = XInternAtom (screen->dpy (), oss.str ().c_str (), 0);
-
     optionSetSlowAnimationsKeyInitiate (CompositeScreen::toggleSlowAnimations);
 }
 
@@ -320,16 +306,21 @@
 PrivateCompositeScreen::init ()
 {
     Display              *dpy = screen->dpy ();
+    Window               newCmSnOwner = None;
+    Atom                 cmSnAtom = 0;
     Time                 cmSnTimestamp = 0;
     XEvent               event;
+    XSetWindowAttributes attr;
     Window               currentCmSnOwner;
-    int                  value = 0;
+    char                 buf[128];
+
+    sprintf (buf, "_NET_WM_CM_S%d", screen->screenNum ());
+    cmSnAtom = XInternAtom (dpy, buf, 0);
 
     currentCmSnOwner = XGetSelectionOwner (dpy, cmSnAtom);
 
     if (currentCmSnOwner != None)
     {
-	XSelectInput (screen->dpy (), currentCmSnOwner, StructureNotifyMask);
 	if (!replaceCurrentWm)
 	{
 	    compLogMessage ("composite", CompLogLevelError,
@@ -343,19 +334,28 @@
 	}
     }
 
-    XChangeProperty (dpy, cmSnOwner, netCmHandoffAtom, XA_INTEGER, 8,
-		     PropModeReplace, (unsigned char *) &value, 1);
-    XChangeProperty (dpy, cmSnOwner, Atoms::wmName, Atoms::utf8String, 8,
+    attr.override_redirect = true;
+    attr.event_mask        = PropertyChangeMask;
+
+    newCmSnOwner =
+	XCreateWindow (dpy, screen->root (),
+		       -100, -100, 1, 1, 0,
+		       CopyFromParent, CopyFromParent,
+		       CopyFromParent,
+		       CWOverrideRedirect | CWEventMask,
+		       &attr);
+
+    XChangeProperty (dpy, newCmSnOwner, Atoms::wmName, Atoms::utf8String, 8,
 		     PropModeReplace, (unsigned char *) PACKAGE,
 		     strlen (PACKAGE));
 
-    XWindowEvent (dpy, cmSnOwner, PropertyChangeMask, &event);
+    XWindowEvent (dpy, newCmSnOwner, PropertyChangeMask, &event);
 
     cmSnTimestamp = event.xproperty.time;
 
-    XSetSelectionOwner (dpy, cmSnAtom, cmSnOwner, cmSnTimestamp);
+    XSetSelectionOwner (dpy, cmSnAtom, newCmSnOwner, cmSnTimestamp);
 
-    if (XGetSelectionOwner (dpy, cmSnAtom) != cmSnOwner)
+    if (XGetSelectionOwner (dpy, cmSnAtom) != newCmSnOwner)
     {
 	compLogMessage ("core", CompLogLevelError,
 			"Could not acquire compositing manager "
@@ -378,20 +378,6 @@
 
     XSendEvent (dpy, screen->root (), FALSE, StructureNotifyMask, &event);
 
-    if (netCmHandoffSupported)
-    {
-	/* Wait for old compositing manager to go away */
-	if (currentCmSnOwner != None)
-	{
-	    do {
-		XWindowEvent (dpy, currentCmSnOwner, StructureNotifyMask, &event);
-	    } while (event.type != DestroyNotify);
-	}
-
-	XCompositeRedirectSubwindows (dpy, screen->root (),
-				      CompositeRedirectManual);
-    }
-
     return true;
 }
 
@@ -400,46 +386,25 @@
 CompositeScreen::registerPaintHandler (PaintHandler *pHnd)
 {
     Display *dpy = screen->dpy ();
-    Window  currentCmSnOwner = 0;
-    int updateMode = 0;
 
     if (priv->active)
 	return false;
 
     CompScreen::checkForError (dpy);
 
-    /* Check if the previous compositor (if one is around)
-     * supports the _NET_CM_HANDOFF protocol, if so then
-     * we need to do an automatic redirect and paint the
-     * scene once and then tell it to go away */
-    priv->netCmHandoffSupported = false;
-    currentCmSnOwner = XGetSelectionOwner (screen->dpy (), priv->cmSnAtom);
-
-    if (currentCmSnOwner != priv->cmSnOwner)
-    {
-	Atom type;
-	int  fmt;
-	unsigned long nitems, nleft;
-	unsigned char *prop;
-
-	if (XGetWindowProperty (screen->dpy (), currentCmSnOwner, priv->netCmHandoffAtom,
-				0L, 8L, false, XA_INTEGER, &type, &fmt,
-				&nitems, &nleft, &prop) == Success)
-	{
-	    if (type == XA_INTEGER && fmt == 8 && nitems != 0 && nleft == 0)
-	    {
-		priv->netCmHandoffSupported = true;
-	    }
-
-	    XFree (prop);
-	}
-    }
-
-    priv->netCmHandoffSupported ? updateMode = CompositeRedirectAutomatic :
-				  updateMode = CompositeRedirectManual;
-
     XCompositeRedirectSubwindows (dpy, screen->root (),
-				  updateMode);
+				  CompositeRedirectManual);
+
+    priv->overlayWindowCount = 0;
+
+    if (CompScreen::checkForError (dpy))
+    {
+	compLogMessage ("composite", CompLogLevelError,
+			"Another composite manager is already "
+			"running on screen: %d", screen->screenNum ());
+
+	return false;
+    }
 
     foreach (CompWindow *w, screen->windows ())
     {
@@ -457,19 +422,13 @@
 	(boost::bind (&CompositeScreen::handlePaintTimeout, this),
 	 priv->optimalRedrawTime);
 
-    if (priv->netCmHandoffSupported)
-	priv->paintTimer.setTimes (0, 0);
-
     return true;
 }
 
 void
 CompositeScreen::unregisterPaintHandler ()
 {
-    XEvent ev;
     Display *dpy = screen->dpy ();
-    bool   oldCmSupportsHandoff = false;
-    Window currentCmSnOwner = None;
 
     foreach (CompWindow *w, screen->windows ())
     {
@@ -481,38 +440,14 @@
 
     priv->overlayWindowCount = 0;
 
+    XCompositeUnredirectSubwindows (dpy, screen->root (),
+				    CompositeRedirectManual);
+
     priv->pHnd = NULL;
     priv->active = false;
     priv->paintTimer.stop ();
 
-    Atom type;
-    int  fmt;
-    unsigned long nitems, nleft;
-    unsigned char *prop;
-
-    /* Polling like this is very ugly */
-    while (currentCmSnOwner != priv->cmSnOwner)
-	currentCmSnOwner = XGetSelectionOwner (screen->dpy (), priv->cmSnAtom);
-
-    if (XGetWindowProperty (screen->dpy (), currentCmSnOwner, priv->netCmHandoffAtom,
-			    0L, 8L, false, XA_INTEGER, &type, &fmt,
-			    &nitems, &nleft, &prop) == Success)
-    {
-	if (type == XA_INTEGER && fmt == 8 && nitems != 0 && nleft == 0)
-	{
-	    oldCmSupportsHandoff = true;
-	}
-
-	XFree (prop);
-    }
-
-    if (oldCmSupportsHandoff)
-    {
-	XCompositeUnredirectSubwindows (dpy, screen->root (),
-					CompositeRedirectManual);
-    }
-    else
-	hideOutputWindow ();
+    hideOutputWindow ();
 }
 
 bool
@@ -666,6 +601,8 @@
     else
 #endif
 	output = overlay = screen->root ();
+
+    cScreen->hideOutputWindow ();
 }
 
 Window
@@ -956,9 +893,6 @@
     else
 	timeToNextRedraw = priv->getTimeToNextRedraw (&tv);
 
-    if (!priv->mInit)
-	priv->mInit = priv->init ();
-
     if (priv->idle)
 	priv->paintTimer.setTimes (timeToNextRedraw, MAXSHORT);
     else

=== modified file 'src/main.cpp'
--- src/main.cpp	2011-09-19 12:54:22 +0000
+++ src/main.cpp	2011-10-15 07:07:10 +0000
@@ -234,8 +234,17 @@
 								   screen->priv)));
     }
 
-    if (!disableSm)
-	CompSession::init (clientId);
+     if (!disableSm)
+     {
+	if (clientId == NULL)
+	{
+	    char *desktop_autostart_id = getenv ("DESKTOP_AUTOSTART_ID");
+	    if (desktop_autostart_id != NULL)
+		clientId = strdup (desktop_autostart_id);
+	    unsetenv ("DESKTOP_AUTOSTART_ID");
+ 	}
+ 	CompSession::init (clientId);
+     }
 
     return true;
 }

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2011-10-08 11:38:21 +0000
+++ src/screen.cpp	2011-10-15 07:07:10 +0000
@@ -4460,99 +4460,6 @@
 
     XSendEvent (dpy, root, FALSE, StructureNotifyMask, &event);
 
-    /* Need to set a default here so that the value isn't uninitialized
-     * when loading plugins FIXME: Should find a way to initialize options
-     * first and then set this value, or better yet, tie this value directly
-     * to the option */
-    priv->vpSize.setWidth (priv->optionGetHsize ());
-    priv->vpSize.setHeight (priv->optionGetVsize ());
-
-    for (i = 0; i < SCREEN_EDGE_NUM; i++)
-    {
-	priv->screenEdge[i].id    = None;
-	priv->screenEdge[i].count = 0;
-    }
-
-    priv->screenNum = DefaultScreen (dpy);
-    priv->colormap  = DefaultColormap (dpy, priv->screenNum);
-    priv->root	    = root;
-
-    priv->snContext = sn_monitor_context_new (priv->snDisplay, priv->screenNum,
-					      compScreenSnEvent, this, NULL);
-
-    priv->wmSnSelectionWindow = newWmSnOwner;
-    priv->wmSnAtom            = wmSnAtom;
-    priv->wmSnTimestamp       = wmSnTimestamp;
-
-    if (!XGetWindowAttributes (dpy, priv->root, &priv->attrib))
-	return false;
-
-    priv->workArea.setWidth (priv->attrib.width);
-    priv->workArea.setHeight (priv->attrib.height);
-
-    priv->grabWindow = None;
-
-    templ.visualid = XVisualIDFromVisual (priv->attrib.visual);
-
-    visinfo = XGetVisualInfo (dpy, VisualIDMask, &templ, &nvisinfo);
-    if (!nvisinfo)
-    {
-	compLogMessage ("core", CompLogLevelFatal,
-			"Couldn't get visual info for default visual");
-	return false;
-    }
-
-    black.red = black.green = black.blue = 0;
-
-    if (!XAllocColor (dpy, priv->colormap, &black))
-    {
-	compLogMessage ("core", CompLogLevelFatal,
-			"Couldn't allocate color");
-	XFree (visinfo);
-	return false;
-    }
-
-    bitmap = XCreateBitmapFromData (dpy, priv->root, &data, 1, 1);
-    if (!bitmap)
-    {
-	compLogMessage ("core", CompLogLevelFatal,
-			"Couldn't create bitmap");
-	XFree (visinfo);
-	return false;
-    }
-
-    priv->invisibleCursor = XCreatePixmapCursor (dpy, bitmap, bitmap,
-						 &black, &black, 0, 0);
-    if (!priv->invisibleCursor)
-    {
-	compLogMessage ("core", CompLogLevelFatal,
-			"Couldn't create invisible cursor");
-	XFree (visinfo);
-	return false;
-    }
-
-    XFreePixmap (dpy, bitmap);
-    XFreeColors (dpy, priv->colormap, &black.pixel, 1, 0);
-
-    XFree (visinfo);
-
-    priv->reshape (priv->attrib.width, priv->attrib.height);
-
-    priv->detectOutputDevices ();
-    priv->updateOutputDevices ();
-
-    priv->getDesktopHints ();
-
-    priv->initialized = true;
-
-    /* TODO: Bailout properly when screenInitPlugins fails
-     * TODO: It would be nicer if this line could mean
-     * "init all the screens", but unfortunately it only inits
-     * plugins loaded on the command line screen's and then
-     * we need to call updatePlugins () to init the remaining
-     * screens from option changes */
-    assert (CompPlugin::screenInitPlugins (this));
-
     /* Wait for old window manager to go away */
     if (currentWmSnOwner != None)
     {
@@ -4615,6 +4522,82 @@
 	return false;
     }
 
+    for (i = 0; i < SCREEN_EDGE_NUM; i++)
+    {
+	priv->screenEdge[i].id    = None;
+	priv->screenEdge[i].count = 0;
+    }
+
+    priv->screenNum = DefaultScreen (dpy);
+    priv->colormap  = DefaultColormap (dpy, priv->screenNum);
+    priv->root	    = root;
+
+    priv->snContext = sn_monitor_context_new (priv->snDisplay, priv->screenNum,
+					      compScreenSnEvent, this, NULL);
+
+    priv->wmSnSelectionWindow = newWmSnOwner;
+    priv->wmSnAtom            = wmSnAtom;
+    priv->wmSnTimestamp       = wmSnTimestamp;
+
+    if (!XGetWindowAttributes (dpy, priv->root, &priv->attrib))
+	return false;
+
+    priv->workArea.setWidth (priv->attrib.width);
+    priv->workArea.setHeight (priv->attrib.height);
+
+    priv->grabWindow = None;
+
+    templ.visualid = XVisualIDFromVisual (priv->attrib.visual);
+
+    visinfo = XGetVisualInfo (dpy, VisualIDMask, &templ, &nvisinfo);
+    if (!nvisinfo)
+    {
+	compLogMessage ("core", CompLogLevelFatal,
+			"Couldn't get visual info for default visual");
+	return false;
+    }
+
+    black.red = black.green = black.blue = 0;
+
+    if (!XAllocColor (dpy, priv->colormap, &black))
+    {
+	compLogMessage ("core", CompLogLevelFatal,
+			"Couldn't allocate color");
+	XFree (visinfo);
+	return false;
+    }
+
+    bitmap = XCreateBitmapFromData (dpy, priv->root, &data, 1, 1);
+    if (!bitmap)
+    {
+	compLogMessage ("core", CompLogLevelFatal,
+			"Couldn't create bitmap");
+	XFree (visinfo);
+	return false;
+    }
+
+    priv->invisibleCursor = XCreatePixmapCursor (dpy, bitmap, bitmap,
+						 &black, &black, 0, 0);
+    if (!priv->invisibleCursor)
+    {
+	compLogMessage ("core", CompLogLevelFatal,
+			"Couldn't create invisible cursor");
+	XFree (visinfo);
+	return false;
+    }
+
+    XFreePixmap (dpy, bitmap);
+    XFreeColors (dpy, priv->colormap, &black.pixel, 1, 0);
+
+    XFree (visinfo);
+
+    priv->reshape (priv->attrib.width, priv->attrib.height);
+
+    priv->detectOutputDevices ();
+    priv->updateOutputDevices ();
+
+    priv->getDesktopHints ();
+
     attrib.override_redirect = 1;
     attrib.event_mask	     = PropertyChangeMask;
 
@@ -4731,46 +4714,25 @@
 	    focusDefaultWindow ();
     }
 
-    /* Dispatch any queued timers */
-    while (TimeoutHandler::Default ()->timers ().begin () != TimeoutHandler::Default ()->timers ().end ())
-    {
-	if (TimeoutHandler::Default ()->timers ().front ()->minLeft () <= 0)
-	{
-	    CompTimer *t = TimeoutHandler::Default ()->timers ().front ();
-	    TimeoutHandler::Default ()->timers ().pop_front ();
-
-	    t->setActive (false);
-	    if (t->triggerCallback ())
-	    {
-		TimeoutHandler::Default ()->addTimer (t);
-		t->setActive (true);
-	    }
-	}
-	else
-	    break;
-    }
-
-    if (priv->dirtyPluginList)
-	priv->updatePlugins ();
-
-    /* Dispatch any queued timers */
-    while (TimeoutHandler::Default ()->timers ().begin () != TimeoutHandler::Default ()->timers ().end ())
-    {
-	if (TimeoutHandler::Default ()->timers ().front ()->minLeft () <= 0)
-	{
-	    CompTimer *t = TimeoutHandler::Default ()->timers ().front ();
-	    TimeoutHandler::Default ()->timers ().pop_front ();
-
-	    t->setActive (false);
-	    if (t->triggerCallback ())
-	    {
-		TimeoutHandler::Default ()->addTimer (t);
-		t->setActive (true);
-	    }
-	}
-	else
-	    break;
-    }
+    /* Need to set a default here so that the value isn't uninitialized
+     * when loading plugins FIXME: Should find a way to initialize options
+     * first and then set this value, or better yet, tie this value directly
+     * to the option */
+    priv->vpSize.setWidth (priv->optionGetHsize ());
+    priv->vpSize.setHeight (priv->optionGetVsize ());
+
+    priv->initialized = true;
+
+    /* TODO: Bailout properly when screenInitPlugins fails
+     * TODO: It would be nicer if this line could mean
+     * "init all the screens", but unfortunately it only inits
+     * plugins loaded on the command line screen's and then
+     * we need to call updatePlugins () to init the remaining
+     * screens from option changes */
+    assert (CompPlugin::screenInitPlugins (this));
+
+    /* The active plugins list might have been changed - load any
+     * new plugins */
 
     priv->vpSize.setWidth (priv->optionGetHsize ());
     priv->vpSize.setHeight (priv->optionGetVsize ());
@@ -4799,6 +4761,9 @@
     while (!priv->windows.empty ())
 	delete priv->windows.front ();
 
+    while ((p = CompPlugin::pop ()))
+	CompPlugin::unload (p);
+
     XUngrabKey (priv->dpy, AnyKey, AnyModifier, priv->root);
 
     priv->initialized = false;
@@ -4822,14 +4787,6 @@
     if (priv->snDisplay)
 	sn_display_unref (priv->snDisplay);
 
-    /* Remove our selection */
-    XSelectInput (priv->dpy, priv->root, NoEventMask);
-    XDestroyWindow (screen->dpy (), priv->wmSnSelectionWindow);
-    XSync (screen->dpy (), FALSE);
-
-    while ((p = CompPlugin::pop ()))
-	CompPlugin::unload (p);
-
     XSync (priv->dpy, False);
     XCloseDisplay (priv->dpy);
 

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-10-11 09:36:19 +0000
+++ src/window.cpp	2011-10-15 07:07:10 +0000
@@ -6517,7 +6517,7 @@
 			priv->desktop = screen->currentDesktop ();
 
 		    screen->setWindowProp (priv->id, Atoms::winDesktop,
-					   priv->desktop);
+				           priv->desktop);
 		}
 	    }
 	}