diff --git a/src/Makefile.am b/src/Makefile.am

index bcb3505c7..5bbac70e8 100644

--- a/src/Makefile.am

+++ b/src/Makefile.am

@@ -114,6 +114,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\

 	backends/meta-cursor-tracker-private.h	\

 	backends/meta-cursor-renderer.c		\

 	backends/meta-cursor-renderer.h		\

+	backends/meta-cursor-sprite-xcursor.c	\

+	backends/meta-cursor-sprite-xcursor.h	\

 	backends/meta-dnd-private.h		\

 	backends/meta-egl.c			\

 	backends/meta-egl.h			\

@@ -176,6 +178,8 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES =	\

 	backends/x11/meta-gpu-xrandr.h			\

 	backends/x11/cm/meta-backend-x11-cm.c		\

 	backends/x11/cm/meta-backend-x11-cm.h		\

+	backends/x11/cm/meta-cursor-sprite-xfixes.c	\

+	backends/x11/cm/meta-cursor-sprite-xfixes.h	\

 	backends/x11/cm/meta-renderer-x11-cm.c		\

 	backends/x11/cm/meta-renderer-x11-cm.h		\

 	backends/x11/nested/meta-backend-x11-nested.c	\

@@ -370,6 +374,8 @@ if HAVE_WAYLAND

 libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\

 	compositor/meta-surface-actor-wayland.c	\

 	compositor/meta-surface-actor-wayland.h	\

+	wayland/meta-cursor-sprite-wayland.c	\

+	wayland/meta-cursor-sprite-wayland.h	\

 	wayland/meta-wayland.c			\

 	wayland/meta-wayland.h			\

 	wayland/meta-wayland-private.h		\

@@ -431,10 +437,10 @@ libmutter_@LIBMUTTER_API_VERSION@_la_SOURCES +=	\

 	wayland/meta-wayland-touch.h		\

 	wayland/meta-wayland-surface.c		\

 	wayland/meta-wayland-surface.h		\

-	wayland/meta-wayland-surface-role-cursor.c	\

-	wayland/meta-wayland-surface-role-cursor.h	\

-	wayland/meta-wayland-surface-role-tablet-cursor.c	\

-	wayland/meta-wayland-surface-role-tablet-cursor.h	\

+	wayland/meta-wayland-cursor-surface.c	\

+	wayland/meta-wayland-cursor-surface.h	\

+	wayland/meta-wayland-tablet-cursor-surface.c	\

+	wayland/meta-wayland-tablet-cursor-surface.h	\

 	wayland/meta-wayland-actor-surface.c	\

 	wayland/meta-wayland-actor-surface.h	\

 	wayland/meta-wayland-subsurface.c	\

diff --git a/src/backends/meta-cursor-renderer.c b/src/backends/meta-cursor-renderer.c

index f6470e66a..eb79737f1 100644

--- a/src/backends/meta-cursor-renderer.c

+++ b/src/backends/meta-cursor-renderer.c

@@ -193,8 +193,8 @@ meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,

 }

 static void

-update_cursor (MetaCursorRenderer *renderer,

-               MetaCursorSprite   *cursor_sprite)

+meta_cursor_renderer_update_cursor (MetaCursorRenderer *renderer,

+                                    MetaCursorSprite   *cursor_sprite)

 {

   MetaCursorRendererPrivate *priv = meta_cursor_renderer_get_instance_private (renderer);

   gboolean handled_by_backend;

@@ -237,7 +237,7 @@ meta_cursor_renderer_set_cursor (MetaCursorRenderer *renderer,

     return;

   priv->displayed_cursor = cursor_sprite;

-  update_cursor (renderer, cursor_sprite);

+  meta_cursor_renderer_update_cursor (renderer, cursor_sprite);

 }

 void

@@ -246,7 +246,7 @@ meta_cursor_renderer_force_update (MetaCursorRenderer *renderer)

   MetaCursorRendererPrivate *priv =

     meta_cursor_renderer_get_instance_private (renderer);

-  update_cursor (renderer, priv->displayed_cursor);

+  meta_cursor_renderer_update_cursor (renderer, priv->displayed_cursor);

 }

 void

