Merge lp:~mkhu/compiz/fix_startup_notification_busy_cursor into lp:compiz/0.9.10

[Micheal Hsu]

Use XIDefineCursor rather than XDefineCursor.

compiz should show a busy cursor during the application startup stage.
the corresponding code is in scr/screen.cpp:
cps::StartupSequenceImpl::updateStateFeedback ()
the patch changes all XDefineCursor to XIDefineCursor (see XInput2 extension)

(LP: #1179155)

compiz should show a busy cursor during the application startup stage.
the corresponding code is in scr/screen.cpp:
cps::StartupSequenceImple::updateStateFeedback ()
the patch changes all XDefineCursor to XIDefineCursor (see XInput2 extension)

[Micheal Hsu (mkhu)]

A little note:
"xext" is duplicated in CMake variable COMPIZ_REQUIRES (see top level CMakeLists.txt)
so I changed the second one to "xi".
it's not apparent in the generated diff.

[MC Return (mc-return)]

+1, LGTM, but waiting for Sam's opinion on this one...

Abstain for now.

review: Abstain

[Sam Spilsbury (smspillaz)]

Hi, this looks fine - can you check if the build-deps in debian/control also need to be updated for the xi dep?

review: Needs Information

[Micheal Hsu (mkhu)]

"libxi-dev" is in the Build-Depends section.

[Sam Spilsbury (smspillaz)]

Thanks. I haven't been able to check this myself from my current location.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~stevenhooke11/compiz/fix_startup_notification_busy_cursor/+merge/163421/+edit-commit-message

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-02-27 11:48:55 +0000
+++ CMakeLists.txt	2013-05-12 08:40:34 +0000
@@ -104,7 +104,7 @@
     x11-xcb
     xrandr
     xinerama
-    xext
+    xi
     ice
     sm
     libxml-2.0

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2013-02-27 03:24:45 +0000
+++ src/privatescreen.h	2013-05-12 08:40:34 +0000
@@ -744,6 +744,7 @@
 
     Window wmSnSelectionWindow;
 
+    int    clientPointerDeviceId;
     Cursor normalCursor;
     Cursor busyCursor;
     Cursor invisibleCursor;

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2013-02-03 17:58:29 +0000
+++ src/screen.cpp	2013-05-12 08:40:34 +0000
@@ -52,6 +52,7 @@
 #include <X11/extensions/Xrandr.h>
 #include <X11/extensions/shape.h>
 #include <X11/cursorfont.h>
+#include <X11/extensions/XInput2.h>
 
 #include <core/global.h>
 #include <core/screen.h>
@@ -2082,9 +2083,9 @@
     if (priv->initialized)
     {
 	if (!emptySequence())
-	    XDefineCursor (priv->dpy, priv->rootWindow(), priv->busyCursor);
+	    XIDefineCursor (priv->dpy, priv->clientPointerDeviceId, priv->rootWindow(), priv->busyCursor);
 	else
-	    XDefineCursor (priv->dpy, priv->rootWindow(), priv->normalCursor);
+	    XIDefineCursor (priv->dpy, priv->clientPointerDeviceId, priv->rootWindow(), priv->normalCursor);
     }
 }
 
@@ -5002,10 +5003,12 @@
     eventManager.setSupportingWmCheck (dpy, rootWindow());
     screen->updateSupportedWmHints ();
 
+    XIGetClientPointer (dpy, None, &clientPointerDeviceId);
+
     normalCursor = XCreateFontCursor (dpy, XC_left_ptr);
     busyCursor   = XCreateFontCursor (dpy, XC_watch);
 
-    XDefineCursor (dpy, rootWindow(), normalCursor);
+    XIDefineCursor (dpy, clientPointerDeviceId, rootWindow(), normalCursor);
 
     /* Attempt to gain SubstructureRedirectMask */
     CompScreenImpl::checkForError (dpy);
@@ -5180,6 +5183,7 @@
     nDesktop (1),
     currentDesktop (0),
     wmSnSelectionWindow (None),
+    clientPointerDeviceId (None),
     normalCursor (None),
     busyCursor (None),
     invisibleCursor (None),