[mutter] cursor: Save the original MetaCursor a cursor came from
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cursor: Save the original MetaCursor a cursor came from
- Date: Wed, 23 Apr 2014 16:15:55 +0000 (UTC)
commit 98a1573beec33f34186fff3bd52ce8d84916d6f9
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Wed Apr 23 11:04:08 2014 -0400
cursor: Save the original MetaCursor a cursor came from
So we can recreate it as a server-side cursor
src/backends/meta-cursor-private.h | 1 +
src/backends/meta-cursor.c | 7 +++++++
src/backends/meta-cursor.h | 2 ++
3 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/backends/meta-cursor-private.h b/src/backends/meta-cursor-private.h
index b149021..09ab992 100644
--- a/src/backends/meta-cursor-private.h
+++ b/src/backends/meta-cursor-private.h
@@ -36,6 +36,7 @@ typedef struct {
struct _MetaCursorReference {
int ref_count;
+ MetaCursor cursor;
MetaCursorImage image;
};
diff --git a/src/backends/meta-cursor.c b/src/backends/meta-cursor.c
index 1558ed5..828a1ff 100644
--- a/src/backends/meta-cursor.c
+++ b/src/backends/meta-cursor.c
@@ -235,6 +235,7 @@ meta_cursor_reference_from_theme (MetaCursor cursor)
self = g_slice_new0 (MetaCursorReference);
self->ref_count = 1;
+ self->cursor = cursor;
meta_cursor_image_load_from_xcursor_image (&self->image, image);
XcursorImageDestroy (image);
@@ -363,3 +364,9 @@ meta_cursor_reference_get_gbm_bo (MetaCursorReference *cursor,
*hot_y = cursor->image.hot_y;
return cursor->image.bo;
}
+
+MetaCursor
+meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor)
+{
+ return cursor->cursor;
+}
diff --git a/src/backends/meta-cursor.h b/src/backends/meta-cursor.h
index 483115e..e9e1290 100644
--- a/src/backends/meta-cursor.h
+++ b/src/backends/meta-cursor.h
@@ -36,6 +36,8 @@ MetaCursorReference * meta_cursor_reference_from_buffer (struct wl_resource *buf
int hot_x,
int hot_y);
+MetaCursor meta_cursor_reference_get_meta_cursor (MetaCursorReference *cursor);
+
Cursor meta_cursor_create_x_cursor (Display *xdisplay,
MetaCursor cursor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]