@@ -261,7 +261,7 @@ meta_cursor_renderer_set_position (MetaCursorRenderer *renderer,

   priv->current_x = x;

   priv->current_y = y;

-  update_cursor (renderer, priv->displayed_cursor);

+  meta_cursor_renderer_update_cursor (renderer, priv->displayed_cursor);

 }

 ClutterPoint

@@ -283,28 +283,3 @@ meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer)

   return priv->displayed_cursor;

 }

-

-#ifdef HAVE_WAYLAND

-void

-meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,

-                                                    MetaCursorSprite   *cursor_sprite,

-                                                    struct wl_resource *buffer)

-{

-

-  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);

-

-  if (renderer_class->realize_cursor_from_wl_buffer)

-    renderer_class->realize_cursor_from_wl_buffer (renderer, cursor_sprite, buffer);

-}

-#endif

-

-void

-meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,

-                                                  MetaCursorSprite   *cursor_sprite,

-                                                  XcursorImage       *xc_image)

-{

-  MetaCursorRendererClass *renderer_class = META_CURSOR_RENDERER_GET_CLASS (renderer);

-

-  if (renderer_class->realize_cursor_from_xcursor)

-    renderer_class->realize_cursor_from_xcursor (renderer, cursor_sprite, xc_image);

-}

diff --git a/src/backends/meta-cursor-renderer.h b/src/backends/meta-cursor-renderer.h

index 1691f4471..830d16ef6 100644

--- a/src/backends/meta-cursor-renderer.h

+++ b/src/backends/meta-cursor-renderer.h

@@ -26,10 +26,6 @@

 #define META_CURSOR_RENDERER_H

 #include <glib-object.h>

-#include <X11/Xcursor/Xcursor.h>

-#ifdef HAVE_WAYLAND

-#include <wayland-server.h>

-#endif

 #include <meta/screen.h>

 #include "meta-cursor.h"

@@ -44,14 +40,6 @@ struct _MetaCursorRendererClass

   gboolean (* update_cursor) (MetaCursorRenderer *renderer,

                               MetaCursorSprite   *cursor_sprite);

-#ifdef HAVE_WAYLAND

-  void (* realize_cursor_from_wl_buffer) (MetaCursorRenderer *renderer,

-                                          MetaCursorSprite *cursor_sprite,

-                                          struct wl_resource *buffer);

-#endif

-  void (* realize_cursor_from_xcursor) (MetaCursorRenderer *renderer,

-                                        MetaCursorSprite *cursor_sprite,

-                                        XcursorImage *xc_image);

 };

 MetaCursorRenderer * meta_cursor_renderer_new (void);

