From 98582dca02f99886e81081205afd7f6337e86ca4 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Wed, 24 Apr 2024 09:35:19 -0700
Subject: [PATCH] Fixed Win+V handling (pasting from clipboard history) on
Windows
Fixes https://github.com/libsdl-org/SDL/issues/9613
---
src/video/windows/SDL_windowsevents.c | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/video/windows/SDL_windowsevents.c b/src/video/windows/SDL_windowsevents.c
index 00ca0bb2e4402..1b594a85d5eb2 100644
--- a/src/video/windows/SDL_windowsevents.c
+++ b/src/video/windows/SDL_windowsevents.c
@@ -152,7 +152,7 @@ static Uint64 WIN_GetEventTimestamp()
return timestamp;
}
-static SDL_Scancode WindowsScanCodeToSDLScanCode(LPARAM lParam, WPARAM wParam)
+static SDL_Scancode WindowsScanCodeToSDLScanCode(LPARAM lParam, WPARAM wParam, SDL_bool *virtual_key)
{
SDL_Scancode code;
Uint8 index;
@@ -163,6 +163,8 @@ static SDL_Scancode WindowsScanCodeToSDLScanCode(LPARAM lParam, WPARAM wParam)
* Strip high-order bit. */
scanCode &= ~0x80;
+ *virtual_key = (scanCode == 0);
+
if (scanCode != 0) {
if ((keyFlags & KF_EXTENDED) == KF_EXTENDED) {
scanCode = MAKEWORD(scanCode, 0xe0);
@@ -1153,7 +1155,8 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
case WM_KEYDOWN:
case WM_SYSKEYDOWN:
{
- SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam);
+ SDL_bool virtual_key = SDL_FALSE;
+ SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam, &virtual_key);
const Uint8 *keyboardState = SDL_GetKeyboardState(NULL);
/* Detect relevant keyboard shortcuts */
@@ -1164,7 +1167,7 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
}
}
- if (!data->videodata->raw_keyboard_enabled && code != SDL_SCANCODE_UNKNOWN) {
+ if ((virtual_key || !data->videodata->raw_keyboard_enabled) && code != SDL_SCANCODE_UNKNOWN) {
SDL_SendKeyboardKey(WIN_GetEventTimestamp(), SDL_GLOBAL_KEYBOARD_ID, SDL_PRESSED, code);
}
}
@@ -1175,10 +1178,11 @@ LRESULT CALLBACK WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
case WM_SYSKEYUP:
case WM_KEYUP:
{
- SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam);
+ SDL_bool virtual_key = SDL_FALSE;
+ SDL_Scancode code = WindowsScanCodeToSDLScanCode(lParam, wParam, &virtual_key);
const Uint8 *keyboardState = SDL_GetKeyboardState(NULL);
- if (!data->videodata->raw_keyboard_enabled && code != SDL_SCANCODE_UNKNOWN) {
+ if ((virtual_key || !data->videodata->raw_keyboard_enabled) && code != SDL_SCANCODE_UNKNOWN) {
if (code == SDL_SCANCODE_PRINTSCREEN &&
keyboardState[code] == SDL_RELEASED) {
SDL_SendKeyboardKey(WIN_GetEventTimestamp(), SDL_GLOBAL_KEYBOARD_ID, SDL_PRESSED, code);