Add hint for blocking win key when using raw keyboard (#13066)

Co-authored-by: Susko3 <Susko3@protonmail.com>
This commit is contained in:
expikr
2025-10-27 00:27:33 +08:00
committed by GitHub
parent 0ea20a5f86
commit b4eaf9d96f
5 changed files with 73 additions and 1 deletions

View File

@@ -4384,6 +4384,28 @@ extern "C" {
*/ */
#define SDL_HINT_WINDOWS_RAW_KEYBOARD "SDL_WINDOWS_RAW_KEYBOARD" #define SDL_HINT_WINDOWS_RAW_KEYBOARD "SDL_WINDOWS_RAW_KEYBOARD"
/**
* A variable controlling whether or not the RIDEV_NOHOTKEYS flag is set when
* enabling Windows raw keyboard events.
*
* This blocks any hotkeys that have been registered by applications from
* having any effect beyond generating raw WM_INPUT events.
*
* This flag does not affect system-hotkeys like ALT-TAB or CTRL-ALT-DEL,
* but does affect the Windows Logo key since it is a userland hotkey registered
* by explorer.exe.
*
* The variable can be set to the following values:
*
* - "0": Hotkeys are not excluded. (default)
* - "1": Hotkeys are excluded.
*
* This hint can be set anytime.
*
* \since This hint is available since SDL 3.4.0.
*/
#define SDL_HINT_WINDOWS_RAW_KEYBOARD_EXCLUDE_HOTKEYS "SDL_WINDOWS_RAW_KEYBOARD_EXCLUDE_HOTKEYS"
/** /**
* A variable controlling whether SDL uses Kernel Semaphores on Windows. * A variable controlling whether SDL uses Kernel Semaphores on Windows.
* *

View File

@@ -34,6 +34,7 @@
#define ENABLE_RAW_MOUSE_INPUT 0x01 #define ENABLE_RAW_MOUSE_INPUT 0x01
#define ENABLE_RAW_KEYBOARD_INPUT 0x02 #define ENABLE_RAW_KEYBOARD_INPUT 0x02
#define RAW_KEYBOARD_FLAG_NOHOTKEYS 0x04
typedef struct typedef struct
{ {
@@ -81,6 +82,9 @@ static DWORD WINAPI WIN_RawInputThread(LPVOID param)
devices[count].usUsagePage = USB_USAGEPAGE_GENERIC_DESKTOP; devices[count].usUsagePage = USB_USAGEPAGE_GENERIC_DESKTOP;
devices[count].usUsage = USB_USAGE_GENERIC_KEYBOARD; devices[count].usUsage = USB_USAGE_GENERIC_KEYBOARD;
devices[count].dwFlags = 0; devices[count].dwFlags = 0;
if (data->flags & RAW_KEYBOARD_FLAG_NOHOTKEYS) {
devices[count].dwFlags |= RIDEV_NOHOTKEYS;
}
devices[count].hwndTarget = window; devices[count].hwndTarget = window;
++count; ++count;
} }
@@ -203,6 +207,9 @@ static bool WIN_UpdateRawInputEnabled(SDL_VideoDevice *_this)
} }
if (data->raw_keyboard_enabled) { if (data->raw_keyboard_enabled) {
flags |= ENABLE_RAW_KEYBOARD_INPUT; flags |= ENABLE_RAW_KEYBOARD_INPUT;
if (data->raw_keyboard_flag_nohotkeys) {
flags |= RAW_KEYBOARD_FLAG_NOHOTKEYS;
}
} }
if (flags != data->raw_input_enabled) { if (flags != data->raw_input_enabled) {
if (WIN_SetRawInputEnabled(_this, flags)) { if (WIN_SetRawInputEnabled(_this, flags)) {
@@ -250,6 +257,34 @@ bool WIN_SetRawKeyboardEnabled(SDL_VideoDevice *_this, bool enabled)
return true; return true;
} }
typedef enum WIN_RawKeyboardFlag {
NOHOTKEYS
} WIN_RawKeyboardFlag;
static bool WIN_SetRawKeyboardFlag(SDL_VideoDevice *_this, WIN_RawKeyboardFlag flag, bool enabled)
{
SDL_VideoData *data = _this->internal;
switch(flag) {
case NOHOTKEYS:
data->raw_keyboard_flag_nohotkeys = enabled;
break;
default:
return false;
}
if (data->gameinput_context) {
return true;
}
return WIN_UpdateRawInputEnabled(_this);
}
bool WIN_SetRawKeyboardFlag_NoHotkeys(SDL_VideoDevice *_this, bool enabled)
{
return WIN_SetRawKeyboardFlag(_this, NOHOTKEYS, enabled);
}
#else #else
bool WIN_SetRawMouseEnabled(SDL_VideoDevice *_this, bool enabled) bool WIN_SetRawMouseEnabled(SDL_VideoDevice *_this, bool enabled)
@@ -262,6 +297,11 @@ bool WIN_SetRawKeyboardEnabled(SDL_VideoDevice *_this, bool enabled)
return SDL_Unsupported(); return SDL_Unsupported();
} }
bool WIN_SetRawKeyboardFlag_NoHotkeys(SDL_VideoDevice *_this, bool enabled)
{
return SDL_Unsupported();
}
#endif // !SDL_PLATFORM_XBOXONE && !SDL_PLATFORM_XBOXSERIES #endif // !SDL_PLATFORM_XBOXONE && !SDL_PLATFORM_XBOXSERIES
#endif // SDL_VIDEO_DRIVER_WINDOWS #endif // SDL_VIDEO_DRIVER_WINDOWS

View File

@@ -25,6 +25,6 @@
extern bool WIN_SetRawMouseEnabled(SDL_VideoDevice *_this, bool enabled); extern bool WIN_SetRawMouseEnabled(SDL_VideoDevice *_this, bool enabled);
extern bool WIN_SetRawKeyboardEnabled(SDL_VideoDevice *_this, bool enabled); extern bool WIN_SetRawKeyboardEnabled(SDL_VideoDevice *_this, bool enabled);
extern bool WIN_RefreshRawInputEnabled(SDL_VideoDevice *_this); extern bool WIN_SetRawKeyboardFlag_NoHotkeys(SDL_VideoDevice *_this, bool enabled);
#endif // SDL_windowsrawinput_h_ #endif // SDL_windowsrawinput_h_

View File

@@ -149,6 +149,13 @@ static void SDLCALL UpdateWindowsRawKeyboard(void *userdata, const char *name, c
WIN_SetRawKeyboardEnabled(_this, enabled); WIN_SetRawKeyboardEnabled(_this, enabled);
} }
static void SDLCALL UpdateWindowsRawKeyboardNoHotkeys(void *userdata, const char *name, const char *oldValue, const char *newValue)
{
SDL_VideoDevice *_this = (SDL_VideoDevice *)userdata;
bool enabled = SDL_GetStringBoolean(newValue, false);
WIN_SetRawKeyboardFlag_NoHotkeys(_this, enabled);
}
static void SDLCALL UpdateWindowsEnableMessageLoop(void *userdata, const char *name, const char *oldValue, const char *newValue) static void SDLCALL UpdateWindowsEnableMessageLoop(void *userdata, const char *name, const char *oldValue, const char *newValue)
{ {
g_WindowsEnableMessageLoop = SDL_GetStringBoolean(newValue, true); g_WindowsEnableMessageLoop = SDL_GetStringBoolean(newValue, true);
@@ -632,6 +639,7 @@ static bool WIN_VideoInit(SDL_VideoDevice *_this)
#endif #endif
SDL_AddHintCallback(SDL_HINT_WINDOWS_RAW_KEYBOARD, UpdateWindowsRawKeyboard, _this); SDL_AddHintCallback(SDL_HINT_WINDOWS_RAW_KEYBOARD, UpdateWindowsRawKeyboard, _this);
SDL_AddHintCallback(SDL_HINT_WINDOWS_RAW_KEYBOARD_EXCLUDE_HOTKEYS, UpdateWindowsRawKeyboardNoHotkeys, _this);
SDL_AddHintCallback(SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP, UpdateWindowsEnableMessageLoop, NULL); SDL_AddHintCallback(SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP, UpdateWindowsEnableMessageLoop, NULL);
SDL_AddHintCallback(SDL_HINT_WINDOWS_ENABLE_MENU_MNEMONICS, UpdateWindowsEnableMenuMnemonics, NULL); SDL_AddHintCallback(SDL_HINT_WINDOWS_ENABLE_MENU_MNEMONICS, UpdateWindowsEnableMenuMnemonics, NULL);
SDL_AddHintCallback(SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN, UpdateWindowFrameUsableWhileCursorHidden, NULL); SDL_AddHintCallback(SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN, UpdateWindowFrameUsableWhileCursorHidden, NULL);
@@ -649,6 +657,7 @@ void WIN_VideoQuit(SDL_VideoDevice *_this)
SDL_VideoData *data = _this->internal; SDL_VideoData *data = _this->internal;
SDL_RemoveHintCallback(SDL_HINT_WINDOWS_RAW_KEYBOARD, UpdateWindowsRawKeyboard, _this); SDL_RemoveHintCallback(SDL_HINT_WINDOWS_RAW_KEYBOARD, UpdateWindowsRawKeyboard, _this);
SDL_RemoveHintCallback(SDL_HINT_WINDOWS_RAW_KEYBOARD_EXCLUDE_HOTKEYS, UpdateWindowsRawKeyboardNoHotkeys, _this);
SDL_RemoveHintCallback(SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP, UpdateWindowsEnableMessageLoop, NULL); SDL_RemoveHintCallback(SDL_HINT_WINDOWS_ENABLE_MESSAGELOOP, UpdateWindowsEnableMessageLoop, NULL);
SDL_RemoveHintCallback(SDL_HINT_WINDOWS_ENABLE_MENU_MNEMONICS, UpdateWindowsEnableMenuMnemonics, NULL); SDL_RemoveHintCallback(SDL_HINT_WINDOWS_ENABLE_MENU_MNEMONICS, UpdateWindowsEnableMenuMnemonics, NULL);
SDL_RemoveHintCallback(SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN, UpdateWindowFrameUsableWhileCursorHidden, NULL); SDL_RemoveHintCallback(SDL_HINT_WINDOW_FRAME_USABLE_WHILE_CURSOR_HIDDEN, UpdateWindowFrameUsableWhileCursorHidden, NULL);

View File

@@ -590,6 +590,7 @@ struct SDL_VideoData
SDL_Point last_raw_mouse_position; SDL_Point last_raw_mouse_position;
bool raw_mouse_enabled; bool raw_mouse_enabled;
bool raw_keyboard_enabled; bool raw_keyboard_enabled;
bool raw_keyboard_flag_nohotkeys;
bool pending_E1_key_sequence; bool pending_E1_key_sequence;
Uint32 raw_input_enabled; Uint32 raw_input_enabled;