@@ -70,16 +58,6 @@ MetaCursorSprite * meta_cursor_renderer_get_cursor (MetaCursorRenderer *renderer

 ClutterRect meta_cursor_renderer_calculate_rect (MetaCursorRenderer *renderer,

                                                  MetaCursorSprite   *cursor_sprite);

-#ifdef HAVE_WAYLAND

-void meta_cursor_renderer_realize_cursor_from_wl_buffer (MetaCursorRenderer *renderer,

-                                                         MetaCursorSprite   *cursor_sprite,

-                                                         struct wl_resource *buffer);

-#endif

-

-void meta_cursor_renderer_realize_cursor_from_xcursor (MetaCursorRenderer *renderer,

-                                                       MetaCursorSprite   *cursor_sprite,

-                                                       XcursorImage       *xc_image);

-

 void meta_cursor_renderer_emit_painted (MetaCursorRenderer *renderer,

                                         MetaCursorSprite   *cursor_sprite);

diff --git a/src/backends/meta-cursor-sprite-xcursor.c b/src/backends/meta-cursor-sprite-xcursor.c

new file mode 100644

index 000000000..657c1dae8

--- /dev/null

+++ b/src/backends/meta-cursor-sprite-xcursor.c

@@ -0,0 +1,292 @@

+/*

+ * Copyright 2013, 2018 Red Hat, Inc.

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, see <http://www.gnu.org/licenses/>.

+ *

+ */

+

+#include "config.h"

+

+#include "backends/meta-cursor-sprite-xcursor.h"

+

+#include "backends/meta-cursor.h"

+#include "backends/meta-cursor-renderer.h"

+#include "clutter/clutter.h"

+#include "cogl/cogl.h"

+#include "meta/prefs.h"

+

+struct _MetaCursorSpriteXcursor

+{

+  MetaCursorSprite parent;

+

+  MetaCursor cursor;

+

+  int current_frame;

+  XcursorImages *xcursor_images;

+

+  int theme_scale;

+  gboolean theme_dirty;

+};

+

+G_DEFINE_TYPE (MetaCursorSpriteXcursor, meta_cursor_sprite_xcursor,

+               META_TYPE_CURSOR_SPRITE)

+

+static const char *

+translate_meta_cursor (MetaCursor cursor)

+{

+  switch (cursor)

+    {

+    case META_CURSOR_DEFAULT:

+      return "left_ptr";

+    case META_CURSOR_NORTH_RESIZE:

+      return "top_side";

+    case META_CURSOR_SOUTH_RESIZE:

+      return "bottom_side";

+    case META_CURSOR_WEST_RESIZE:

+      return "left_side";

+    case META_CURSOR_EAST_RESIZE:

+      return "right_side";

+    case META_CURSOR_SE_RESIZE:

+      return "bottom_right_corner";

+    case META_CURSOR_SW_RESIZE:

+      return "bottom_left_corner";

+    case META_CURSOR_NE_RESIZE:

+      return "top_right_corner";

+    case META_CURSOR_NW_RESIZE:

+      return "top_left_corner";

+    case META_CURSOR_MOVE_OR_RESIZE_WINDOW:

+      return "fleur";

+    case META_CURSOR_BUSY:

+      return "watch";

+    case META_CURSOR_DND_IN_DRAG:

+      return "dnd-none";

+    case META_CURSOR_DND_MOVE:

+      return "dnd-move";

+    case META_CURSOR_DND_COPY:

+      return "dnd-copy";

+    case META_CURSOR_DND_UNSUPPORTED_TARGET:

+      return "dnd-none";

+    case META_CURSOR_POINTING_HAND:

+      return "hand2";

+    case META_CURSOR_CROSSHAIR:

+      return "crosshair";

+    case META_CURSOR_IBEAM:

+      return "xterm";

+    default:

+      break;

+    }

+

+  g_assert_not_reached ();

+}

+

+MetaCursor

+meta_cursor_sprite_xcursor_get_cursor (MetaCursorSpriteXcursor *sprite_xcursor)

+{

+  return sprite_xcursor->cursor;

+}

+

+Cursor

+meta_create_x_cursor (Display    *xdisplay,

+                      MetaCursor  cursor)

+{

+  return XcursorLibraryLoadCursor (xdisplay, translate_meta_cursor (cursor));

+}

+

+static XcursorImages *

+load_cursor_on_client (MetaCursor cursor, int scale)

+{

+  return XcursorLibraryLoadImages (translate_meta_cursor (cursor),

+                                   meta_prefs_get_cursor_theme (),

+                                   meta_prefs_get_cursor_size () * scale);

+}

+

+static void

+load_from_current_xcursor_image (MetaCursorSpriteXcursor *sprite_xcursor)

+{

+  MetaCursorSprite *sprite = META_CURSOR_SPRITE (sprite_xcursor);

+  XcursorImage *xc_image;

+  int width, height, rowstride;

+  CoglPixelFormat cogl_format;

+  ClutterBackend *clutter_backend;

+  CoglContext *cogl_context;

+  CoglTexture2D *texture;

+  CoglError *error = NULL;

+

+  g_assert (!meta_cursor_sprite_get_cogl_texture (sprite));

+

+  xc_image = meta_cursor_sprite_xcursor_get_current_image (sprite_xcursor);

+  width = (int) xc_image->width;

+  height = (int) xc_image->height;

+  rowstride = width * 4;

+

+#if G_BYTE_ORDER == G_LITTLE_ENDIAN

+  cogl_format = COGL_PIXEL_FORMAT_BGRA_8888;

+#else

+  cogl_format = COGL_PIXEL_FORMAT_ARGB_8888;

+#endif

+

+  clutter_backend = clutter_get_default_backend ();

+  cogl_context = clutter_backend_get_cogl_context (clutter_backend);

+  texture = cogl_texture_2d_new_from_data (cogl_context,

+                                           width, height,

+                                           cogl_format,

+                                           rowstride,

+                                           (uint8_t *) xc_image->pixels,

+                                           &error);

+  if (!texture)

+    {

+      g_warning ("Failed to allocate cursor texture: %s\n", error->message);

+      cogl_error_free (error);

+    }

+

+  meta_cursor_sprite_set_texture (sprite,

+                                  COGL_TEXTURE (texture),

+                                  xc_image->xhot, xc_image->yhot);

+

+  if (texture)

+    cogl_object_unref (texture);

+}

+

+void

+meta_cursor_sprite_xcursor_set_theme_scale (MetaCursorSpriteXcursor *sprite_xcursor,

+                                            int                      theme_scale)

+{

+  if (sprite_xcursor->theme_scale != theme_scale)

+    sprite_xcursor->theme_dirty = TRUE;

+  sprite_xcursor->theme_scale = theme_scale;

+}

+

+

+static gboolean

+meta_cursor_sprite_xcursor_is_animated (MetaCursorSprite *sprite)

+{

+  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);

+

+  return (sprite_xcursor->xcursor_images &&

+          sprite_xcursor->xcursor_images->nimage > 1);

+}

