diff options
| author | Ray Strode <rstrode@redhat.com> | 2023-01-02 12:27:24 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2023-01-02 12:27:24 -0500 |
| commit | fcaa382d535edb12461fbbc9942dc49b549d091b (patch) | |
| tree | cf9d62528e7497021b3d9bd70ce240602620cc24 | |
| parent | 96d050ce96333f110e5a44540dc98b93be9818be (diff) | |
| parent | 42d414f9f760c97244d1b1f774d853c7d0b79f7e (diff) | |
Merge branch 'plymouth-fixleds' into 'main'
ply-input-device: Don't skip setting LEDs on the device that a lock key was pressed on
See merge request plymouth/plymouth!227
| -rw-r--r-- | src/libply-splash-core/ply-input-device.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/libply-splash-core/ply-input-device.c b/src/libply-splash-core/ply-input-device.c index be473fc5..fc92de56 100644 --- a/src/libply-splash-core/ply-input-device.c +++ b/src/libply-splash-core/ply-input-device.c @@ -61,6 +61,8 @@ struct _ply_input_device struct xkb_compose_state *compose_state; struct libevdev *dev; + + uint32_t leds_state_invalid : 1; }; static bool @@ -204,8 +206,10 @@ on_input (ply_input_device_t *input_device) updated_state = xkb_state_update_key (input_device->keyboard_state, keycode, xkb_key_direction); - if ((updated_state & XKB_STATE_LEDS) != 0) + if ((updated_state & XKB_STATE_LEDS) != 0) { + input_device->leds_state_invalid = true; ply_trigger_pull (input_device->leds_changed_trigger, input_device); + } /* If the key is repeating, or is being pressed down */ if (key_state == PLY_KEY_HELD || key_state == PLY_KEY_DOWN) @@ -384,7 +388,8 @@ ply_input_device_set_state (ply_input_device_t *input_device, if (mods_depressed == xkb_state->mods_depressed && mods_latched == xkb_state->mods_latched && mods_locked == xkb_state->mods_locked && - group == xkb_state->group) + group == xkb_state->group && + !input_device->leds_state_invalid) return; mods_depressed = xkb_state->mods_depressed; @@ -414,6 +419,7 @@ ply_input_device_set_state (ply_input_device_t *input_device, ev[i].code = SYN_REPORT; ply_write (input_device->fd, ev, sizeof(ev)); + input_device->leds_state_invalid = false; } ply_xkb_keyboard_state_t |