brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backends/native: Make group modes checks libinput device independent

Browse Source 
Remove the dependence on the underlying libinput device here.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1639>
This commit is contained in:
Carlos Garnacho 2020-12-15 23:57:59 +01:00
parent 505f65e8d6
commit 96070e820c
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/backends/native/meta-input-device-native.c
View File

@ -78,6 +78,7 @@ meta_input_device_native_finalize (GObject *object)
stop_mousekeys_move (device_evdev); stop_mousekeys_move (device_evdev);
g_clear_pointer (&device_evdev->pad_features, g_array_unref); g_clear_pointer (&device_evdev->pad_features, g_array_unref);
g_clear_pointer (&device_evdev->modes, g_array_unref);
G_OBJECT_CLASS (meta_input_device_native_parent_class)->finalize (object); G_OBJECT_CLASS (meta_input_device_native_parent_class)->finalize (object);
} }
@ -159,13 +160,12 @@ static int
meta_input_device_native_get_group_n_modes (ClutterInputDevice *device, meta_input_device_native_get_group_n_modes (ClutterInputDevice *device,
int group) int group)
{ {
struct libinput_device *libinput_device; MetaInputDeviceNative *device_native = META_INPUT_DEVICE_NATIVE (device);
struct libinput_tablet_pad_mode_group *mode_group;
libinput_device = meta_input_device_native_get_libinput_device (device); if (!device_native->modes || group < device_native->modes->len)
mode_group = libinput_device_tablet_pad_get_mode_group (libinput_device, group); return -1;
return libinput_tablet_pad_mode_group_get_num_modes (mode_group); return g_array_index (device_native->modes, int, group);
} }
static gboolean static gboolean
@ -1284,7 +1284,7 @@ update_pad_features (MetaInputDeviceNative *device_native)
ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (device_native); ClutterInputDevice *device = CLUTTER_INPUT_DEVICE (device_native);
struct libinput_device *libinput_device; struct libinput_device *libinput_device;
struct libinput_tablet_pad_mode_group *mode_group; struct libinput_tablet_pad_mode_group *mode_group;
int n_groups, n_buttons, n_rings, n_strips, i, j; int n_groups, n_buttons, n_rings, n_strips, n_modes, i, j;
libinput_device = meta_input_device_native_get_libinput_device (device); libinput_device = meta_input_device_native_get_libinput_device (device);
n_rings = libinput_device_tablet_pad_get_num_rings (libinput_device); n_rings = libinput_device_tablet_pad_get_num_rings (libinput_device);
@ -1293,12 +1293,16 @@ update_pad_features (MetaInputDeviceNative *device_native)
n_buttons = libinput_device_tablet_pad_get_num_buttons (libinput_device); n_buttons = libinput_device_tablet_pad_get_num_buttons (libinput_device);
device_native->pad_features = g_array_new (FALSE, FALSE, sizeof (PadFeature)); device_native->pad_features = g_array_new (FALSE, FALSE, sizeof (PadFeature));
device_native->modes = g_array_sized_new (FALSE, FALSE, sizeof (int), n_groups);
for (i = 0; i < n_groups; i++) for (i = 0; i < n_groups; i++)
{ {
mode_group = mode_group =
libinput_device_tablet_pad_get_mode_group (libinput_device, i); libinput_device_tablet_pad_get_mode_group (libinput_device, i);
n_modes = libinput_tablet_pad_mode_group_get_num_modes (mode_group);
g_array_append_val (device_native->modes, n_modes);
for (j = 0; j < n_buttons; j++) for (j = 0; j < n_buttons; j++)
{ {
gboolean is_mode_switch = gboolean is_mode_switch =

1
src/backends/native/meta-input-device-native.h
View File

@ -76,6 +76,7 @@ struct _MetaInputDeviceNative
MetaSeatImpl *seat_impl; MetaSeatImpl *seat_impl;
ClutterInputDeviceTool *last_tool; ClutterInputDeviceTool *last_tool;
GArray *pad_features; GArray *pad_features;
GArray *modes;
cairo_matrix_t device_matrix; cairo_matrix_t device_matrix;
double device_aspect_ratio; /* w:h */ double device_aspect_ratio; /* w:h */