+

+XcursorImage *

+meta_cursor_sprite_xcursor_get_current_image (MetaCursorSpriteXcursor *sprite_xcursor)

+{

+  return sprite_xcursor->xcursor_images->images[sprite_xcursor->current_frame];

+}

+

+static void

+meta_cursor_sprite_xcursor_tick_frame (MetaCursorSprite *sprite)

+{

+  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);

+

+  if (!meta_cursor_sprite_is_animated (sprite))

+    return;

+

+  sprite_xcursor->current_frame++;

+

+  if (sprite_xcursor->current_frame >= sprite_xcursor->xcursor_images->nimage)

+    sprite_xcursor->current_frame = 0;

+

+  meta_cursor_sprite_clear_texture (sprite);

+  load_from_current_xcursor_image (sprite_xcursor);

+}

+

+static unsigned int

+meta_cursor_sprite_xcursor_get_current_frame_time (MetaCursorSprite *sprite)

+{

+  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);

+  XcursorImages *xcursor_images;

+

+  g_return_val_if_fail (meta_cursor_sprite_is_animated (sprite), 0);

+

+  xcursor_images = sprite_xcursor->xcursor_images;

+  return xcursor_images->images[sprite_xcursor->current_frame]->delay;

+}

+

+static void

+load_cursor_from_theme (MetaCursorSprite *sprite)

+{

+  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);

+

+  g_assert (sprite_xcursor->cursor != META_CURSOR_NONE);

+

+  sprite_xcursor->theme_dirty = FALSE;

+

+  /* We might be reloading with a different scale. If so clear the old data. */

+  if (sprite_xcursor->xcursor_images)

+    {

+      meta_cursor_sprite_clear_texture (sprite);

+      XcursorImagesDestroy (sprite_xcursor->xcursor_images);

+    }

+

+  sprite_xcursor->current_frame = 0;

+  sprite_xcursor->xcursor_images =

+    load_cursor_on_client (sprite_xcursor->cursor,

+                           sprite_xcursor->theme_scale);

