Merge lp:~3v1n0/unity/use-cursor-cache into lp:unity/7.3

[Marco Trevisan (Treviño)]

Unity: use compiz cursorCache to get properly updated cursors

We avoid duplicating instances and they're automatically recreated
when the system cursor setting change.

Backporting to Wily

[Andrea Azzarone (azzar1)]

review: Approve

=== modified file 'dash/previews/CMakeLists.txt'
--- dash/previews/CMakeLists.txt	2013-05-06 11:57:14 +0000
+++ dash/previews/CMakeLists.txt	2015-12-02 18:35:54 +0000
@@ -48,36 +48,36 @@
 # Application Standalone variant
 #
 add_executable (app_previews StandaloneApplicationPreview.cpp)
-target_link_libraries (app_previews previews-lib unity-shared)
+target_link_libraries (app_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Music Standalone variant
 #
 add_executable (music_previews StandaloneMusicPreview.cpp)
-target_link_libraries (music_previews previews-lib unity-shared)
+target_link_libraries (music_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Social Standalone variant
 #
 add_executable (social_previews StandaloneSocialPreview.cpp)
-target_link_libraries (social_previews previews-lib unity-shared)
+target_link_libraries (social_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Movie Standalone variant
 #
 add_executable (movie_previews StandaloneMoviePreview.cpp)
-target_link_libraries (movie_previews previews-lib unity-shared)
+target_link_libraries (movie_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Payment Standalone variant
 #
 add_executable (payment_previews StandaloneMusicPaymentPreview.cpp)
 add_dependencies (payment_previews previews-lib)
-target_link_libraries (payment_previews previews-lib unity-shared)
+target_link_libraries (payment_previews previews-lib unity-shared unity-shared-standalone)
 
 #
 # Error Standalone variant
 #
 add_executable (error_previews StandaloneErrorPreview.cpp)
 add_dependencies (error_previews previews-lib)
-target_link_libraries (error_previews previews-lib unity-shared)
+target_link_libraries (error_previews previews-lib unity-shared unity-shared-standalone)
 
=== modified file 'debian/control'
--- debian/control	2015-08-24 16:03:38 +0000
+++ debian/control	2015-12-02 18:35:54 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: cmake,
-               compiz-dev (>= 1:0.9.11),
+               compiz-dev (>= 1:0.9.12.2),
                debhelper (>= 9.0.0~),
                dbus-test-runner,
                dh-migrations,
 
=== modified file 'decorations/DecorationsDataPool.cpp'
--- decorations/DecorationsDataPool.cpp	2014-04-02 15:12:16 +0000
+++ decorations/DecorationsDataPool.cpp	2015-12-02 18:35:54 +0000
@@ -67,7 +67,6 @@
 
 DataPool::DataPool()
 {
-  SetupCursors();
   SetupTextures();
 
   CompSize glow_size(texture::GLOW_SIZE, texture::GLOW_SIZE);
@@ -78,13 +77,6 @@
   unity::Settings::Instance().dpi_changed.connect(cb);
 }
 
-DataPool::~DataPool()
-{
-  auto* dpy = screen->dpy();
-  for (auto cursor : edge_cursors_)
-    XFreeCursor(dpy, cursor);
-}
-
 DataPool::Ptr const& DataPool::Get()
 {
   if (instance_)
@@ -99,16 +91,9 @@
   instance_.reset();
 }
 
-void DataPool::SetupCursors()
-{
-  auto* dpy = screen->dpy();
-  for (unsigned c = 0; c < edge_cursors_.size(); ++c)
-    edge_cursors_[c] = XCreateFontCursor(dpy, EdgeTypeToCursorShape(Edge::Type(c)));
-}
-
 Cursor DataPool::EdgeCursor(Edge::Type type) const
 {
-  return edge_cursors_[unsigned(type)];
+  return screen->cursorCache(EdgeTypeToCursorShape(type));
 }
 
 void DataPool::SetupTextures()
 
=== modified file 'decorations/DecorationsDataPool.h'
--- decorations/DecorationsDataPool.h	2014-04-02 15:12:16 +0000
+++ decorations/DecorationsDataPool.h	2015-12-02 18:35:54 +0000
@@ -36,7 +36,7 @@
 
   static DataPool::Ptr const& Get();
   static void Reset();
-  virtual ~DataPool();
+  virtual ~DataPool() = default;
 
   Cursor EdgeCursor(Edge::Type) const;
   cu::SimpleTexture::Ptr const& GlowTexture() const;
@@ -48,10 +48,8 @@
   DataPool(DataPool const&) = delete;
   DataPool& operator=(DataPool const&) = delete;
 
-  void SetupCursors();
   void SetupTextures();
 
-  std::array<Cursor, size_t(Edge::Type::Size)> edge_cursors_;
   cu::SimpleTexture::Ptr glow_texture_;
 
   typedef std::array<std::array<cu::SimpleTexture::Ptr, size_t(WidgetState::Size)>, size_t(WindowButtonType::Size)> WindowButtonsArray;
 
=== modified file 'panel/PanelTitlebarGrabAreaView.cpp'
--- panel/PanelTitlebarGrabAreaView.cpp	2014-04-02 21:42:44 +0000
+++ panel/PanelTitlebarGrabAreaView.cpp	2015-12-02 18:35:54 +0000
@@ -24,6 +24,7 @@
 #include <X11/cursorfont.h>
 #include "unity-shared/UnitySettings.h"
 #include "unity-shared/DecorationStyle.h"
+#include "unity-shared/WindowManager.h"
 #include "PanelTitlebarGrabAreaView.h"
 
 
@@ -48,12 +49,6 @@
   });
 }
 
-PanelTitlebarGrabArea::~PanelTitlebarGrabArea()
-{
-  if (grab_cursor_)
-    XFreeCursor(nux::GetGraphicsDisplay()->GetX11Display(), grab_cursor_);
-}
-
 void PanelTitlebarGrabArea::SetGrabbed(bool enabled)
 {
   auto display = nux::GetGraphicsDisplay()->GetX11Display();
@@ -64,13 +59,12 @@
 
   if (enabled && !grab_cursor_)
   {
-    grab_cursor_ = XCreateFontCursor(display, XC_fleur);
+    grab_cursor_ = WindowManager::Default().GetCachedCursor(XC_fleur);
     XDefineCursor(display, panel_window->GetInputWindowId(), grab_cursor_);
   }
   else if (!enabled && grab_cursor_)
   {
     XUndefineCursor(display, panel_window->GetInputWindowId());
-    XFreeCursor(display, grab_cursor_);
     grab_cursor_ = None;
   }
 }
 
=== modified file 'panel/PanelTitlebarGrabAreaView.h'
--- panel/PanelTitlebarGrabAreaView.h	2014-04-02 21:42:44 +0000
+++ panel/PanelTitlebarGrabAreaView.h	2015-12-02 18:35:54 +0000
@@ -38,7 +38,6 @@
 
 public:
   PanelTitlebarGrabArea();
-  ~PanelTitlebarGrabArea();
 
   void SetGrabbed(bool enabled);
   bool IsGrabbed();
 
=== modified file 'plugins/unityshell/src/UnityGestureBroker.cpp'
--- plugins/unityshell/src/UnityGestureBroker.cpp	2013-04-04 23:26:31 +0000
+++ plugins/unityshell/src/UnityGestureBroker.cpp	2015-12-02 18:35:54 +0000
@@ -24,27 +24,13 @@
 #include "UnityGestureTarget.h"
 #include "WindowGestureTarget.h"
 
-#include <X11/cursorfont.h>
-
 UnityGestureBroker::UnityGestureBroker()
   : nux::GestureBroker()
 {
-  g_assert(WindowGestureTarget::fleur_cursor == 0);
-  WindowGestureTarget::fleur_cursor = XCreateFontCursor (screen->dpy (), XC_fleur);
-
   unity_target.reset(new UnityGestureTarget);
   gestural_window_switcher_.reset(new unity::GesturalWindowSwitcher);
 }
 
-UnityGestureBroker::~UnityGestureBroker()
-{
-  if (WindowGestureTarget::fleur_cursor)
-  {
-    XFreeCursor (screen->dpy (), WindowGestureTarget::fleur_cursor);
-    WindowGestureTarget::fleur_cursor = 0;
-  }
-}
-
 std::vector<nux::ShPtGestureTarget>
 UnityGestureBroker::FindGestureTargets(const nux::GestureEvent &event)
 {
 
=== modified file 'plugins/unityshell/src/UnityGestureBroker.h'
--- plugins/unityshell/src/UnityGestureBroker.h	2012-08-14 12:48:21 +0000
+++ plugins/unityshell/src/UnityGestureBroker.h	2015-12-02 18:35:54 +0000
@@ -32,7 +32,7 @@
 {
 public:
   UnityGestureBroker();
-  virtual ~UnityGestureBroker();
+  virtual ~UnityGestureBroker() = default;
 
 private:
   std::vector<nux::ShPtGestureTarget>
 
=== modified file 'plugins/unityshell/src/WindowGestureTarget.cpp'
--- plugins/unityshell/src/WindowGestureTarget.cpp	2013-07-01 21:42:50 +0000
+++ plugins/unityshell/src/WindowGestureTarget.cpp	2015-12-02 18:35:54 +0000
@@ -23,6 +23,7 @@
 #include "WindowGestureTarget.h"
 
 #include <Nux/Nux.h> // otherwise unityshell.h inclusion will cause failures
+#include <X11/cursorfont.h>
 #include "unityshell.h"
 
 // To make the gesture tests pass, this has to be a local include.
@@ -30,8 +31,6 @@
 
 using namespace nux;
 
-Cursor WindowGestureTarget::fleur_cursor = 0;
-
 WindowGestureTarget::WindowGestureTarget(CompWindow *window)
   : window_(window), drag_grab_(0), started_window_move_(false),
     window_restored_by_pinch_(false)
@@ -138,7 +137,7 @@
 {
   if (!event.IsDirectTouch())
   {
-    drag_grab_ = screen->pushGrab(fleur_cursor, "unity");
+    drag_grab_ = screen->pushGrab(screen->cursorCache(XC_fleur), "unity");
     window_->grabNotify(window_->serverGeometry().x(),
                         window_->serverGeometry().y(),
                         0,
 
=== modified file 'plugins/unityshell/src/WindowGestureTarget.h'
--- plugins/unityshell/src/WindowGestureTarget.h	2013-07-01 21:42:50 +0000
+++ plugins/unityshell/src/WindowGestureTarget.h	2015-12-02 18:35:54 +0000
@@ -36,8 +36,6 @@
 
     virtual nux::GestureDeliveryRequest GestureEvent(const nux::GestureEvent &event);
 
-    static Cursor fleur_cursor;
-
     CompWindow *window() {return window_;}
   private:
     virtual bool Equals(const nux::GestureTarget& other) const;
 
=== modified file 'tests/MockWindowManager.h'
--- tests/MockWindowManager.h	2015-01-21 15:28:59 +0000
+++ tests/MockWindowManager.h	2015-12-02 18:35:54 +0000
@@ -101,6 +101,7 @@
 
     MOCK_CONST_METHOD1(GetWindowName, std::string(Window));
     MOCK_CONST_METHOD1(IsOnscreenKeyboard, bool(Window));
+    MOCK_CONST_METHOD1(GetCachedCursor, Cursor(unsigned int));
 
     MOCK_METHOD1(AddProperties, void(GVariantBuilder*));
 };
 
=== modified file 'tests/test-gestures/WindowGestureTargetMock.h'
--- tests/test-gestures/WindowGestureTargetMock.h	2012-07-27 20:20:29 +0000
+++ tests/test-gestures/WindowGestureTargetMock.h	2015-12-02 18:35:54 +0000
@@ -32,7 +32,6 @@
     CompWindowMock *window;
     std::list<nux::GestureEvent> events_received;
 
-    static Cursor fleur_cursor;
   private:
     virtual bool Equals(const nux::GestureTarget& other) const
     {
 
=== modified file 'tests/test-gestures/compiz_mock/core/screen.h'
--- tests/test-gestures/compiz_mock/core/screen.h	2012-07-27 20:20:29 +0000
+++ tests/test-gestures/compiz_mock/core/screen.h	2015-12-02 18:35:54 +0000
@@ -58,6 +58,7 @@
   }
 
   Cursor invisibleCursor() {return 1;}
+  Cursor cursorCache(unsigned int) {return 0;}
 
   int width_;
   int height_;
 
=== modified file 'tests/test-gestures/test_gestures_main.cpp'
--- tests/test-gestures/test_gestures_main.cpp	2012-07-27 20:24:01 +0000
+++ tests/test-gestures/test_gestures_main.cpp	2015-12-02 18:35:54 +0000
@@ -46,7 +46,6 @@
     g_gesture_event_reject_count[gesture_id_] + 1;
 }
 
-Cursor WindowGestureTargetMock::fleur_cursor = 0;
 std::set<WindowGestureTargetMock*> g_window_target_mocks;
 
 int main(int argc, char** argv)
 
=== modified file 'unity-shared/IMTextEntry.cpp'
--- unity-shared/IMTextEntry.cpp	2014-05-26 14:58:52 +0000
+++ unity-shared/IMTextEntry.cpp	2015-12-02 18:35:54 +0000
@@ -19,7 +19,9 @@
  */
 
 #include "IMTextEntry.h"
+#include "WindowManager.h"
 #include <gtk/gtk.h>
+#include <X11/cursorfont.h>
 
 namespace unity
 {
@@ -28,7 +30,30 @@
 IMTextEntry::IMTextEntry()
   : TextEntry("", NUX_TRACKER_LOCATION)
   , clipboard_enabled(true)
-{}
+{
+  // Let's override the nux RecvMouse{Enter,Leave} using the hard way
+  mouse_enter.clear();
+  mouse_leave.clear();
+
+  mouse_enter.connect([this] (int, int, unsigned long, unsigned long) {
+    auto dpy = nux::GetGraphicsDisplay()->GetX11Display();
+    auto window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
+
+    if (dpy && window)
+    {
+      auto cursor = WindowManager::Default().GetCachedCursor(XC_xterm);
+      XDefineCursor(dpy, window->GetInputWindowId(), cursor);
+    }
+  });
+
+  mouse_leave.connect([this] (int, int, unsigned long, unsigned long) {
+    auto dpy = nux::GetGraphicsDisplay()->GetX11Display();
+    auto window = static_cast<nux::BaseWindow*>(GetTopLevelViewWindow());
+
+    if (dpy && window)
+      XUndefineCursor(dpy, window->GetInputWindowId());
+  });
+}
 
 void IMTextEntry::CopyClipboard()
 {
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2015-09-10 13:23:47 +0000
+++ unity-shared/PluginAdapter.cpp	2015-12-02 18:35:54 +0000
@@ -1486,6 +1486,11 @@
     _last_focused_window = NULL;
 }
 
+Cursor PluginAdapter::GetCachedCursor(unsigned int cursor_name) const
+{
+  return screen->cursorCache(cursor_name);
+}
+
 void PluginAdapter::UnmapAllNoNuxWindowsSync()
 {
   for (auto const& window : m_Screen->windows())
 
=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2015-06-05 16:39:31 +0000
+++ unity-shared/PluginAdapter.h	2015-12-02 18:35:54 +0000
@@ -194,6 +194,8 @@
 
   Window GetTopWindowAbove(Window xid) const;
 
+  Cursor GetCachedCursor(unsigned int) const;
+
   void UnmapAllNoNuxWindowsSync();
   static bool IsNuxWindow(CompWindow* value);
 
 
=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2015-06-05 16:39:31 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2015-12-02 18:35:54 +0000
@@ -742,6 +742,11 @@
   return standalone_windows_;
 }
 
+Cursor StandaloneWindowManager::GetCachedCursor(unsigned int cursor_name) const
+{
+  return 0;
+}
+
 void StandaloneWindowManager::SetCurrentViewport(nux::Point const& vp)
 {
   current_vp_ = vp;
 
=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2015-06-05 16:39:31 +0000
+++ unity-shared/StandaloneWindowManager.h	2015-12-02 18:35:54 +0000
@@ -181,6 +181,8 @@
   void SetCurrentViewport(nux::Point const& vp);
   void SetWorkareaGeometry(nux::Geometry const& geo);
 
+  Cursor GetCachedCursor(unsigned int cursor_name) const;
+
   void ResetStatus();
 
 protected:
 
=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2015-06-05 16:39:31 +0000
+++ unity-shared/WindowManager.h	2015-12-02 18:35:54 +0000
@@ -171,6 +171,8 @@
   virtual std::string GetStringProperty(Window, Atom) const = 0;
   virtual std::vector<long> GetCardinalProperty(Window, Atom) const = 0;
 
+  virtual Cursor GetCachedCursor(unsigned int cursor_name) const = 0;
+
   virtual void UnmapAllNoNuxWindowsSync() = 0;