[gtk/wayland-cursors: 1/2] wip: copy wayland-cursor into tree



commit 24fed0cdd915013099b7b3be82d11e746e463743
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Jan 24 13:33:13 2020 -0500

    wip: copy wayland-cursor into tree

 gdk/wayland/cursor/meson.build        |  12 +
 gdk/wayland/cursor/os-compatibility.c | 173 ++++++
 gdk/wayland/cursor/os-compatibility.h |  34 ++
 gdk/wayland/cursor/wayland-cursor.c   | 441 +++++++++++++++
 gdk/wayland/cursor/wayland-cursor.h   |  77 +++
 gdk/wayland/cursor/xcursor.c          | 977 ++++++++++++++++++++++++++++++++++
 gdk/wayland/cursor/xcursor.h          |  65 +++
 gdk/wayland/meson.build               |   6 +-
 meson.build                           |   2 -
 9 files changed, 1783 insertions(+), 4 deletions(-)
---
diff --git a/gdk/wayland/cursor/meson.build b/gdk/wayland/cursor/meson.build
new file mode 100644
index 0000000000..fb14dbf9b6
--- /dev/null
+++ b/gdk/wayland/cursor/meson.build
@@ -0,0 +1,12 @@
+wayland_cursor_sources = files([
+  'wayland-cursor.c',
+  'xcursor.c',
+  'os-compatibility.c'
+])
+
+libwayland_cursor = static_library('wayland+cursor',
+                                   sources: wayland_cursor_sources,
+                                   include_directories: [ confinc, ],
+                                   dependencies: [ glib_dep, ],
+                                   c_args: common_cflags,
+                                   link_args: common_ldflags)
diff --git a/gdk/wayland/cursor/os-compatibility.c b/gdk/wayland/cursor/os-compatibility.c
new file mode 100644
index 0000000000..bd28dbb205
--- /dev/null
+++ b/gdk/wayland/cursor/os-compatibility.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright © 2012 Collabora, Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "config.h"
+
+#include <sys/types.h>
+#include <unistd.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+
+#define HAVE_MEMFD_CREATE
+#ifdef HAVE_MEMFD_CREATE
+#include <sys/mman.h>
+#endif
+
+#include "os-compatibility.h"
+
+#ifndef HAVE_MKOSTEMP
+static int
+set_cloexec_or_close(int fd)
+{
+       long flags;
+
+       if (fd == -1)
+               return -1;
+
+       flags = fcntl(fd, F_GETFD);
+       if (flags == -1)
+               goto err;
+
+       if (fcntl(fd, F_SETFD, flags | FD_CLOEXEC) == -1)
+               goto err;
+
+       return fd;
+
+err:
+       close(fd);
+       return -1;
+}
+#endif
+
+static int
+create_tmpfile_cloexec(char *tmpname)
+{
+       int fd;
+
+#ifdef HAVE_MKOSTEMP
+       fd = mkostemp(tmpname, O_CLOEXEC);
+       if (fd >= 0)
+               unlink(tmpname);
+#else
+       fd = mkstemp(tmpname);
+       if (fd >= 0) {
+               fd = set_cloexec_or_close(fd);
+               unlink(tmpname);
+       }
+#endif
+
+       return fd;
+}
+
+/*
+ * Create a new, unique, anonymous file of the given size, and
+ * return the file descriptor for it. The file descriptor is set
+ * CLOEXEC. The file is immediately suitable for mmap()'ing
+ * the given size at offset zero.
+ *
+ * The file should not have a permanent backing store like a disk,
+ * but may have if XDG_RUNTIME_DIR is not properly implemented in OS.
+ *
+ * The file name is deleted from the file system.
+ *
+ * The file is suitable for buffer sharing between processes by
+ * transmitting the file descriptor over Unix sockets using the
+ * SCM_RIGHTS methods.
+ *
+ * If the C library implements posix_fallocate(), it is used to
+ * guarantee that disk space is available for the file at the
+ * given size. If disk space is insufficent, errno is set to ENOSPC.
+ * If posix_fallocate() is not supported, program may receive
+ * SIGBUS on accessing mmap()'ed file contents instead.
+ *
+ * If the C library implements memfd_create(), it is used to create the
+ * file purely in memory, without any backing file name on the file
+ * system, and then sealing off the possibility of shrinking it.  This
+ * can then be checked before accessing mmap()'ed file contents, to
+ * make sure SIGBUS can't happen.  It also avoids requiring
+ * XDG_RUNTIME_DIR.
+ */
+int
+os_create_anonymous_file(off_t size)
+{
+       static const char template[] = "/wayland-cursor-shared-XXXXXX";
+       const char *path;
+       char *name;
+       int fd;
+       int ret;
+
+#ifdef HAVE_MEMFD_CREATE
+       fd = memfd_create("wayland-cursor", MFD_CLOEXEC | MFD_ALLOW_SEALING);
+       if (fd >= 0) {
+               /* We can add this seal before calling posix_fallocate(), as
+                * the file is currently zero-sized anyway.
+                *
+                * There is also no need to check for the return value, we
+                * couldn't do anything with it anyway.
+                */
+               fcntl(fd, F_ADD_SEALS, F_SEAL_SHRINK | F_SEAL_SEAL);
+       } else
+#endif
+       {
+               path = getenv("XDG_RUNTIME_DIR");
+               if (!path) {
+                       errno = ENOENT;
+                       return -1;
+               }
+
+               name = malloc(strlen(path) + sizeof(template));
+               if (!name)
+                       return -1;
+
+               strcpy(name, path);
+               strcat(name, template);
+
+               fd = create_tmpfile_cloexec(name);
+
+               free(name);
+
+               if (fd < 0)
+                       return -1;
+       }
+
+#ifdef HAVE_POSIX_FALLOCATE
+       ret = posix_fallocate(fd, 0, size);
+       if (ret != 0) {
+               close(fd);
+               errno = ret;
+               return -1;
+       }
+#else
+       ret = ftruncate(fd, size);
+       if (ret < 0) {
+               close(fd);
+               return -1;
+       }
+#endif
+
+       return fd;
+}
diff --git a/gdk/wayland/cursor/os-compatibility.h b/gdk/wayland/cursor/os-compatibility.h
new file mode 100644
index 0000000000..d0e69acd93
--- /dev/null
+++ b/gdk/wayland/cursor/os-compatibility.h
@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2012 Collabora, Ltd.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef OS_COMPATIBILITY_H
+#define OS_COMPATIBILITY_H
+
+#include <sys/types.h>
+
+int
+os_create_anonymous_file(off_t size);
+
+#endif /* OS_COMPATIBILITY_H */
diff --git a/gdk/wayland/cursor/wayland-cursor.c b/gdk/wayland/cursor/wayland-cursor.c
new file mode 100644
index 0000000000..0a208bc8ef
--- /dev/null
+++ b/gdk/wayland/cursor/wayland-cursor.c
@@ -0,0 +1,441 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "config.h"
+#include "xcursor.h"
+#include "wayland-cursor.h"
+#include "wayland-client.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <errno.h>
+#include <os-compatibility.h>
+
+#define ARRAY_LENGTH(a) (sizeof (a) / sizeof (a)[0])
+
+struct shm_pool {
+       struct wl_shm_pool *pool;
+       int fd;
+       unsigned int size;
+       unsigned int used;
+       char *data;
+};
+
+static struct shm_pool *
+shm_pool_create(struct wl_shm *shm, int size)
+{
+       struct shm_pool *pool;
+
+       pool = malloc(sizeof *pool);
+       if (!pool)
+               return NULL;
+
+       pool->fd = os_create_anonymous_file (size);
+       if (pool->fd < 0)
+               goto err_free;
+
+       pool->data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+                         pool->fd, 0);
+
+       if (pool->data == MAP_FAILED)
+               goto err_close;
+
+       pool->pool = wl_shm_create_pool(shm, pool->fd, size);
+       pool->size = size;
+       pool->used = 0;
+
+       return pool;
+
+err_close:
+       close(pool->fd);
+err_free:
+       free(pool);
+       return NULL;
+}
+
+static int
+shm_pool_resize(struct shm_pool *pool, int size)
+{
+       if (ftruncate(pool->fd, size) < 0)
+               return 0;
+
+#ifdef HAVE_POSIX_FALLOCATE
+       errno = posix_fallocate(pool->fd, 0, size);
+       if (errno != 0)
+               return 0;
+#endif
+
+       wl_shm_pool_resize(pool->pool, size);
+
+       munmap(pool->data, pool->size);
+
+       pool->data = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED,
+                         pool->fd, 0);
+       if (pool->data == (void *)-1)
+               return 0;
+       pool->size = size;
+
+       return 1;
+}
+
+static int
+shm_pool_allocate(struct shm_pool *pool, int size)
+{
+       int offset;
+
+       if (pool->used + size > pool->size)
+               if (!shm_pool_resize(pool, 2 * pool->size + size))
+                       return -1;
+
+       offset = pool->used;
+       pool->used += size;
+
+       return offset;
+}
+
+static void
+shm_pool_destroy(struct shm_pool *pool)
+{
+       munmap(pool->data, pool->size);
+       wl_shm_pool_destroy(pool->pool);
+       close(pool->fd);
+       free(pool);
+}
+
+
+struct wl_cursor_theme {
+       unsigned int cursor_count;
+       struct wl_cursor **cursors;
+       struct wl_shm *shm;
+       struct shm_pool *pool;
+       char *name;
+       int size;
+};
+
+struct cursor_image {
+       struct wl_cursor_image image;
+       struct wl_cursor_theme *theme;
+       struct wl_buffer *buffer;
+       int offset; /* data offset of this image in the shm pool */
+};
+
+struct cursor {
+       struct wl_cursor cursor;
+       uint32_t total_delay; /* length of the animation in ms */
+};
+
+/** Get an shm buffer for a cursor image
+ *
+ * \param image The cursor image
+ * \return An shm buffer for the cursor image. The user should not destroy
+ * the returned buffer.
+ */
+WL_EXPORT struct wl_buffer *
+wl_cursor_image_get_buffer(struct wl_cursor_image *_img)
+{
+       struct cursor_image *image = (struct cursor_image *) _img;
+       struct wl_cursor_theme *theme = image->theme;
+
+       if (!image->buffer) {
+               image->buffer =
+                       wl_shm_pool_create_buffer(theme->pool->pool,
+                                                 image->offset,
+                                                 _img->width, _img->height,
+                                                 _img->width * 4,
+                                                 WL_SHM_FORMAT_ARGB8888);
+       };
+
+       return image->buffer;
+}
+
+static void
+wl_cursor_image_destroy(struct wl_cursor_image *_img)
+{
+       struct cursor_image *image = (struct cursor_image *) _img;
+
+       if (image->buffer)
+               wl_buffer_destroy(image->buffer);
+
+       free(image);
+}
+
+static void
+wl_cursor_destroy(struct wl_cursor *cursor)
+{
+       unsigned int i;
+
+       for (i = 0; i < cursor->image_count; i++)
+               wl_cursor_image_destroy(cursor->images[i]);
+
+       free(cursor->images);
+       free(cursor->name);
+       free(cursor);
+}
+
+static struct wl_cursor *
+wl_cursor_create_from_xcursor_images(XcursorImages *images,
+                                    struct wl_cursor_theme *theme)
+{
+       struct cursor *cursor;
+       struct cursor_image *image;
+       int i, size;
+
+       cursor = malloc(sizeof *cursor);
+       if (!cursor)
+               return NULL;
+
+       cursor->cursor.images =
+               malloc(images->nimage * sizeof cursor->cursor.images[0]);
+       if (!cursor->cursor.images) {
+               free(cursor);
+               return NULL;
+       }
+
+       cursor->cursor.name = strdup(images->name);
+       cursor->total_delay = 0;
+
+       for (i = 0; i < images->nimage; i++) {
+               image = malloc(sizeof *image);
+               if (image == NULL)
+                       break;
+
+               image->theme = theme;
+               image->buffer = NULL;
+
+               image->image.width = images->images[i]->width;
+               image->image.height = images->images[i]->height;
+               image->image.hotspot_x = images->images[i]->xhot;
+               image->image.hotspot_y = images->images[i]->yhot;
+               image->image.delay = images->images[i]->delay;
+
+               size = image->image.width * image->image.height * 4;
+               image->offset = shm_pool_allocate(theme->pool, size);
+               if (image->offset < 0) {
+                       free(image);
+                       break;
+               }
+
+               /* copy pixels to shm pool */
+               memcpy(theme->pool->data + image->offset,
+                      images->images[i]->pixels, size);
+               cursor->total_delay += image->image.delay;
+               cursor->cursor.images[i] = (struct wl_cursor_image *) image;
+       }
+       cursor->cursor.image_count = i;
+
+       if (cursor->cursor.image_count == 0) {
+               free(cursor->cursor.name);
+               free(cursor->cursor.images);
+               free(cursor);
+               return NULL;
+       }
+
+       return &cursor->cursor;
+}
+
+static void
+load_callback(XcursorImages *images, void *data)
+{
+       struct wl_cursor_theme *theme = data;
+       struct wl_cursor *cursor;
+
+       if (wl_cursor_theme_get_cursor(theme, images->name)) {
+               XcursorImagesDestroy(images);
+               return;
+       }
+
+       cursor = wl_cursor_create_from_xcursor_images(images, theme);
+
+       if (cursor) {
+               theme->cursor_count++;
+               theme->cursors =
+                       realloc(theme->cursors,
+                               theme->cursor_count * sizeof theme->cursors[0]);
+
+               if (theme->cursors == NULL) {
+                       theme->cursor_count--;
+                       free(cursor);
+               } else {
+                       theme->cursors[theme->cursor_count - 1] = cursor;
+               }
+       }
+
+       XcursorImagesDestroy(images);
+}
+
+/** Load a cursor theme to memory shared with the compositor
+ *
+ * \param name The name of the cursor theme to load. If %NULL, the default
+ * theme will be loaded.
+ * \param size Desired size of the cursor images.
+ * \param shm The compositor's shm interface.
+ *
+ * \return An object representing the theme that should be destroyed with
+ * wl_cursor_theme_destroy() or %NULL on error. If no theme with the given
+ * name exists, a default theme will be loaded.
+ */
+WL_EXPORT struct wl_cursor_theme *
+wl_cursor_theme_load(const char *name, int size, struct wl_shm *shm)
+{
+       struct wl_cursor_theme *theme;
+
+       theme = malloc(sizeof *theme);
+       if (!theme)
+               return NULL;
+
+       if (!name)
+               name = "default";
+
+       theme->name = strdup(name);
+       if (!theme->name)
+               goto out_error_name;
+       theme->size = size;
+       theme->cursor_count = 0;
+       theme->cursors = NULL;
+
+       theme->pool = shm_pool_create(shm, size * size * 4);
+       if (!theme->pool)
+               goto out_error_pool;
+
+       xcursor_load_theme(name, size, load_callback, theme);
+
+       return theme;
+
+out_error_pool:
+       free(theme->name);
+out_error_name:
+       free(theme);
+       return NULL;
+}
+
+/** Destroys a cursor theme object
+ *
+ * \param theme The cursor theme to be destroyed
+ */
+WL_EXPORT void
+wl_cursor_theme_destroy(struct wl_cursor_theme *theme)
+{
+       unsigned int i;
+
+       for (i = 0; i < theme->cursor_count; i++)
+               wl_cursor_destroy(theme->cursors[i]);
+
+       shm_pool_destroy(theme->pool);
+
+       free(theme->name);
+       free(theme->cursors);
+       free(theme);
+}
+
+/** Get the cursor for a given name from a cursor theme
+ *
+ * \param theme The cursor theme
+ * \param name Name of the desired cursor
+ * \return The theme's cursor of the given name or %NULL if there is no
+ * such cursor
+ */
+WL_EXPORT struct wl_cursor *
+wl_cursor_theme_get_cursor(struct wl_cursor_theme *theme,
+                          const char *name)
+{
+       unsigned int i;
+
+       for (i = 0; i < theme->cursor_count; i++) {
+               if (strcmp(name, theme->cursors[i]->name) == 0)
+                       return theme->cursors[i];
+       }
+
+       return NULL;
+}
+
+/** Find the frame for a given elapsed time in a cursor animation
+ *  as well as the time left until next cursor change.
+ *
+ * \param cursor The cursor
+ * \param time Elapsed time in ms since the beginning of the animation
+ * \param duration pointer to uint32_t to store time left for this image or
+ *                 zero if the cursor won't change.
+ *
+ * \return The index of the image that should be displayed for the
+ * given time in the cursor animation.
+ */
+WL_EXPORT int
+wl_cursor_frame_and_duration(struct wl_cursor *_cursor, uint32_t time,
+                            uint32_t *duration)
+{
+       struct cursor *cursor = (struct cursor *) _cursor;
+       uint32_t t;
+       int i;
+
+       if (cursor->cursor.image_count == 1) {
+               if (duration)
+                       *duration = 0;
+               return 0;
+       }
+
+       i = 0;
+       t = time % cursor->total_delay;
+
+       /* If there is a 0 delay in the image set then this
+        * loop breaks on it and we display that cursor until
+        * time % cursor->total_delay wraps again.
+        * Since a 0 delay is silly, and we've never actually
+        * seen one in a cursor file, we haven't bothered to
+        * "fix" this.
+        */
+       while (t - cursor->cursor.images[i]->delay < t)
+               t -= cursor->cursor.images[i++]->delay;
+
+       if (!duration)
+               return i;
+
+       /* Make sure we don't accidentally tell the caller this is
+        * a static cursor image.
+        */
+       if (t >= cursor->cursor.images[i]->delay)
+               *duration = 1;
+       else
+               *duration = cursor->cursor.images[i]->delay - t;
+
+       return i;
+}
+
+/** Find the frame for a given elapsed time in a cursor animation
+ *
+ * \param cursor The cursor
+ * \param time Elapsed time in ms since the beginning of the animation
+ *
+ * \return The index of the image that should be displayed for the
+ * given time in the cursor animation.
+ */
+WL_EXPORT int
+wl_cursor_frame(struct wl_cursor *_cursor, uint32_t time)
+{
+       return wl_cursor_frame_and_duration(_cursor, time, NULL);
+}
diff --git a/gdk/wayland/cursor/wayland-cursor.h b/gdk/wayland/cursor/wayland-cursor.h
new file mode 100644
index 0000000000..40d3fc5c9d
--- /dev/null
+++ b/gdk/wayland/cursor/wayland-cursor.h
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2012 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef WAYLAND_CURSOR_H
+#define WAYLAND_CURSOR_H
+
+#include <stdint.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct wl_cursor_theme;
+struct wl_buffer;
+struct wl_shm;
+
+struct wl_cursor_image {
+       uint32_t width;         /* actual width */
+       uint32_t height;        /* actual height */
+       uint32_t hotspot_x;     /* hot spot x (must be inside image) */
+       uint32_t hotspot_y;     /* hot spot y (must be inside image) */
+       uint32_t delay;         /* animation delay to next frame (ms) */
+};
+
+struct wl_cursor {
+       unsigned int image_count;
+       struct wl_cursor_image **images;
+       char *name;
+};
+
+struct wl_cursor_theme *
+wl_cursor_theme_load(const char *name, int size, struct wl_shm *shm);
+
+void
+wl_cursor_theme_destroy(struct wl_cursor_theme *theme);
+
+struct wl_cursor *
+wl_cursor_theme_get_cursor(struct wl_cursor_theme *theme,
+                          const char *name);
+
+struct wl_buffer *
+wl_cursor_image_get_buffer(struct wl_cursor_image *image);
+
+int
+wl_cursor_frame(struct wl_cursor *cursor, uint32_t time);
+
+int
+wl_cursor_frame_and_duration(struct wl_cursor *cursor, uint32_t time,
+                            uint32_t *duration);
+
+#ifdef  __cplusplus
+}
+#endif
+
+#endif
diff --git a/gdk/wayland/cursor/xcursor.c b/gdk/wayland/cursor/xcursor.c
new file mode 100644
index 0000000000..689c702672
--- /dev/null
+++ b/gdk/wayland/cursor/xcursor.c
@@ -0,0 +1,977 @@
+/*
+ * Copyright © 2002 Keith Packard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include "xcursor.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <dirent.h>
+
+/*
+ * From libXcursor/include/X11/extensions/Xcursor.h
+ */
+
+#define XcursorTrue    1
+#define XcursorFalse   0
+
+/*
+ * Cursor files start with a header.  The header
+ * contains a magic number, a version number and a
+ * table of contents which has type and offset information
+ * for the remaining tables in the file.
+ *
+ * File minor versions increment for compatible changes
+ * File major versions increment for incompatible changes (never, we hope)
+ *
+ * Chunks of the same type are always upward compatible.  Incompatible
+ * changes are made with new chunk types; the old data can remain under
+ * the old type.  Upward compatible changes can add header data as the
+ * header lengths are specified in the file.
+ *
+ *  File:
+ *     FileHeader
+ *     LISTofChunk
+ *
+ *  FileHeader:
+ *     CARD32          magic       magic number
+ *     CARD32          header      bytes in file header
+ *     CARD32          version     file version
+ *     CARD32          ntoc        number of toc entries
+ *     LISTofFileToc   toc         table of contents
+ *
+ *  FileToc:
+ *     CARD32          type        entry type
+ *     CARD32          subtype     entry subtype (size for images)
+ *     CARD32          position    absolute file position
+ */
+
+#define XCURSOR_MAGIC  0x72756358  /* "Xcur" LSBFirst */
+
+/*
+ * Current Xcursor version number.  Will be substituted by configure
+ * from the version in the libXcursor configure.ac file.
+ */
+
+#define XCURSOR_LIB_MAJOR 1
+#define XCURSOR_LIB_MINOR 1
+#define XCURSOR_LIB_REVISION 13
+#define XCURSOR_LIB_VERSION    ((XCURSOR_LIB_MAJOR * 10000) + \
+                                (XCURSOR_LIB_MINOR * 100) + \
+                                (XCURSOR_LIB_REVISION))
+
+/*
+ * This version number is stored in cursor files; changes to the
+ * file format require updating this version number
+ */
+#define XCURSOR_FILE_MAJOR     1
+#define XCURSOR_FILE_MINOR     0
+#define XCURSOR_FILE_VERSION   ((XCURSOR_FILE_MAJOR << 16) | (XCURSOR_FILE_MINOR))
+#define XCURSOR_FILE_HEADER_LEN        (4 * 4)
+#define XCURSOR_FILE_TOC_LEN   (3 * 4)
+
+typedef struct _XcursorFileToc {
+    XcursorUInt            type;       /* chunk type */
+    XcursorUInt            subtype;    /* subtype (size for images) */
+    XcursorUInt            position;   /* absolute position in file */
+} XcursorFileToc;
+
+typedef struct _XcursorFileHeader {
+    XcursorUInt            magic;      /* magic number */
+    XcursorUInt            header;     /* byte length of header */
+    XcursorUInt            version;    /* file version number */
+    XcursorUInt            ntoc;       /* number of toc entries */
+    XcursorFileToc  *tocs;     /* table of contents */
+} XcursorFileHeader;
+
+/*
+ * The rest of the file is a list of chunks, each tagged by type
+ * and version.
+ *
+ *  Chunk:
+ *     ChunkHeader
+ *     <extra type-specific header fields>
+ *     <type-specific data>
+ *
+ *  ChunkHeader:
+ *     CARD32      header      bytes in chunk header + type header
+ *     CARD32      type        chunk type
+ *     CARD32      subtype     chunk subtype
+ *     CARD32      version     chunk type version
+ */
+
+#define XCURSOR_CHUNK_HEADER_LEN    (4 * 4)
+
+typedef struct _XcursorChunkHeader {
+    XcursorUInt            header;     /* bytes in chunk header */
+    XcursorUInt            type;       /* chunk type */
+    XcursorUInt            subtype;    /* chunk subtype (size for images) */
+    XcursorUInt            version;    /* version of this type */
+} XcursorChunkHeader;
+
+/*
+ * Here's a list of the known chunk types
+ */
+
+/*
+ * Comments consist of a 4-byte length field followed by
+ * UTF-8 encoded text
+ *
+ *  Comment:
+ *     ChunkHeader header      chunk header
+ *     CARD32      length      bytes in text
+ *     LISTofCARD8 text        UTF-8 encoded text
+ */
+
+#define XCURSOR_COMMENT_TYPE       0xfffe0001
+#define XCURSOR_COMMENT_VERSION            1
+#define XCURSOR_COMMENT_HEADER_LEN  (XCURSOR_CHUNK_HEADER_LEN + (1 *4))
+#define XCURSOR_COMMENT_COPYRIGHT   1
+#define XCURSOR_COMMENT_LICENSE            2
+#define XCURSOR_COMMENT_OTHER      3
+#define XCURSOR_COMMENT_MAX_LEN            0x100000
+
+typedef struct _XcursorComment {
+    XcursorUInt            version;
+    XcursorUInt            comment_type;
+    char           *comment;
+} XcursorComment;
+
+/*
+ * Each cursor image occupies a separate image chunk.
+ * The length of the image header follows the chunk header
+ * so that future versions can extend the header without
+ * breaking older applications
+ *
+ *  Image:
+ *     ChunkHeader     header  chunk header
+ *     CARD32          width   actual width
+ *     CARD32          height  actual height
+ *     CARD32          xhot    hot spot x
+ *     CARD32          yhot    hot spot y
+ *     CARD32          delay   animation delay
+ *     LISTofCARD32    pixels  ARGB pixels
+ */
+
+#define XCURSOR_IMAGE_TYPE         0xfffd0002
+#define XCURSOR_IMAGE_VERSION      1
+#define XCURSOR_IMAGE_HEADER_LEN    (XCURSOR_CHUNK_HEADER_LEN + (5*4))
+#define XCURSOR_IMAGE_MAX_SIZE     0x7fff      /* 32767x32767 max cursor size */
+
+typedef struct _XcursorFile XcursorFile;
+
+struct _XcursorFile {
+    void    *closure;
+    int            (*read)  (XcursorFile *file, unsigned char *buf, int len);
+    int            (*write) (XcursorFile *file, unsigned char *buf, int len);
+    int            (*seek)  (XcursorFile *file, long offset, int whence);
+};
+
+typedef struct _XcursorComments {
+    int                    ncomment;   /* number of comments */
+    XcursorComment  **comments;        /* array of XcursorComment pointers */
+} XcursorComments;
+
+/*
+ * From libXcursor/src/file.c
+ */
+
+static XcursorImage *
+XcursorImageCreate (int width, int height)
+{
+    XcursorImage    *image;
+
+    if (width < 0 || height < 0)
+       return NULL;
+    if (width > XCURSOR_IMAGE_MAX_SIZE || height > XCURSOR_IMAGE_MAX_SIZE)
+       return NULL;
+
+    image = malloc (sizeof (XcursorImage) +
+                   width * height * sizeof (XcursorPixel));
+    if (!image)
+       return NULL;
+    image->version = XCURSOR_IMAGE_VERSION;
+    image->pixels = (XcursorPixel *) (image + 1);
+    image->size = width > height ? width : height;
+    image->width = width;
+    image->height = height;
+    image->delay = 0;
+    return image;
+}
+
+static void
+XcursorImageDestroy (XcursorImage *image)
+{
+    free (image);
+}
+
+static XcursorImages *
+XcursorImagesCreate (int size)
+{
+    XcursorImages   *images;
+
+    images = malloc (sizeof (XcursorImages) +
+                    size * sizeof (XcursorImage *));
+    if (!images)
+       return NULL;
+    images->nimage = 0;
+    images->images = (XcursorImage **) (images + 1);
+    images->name = NULL;
+    return images;
+}
+
+void
+XcursorImagesDestroy (XcursorImages *images)
+{
+    int        n;
+
+    if (!images)
+        return;
+
+    for (n = 0; n < images->nimage; n++)
+       XcursorImageDestroy (images->images[n]);
+    if (images->name)
+       free (images->name);
+    free (images);
+}
+
+static void
+XcursorImagesSetName (XcursorImages *images, const char *name)
+{
+    char    *new;
+
+    if (!images || !name)
+        return;
+
+    new = malloc (strlen (name) + 1);
+
+    if (!new)
+       return;
+
+    strcpy (new, name);
+    if (images->name)
+       free (images->name);
+    images->name = new;
+}
+
+static XcursorBool
+_XcursorReadUInt (XcursorFile *file, XcursorUInt *u)
+{
+    unsigned char   bytes[4];
+
+    if (!file || !u)
+        return XcursorFalse;
+
+    if ((*file->read) (file, bytes, 4) != 4)
+       return XcursorFalse;
+    *u = ((bytes[0] << 0) |
+         (bytes[1] << 8) |
+         (bytes[2] << 16) |
+         (bytes[3] << 24));
+    return XcursorTrue;
+}
+
+static void
+_XcursorFileHeaderDestroy (XcursorFileHeader *fileHeader)
+{
+    free (fileHeader);
+}
+
+static XcursorFileHeader *
+_XcursorFileHeaderCreate (int ntoc)
+{
+    XcursorFileHeader  *fileHeader;
+
+    if (ntoc > 0x10000)
+       return NULL;
+    fileHeader = malloc (sizeof (XcursorFileHeader) +
+                        ntoc * sizeof (XcursorFileToc));
+    if (!fileHeader)
+       return NULL;
+    fileHeader->magic = XCURSOR_MAGIC;
+    fileHeader->header = XCURSOR_FILE_HEADER_LEN;
+    fileHeader->version = XCURSOR_FILE_VERSION;
+    fileHeader->ntoc = ntoc;
+    fileHeader->tocs = (XcursorFileToc *) (fileHeader + 1);
+    return fileHeader;
+}
+
+static XcursorFileHeader *
+_XcursorReadFileHeader (XcursorFile *file)
+{
+    XcursorFileHeader  head, *fileHeader;
+    XcursorUInt                skip;
+    unsigned int       n;
+
+    if (!file)
+        return NULL;
+
+    if (!_XcursorReadUInt (file, &head.magic))
+       return NULL;
+    if (head.magic != XCURSOR_MAGIC)
+       return NULL;
+    if (!_XcursorReadUInt (file, &head.header))
+       return NULL;
+    if (!_XcursorReadUInt (file, &head.version))
+       return NULL;
+    if (!_XcursorReadUInt (file, &head.ntoc))
+       return NULL;
+    skip = head.header - XCURSOR_FILE_HEADER_LEN;
+    if (skip)
+       if ((*file->seek) (file, skip, SEEK_CUR) == EOF)
+           return NULL;
+    fileHeader = _XcursorFileHeaderCreate (head.ntoc);
+    if (!fileHeader)
+       return NULL;
+    fileHeader->magic = head.magic;
+    fileHeader->header = head.header;
+    fileHeader->version = head.version;
+    fileHeader->ntoc = head.ntoc;
+    for (n = 0; n < fileHeader->ntoc; n++)
+    {
+       if (!_XcursorReadUInt (file, &fileHeader->tocs[n].type))
+           break;
+       if (!_XcursorReadUInt (file, &fileHeader->tocs[n].subtype))
+           break;
+       if (!_XcursorReadUInt (file, &fileHeader->tocs[n].position))
+           break;
+    }
+    if (n != fileHeader->ntoc)
+    {
+       _XcursorFileHeaderDestroy (fileHeader);
+       return NULL;
+    }
+    return fileHeader;
+}
+
+static XcursorBool
+_XcursorSeekToToc (XcursorFile         *file,
+                  XcursorFileHeader    *fileHeader,
+                  int                  toc)
+{
+    if (!file || !fileHeader || \
+        (*file->seek) (file, fileHeader->tocs[toc].position, SEEK_SET) == EOF)
+       return XcursorFalse;
+    return XcursorTrue;
+}
+
+static XcursorBool
+_XcursorFileReadChunkHeader (XcursorFile       *file,
+                            XcursorFileHeader  *fileHeader,
+                            int                toc,
+                            XcursorChunkHeader *chunkHeader)
+{
+    if (!file || !fileHeader || !chunkHeader)
+        return XcursorFalse;
+    if (!_XcursorSeekToToc (file, fileHeader, toc))
+       return XcursorFalse;
+    if (!_XcursorReadUInt (file, &chunkHeader->header))
+       return XcursorFalse;
+    if (!_XcursorReadUInt (file, &chunkHeader->type))
+       return XcursorFalse;
+    if (!_XcursorReadUInt (file, &chunkHeader->subtype))
+       return XcursorFalse;
+    if (!_XcursorReadUInt (file, &chunkHeader->version))
+       return XcursorFalse;
+    /* sanity check */
+    if (chunkHeader->type != fileHeader->tocs[toc].type ||
+       chunkHeader->subtype != fileHeader->tocs[toc].subtype)
+       return XcursorFalse;
+    return XcursorTrue;
+}
+
+#define dist(a,b)   ((a) > (b) ? (a) - (b) : (b) - (a))
+
+static XcursorDim
+_XcursorFindBestSize (XcursorFileHeader *fileHeader,
+                     XcursorDim        size,
+                     int               *nsizesp)
+{
+    unsigned int n;
+    int                nsizes = 0;
+    XcursorDim bestSize = 0;
+    XcursorDim thisSize;
+
+    if (!fileHeader || !nsizesp)
+        return 0;
+
+    for (n = 0; n < fileHeader->ntoc; n++)
+    {
+       if (fileHeader->tocs[n].type != XCURSOR_IMAGE_TYPE)
+           continue;
+       thisSize = fileHeader->tocs[n].subtype;
+       if (!bestSize || dist (thisSize, size) < dist (bestSize, size))
+       {
+           bestSize = thisSize;
+           nsizes = 1;
+       }
+       else if (thisSize == bestSize)
+           nsizes++;
+    }
+    *nsizesp = nsizes;
+    return bestSize;
+}
+
+static int
+_XcursorFindImageToc (XcursorFileHeader        *fileHeader,
+                     XcursorDim        size,
+                     int               count)
+{
+    unsigned int       toc;
+    XcursorDim         thisSize;
+
+    if (!fileHeader)
+        return 0;
+
+    for (toc = 0; toc < fileHeader->ntoc; toc++)
+    {
+       if (fileHeader->tocs[toc].type != XCURSOR_IMAGE_TYPE)
+           continue;
+       thisSize = fileHeader->tocs[toc].subtype;
+       if (thisSize != size)
+           continue;
+       if (!count)
+           break;
+       count--;
+    }
+    if (toc == fileHeader->ntoc)
+       return -1;
+    return toc;
+}
+
+static XcursorImage *
+_XcursorReadImage (XcursorFile         *file,
+                  XcursorFileHeader    *fileHeader,
+                  int                  toc)
+{
+    XcursorChunkHeader chunkHeader;
+    XcursorImage       head;
+    XcursorImage       *image;
+    int                        n;
+    XcursorPixel       *p;
+
+    if (!file || !fileHeader)
+        return NULL;
+
+    if (!_XcursorFileReadChunkHeader (file, fileHeader, toc, &chunkHeader))
+       return NULL;
+    if (!_XcursorReadUInt (file, &head.width))
+       return NULL;
+    if (!_XcursorReadUInt (file, &head.height))
+       return NULL;
+    if (!_XcursorReadUInt (file, &head.xhot))
+       return NULL;
+    if (!_XcursorReadUInt (file, &head.yhot))
+       return NULL;
+    if (!_XcursorReadUInt (file, &head.delay))
+       return NULL;
+    /* sanity check data */
+    if (head.width > XCURSOR_IMAGE_MAX_SIZE  ||
+       head.height > XCURSOR_IMAGE_MAX_SIZE)
+       return NULL;
+    if (head.width == 0 || head.height == 0)
+       return NULL;
+    if (head.xhot > head.width || head.yhot > head.height)
+       return NULL;
+
+    /* Create the image and initialize it */
+    image = XcursorImageCreate (head.width, head.height);
+    if (image == NULL)
+           return NULL;
+    if (chunkHeader.version < image->version)
+       image->version = chunkHeader.version;
+    image->size = chunkHeader.subtype;
+    image->xhot = head.xhot;
+    image->yhot = head.yhot;
+    image->delay = head.delay;
+    n = image->width * image->height;
+    p = image->pixels;
+    while (n--)
+    {
+       if (!_XcursorReadUInt (file, p))
+       {
+           XcursorImageDestroy (image);
+           return NULL;
+       }
+       p++;
+    }
+    return image;
+}
+
+static XcursorImages *
+XcursorXcFileLoadImages (XcursorFile *file, int size)
+{
+    XcursorFileHeader  *fileHeader;
+    XcursorDim         bestSize;
+    int                        nsize;
+    XcursorImages      *images;
+    int                        n;
+    int                        toc;
+
+    if (!file || size < 0)
+       return NULL;
+    fileHeader = _XcursorReadFileHeader (file);
+    if (!fileHeader)
+       return NULL;
+    bestSize = _XcursorFindBestSize (fileHeader, (XcursorDim) size, &nsize);
+    if (!bestSize)
+    {
+        _XcursorFileHeaderDestroy (fileHeader);
+       return NULL;
+    }
+    images = XcursorImagesCreate (nsize);
+    if (!images)
+    {
+        _XcursorFileHeaderDestroy (fileHeader);
+       return NULL;
+    }
+    for (n = 0; n < nsize; n++)
+    {
+       toc = _XcursorFindImageToc (fileHeader, bestSize, n);
+       if (toc < 0)
+           break;
+       images->images[images->nimage] = _XcursorReadImage (file, fileHeader,
+                                                           toc);
+       if (!images->images[images->nimage])
+           break;
+       images->nimage++;
+    }
+    _XcursorFileHeaderDestroy (fileHeader);
+    if (images->nimage != nsize)
+    {
+       XcursorImagesDestroy (images);
+       images = NULL;
+    }
+    return images;
+}
+
+static int
+_XcursorStdioFileRead (XcursorFile *file, unsigned char *buf, int len)
+{
+    FILE    *f = file->closure;
+    return fread (buf, 1, len, f);
+}
+
+static int
+_XcursorStdioFileWrite (XcursorFile *file, unsigned char *buf, int len)
+{
+    FILE    *f = file->closure;
+    return fwrite (buf, 1, len, f);
+}
+
+static int
+_XcursorStdioFileSeek (XcursorFile *file, long offset, int whence)
+{
+    FILE    *f = file->closure;
+    return fseek (f, offset, whence);
+}
+
+static void
+_XcursorStdioFileInitialize (FILE *stdfile, XcursorFile *file)
+{
+    file->closure = stdfile;
+    file->read = _XcursorStdioFileRead;
+    file->write = _XcursorStdioFileWrite;
+    file->seek = _XcursorStdioFileSeek;
+}
+
+static XcursorImages *
+XcursorFileLoadImages (FILE *file, int size)
+{
+    XcursorFile        f;
+
+    if (!file)
+        return NULL;
+
+    _XcursorStdioFileInitialize (file, &f);
+    return XcursorXcFileLoadImages (&f, size);
+}
+
+/*
+ * From libXcursor/src/library.c
+ */
+
+#ifndef ICONDIR
+#define ICONDIR "/usr/X11R6/lib/X11/icons"
+#endif
+
+#ifndef XCURSORPATH
+#define XCURSORPATH 
"~/.icons:/usr/share/icons:/usr/share/pixmaps:~/.cursors:/usr/share/cursors/xorg-x11:"ICONDIR
+#endif
+
+static const char *
+XcursorLibraryPath (void)
+{
+    static const char  *path;
+
+    if (!path)
+    {
+       path = getenv ("XCURSOR_PATH");
+       if (!path)
+           path = XCURSORPATH;
+    }
+    return path;
+}
+
+static  void
+_XcursorAddPathElt (char *path, const char *elt, int len)
+{
+    int            pathlen = strlen (path);
+
+    /* append / if the path doesn't currently have one */
+    if (path[0] == '\0' || path[pathlen - 1] != '/')
+    {
+       strcat (path, "/");
+       pathlen++;
+    }
+    if (len == -1)
+       len = strlen (elt);
+    /* strip leading slashes */
+    while (len && elt[0] == '/')
+    {
+       elt++;
+       len--;
+    }
+    strncpy (path + pathlen, elt, len);
+    path[pathlen + len] = '\0';
+}
+
+static char *
+_XcursorBuildThemeDir (const char *dir, const char *theme)
+{
+    const char     *colon;
+    const char     *tcolon;
+    char           *full;
+    char           *home;
+    int                    dirlen;
+    int                    homelen;
+    int                    themelen;
+    int                    len;
+
+    if (!dir || !theme)
+        return NULL;
+
+    colon = strchr (dir, ':');
+    if (!colon)
+       colon = dir + strlen (dir);
+
+    dirlen = colon - dir;
+
+    tcolon = strchr (theme, ':');
+    if (!tcolon)
+       tcolon = theme + strlen (theme);
+
+    themelen = tcolon - theme;
+
+    home = NULL;
+    homelen = 0;
+    if (*dir == '~')
+    {
+       home = getenv ("HOME");
+       if (!home)
+           return NULL;
+       homelen = strlen (home);
+       dir++;
+       dirlen--;
+    }
+
+    /*
+     * add space for any needed directory separators, one per component,
+     * and one for the trailing null
+     */
+    len = 1 + homelen + 1 + dirlen + 1 + themelen + 1;
+
+    full = malloc (len);
+    if (!full)
+       return NULL;
+    full[0] = '\0';
+
+    if (home)
+       _XcursorAddPathElt (full, home, -1);
+    _XcursorAddPathElt (full, dir, dirlen);
+    _XcursorAddPathElt (full, theme, themelen);
+    return full;
+}
+
+static char *
+_XcursorBuildFullname (const char *dir, const char *subdir, const char *file)
+{
+    char    *full;
+
+    if (!dir || !subdir || !file)
+        return NULL;
+
+    full = malloc (strlen (dir) + 1 + strlen (subdir) + 1 + strlen (file) + 1);
+    if (!full)
+       return NULL;
+    full[0] = '\0';
+    _XcursorAddPathElt (full, dir, -1);
+    _XcursorAddPathElt (full, subdir, -1);
+    _XcursorAddPathElt (full, file, -1);
+    return full;
+}
+
+static const char *
+_XcursorNextPath (const char *path)
+{
+    char    *colon = strchr (path, ':');
+
+    if (!colon)
+       return NULL;
+    return colon + 1;
+}
+
+#define XcursorWhite(c)        ((c) == ' ' || (c) == '\t' || (c) == '\n')
+#define XcursorSep(c) ((c) == ';' || (c) == ',')
+
+static char *
+_XcursorThemeInherits (const char *full)
+{
+    char    line[8192];
+    char    *result = NULL;
+    FILE    *f;
+
+    if (!full)
+        return NULL;
+
+    f = fopen (full, "r");
+    if (f)
+    {
+       while (fgets (line, sizeof (line), f))
+       {
+           if (!strncmp (line, "Inherits", 8))
+           {
+               char    *l = line + 8;
+               char    *r;
+               while (*l == ' ') l++;
+               if (*l != '=') continue;
+               l++;
+               while (*l == ' ') l++;
+               result = malloc (strlen (l) + 1);
+               if (result)
+               {
+                   r = result;
+                   while (*l)
+                   {
+                       while (XcursorSep(*l) || XcursorWhite (*l)) l++;
+                       if (!*l)
+                           break;
+                       if (r != result)
+                           *r++ = ':';
+                       while (*l && !XcursorWhite(*l) &&
+                              !XcursorSep(*l))
+                           *r++ = *l++;
+                   }
+                   *r++ = '\0';
+               }
+               break;
+           }
+       }
+       fclose (f);
+    }
+    return result;
+}
+
+static FILE *
+XcursorScanTheme (const char *theme, const char *name)
+{
+    FILE       *f = NULL;
+    char       *full;
+    char       *dir;
+    const char  *path;
+    char       *inherits = NULL;
+    const char *i;
+
+    if (!theme || !name)
+        return NULL;
+
+    /*
+     * Scan this theme
+     */
+    for (path = XcursorLibraryPath ();
+        path && f == NULL;
+        path = _XcursorNextPath (path))
+    {
+       dir = _XcursorBuildThemeDir (path, theme);
+       if (dir)
+       {
+           full = _XcursorBuildFullname (dir, "cursors", name);
+           if (full)
+           {
+               f = fopen (full, "r");
+               free (full);
+           }
+           if (!f && !inherits)
+           {
+               full = _XcursorBuildFullname (dir, "", "index.theme");
+               if (full)
+               {
+                   inherits = _XcursorThemeInherits (full);
+                   free (full);
+               }
+           }
+           free (dir);
+       }
+    }
+    /*
+     * Recurse to scan inherited themes
+     */
+    for (i = inherits; i && f == NULL; i = _XcursorNextPath (i))
+       f = XcursorScanTheme (i, name);
+    if (inherits != NULL)
+       free (inherits);
+    return f;
+}
+
+XcursorImages *
+XcursorLibraryLoadImages (const char *file, const char *theme, int size)
+{
+    FILE           *f = NULL;
+    XcursorImages   *images = NULL;
+
+    if (!file)
+        return NULL;
+
+    if (theme)
+       f = XcursorScanTheme (theme, file);
+    if (!f)
+       f = XcursorScanTheme ("default", file);
+    if (f)
+    {
+       images = XcursorFileLoadImages (f, size);
+       if (images)
+           XcursorImagesSetName (images, file);
+       fclose (f);
+    }
+    return images;
+}
+
+static void
+load_all_cursors_from_dir(const char *path, int size,
+                         void (*load_callback)(XcursorImages *, void *),
+                         void *user_data)
+{
+       FILE *f;
+       DIR *dir = opendir(path);
+       struct dirent *ent;
+       char *full;
+       XcursorImages *images;
+
+       if (!dir)
+               return;
+
+       for(ent = readdir(dir); ent; ent = readdir(dir)) {
+#ifdef _DIRENT_HAVE_D_TYPE
+               if (ent->d_type != DT_UNKNOWN &&
+                   (ent->d_type != DT_REG && ent->d_type != DT_LNK))
+                       continue;
+#endif
+
+               full = _XcursorBuildFullname(path, "", ent->d_name);
+               if (!full)
+                       continue;
+
+               f = fopen(full, "r");
+               if (!f) {
+                       free(full);
+                       continue;
+               }
+
+               images = XcursorFileLoadImages(f, size);
+
+               if (images) {
+                       XcursorImagesSetName(images, ent->d_name);
+                       load_callback(images, user_data);
+               }
+
+               fclose (f);
+               free(full);
+       }
+
+       closedir(dir);
+}
+
+/** Load all the cursor of a theme
+ *
+ * This function loads all the cursor images of a given theme and its
+ * inherited themes. Each cursor is loaded into an XcursorImages object
+ * which is passed to the caller's load callback. If a cursor appears
+ * more than once across all the inherited themes, the load callback
+ * will be called multiple times, with possibly different XcursorImages
+ * object which have the same name. The user is expected to destroy the
+ * XcursorImages objects passed to the callback with
+ * XcursorImagesDestroy().
+ *
+ * \param theme The name of theme that should be loaded
+ * \param size The desired size of the cursor images
+ * \param load_callback A callback function that will be called
+ * for each cursor loaded. The first parameter is the XcursorImages
+ * object representing the loaded cursor and the second is a pointer
+ * to data provided by the user.
+ * \param user_data The data that should be passed to the load callback
+ */
+void
+xcursor_load_theme(const char *theme, int size,
+                   void (*load_callback)(XcursorImages *, void *),
+                   void *user_data)
+{
+       char *full, *dir;
+       char *inherits = NULL;
+       const char *path, *i;
+
+       if (!theme)
+               theme = "default";
+
+       for (path = XcursorLibraryPath();
+            path;
+            path = _XcursorNextPath(path)) {
+               dir = _XcursorBuildThemeDir(path, theme);
+               if (!dir)
+                       continue;
+
+               full = _XcursorBuildFullname(dir, "cursors", "");
+
+               if (full) {
+                       load_all_cursors_from_dir(full, size, load_callback,
+                                                 user_data);
+                       free(full);
+               }
+
+               if (!inherits) {
+                       full = _XcursorBuildFullname(dir, "", "index.theme");
+                       if (full) {
+                               inherits = _XcursorThemeInherits(full);
+                               free(full);
+                       }
+               }
+
+               free(dir);
+       }
+
+       for (i = inherits; i; i = _XcursorNextPath(i))
+               xcursor_load_theme(i, size, load_callback, user_data);
+
+       if (inherits)
+               free(inherits);
+}
diff --git a/gdk/wayland/cursor/xcursor.h b/gdk/wayland/cursor/xcursor.h
new file mode 100644
index 0000000000..62e232202a
--- /dev/null
+++ b/gdk/wayland/cursor/xcursor.h
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2002 Keith Packard
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef XCURSOR_H
+#define XCURSOR_H
+
+typedef int            XcursorBool;
+typedef unsigned int   XcursorUInt;
+
+typedef XcursorUInt    XcursorDim;
+typedef XcursorUInt    XcursorPixel;
+
+typedef struct _XcursorImage {
+    XcursorUInt            version;    /* version of the image data */
+    XcursorDim     size;       /* nominal size for matching */
+    XcursorDim     width;      /* actual width */
+    XcursorDim     height;     /* actual height */
+    XcursorDim     xhot;       /* hot spot x (must be inside image) */
+    XcursorDim     yhot;       /* hot spot y (must be inside image) */
+    XcursorUInt            delay;      /* animation delay to next frame (ms) */
+    XcursorPixel    *pixels;   /* pointer to pixels */
+} XcursorImage;
+
+/*
+ * Other data structures exposed by the library API
+ */
+typedef struct _XcursorImages {
+    int                    nimage;     /* number of images */
+    XcursorImage    **images;  /* array of XcursorImage pointers */
+    char           *name;      /* name used to load images */
+} XcursorImages;
+
+XcursorImages *
+XcursorLibraryLoadImages (const char *file, const char *theme, int size);
+
+void
+XcursorImagesDestroy (XcursorImages *images);
+
+void
+xcursor_load_theme(const char *theme, int size,
+                   void (*load_callback)(XcursorImages *, void *),
+                   void *user_data);
+#endif
diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build
index fe094bb7e4..a6fe2a88c5 100644
--- a/gdk/wayland/meson.build
+++ b/gdk/wayland/meson.build
@@ -1,3 +1,5 @@
+subdir('cursor')
+
 gdk_wayland_sources = files([
   'gdkapplaunchcontext-wayland.c',
   'gdkcairocontext-wayland.c',
@@ -33,7 +35,6 @@ gdk_wayland_deps = [
   xkbdep,
   wlclientdep,
   wlprotocolsdep,
-  wlcursordep,
   wlegldep,
 ]
 
@@ -105,4 +106,5 @@ libgdk_wayland = static_library('gdk-wayland',
                                   '-DG_LOG_DOMAIN="Gdk"',
                                 ] + common_cflags,
                                 link_args: common_ldflags,
-                                dependencies: [ gdk_deps, gdk_wayland_deps, ])
+                                link_with: [libwayland_cursor, ],
+                                dependencies: [ gdk_deps, gdk_wayland_deps])
diff --git a/meson.build b/meson.build
index 22a211c4fc..1c3b93aab9 100644
--- a/meson.build
+++ b/meson.build
@@ -453,7 +453,6 @@ wayland_pkgs = []
 if wayland_enabled
   wlclientdep    = dependency('wayland-client', version:  wayland_req)
   wlprotocolsdep = dependency('wayland-protocols', version: wayland_proto_req)
-  wlcursordep    = dependency('wayland-cursor', version: wayland_req)
   wlegldep       = dependency('wayland-egl')
   backend_immodules += ['wayland']
 
@@ -461,7 +460,6 @@ if wayland_enabled
     'wayland-client', wayland_req,
     'wayland-protocols', wayland_proto_req,
     'xkbcommon', xkbcommon_req,
-    'wayland-cursor', wayland_req,
     'wayland-egl',
   ]
 endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]