[mutter/wayland] cursor-tracker: Make set_root_cursor take a MetaCursorReference
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] cursor-tracker: Make set_root_cursor take a MetaCursorReference
- Date: Mon, 31 Mar 2014 23:16:16 +0000 (UTC)
commit f95f2b0c6d297d6c7eaad8fe0341188a2f917b50
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Mar 31 17:28:19 2014 -0400
cursor-tracker: Make set_root_cursor take a MetaCursorReference
src/core/meta-cursor-tracker-private.h | 2 +-
src/core/meta-cursor-tracker.c | 7 ++++---
src/core/screen.c | 5 ++++-
3 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/src/core/meta-cursor-tracker-private.h b/src/core/meta-cursor-tracker-private.h
index f236b34..ef8de4b 100644
--- a/src/core/meta-cursor-tracker-private.h
+++ b/src/core/meta-cursor-tracker-private.h
@@ -86,7 +86,7 @@ void meta_cursor_tracker_set_window_cursor (MetaCursorTracker *tracker,
MetaCursorReference *cursor);
void meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker);
void meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
- MetaCursor cursor);
+ MetaCursorReference *cursor);
void meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
int new_x,
diff --git a/src/core/meta-cursor-tracker.c b/src/core/meta-cursor-tracker.c
index a5ceb2e..9e05edb 100644
--- a/src/core/meta-cursor-tracker.c
+++ b/src/core/meta-cursor-tracker.c
@@ -396,11 +396,12 @@ meta_cursor_tracker_unset_window_cursor (MetaCursorTracker *tracker)
}
void
-meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
- MetaCursor cursor)
+meta_cursor_tracker_set_root_cursor (MetaCursorTracker *tracker,
+ MetaCursorReference *cursor)
{
g_clear_pointer (&tracker->root_cursor, meta_cursor_reference_unref);
- tracker->root_cursor = meta_cursor_reference_from_theme (tracker, cursor);
+ if (cursor)
+ tracker->root_cursor = meta_cursor_reference_ref (cursor);
sync_cursor (tracker);
}
diff --git a/src/core/screen.c b/src/core/screen.c
index 38f8da8..030bab7 100644
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1387,8 +1387,11 @@ meta_screen_update_cursor (MetaScreen *screen)
MetaDisplay *display = screen->display;
MetaCursor cursor = screen->current_cursor;
Cursor xcursor;
+ MetaCursorReference *cursor_ref;
- meta_cursor_tracker_set_root_cursor (screen->cursor_tracker, cursor);
+ cursor_ref = meta_cursor_reference_from_theme (screen->cursor_tracker, cursor);
+ meta_cursor_tracker_set_root_cursor (screen->cursor_tracker, cursor_ref);
+ meta_cursor_reference_unref (cursor_ref);
/* Set a cursor for X11 applications that don't specify their own */
xcursor = meta_display_create_x_cursor (display, cursor);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]