render: don't bother with animated cursors on floating slaves (#39989)

whot · jeremyhu · commit a1ed67fa0551 · 2012-01-18T10:55:12.000-08:00
X.Org Bug 39989 <http://bugs.freedesktop.org/show_bug.cgi?id=39989> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> (cherry picked from commit bbb6b8c)
diff --git a/render/animcur.c b/render/animcur.c
@@ -208,6 +208,9 @@ AnimCurDisplayCursor (DeviceIntPtr pDev,
     AnimCurScreenPtr    as = GetAnimCurScreen(pScreen);
     Bool		ret;
 
+    if (IsFloating(pDev))
+	    return FALSE;
+
     Unwrap (as, pScreen, DisplayCursor);
     if (IsAnimCur(pCursor))
     {

Original file line number	Diff line number	Diff line change
`@@ -208,6 +208,9 @@ AnimCurDisplayCursor (DeviceIntPtr pDev,`
`208`	`208`	`AnimCurScreenPtr as = GetAnimCurScreen(pScreen);`
`209`	`209`	`Bool ret;`
`210`	`210`
	`211`	`+ if (IsFloating(pDev))`
	`212`	`+ return FALSE;`
	`213`	`+`
`211`	`214`	`Unwrap (as, pScreen, DisplayCursor);`
`212`	`215`	`if (IsAnimCur(pCursor))`
`213`	`216`	`{`