+  if (!sprite_xcursor->xcursor_images)

+    g_error ("Could not find cursor. Perhaps set XCURSOR_PATH?");

+

+  load_from_current_xcursor_image (sprite_xcursor);

+}

+

+static void

+meta_cursor_sprite_xcursor_realize_texture (MetaCursorSprite *sprite)

+{

+  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (sprite);

+

+  if (sprite_xcursor->theme_dirty)

+    load_cursor_from_theme (sprite);

+}

+

+MetaCursorSpriteXcursor *

+meta_cursor_sprite_xcursor_new (MetaCursor cursor)

+{

+  MetaCursorSpriteXcursor *sprite_xcursor;

+

+  sprite_xcursor = g_object_new (META_TYPE_CURSOR_SPRITE_XCURSOR, NULL);

+  sprite_xcursor->cursor = cursor;

+

+  return sprite_xcursor;

+}

+

+static void

+meta_cursor_sprite_xcursor_finalize (GObject *object)

+{

+  MetaCursorSpriteXcursor *sprite_xcursor = META_CURSOR_SPRITE_XCURSOR (object);

+

+  g_clear_pointer (&sprite_xcursor->xcursor_images,

+                   XcursorImagesDestroy);

+

+  G_OBJECT_CLASS (meta_cursor_sprite_xcursor_parent_class)->finalize (object);

+}

+

+static void

+meta_cursor_sprite_xcursor_init (MetaCursorSpriteXcursor *sprite_xcursor)

+{

+  sprite_xcursor->theme_dirty = TRUE;

+}

+

+static void

+meta_cursor_sprite_xcursor_class_init (MetaCursorSpriteXcursorClass *klass)

+{

+  GObjectClass *object_class = G_OBJECT_CLASS (klass);

+  MetaCursorSpriteClass *cursor_sprite_class = META_CURSOR_SPRITE_CLASS (klass);

+

+  object_class->finalize = meta_cursor_sprite_xcursor_finalize;

+

+  cursor_sprite_class->realize_texture =

+    meta_cursor_sprite_xcursor_realize_texture;

+  cursor_sprite_class->is_animated = meta_cursor_sprite_xcursor_is_animated;

+  cursor_sprite_class->tick_frame = meta_cursor_sprite_xcursor_tick_frame;

+  cursor_sprite_class->get_current_frame_time =

+    meta_cursor_sprite_xcursor_get_current_frame_time;

+}

diff --git a/src/backends/meta-cursor-sprite-xcursor.h b/src/backends/meta-cursor-sprite-xcursor.h

new file mode 100644

index 000000000..dbc927484

--- /dev/null

+++ b/src/backends/meta-cursor-sprite-xcursor.h

@@ -0,0 +1,43 @@

+/*

+ * Copyright 2013, 2018 Red Hat, Inc.

+ *

+ * This program is free software; you can redistribute it and/or

+ * modify it under the terms of the GNU General Public License as

+ * published by the Free Software Foundation; either version 2 of the

+ * License, or (at your option) any later version.

+ *

+ * This program is distributed in the hope that it will be useful, but

+ * WITHOUT ANY WARRANTY; without even the implied warranty of

+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+ * General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, see <http://www.gnu.org/licenses/>.

+ *

+ */

+

+#ifndef META_CURSOR_SPRITE_XCURSOR_H

+#define META_CURSOR_SPRITE_XCURSOR_H

+

+#include <glib-object.h>

+#include <X11/Xcursor/Xcursor.h>

+

+#include "backends/meta-cursor.h"

+

+#define META_TYPE_CURSOR_SPRITE_XCURSOR meta_cursor_sprite_xcursor_get_type ()

+G_DECLARE_FINAL_TYPE (MetaCursorSpriteXcursor, meta_cursor_sprite_xcursor,

+                      META, CURSOR_SPRITE_XCURSOR, MetaCursorSprite)

+

+MetaCursorSpriteXcursor * meta_cursor_sprite_xcursor_new (MetaCursor cursor);

