[mutter/wayland] cursor-tracker: Split out the code that updates the new cursor
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter/wayland] cursor-tracker: Split out the code that updates the new cursor
- Date: Mon, 31 Mar 2014 23:15:31 +0000 (UTC)
commit 863569b70248470f82893020853b5ef379378c76
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Mon Mar 31 15:04:49 2014 -0400
cursor-tracker: Split out the code that updates the new cursor
src/core/meta-cursor-tracker.c | 25 +++++++++++++++----------
1 files changed, 15 insertions(+), 10 deletions(-)
---
diff --git a/src/core/meta-cursor-tracker.c b/src/core/meta-cursor-tracker.c
index 5c315fc..cc698fb 100644
--- a/src/core/meta-cursor-tracker.c
+++ b/src/core/meta-cursor-tracker.c
@@ -887,6 +887,20 @@ get_displayed_cursor (MetaCursorTracker *tracker)
}
static void
+update_displayed_cursor (MetaCursorTracker *tracker)
+{
+ if (meta_is_wayland_compositor ())
+ {
+ if (tracker->displayed_cursor)
+ cogl_pipeline_set_layer_texture (tracker->pipeline, 0, COGL_TEXTURE (displayed_cursor->texture));
+ else
+ cogl_pipeline_set_layer_texture (tracker->pipeline, 0, NULL);
+
+ update_hw_cursor (tracker);
+ }
+}
+
+static void
sync_displayed_cursor (MetaCursorTracker *tracker)
{
MetaCursorReference *displayed_cursor = get_displayed_cursor (tracker);
@@ -898,16 +912,7 @@ sync_displayed_cursor (MetaCursorTracker *tracker)
if (displayed_cursor)
tracker->displayed_cursor = meta_cursor_reference_ref (displayed_cursor);
- if (meta_is_wayland_compositor ())
- {
- if (displayed_cursor)
- cogl_pipeline_set_layer_texture (tracker->pipeline, 0, COGL_TEXTURE (displayed_cursor->texture));
- else
- cogl_pipeline_set_layer_texture (tracker->pipeline, 0, NULL);
-
- update_hw_cursor (tracker);
- }
-
+ update_displayed_cursor (tracker);
g_signal_emit (tracker, signals[CURSOR_CHANGED], 0);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]