[mutter] backends: Get rid of meta-cursor-private.h

[Jonas Ådahl <jadahl src gnome org>]

commit 165050f8f9c59262f690ea2ae3d3ba4af41f19b3
Author: Jonas Ådahl <jadahl gmail com>
Date:   Tue Mar 10 14:41:12 2015 +0800

    backends: Get rid of meta-cursor-private.h
    
    There is nothing special about the private API which only consists of
    getters for renderer specific backing buffer. Lets them to the regular
    .h file and treat them as part of the normal API.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=744932

 src/Makefile.am                                   |    1 -
 src/backends/meta-cursor-private.h                |   68 ---------------------
 src/backends/meta-cursor-renderer.c               |    1 -
 src/backends/meta-cursor-tracker.c                |    1 -
 src/backends/meta-cursor.c                        |   24 +++++++-
 src/backends/meta-cursor.h                        |   14 ++++
 src/backends/meta-stage.c                         |    1 -
 src/backends/native/meta-cursor-renderer-native.c |    1 -
 8 files changed, 37 insertions(+), 74 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 04671e7..d7122dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,7 +68,6 @@ libmutter_la_SOURCES =                                \
        backends/meta-barrier-private.h         \
        backends/meta-cursor.c                  \
        backends/meta-cursor.h                  \
-       backends/meta-cursor-private.h          \
        backends/meta-cursor-tracker.c          \
        backends/meta-cursor-tracker-private.h  \
        backends/meta-cursor-renderer.c         \
diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c
index 9531cf0..5509288 100644
--- a/src/backends/meta-cursor-renderer.c
+++ b/src/backends/meta-cursor-renderer.c
@@ -25,7 +25,6 @@
 #include "config.h"
 
 #include "meta-cursor-renderer.h"
-#include "meta-cursor-private.h"
 
 #include <meta/meta-backend.h>
 #include <meta/util.h>
diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c
index bd61efc..544926c 100644
--- a/src/backends/meta-cursor-tracker.c
+++ b/src/backends/meta-cursor-tracker.c
@@ -43,7 +43,6 @@
 #include <X11/extensions/Xfixes.h>
 
 #include "meta-backend-private.h"
-#include "meta-cursor-private.h"
 
 G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);
 
diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c
index 3c9d44d..706984d 100644
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -21,7 +21,7 @@
 
 #include "config.h"
 
-#include "meta-cursor-private.h"
+#include "meta-cursor.h"
 
 #include <meta/errors.h>
 
@@ -30,6 +30,7 @@
 #include "meta-backend-private.h"
 
 #ifdef HAVE_NATIVE_BACKEND
+#include <gbm.h>
 #include "backends/native/meta-cursor-renderer-native.h"
 #endif
 
@@ -43,6 +44,27 @@
 #include <cogl/cogl-wayland-server.h>
 #endif
 
+typedef struct
+{
+  CoglTexture2D *texture;
+  int hot_x, hot_y;
+
+#ifdef HAVE_NATIVE_BACKEND
+  struct gbm_bo *bo;
+#endif
+} MetaCursorImage;
+
+struct _MetaCursorSprite
+{
+  GObject parent;
+
+  MetaCursor cursor;
+  MetaCursorImage image;
+
+  int current_frame;
+  XcursorImages *xcursor_images;
+};
+
 GType meta_cursor_sprite_get_type (void) G_GNUC_CONST;
 
 G_DEFINE_TYPE (MetaCursorSprite, meta_cursor_sprite, G_TYPE_OBJECT)
diff --git a/src/backends/meta-cursor.h b/src/backends/meta-cursor.h
index 2001d1b..a9e3a9f 100644
--- a/src/backends/meta-cursor.h
+++ b/src/backends/meta-cursor.h
@@ -50,4 +50,18 @@ MetaCursorSprite * meta_cursor_sprite_from_texture (CoglTexture2D *texture,
 Cursor meta_cursor_create_x_cursor (Display    *xdisplay,
                                     MetaCursor  cursor);
 
+CoglTexture *meta_cursor_sprite_get_cogl_texture (MetaCursorSprite *self,
+                                                  int              *hot_x,
+                                                  int              *hot_y);
+
+#ifdef HAVE_NATIVE_BACKEND
+struct gbm_bo *meta_cursor_sprite_get_gbm_bo (MetaCursorSprite *self,
+                                              int              *hot_x,
+                                              int              *hot_y);
+#endif
+
+gboolean meta_cursor_sprite_is_animated            (MetaCursorSprite *self);
+void     meta_cursor_sprite_tick_frame             (MetaCursorSprite *self);
+guint    meta_cursor_sprite_get_current_frame_time (MetaCursorSprite *self);
+
 #endif /* META_CURSOR_H */
diff --git a/src/backends/meta-stage.c b/src/backends/meta-stage.c
index 1965af5..eb270f1 100644
--- a/src/backends/meta-stage.c
+++ b/src/backends/meta-stage.c
@@ -24,7 +24,6 @@
 
 #include "meta-stage.h"
 
-#include "meta-cursor-private.h"
 #include <meta/meta-backend.h>
 #include <meta/util.h>
 
diff --git a/src/backends/native/meta-cursor-renderer-native.c 
b/src/backends/native/meta-cursor-renderer-native.c
index 2d14c25..81ab4d0 100644
--- a/src/backends/native/meta-cursor-renderer-native.c
+++ b/src/backends/native/meta-cursor-renderer-native.c
@@ -29,7 +29,6 @@
 #include <gbm.h>
 #include <xf86drm.h>
 
-#include "meta-cursor-private.h"
 #include "meta-monitor-manager-private.h"
 
 #ifndef DRM_CAP_CURSOR_WIDTH