Merge lp:~aacid/unity-2d/unity-2d-shell_shape_bounding_shape_input into lp:~unity-2d-team/unity-2d/unity-2d-shell

[Albert Astals Cid]

Use ShapeInput when we are on compositing mode, ShapeBounding on non composited one, improves shadow drawing in the composited case.

=== modified file 'libunity-2d-private/src/inputshapemanager.cpp'
--- libunity-2d-private/src/inputshapemanager.cpp	2012-02-03 16:20:38 +0000
+++ libunity-2d-private/src/inputshapemanager.cpp	2012-02-07 12:43:34 +0000
@@ -5,7 +5,7 @@
 
 #include "inputshapemanager.h"
 #include "unity2ddeclarativeview.h"
-#include "screeninfo.h"
+#include "desktopinfo.h"
 
 // X11
 #include <X11/Xlib.h>
@@ -39,7 +39,8 @@
     // pixmap created from the mask bitmap. However for some reason I wasn't able to figure out yet
     // I get a lot of warnings when calling QBitmap::handle, so for now I'm passing a region as a
     // workaround.
-    XShapeCombineRegion(QX11Info::display(), m_target->effectiveWinId(), ShapeBounding,
+    XShapeCombineRegion(QX11Info::display(), m_target->effectiveWinId(),
+                        DesktopInfo::instance()->isCompositingManagerRunning() ? ShapeInput : ShapeBounding,
                         0, 0, QRegion(inputShape).handle(), ShapeSet);
 }