fdo-mirrors/libinput
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libinput/libinput.git synced 2026-02-03 20:30:27 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

evdev: rename evdev_paired_keyboard to evdev_paired_device

Browse source 
We'll be using this struct for other devices than keyboards.

Part-of: <https://gitlab.freedesktop.org/libinput/libinput/-/merge_requests/1414>
This commit is contained in:
Peter Hutterer 2026-01-21 08:45:04 +10:00 • committed by Marge Bot
parent 47482bcd8b
commit e161abdc19
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/evdev-fallback.c
View file

@ -768,7 +768,7 @@ fallback_lid_keyboard_event(usec_t time, struct libinput_event *event, void *dat
static void
fallback_lid_toggle_keyboard_listener(struct fallback_dispatch *dispatch,
struct evdev_paired_keyboard *kbd,
struct evdev_paired_device *kbd,
bool is_closed)
{
assert(kbd->device);
@ -789,7 +789,7 @@ static void
fallback_lid_toggle_keyboard_listeners(struct fallback_dispatch *dispatch,
bool is_closed)
{
struct evdev_paired_keyboard *kbd;
struct evdev_paired_device *kbd;
list_for_each(kbd, &dispatch->lid.paired_keyboard_list, link) {
if (!kbd->device)
@ -1274,7 +1274,7 @@ static void
fallback_interface_remove(struct evdev_dispatch *evdev_dispatch)
{
struct fallback_dispatch *dispatch = fallback_dispatch(evdev_dispatch);
struct evdev_paired_keyboard *kbd;
struct evdev_paired_device *kbd;
libinput_timer_cancel(&dispatch->debounce.timer);
libinput_timer_cancel(&dispatch->debounce.timer_short);
@ -1283,7 +1283,7 @@ fallback_interface_remove(struct evdev_dispatch *evdev_dispatch)
libinput_device_remove_event_listener(&dispatch->tablet_mode.other.listener);
list_for_each_safe(kbd, &dispatch->lid.paired_keyboard_list, link) {
evdev_paired_keyboard_destroy(kbd);
evdev_paired_device_destroy(kbd);
}
}
@ -1412,7 +1412,7 @@ fallback_lid_pair_keyboard(struct evdev_device *lid_switch,
struct evdev_device *keyboard)
{
struct fallback_dispatch *dispatch = fallback_dispatch(lid_switch->dispatch);
struct evdev_paired_keyboard *kbd;
struct evdev_paired_device *kbd;
size_t count = 0;
if ((keyboard->tags & EVDEV_TAG_KEYBOARD) == 0 ||
@ -1549,7 +1549,7 @@ fallback_interface_device_removed(struct evdev_device *device,
struct evdev_device *removed_device)
{
struct fallback_dispatch *dispatch = fallback_dispatch(device->dispatch);
struct evdev_paired_keyboard *kbd;
struct evdev_paired_device *kbd;
list_for_each_safe(kbd, &dispatch->lid.paired_keyboard_list, link) {
if (!kbd->device)
@ -1558,7 +1558,7 @@ fallback_interface_device_removed(struct evdev_device *device,
if (kbd->device != removed_device)
continue;
evdev_paired_keyboard_destroy(kbd);
evdev_paired_device_destroy(kbd);
}
if (removed_device == dispatch->tablet_mode.other.sw_device) {

12
src/evdev-mt-touchpad.c
View file

@ -1918,7 +1918,7 @@ tp_interface_process(struct evdev_dispatch *dispatch,
static void
tp_remove_sendevents(struct tp_dispatch *tp)
{
struct evdev_paired_keyboard *kbd;
struct evdev_paired_device *kbd;
libinput_timer_cancel(&tp->palm.trackpoint_timer);
libinput_timer_cancel(&tp->dwt.keyboard_timer);
@ -1941,12 +1941,12 @@ static void
tp_interface_remove(struct evdev_dispatch *dispatch)
{
struct tp_dispatch *tp = tp_dispatch(dispatch);
struct evdev_paired_keyboard *kbd;
struct evdev_paired_device *kbd;
libinput_timer_cancel(&tp->arbitration.arbitration_timer);
list_for_each_safe(kbd, &tp->dwt.paired_keyboard_list, link) {
evdev_paired_keyboard_destroy(kbd);
evdev_paired_device_destroy(kbd);
}
tp->dwt.keyboard_active = false;
@ -2305,7 +2305,7 @@ static void
tp_dwt_pair_keyboard(struct evdev_device *touchpad, struct evdev_device *keyboard)
{
struct tp_dispatch *tp = (struct tp_dispatch *)touchpad->dispatch;
struct evdev_paired_keyboard *kbd;
struct evdev_paired_device *kbd;
size_t count = 0;
if ((keyboard->tags & EVDEV_TAG_KEYBOARD) == 0)
@ -2555,7 +2555,7 @@ tp_interface_device_removed(struct evdev_device *device,
struct evdev_device *removed_device)
{
struct tp_dispatch *tp = (struct tp_dispatch *)device->dispatch;
struct evdev_paired_keyboard *kbd;
struct evdev_paired_device *kbd;
if (removed_device == tp->buttons.trackpoint) {
/* Clear any pending releases for the trackpoint */
@ -2572,7 +2572,7 @@ tp_interface_device_removed(struct evdev_device *device,
list_for_each_safe(kbd, &tp->dwt.paired_keyboard_list, link) {
if (kbd->device == removed_device) {
evdev_paired_keyboard_destroy(kbd);
evdev_paired_device_destroy(kbd);
tp->dwt.keyboard_active = false;
}
}

12
src/evdev.h
View file

@ -1011,19 +1011,19 @@ evdev_device_check_abs_axis_range(struct evdev_device *device,
}
}
struct evdev_paired_keyboard {
struct evdev_paired_device {
struct list link;
struct evdev_device *device;
struct libinput_event_listener listener;
};
static inline void
evdev_paired_keyboard_destroy(struct evdev_paired_keyboard *kbd)
evdev_paired_device_destroy(struct evdev_paired_device *device)
{
kbd->device = NULL;
libinput_device_remove_event_listener(&kbd->listener);
list_remove(&kbd->link);
free(kbd);
device->device = NULL;
libinput_device_remove_event_listener(&device->listener);
list_remove(&device->link);
free(device);
}
static inline bool