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

wayland: Use clutter_input_device_is_grouped() for tablet grouping

Browse Source 
Instead of poking the internal libinput device.

https://bugzilla.gnome.org/show_bug.cgi?id=779986
This commit is contained in:
Carlos Garnacho 2017-02-13 11:59:44 +01:00
parent e081bb3921
commit 29b240e883
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/wayland/meta-wayland-tablet-seat.c
View File

@ -482,14 +482,7 @@ lookup_grouped_devices (ClutterInputDevice *device,
ClutterDeviceManager *device_manager; ClutterDeviceManager *device_manager;
const GSList *devices, *l; const GSList *devices, *l;
GList *group = NULL; GList *group = NULL;
MetaBackend *backend = meta_get_backend ();
#ifdef HAVE_NATIVE_BACKEND
struct libinput_device *dev = NULL, *libinput_device;
if (META_IS_BACKEND_NATIVE (backend))
dev = clutter_evdev_input_device_get_libinput_device (device);
#endif
device_manager = clutter_device_manager_get_default (); device_manager = clutter_device_manager_get_default ();
devices = clutter_device_manager_peek_devices (device_manager); devices = clutter_device_manager_peek_devices (device_manager);
@ -500,16 +493,8 @@ lookup_grouped_devices (ClutterInputDevice *device,
if (clutter_input_device_get_device_type (l->data) != type) if (clutter_input_device_get_device_type (l->data) != type)
continue; continue;
#ifdef HAVE_NATIVE_BACKEND if (!clutter_input_device_is_grouped (device, l->data))
if (META_IS_BACKEND_NATIVE (backend)) continue;
{
libinput_device = clutter_evdev_input_device_get_libinput_device (l->data);
if (libinput_device_get_device_group (dev) !=
libinput_device_get_device_group (libinput_device))
continue;
}
#endif
group = g_list_prepend (group, l->data); group = g_list_prepend (group, l->data);
} }