isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-25 09:30:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

backends/native: Make MetaInputSettingsNative vmethods "async"

Browse Source 
Those that are exposed via MetaInputSettings API that's still accessible
in other parts of the backend.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1403>
This commit is contained in:
Carlos Garnacho 2020-11-21 12:52:55 +01:00 committed by Marge Bot
parent ceefa72ade
commit 18fdcfc95a
1 changed files with 78 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
src/backends/native/meta-input-settings-native.c
View File

@ -82,14 +82,17 @@ meta_input_settings_native_get_property (GObject *object,
} }
} }
static void static gboolean
meta_input_settings_native_set_send_events (MetaInputSettings *settings, set_send_events (GTask *task)
ClutterInputDevice *device,
GDesktopDeviceSendEvents mode)
{ {
GDesktopDeviceSendEvents mode;
ClutterInputDevice *device;
enum libinput_config_send_events_mode libinput_mode; enum libinput_config_send_events_mode libinput_mode;
struct libinput_device *libinput_device; struct libinput_device *libinput_device;
device = g_task_get_source_object (task);
mode = GPOINTER_TO_UINT (g_task_get_task_data (task));
switch (mode) switch (mode)
{ {
case G_DESKTOP_DEVICE_SEND_EVENTS_DISABLED: case G_DESKTOP_DEVICE_SEND_EVENTS_DISABLED:
@ -106,9 +109,39 @@ meta_input_settings_native_set_send_events (MetaInputSettings *settings,
} }
libinput_device = meta_input_device_native_get_libinput_device (device); libinput_device = meta_input_device_native_get_libinput_device (device);
if (!libinput_device)
return;
libinput_device_config_send_events_set_mode (libinput_device, libinput_mode); libinput_device_config_send_events_set_mode (libinput_device, libinput_mode);
return G_SOURCE_REMOVE;
}
static void
meta_input_settings_native_set_send_events (MetaInputSettings *settings,
ClutterInputDevice *device,
GDesktopDeviceSendEvents mode)
{
MetaInputSettingsNative *input_settings_native;
GTask *task;
task = g_task_new (device, NULL, NULL, NULL);
g_task_set_task_data (task, GUINT_TO_POINTER (mode), NULL);
input_settings_native = META_INPUT_SETTINGS_NATIVE (settings);
meta_seat_impl_run_input_task (input_settings_native->seat_impl,
task, (GSourceFunc) set_send_events);
g_object_unref (task);
}
static gboolean
set_matrix (GTask *task)
{
ClutterInputDevice *device;
cairo_matrix_t *dev_matrix;
device = g_task_get_source_object (task);
dev_matrix = g_task_get_task_data (task);
g_object_set (device, "device-matrix", dev_matrix, NULL);
return G_SOURCE_REMOVE;
} }
static void static void
@ -116,22 +149,32 @@ meta_input_settings_native_set_matrix (MetaInputSettings *settings,
ClutterInputDevice *device, ClutterInputDevice *device,
gfloat matrix[6]) gfloat matrix[6])
{ {
cairo_matrix_t dev_matrix; MetaInputSettingsNative *input_settings_native;
cairo_matrix_t *dev_matrix;
GTask *task;
dev_matrix = g_new0 (cairo_matrix_t, 1);
if (clutter_input_device_get_device_type (device) == if (clutter_input_device_get_device_type (device) ==
CLUTTER_TOUCHSCREEN_DEVICE || CLUTTER_TOUCHSCREEN_DEVICE ||
meta_input_device_native_get_mapping_mode (device) == meta_input_device_native_get_mapping_mode (device) ==
META_INPUT_DEVICE_MAPPING_ABSOLUTE) META_INPUT_DEVICE_MAPPING_ABSOLUTE)
{ {
cairo_matrix_init (&dev_matrix, matrix[0], matrix[3], matrix[1], cairo_matrix_init (dev_matrix, matrix[0], matrix[3], matrix[1],
matrix[4], matrix[2], matrix[5]); matrix[4], matrix[2], matrix[5]);
} }
else else
{ {
cairo_matrix_init_identity (&dev_matrix); cairo_matrix_init_identity (dev_matrix);
} }
g_object_set (device, "device-matrix", &dev_matrix, NULL); task = g_task_new (device, NULL, NULL, NULL);
g_task_set_task_data (task, dev_matrix, g_free);
input_settings_native = META_INPUT_SETTINGS_NATIVE (settings);
meta_seat_impl_run_input_task (input_settings_native->seat_impl,
task, (GSourceFunc) set_matrix);
g_object_unref (task);
} }
static void static void
@ -596,16 +639,40 @@ meta_input_settings_native_set_tablet_mapping (MetaInputSettings *settings,
meta_input_device_native_set_mapping_mode (device, dev_mapping); meta_input_device_native_set_mapping_mode (device, dev_mapping);
} }
static gboolean
set_tablet_aspect_ratio (GTask *task)
{
ClutterInputDevice *device;
double *aspect_ratio;
device = g_task_get_source_object (task);
aspect_ratio = g_task_get_task_data (task);
g_object_set (device, "output-aspect-ratio", *aspect_ratio, NULL);
return G_SOURCE_REMOVE;
}
static void static void
meta_input_settings_native_set_tablet_aspect_ratio (MetaInputSettings *settings, meta_input_settings_native_set_tablet_aspect_ratio (MetaInputSettings *settings,
ClutterInputDevice *device, ClutterInputDevice *device,
gdouble aspect_ratio) gdouble aspect_ratio)
{ {
MetaInputSettingsNative *input_settings_native;
GTask *task;
if (meta_input_device_native_get_mapping_mode (device) == if (meta_input_device_native_get_mapping_mode (device) ==
META_INPUT_DEVICE_MAPPING_RELATIVE) META_INPUT_DEVICE_MAPPING_RELATIVE)
aspect_ratio = 0; aspect_ratio = 0;
g_object_set (device, "output-aspect-ratio", aspect_ratio, NULL); task = g_task_new (device, NULL, NULL, NULL);
g_task_set_task_data (task,
g_memdup (&aspect_ratio, sizeof (double)),
g_free);
input_settings_native = META_INPUT_SETTINGS_NATIVE (settings);
meta_seat_impl_run_input_task (input_settings_native->seat_impl,
task, (GSourceFunc) set_tablet_aspect_ratio);
g_object_unref (task);
} }
static void static void