fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-06-07 05:18:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

xkb: Fix locked/latched indicator desync across multiple keyboards

Browse source 
When a group indicator (or a latched indicator of any kind) is defined,
e.g.:
  indicator "Scroll Lock" { groups = Group2; }
the logical and physical indicator state may desync across multiple
connected keyboards.

This is caused by XkbPushLockedStateToSlaves only pushing locked_mods to
the slave devices. Pushing locked_group (as well as latched groups/mods)
along with locked_mods resolves the issue.

The issue is not observed with API calls because a different code path
is taken (avoiding XkbPushLockedStateToSlaves altogether).

Signed-off-by: Alexander Melnyk <inboxnumberzero@zoho.com>
(cherry picked from commit 36a7fdd315)

Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/2146>
This commit is contained in:
Alexander Melnyk 2025-12-29 18:43:04 +02:00 • committed by Marge Bot
parent 3797771786
commit d2f1d74f6c
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xkb/xkbActions.c
View file

@ -1234,6 +1234,12 @@ XkbPushLockedStateToSlaves(DeviceIntPtr master, int evtype, int key)
dev->key->xkbInfo->state.locked_mods =
master->key->xkbInfo->state.locked_mods;
dev->key->xkbInfo->state.locked_group =
master->key->xkbInfo->state.locked_group;
dev->key->xkbInfo->state.latched_mods =
master->key->xkbInfo->state.latched_mods;
dev->key->xkbInfo->state.latched_group =
master->key->xkbInfo->state.latched_group;
_XkbApplyState(dev, genStateNotify, evtype, key);
}