fdo-mirrors/libei
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libei.git synced 2026-05-24 16:08:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'no-events-for-removed-devices' into 'main'

Browse source 
Draft: Don't deliver events for removed devices

See merge request libinput/libei!377
This commit is contained in:
David Redondo 2026-05-21 15:38:01 +02:00
commit 4d5ac0caf1
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/libeis-device.c
View file

@ -1188,6 +1188,12 @@ eis_device_remove(struct eis_device *device)
list_remove(&event->link);
eis_event_unref(event);
}
list_for_each_safe(event, &(eis_device_get_context(device)->event_queue), link) {
if (event->device == device) {
list_remove(&event->link);
eis_event_unref(event);
}
}
device->state = EIS_DEVICE_STATE_DEAD;
eis_client_unregister_object(client, &device->proto_object);

41
test/test-eis.c
View file

@ -815,3 +815,44 @@ MUNIT_TEST(eistest_ignore_EPIPE)
return MUNIT_OK;
}
MUNIT_TEST(test_no_events_for_removed_device)
{
_unref_(peck) *peck = peck_new();
peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_ACCEPT_CLIENT);
peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_DEFAULT_SEAT);
peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_HANDLE_BIND_SEAT);
peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_HANDLE_START_EMULATING);
peck_enable_eis_behavior(peck, PECK_EIS_BEHAVIOR_ADD_POINTER);
peck_disable_eis_behavior(peck, PECK_EIS_BEHAVIOR_HANDLE_FRAME);
peck_enable_ei_behavior(peck, PECK_EI_BEHAVIOR_HANDLE_ADDED);
peck_enable_ei_behavior(peck, PECK_EI_BEHAVIOR_HANDLE_RESUMED);
peck_dispatch_until_stable(peck);
with_server(peck) {
struct eis_device *device = peck_eis_get_default_pointer(peck);
eis_device_resume(device);
}
peck_dispatch_until_stable(peck);
with_client(peck) {
struct ei_device *pointer = peck_ei_get_default_pointer(peck);
ei_device_pointer_motion(pointer, 1, 1);
ei_device_frame(pointer, ei_now(ei));
}
peck_dispatch_until_stable(peck);
/* Pausing multiple times should only trigger one event */
with_server(peck) {
struct eis_device *device = peck_eis_get_default_pointer(peck);
_unref_(eis_event) *motion = peck_eis_next_event(eis, EIS_EVENT_POINTER_MOTION);
eis_device_remove(device);
peck_assert_no_eis_events(eis);
}
return MUNIT_OK;
}