uefi-ref/edk2
1
0
Fork 0
mirror of https://github.com/tianocore/edk2 synced 2026-08-27 00:23:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

OvmfPkg/VirtioInputDxe: fold Shift correctly

Browse source 
After applying Shift to a printable character, we must clear
`EFI_*_SHIFT_PRESSED` from ->KeyState to follow SIMPLE_TEXT_INPUT(_EX).

This means that ->KeyState must be populated before key code is parsed.

Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>
Tested-by: Alexander Mikhalitsyn <aleksandr.mikhalitsyn@futurfusion.io>
This commit is contained in:
Ivan Shapovalov 2026-07-30 23:04:44 +03:00 • committed by mergify[bot]
parent 30d146175f
commit 1c76821458
1 changed files with 23 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

29
OvmfPkg/VirtioInputDxe/VirtioKeyboard.c
View file

@ -180,7 +180,7 @@ VOID
VirtioKeyboardConvertKeyCode (
IN OUT VIRTIO_INPUT_DEV *Dev,
IN UINT16 Code,
OUT EFI_INPUT_KEY *Key
OUT EFI_KEY_DATA *KeyData
)
{
// Key mapping in between Linux and UEFI
@ -216,6 +216,8 @@ VirtioKeyboardConvertKeyCode (
[MAX_KEYBOARD_CODE] = 0x00
};
EFI_INPUT_KEY *Key = &KeyData->Key;
// Set default readings
Key->ScanCode = SCAN_NULL;
Key->UnicodeChar = CHAR_NULL;
@ -296,6 +298,20 @@ VirtioKeyboardConvertKeyCode (
Key->UnicodeChar = Map[Code];
}
// If this key cannot be mapped to either a scancode or a printable character, return
if (Key->UnicodeChar == CHAR_NULL) {
return;
}
// If we are processing a shiftable character, clear the explicit shift state (if any)
// because it is now reflected in the character representation itself.
// "if a class of printable characters that are normally adjusted by shift modifiers
// (e.g. Shift Key + “f” key) would be presented solely as a KeyData.Key.UnicodeChar
// without the associated shift state."
if (MapShift[Code] != Map[Code]) {
KeyData->KeyState.KeyShiftState &= ~(EFI_LEFT_SHIFT_PRESSED | EFI_RIGHT_SHIFT_PRESSED);
}
if (Dev->KeyActive[KEY_LEFTCTRL] || Dev->KeyActive[KEY_RIGHTCTRL]) {
// Convert Ctrl+[a-z] and Ctrl+[A-Z] into [1-26] ASCII table entries
Key->UnicodeChar &= 0x1F;
@ -344,10 +360,15 @@ VirtioKeyboardProcessEvent (
OUT EFI_KEY_DATA *KeyData
)
{
//
// Initialize the key data structure with current keyboard and toggle state
//
VirtioKeyboardInitializeKeyState (Dev, &KeyData->KeyState);
//
// Translate the virtio scancode into EFI scancode and Unicode char
//
VirtioKeyboardConvertKeyCode (Dev, KeyCode, &KeyData->Key);
VirtioKeyboardConvertKeyCode (Dev, KeyCode, KeyData);
//
// Keys with no Unicode representation and no EFI scancode are not valid,
@ -359,10 +380,6 @@ VirtioKeyboardProcessEvent (
}
}
//
// Complete the key data structure with current keyboard state (active modifiers)
//
VirtioKeyboardInitializeKeyState (Dev, &KeyData->KeyState);
return EFI_SUCCESS;
}