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

seat-native: Add support for tablet-mode-switch being hot-unplugged

Browse Source 
Add support for the (mostly theoretical) case of an input-device
offering tablet-mode-switch functionality being unplugged.

This makes the has_tablet_switch handling identical to the has_touchscreen
handling, leading to more consistent code.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1506
This commit is contained in:
Hans de Goede 2020-10-15 10:43:32 +02:00 committed by Carlos Garnacho
parent 88cabf8039
commit 21c714a0f2
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/backends/native/meta-seat-native.c
View File

@ -1461,31 +1461,33 @@ meta_seat_native_handle_device_event (ClutterSeat *seat,
MetaSeatNative *seat_native = META_SEAT_NATIVE (seat); MetaSeatNative *seat_native = META_SEAT_NATIVE (seat);
ClutterInputDevice *device = event->device.device; ClutterInputDevice *device = event->device.device;
MetaInputDeviceNative *device_native = META_INPUT_DEVICE_NATIVE (device); MetaInputDeviceNative *device_native = META_INPUT_DEVICE_NATIVE (device);
gboolean check_touch_mode; gboolean is_touchscreen, is_tablet_switch;
check_touch_mode = is_touchscreen =
clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE; clutter_input_device_get_device_type (device) == CLUTTER_TOUCHSCREEN_DEVICE;
is_tablet_switch =
libinput_device_has_capability (device_native->libinput_device,
LIBINPUT_DEVICE_CAP_SWITCH) &&
libinput_device_switch_has_switch (device_native->libinput_device,
LIBINPUT_SWITCH_TABLET_MODE);
switch (event->type) switch (event->type)
{ {
case CLUTTER_DEVICE_ADDED: case CLUTTER_DEVICE_ADDED:
if (check_touch_mode) if (is_touchscreen)
seat_native->has_touchscreen = TRUE; seat_native->has_touchscreen = TRUE;
if (libinput_device_has_capability (device_native->libinput_device, if (is_tablet_switch)
LIBINPUT_DEVICE_CAP_SWITCH) && seat_native->has_tablet_switch = TRUE;
libinput_device_switch_has_switch (device_native->libinput_device,
LIBINPUT_SWITCH_TABLET_MODE))
{
seat_native->has_tablet_switch = TRUE;
check_touch_mode = TRUE;
}
break; break;
case CLUTTER_DEVICE_REMOVED: case CLUTTER_DEVICE_REMOVED:
if (check_touch_mode) if (is_touchscreen)
seat_native->has_touchscreen = has_touchscreen (seat_native); seat_native->has_touchscreen = has_touchscreen (seat_native);
if (is_tablet_switch)
seat_native->has_tablet_switch = has_tablet_switch (seat_native);
if (seat_native->repeat_timer && seat_native->repeat_device == device) if (seat_native->repeat_timer && seat_native->repeat_device == device)
meta_seat_native_clear_repeat_timer (seat_native); meta_seat_native_clear_repeat_timer (seat_native);
break; break;
@ -1494,7 +1496,7 @@ meta_seat_native_handle_device_event (ClutterSeat *seat,
break; break;
} }
if (check_touch_mode) if (is_touchscreen || is_tablet_switch)
update_touch_mode (seat_native); update_touch_mode (seat_native);
return TRUE; return TRUE;