fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-06 05:38:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ev_led_not_needed' into 'main'

Browse source 
xkb_state_led_name_is_active does not appear to require devices to have EV_LED

See merge request plymouth/plymouth!305
This commit is contained in:
Ray Strode 2024-02-01 10:39:17 +00:00
commit 7a0b0b802d
2 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/plugins/renderers/drm/plugin.c
View file

@ -1983,28 +1983,11 @@ get_any_input_device (ply_renderer_backend_t *backend)
return NULL;
}
static ply_input_device_t *
get_any_input_device_with_leds (ply_renderer_backend_t *backend)
{
ply_list_node_t *node;
ply_list_foreach (backend->input_source.input_devices, node) {
ply_input_device_t *input_device;
input_device = ply_list_node_get_data (node);
if (ply_input_device_is_keyboard_with_leds (input_device))
return input_device;
}
return NULL;
}
static bool
get_capslock_state (ply_renderer_backend_t *backend)
{
if (using_input_device (&backend->input_source)) {
ply_input_device_t *dev = get_any_input_device_with_leds (backend);
ply_input_device_t *dev = get_any_input_device (backend);
if (!dev)
return false;
@ -2043,7 +2026,7 @@ sync_input_devices (ply_renderer_backend_t *backend)
ply_xkb_keyboard_state_t *xkb_state;
ply_input_device_t *source_input_device;
source_input_device = get_any_input_device_with_leds (backend);
source_input_device = get_any_input_device (backend);
if (source_input_device == NULL)
return;

21
src/plugins/renderers/frame-buffer/plugin.c
View file

@ -832,28 +832,11 @@ get_any_input_device (ply_renderer_backend_t *backend)
return NULL;
}
static ply_input_device_t *
get_any_input_device_with_leds (ply_renderer_backend_t *backend)
{
ply_list_node_t *node;
ply_list_foreach (backend->input_source.input_devices, node) {
ply_input_device_t *input_device;
input_device = ply_list_node_get_data (node);
if (ply_input_device_is_keyboard_with_leds (input_device))
return input_device;
}
return NULL;
}
static bool
get_capslock_state (ply_renderer_backend_t *backend)
{
if (using_input_device (&backend->input_source)) {
ply_input_device_t *dev = get_any_input_device_with_leds (backend);
ply_input_device_t *dev = get_any_input_device (backend);
if (!dev)
return false;
@ -892,7 +875,7 @@ sync_input_devices (ply_renderer_backend_t *backend)
ply_xkb_keyboard_state_t *xkb_state;
ply_input_device_t *source_input_device;
source_input_device = get_any_input_device_with_leds (backend);
source_input_device = get_any_input_device (backend);
if (source_input_device == NULL)
return;