+

+void meta_cursor_sprite_xcursor_set_theme_scale (MetaCursorSpriteXcursor *sprite_xcursor,

+                                                 int                      scale);

+

+MetaCursor meta_cursor_sprite_xcursor_get_cursor (MetaCursorSpriteXcursor *sprite_xcusror);

+

+XcursorImage * meta_cursor_sprite_xcursor_get_current_image (MetaCursorSpriteXcursor *sprite_xcursor);

+

+Cursor meta_create_x_cursor (Display    *xdisplay,

+                             MetaCursor  cursor);

+

+#endif /* META_CURSOR_SPRITE_XCURSOR_H */

diff --git a/src/backends/meta-cursor-tracker-private.h b/src/backends/meta-cursor-tracker-private.h

index 2ec946847..6f4f84b83 100644

--- a/src/backends/meta-cursor-tracker-private.h

+++ b/src/backends/meta-cursor-tracker-private.h

@@ -26,6 +26,7 @@

 #include "meta-cursor.h"

 #include "meta-cursor-renderer.h"

+#include "backends/x11/cm/meta-cursor-sprite-xfixes.h"

 struct _MetaCursorTracker {

   GObject parent_instance;

@@ -46,7 +47,7 @@ struct _MetaCursorTracker {

   MetaCursorSprite *root_cursor;

   /* The cursor from the X11 server. */

-  MetaCursorSprite *xfixes_cursor;

+  MetaCursorSpriteXfixes *xfixes_cursor;

 };

 struct _MetaCursorTrackerClass {

diff --git a/src/backends/meta-cursor-tracker.c b/src/backends/meta-cursor-tracker.c

index 74fa4351d..6244f11ee 100644

--- a/src/backends/meta-cursor-tracker.c

+++ b/src/backends/meta-cursor-tracker.c

@@ -40,9 +40,9 @@

 #include <gdk/gdk.h>

 #include <gdk/gdkx.h>

-#include <X11/extensions/Xfixes.h>

 #include "meta-backend-private.h"

+#include "backends/x11/cm/meta-cursor-sprite-xfixes.h"

 G_DEFINE_TYPE (MetaCursorTracker, meta_cursor_tracker, G_TYPE_OBJECT);

@@ -218,75 +218,14 @@ static void

 ensure_xfixes_cursor (MetaCursorTracker *tracker)

 {

   MetaDisplay *display = meta_get_display ();

-  XFixesCursorImage *cursor_image;

-  CoglTexture2D *sprite;

-  guint8 *cursor_data;

-  gboolean free_cursor_data;

-  CoglContext *ctx;

-  CoglError *error = NULL;

+  g_autoptr (GError) error = NULL;

   if (tracker->xfixes_cursor)

     return;

-  cursor_image = XFixesGetCursorImage (display->xdisplay);

-  if (!cursor_image)

-    return;

-

-  /* Like all X APIs, XFixesGetCursorImage() returns arrays of 32-bit

-   * quantities as arrays of long; we need to convert on 64 bit */

-  if (sizeof(long) == 4)

-    {

-      cursor_data = (guint8 *)cursor_image->pixels;

-      free_cursor_data = FALSE;

-    }

-  else

-    {

-      int i, j;

-      guint32 *cursor_words;

-      gulong *p;

-      guint32 *q;

-

-      cursor_words = g_new (guint32, cursor_image->width * cursor_image->height);

-      cursor_data = (guint8 *)cursor_words;

-

-      p = cursor_image->pixels;

-      q = cursor_words;

-      for (j = 0; j < cursor_image->height; j++)

-        for (i = 0; i < cursor_image->width; i++)

-          *(q++) = *(p++);

-

-      free_cursor_data = TRUE;

-    }

-

-  ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());

-  sprite = cogl_texture_2d_new_from_data (ctx,

-                                          cursor_image->width,

-                                          cursor_image->height,

-                                          CLUTTER_CAIRO_FORMAT_ARGB32,

-                                          cursor_image->width * 4, /* stride */

-                                          cursor_data,

-                                          &error);

-

-  if (free_cursor_data)

-    g_free (cursor_data);

-

-  if (error != NULL)

-    {

-      meta_warning ("Failed to allocate cursor sprite texture: %s\n", error->message);

-      cogl_error_free (error);

-    }

-

-  if (sprite != NULL)

-    {

-      MetaCursorSprite *cursor_sprite = meta_cursor_sprite_new ();

-      meta_cursor_sprite_set_texture (cursor_sprite,

-                                      COGL_TEXTURE (sprite),

-                                      cursor_image->xhot,

-                                      cursor_image->yhot);

-      cogl_object_unref (sprite);

-      tracker->xfixes_cursor = cursor_sprite;

-    }

-  XFree (cursor_image);

+  tracker->xfixes_cursor = meta_cursor_sprite_xfixes_new (display, &error);

+  if (!tracker->xfixes_cursor)

+    g_warning ("Failed to create XFIXES cursor: %s", error->message);

 }

 /**

@@ -308,7 +247,7 @@ meta_cursor_tracker_get_sprite (MetaCursorTracker *tracker)

   else

     {

       ensure_xfixes_cursor (tracker);

-      cursor_sprite = tracker->xfixes_cursor;

+      cursor_sprite = META_CURSOR_SPRITE (tracker->xfixes_cursor);

     }

   if (cursor_sprite)

@@ -345,7 +284,7 @@ meta_cursor_tracker_get_hot (MetaCursorTracker *tracker,

   else

     {

       ensure_xfixes_cursor (tracker);

-      cursor_sprite = tracker->xfixes_cursor;

+      cursor_sprite = META_CURSOR_SPRITE (tracker->xfixes_cursor);

     }

   if (cursor_sprite)

diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c

index beeee765b..9750dc00b 100644

--- a/src/backends/meta-cursor.c

+++ b/src/backends/meta-cursor.c

@@ -23,19 +23,12 @@

 #include "meta-cursor.h"

-#include <meta/errors.h>

+#include "backends/meta-backend-private.h"

+#include "cogl/cogl.h"

+#include "meta/common.h"

-#include "display-private.h"

-#include "screen-private.h"

-#include "meta-backend-private.h"

-

-#include <string.h>

-

-#include <X11/cursorfont.h>

-#include <X11/extensions/Xfixes.h>

-#include <X11/Xcursor/Xcursor.h>

-

-enum {

+enum

+{

   PREPARE_AT,

   TEXTURE_CHANGED,

@@ -44,316 +37,148 @@ enum {

 static guint signals[LAST_SIGNAL];

-struct _MetaCursorSprite

+typedef struct _MetaCursorSpritePrivate

 {

   GObject parent;

-  MetaCursor cursor;

-

   CoglTexture2D *texture;

   float texture_scale;

   int hot_x, hot_y;

+} MetaCursorSpritePrivate;

-  int current_frame;

-  XcursorImages *xcursor_images;

-

-  int theme_scale;

-  gboolean theme_dirty;

-};

-

-G_DEFINE_TYPE (MetaCursorSprite, meta_cursor_sprite, G_TYPE_OBJECT)

+G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (MetaCursorSprite,

+                                     meta_cursor_sprite,

+                                     G_TYPE_OBJECT)

-static const char *

-translate_meta_cursor (MetaCursor cursor)

-{

-  switch (cursor)

-    {

-    case META_CURSOR_DEFAULT:

-      return "left_ptr";

-    case META_CURSOR_NORTH_RESIZE:

-      return "top_side";

-    case META_CURSOR_SOUTH_RESIZE:

-      return "bottom_side";

-    case META_CURSOR_WEST_RESIZE:

-      return "left_side";

-    case META_CURSOR_EAST_RESIZE:

-      return "right_side";

-    case META_CURSOR_SE_RESIZE:

-      return "bottom_right_corner";