clutter/seat: Keep a pointer to the context
Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3989>
This commit is contained in:
parent
6a694d64f4
commit
0c03a6b676
4 changed files with 41 additions and 3 deletions
|
@ -52,6 +52,7 @@ enum
|
||||||
{
|
{
|
||||||
PROP_0,
|
PROP_0,
|
||||||
|
|
||||||
|
PROP_CONTEXT,
|
||||||
PROP_NAME,
|
PROP_NAME,
|
||||||
PROP_TOUCH_MODE,
|
PROP_TOUCH_MODE,
|
||||||
|
|
||||||
|
@ -64,6 +65,8 @@ typedef struct _ClutterSeatPrivate ClutterSeatPrivate;
|
||||||
|
|
||||||
struct _ClutterSeatPrivate
|
struct _ClutterSeatPrivate
|
||||||
{
|
{
|
||||||
|
ClutterContext *context;
|
||||||
|
|
||||||
unsigned int inhibit_unfocus_count;
|
unsigned int inhibit_unfocus_count;
|
||||||
|
|
||||||
/* Pointer a11y */
|
/* Pointer a11y */
|
||||||
|
@ -85,6 +88,9 @@ clutter_seat_set_property (GObject *object,
|
||||||
|
|
||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
|
case PROP_CONTEXT:
|
||||||
|
priv->context = g_value_get_object (value);
|
||||||
|
break;
|
||||||
case PROP_NAME:
|
case PROP_NAME:
|
||||||
priv->name = g_value_dup_string (value);
|
priv->name = g_value_dup_string (value);
|
||||||
break;
|
break;
|
||||||
|
@ -105,12 +111,15 @@ clutter_seat_get_property (GObject *object,
|
||||||
|
|
||||||
switch (prop_id)
|
switch (prop_id)
|
||||||
{
|
{
|
||||||
case PROP_TOUCH_MODE:
|
case PROP_CONTEXT:
|
||||||
g_value_set_boolean (value, FALSE);
|
g_value_set_object (value, priv->context);
|
||||||
break;
|
break;
|
||||||
case PROP_NAME:
|
case PROP_NAME:
|
||||||
g_value_set_string (value, priv->name);
|
g_value_set_string (value, priv->name);
|
||||||
break;
|
break;
|
||||||
|
case PROP_TOUCH_MODE:
|
||||||
|
g_value_set_boolean (value, FALSE);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
|
||||||
}
|
}
|
||||||
|
@ -119,7 +128,8 @@ clutter_seat_get_property (GObject *object,
|
||||||
static void
|
static void
|
||||||
clutter_seat_constructed (GObject *object)
|
clutter_seat_constructed (GObject *object)
|
||||||
{
|
{
|
||||||
ClutterContext *context = _clutter_context_get_default ();
|
ClutterContext *context =
|
||||||
|
clutter_seat_get_context (CLUTTER_SEAT (object));
|
||||||
ClutterSettings *settings = clutter_context_get_settings (context);
|
ClutterSettings *settings = clutter_context_get_settings (context);
|
||||||
|
|
||||||
G_OBJECT_CLASS (clutter_seat_parent_class)->constructed (object);
|
G_OBJECT_CLASS (clutter_seat_parent_class)->constructed (object);
|
||||||
|
@ -315,6 +325,13 @@ clutter_seat_class_init (ClutterSeatClass *klass)
|
||||||
G_PARAM_READWRITE |
|
G_PARAM_READWRITE |
|
||||||
G_PARAM_CONSTRUCT_ONLY);
|
G_PARAM_CONSTRUCT_ONLY);
|
||||||
|
|
||||||
|
props[PROP_CONTEXT] =
|
||||||
|
g_param_spec_object ("context", NULL, NULL,
|
||||||
|
CLUTTER_TYPE_CONTEXT,
|
||||||
|
G_PARAM_READWRITE |
|
||||||
|
G_PARAM_STATIC_STRINGS |
|
||||||
|
G_PARAM_CONSTRUCT_ONLY);
|
||||||
|
|
||||||
g_object_class_install_properties (object_class, N_PROPS, props);
|
g_object_class_install_properties (object_class, N_PROPS, props);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -795,3 +812,16 @@ clutter_seat_get_name (ClutterSeat *seat)
|
||||||
|
|
||||||
return priv->name;
|
return priv->name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* clutter_seat_get_context:
|
||||||
|
*
|
||||||
|
* Returns: (transfer none): The %ClutterContext
|
||||||
|
*/
|
||||||
|
ClutterContext *
|
||||||
|
clutter_seat_get_context (ClutterSeat *seat)
|
||||||
|
{
|
||||||
|
ClutterSeatPrivate *priv = clutter_seat_get_instance_private (seat);
|
||||||
|
|
||||||
|
return priv->context;
|
||||||
|
}
|
||||||
|
|
|
@ -111,6 +111,8 @@ struct _ClutterSeatClass
|
||||||
ClutterVirtualDeviceType (* get_supported_virtual_device_types) (ClutterSeat *seat);
|
ClutterVirtualDeviceType (* get_supported_virtual_device_types) (ClutterSeat *seat);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
CLUTTER_EXPORT
|
||||||
|
ClutterContext * clutter_seat_get_context (ClutterSeat *seat);
|
||||||
CLUTTER_EXPORT
|
CLUTTER_EXPORT
|
||||||
ClutterInputDevice * clutter_seat_get_pointer (ClutterSeat *seat);
|
ClutterInputDevice * clutter_seat_get_pointer (ClutterSeat *seat);
|
||||||
CLUTTER_EXPORT
|
CLUTTER_EXPORT
|
||||||
|
|
|
@ -137,6 +137,8 @@ meta_backend_native_create_default_seat (MetaBackend *backend,
|
||||||
MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend);
|
MetaBackendNative *backend_native = META_BACKEND_NATIVE (backend);
|
||||||
MetaBackendNativePrivate *priv =
|
MetaBackendNativePrivate *priv =
|
||||||
meta_backend_native_get_instance_private (backend_native);
|
meta_backend_native_get_instance_private (backend_native);
|
||||||
|
ClutterContext *clutter_context =
|
||||||
|
meta_backend_get_clutter_context (backend);
|
||||||
const char *seat_id = NULL;
|
const char *seat_id = NULL;
|
||||||
MetaSeatNativeFlag flags;
|
MetaSeatNativeFlag flags;
|
||||||
|
|
||||||
|
@ -159,6 +161,7 @@ meta_backend_native_create_default_seat (MetaBackend *backend,
|
||||||
|
|
||||||
return CLUTTER_SEAT (g_object_new (META_TYPE_SEAT_NATIVE,
|
return CLUTTER_SEAT (g_object_new (META_TYPE_SEAT_NATIVE,
|
||||||
"backend", backend,
|
"backend", backend,
|
||||||
|
"context", clutter_context,
|
||||||
"seat-id", seat_id,
|
"seat-id", seat_id,
|
||||||
"name", seat_id,
|
"name", seat_id,
|
||||||
"flags", flags,
|
"flags", flags,
|
||||||
|
|
|
@ -2036,9 +2036,12 @@ meta_seat_x11_new (MetaBackend *backend,
|
||||||
int logical_keyboard)
|
int logical_keyboard)
|
||||||
{
|
{
|
||||||
MetaSeatX11 *seat_x11;
|
MetaSeatX11 *seat_x11;
|
||||||
|
ClutterContext *clutter_context =
|
||||||
|
meta_backend_get_clutter_context (backend);
|
||||||
|
|
||||||
seat_x11 = g_object_new (META_TYPE_SEAT_X11,
|
seat_x11 = g_object_new (META_TYPE_SEAT_X11,
|
||||||
"backend", backend,
|
"backend", backend,
|
||||||
|
"context", clutter_context,
|
||||||
"opcode", opcode,
|
"opcode", opcode,
|
||||||
"pointer-id", logical_pointer,
|
"pointer-id", logical_pointer,
|
||||||
"keyboard-id", logical_keyboard,
|
"keyboard-id", logical_keyboard,
|
||||||
|
|
Loading…
Reference in a new issue