isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-16 21:34:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

cursor-tracker: Keep a pointer to the backend

Browse Source 
https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1391
This commit is contained in:
Jonas Ådahl 2020-07-27 15:12:33 +02:00
parent 59a2fc4f5a
commit c23b675daf
2 changed files with 74 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backends/meta-backend.c
View File

@ -988,7 +988,9 @@ meta_backend_initable_init (GInitable *initable,
if (!priv->renderer) if (!priv->renderer)
return FALSE; return FALSE;
priv->cursor_tracker = g_object_new (META_TYPE_CURSOR_TRACKER, NULL); priv->cursor_tracker = g_object_new (META_TYPE_CURSOR_TRACKER,
"backend", backend,
NULL);
priv->dnd = g_object_new (META_TYPE_DND, NULL); priv->dnd = g_object_new (META_TYPE_DND, NULL);

75
src/backends/meta-cursor-tracker.c
View File

@ -45,6 +45,17 @@
#include "meta/util.h" #include "meta/util.h"
#include "x11/meta-x11-display-private.h" #include "x11/meta-x11-display-private.h"
enum
{
PROP_0,
PROP_BACKEND,
N_PROPS
};
static GParamSpec *obj_props[N_PROPS];
struct _MetaCursorTracker struct _MetaCursorTracker
{ {
GObject parent; GObject parent;
@ -52,6 +63,8 @@ struct _MetaCursorTracker
typedef struct _MetaCursorTrackerPrivate typedef struct _MetaCursorTrackerPrivate
{ {
MetaBackend *backend;
gboolean is_showing; gboolean is_showing;
MetaCursorSprite *effective_cursor; /* May be NULL when hidden */ MetaCursorSprite *effective_cursor; /* May be NULL when hidden */
@ -144,9 +157,8 @@ change_cursor_renderer (MetaCursorTracker *tracker)
{ {
MetaCursorTrackerPrivate *priv = MetaCursorTrackerPrivate *priv =
meta_cursor_tracker_get_instance_private (tracker); meta_cursor_tracker_get_instance_private (tracker);
MetaBackend *backend = meta_get_backend ();
MetaCursorRenderer *cursor_renderer = MetaCursorRenderer *cursor_renderer =
meta_backend_get_cursor_renderer (backend); meta_backend_get_cursor_renderer (priv->backend);
meta_cursor_renderer_set_cursor (cursor_renderer, priv->effective_cursor); meta_cursor_renderer_set_cursor (cursor_renderer, priv->effective_cursor);
} }
@ -174,6 +186,48 @@ meta_cursor_tracker_init (MetaCursorTracker *tracker)
priv->is_showing = TRUE; priv->is_showing = TRUE;
} }
static void
meta_cursor_tracker_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
MetaCursorTracker *tracker = META_CURSOR_TRACKER (object);
MetaCursorTrackerPrivate *priv =
meta_cursor_tracker_get_instance_private (tracker);
switch (prop_id)
{
case PROP_BACKEND:
g_value_set_object (value, priv->backend);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
meta_cursor_tracker_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
MetaCursorTracker *tracker = META_CURSOR_TRACKER (object);
MetaCursorTrackerPrivate *priv =
meta_cursor_tracker_get_instance_private (tracker);
switch (prop_id)
{
case PROP_BACKEND:
priv->backend = g_value_get_object (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void static void
meta_cursor_tracker_finalize (GObject *object) meta_cursor_tracker_finalize (GObject *object)
{ {
@ -193,8 +247,20 @@ meta_cursor_tracker_class_init (MetaCursorTrackerClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class->get_property = meta_cursor_tracker_get_property;
object_class->set_property = meta_cursor_tracker_set_property;
object_class->finalize = meta_cursor_tracker_finalize; object_class->finalize = meta_cursor_tracker_finalize;
obj_props[PROP_BACKEND] =
g_param_spec_object ("backend",
"backend",
"MetaBackend",
META_TYPE_BACKEND,
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY |
G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, N_PROPS, obj_props);
signals[CURSOR_CHANGED] = g_signal_new ("cursor-changed", signals[CURSOR_CHANGED] = g_signal_new ("cursor-changed",
G_TYPE_FROM_CLASS (klass), G_TYPE_FROM_CLASS (klass),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
@ -419,9 +485,10 @@ meta_cursor_tracker_update_position (MetaCursorTracker *tracker,
float new_x, float new_x,
float new_y) float new_y)
{ {
MetaBackend *backend = meta_get_backend (); MetaCursorTrackerPrivate *priv =
meta_cursor_tracker_get_instance_private (tracker);
MetaCursorRenderer *cursor_renderer = MetaCursorRenderer *cursor_renderer =
meta_backend_get_cursor_renderer (backend); meta_backend_get_cursor_renderer (priv->backend);
g_assert (meta_is_wayland_compositor ()); g_assert (meta_is_wayland_compositor ());