mirrors/labwc
1
0
Fork 0
mirror of https://github.com/labwc/labwc.git synced 2025-10-29 05:40:24 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

input: test if tablet device is a libinput device

Browse source 
Otherwise we might end with a failed assertion if the
tablet or pad isn't a libinput device.

Fixes https://github.com/labwc/labwc/issues/1916
This commit is contained in:
Jens Peters 2024-06-16 09:10:46 +02:00 • committed by Johan Malm
parent b63c6a0fc2
commit 1495708095
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/input/tablet-pad.c
View file

@ -25,12 +25,25 @@ tablet_pad_attach_tablet(struct seat *seat)
/* loop over all tablets and all pads and link by device group */ /* loop over all tablets and all pads and link by device group */
struct drawing_tablet *tablet; struct drawing_tablet *tablet;
wl_list_for_each(tablet, &seat->tablets, link) { wl_list_for_each(tablet, &seat->tablets, link) {
if (!wlr_input_device_is_libinput(tablet->wlr_input_device)) {
/*
* Prevent iterating over non-libinput devices. This might
* be the case when a tablet is exposed by the Wayland
* protocol backend when running labwc as a nested compositor.
*/
continue;
}
struct libinput_device *tablet_device = struct libinput_device *tablet_device =
wlr_libinput_get_device_handle(tablet->wlr_input_device); wlr_libinput_get_device_handle(tablet->wlr_input_device);
struct libinput_device_group *tablet_group = struct libinput_device_group *tablet_group =
libinput_device_get_device_group(tablet_device); libinput_device_get_device_group(tablet_device);
wl_list_for_each(pad, &seat->tablet_pads, link) { wl_list_for_each(pad, &seat->tablet_pads, link) {
if (!wlr_input_device_is_libinput(pad->wlr_input_device)) {
continue;
}
struct libinput_device *pad_device = struct libinput_device *pad_device =
wlr_libinput_get_device_handle(pad->wlr_input_device); wlr_libinput_get_device_handle(pad->wlr_input_device);
struct libinput_device_group *pad_group = struct libinput_device_group *pad_group =