mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-05 19:08:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only register for the type of raw input requested by the application

Browse Source
This commit is contained in:
Sam Lantinga
2024-06-03 14:39:04 -07:00
parent a919774fe4
commit 73879ef26e
2 changed files with 39 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/video/windows/SDL_windowsrawinput.c
View File

@@ -30,9 +30,13 @@
#include "../../joystick/usb_ids.h" #include "../../joystick/usb_ids.h"
#define ENABLE_RAW_MOUSE_INPUT 0x01
#define ENABLE_RAW_KEYBOARD_INPUT 0x02
typedef struct typedef struct
{ {
SDL_bool done; SDL_bool done;
Uint32 flags;
HANDLE ready_event; HANDLE ready_event;
HANDLE done_event; HANDLE done_event;
HANDLE thread; HANDLE thread;
@@ -40,6 +44,7 @@ typedef struct
static RawInputThreadData thread_data = { static RawInputThreadData thread_data = {
SDL_FALSE, SDL_FALSE,
0,
INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE,
INVALID_HANDLE_VALUE, INVALID_HANDLE_VALUE,
INVALID_HANDLE_VALUE INVALID_HANDLE_VALUE
@@ -51,23 +56,30 @@ static DWORD WINAPI WIN_RawInputThread(LPVOID param)
RawInputThreadData *data = (RawInputThreadData *)param; RawInputThreadData *data = (RawInputThreadData *)param;
RAWINPUTDEVICE devices[2]; RAWINPUTDEVICE devices[2];
HWND window; HWND window;
UINT count = 0;
window = CreateWindowEx(0, TEXT("Message"), NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL); window = CreateWindowEx(0, TEXT("Message"), NULL, 0, 0, 0, 0, 0, HWND_MESSAGE, NULL, NULL, NULL);
if (!window) { if (!window) {
return 0; return 0;
} }
devices[0].usUsagePage = USB_USAGEPAGE_GENERIC_DESKTOP; if (data->flags & ENABLE_RAW_MOUSE_INPUT) {
devices[0].usUsage = USB_USAGE_GENERIC_MOUSE; devices[count].usUsagePage = USB_USAGEPAGE_GENERIC_DESKTOP;
devices[0].dwFlags = 0; devices[count].usUsage = USB_USAGE_GENERIC_MOUSE;
devices[0].hwndTarget = window; devices[count].dwFlags = 0;
devices[count].hwndTarget = window;
++count;
}
devices[1].usUsagePage = USB_USAGEPAGE_GENERIC_DESKTOP; if (data->flags & ENABLE_RAW_KEYBOARD_INPUT) {
devices[1].usUsage = USB_USAGE_GENERIC_KEYBOARD; devices[count].usUsagePage = USB_USAGEPAGE_GENERIC_DESKTOP;
devices[1].dwFlags = 0; devices[count].usUsage = USB_USAGE_GENERIC_KEYBOARD;
devices[1].hwndTarget = window; devices[count].dwFlags = 0;
devices[count].hwndTarget = window;
++count;
}
if (!RegisterRawInputDevices(devices, SDL_arraysize(devices), sizeof(devices[0]))) { if (!RegisterRawInputDevices(devices, count, sizeof(devices[0]))) {
DestroyWindow(window); DestroyWindow(window);
return 0; return 0;
} }
@@ -91,7 +103,7 @@ static DWORD WINAPI WIN_RawInputThread(LPVOID param)
devices[0].dwFlags |= RIDEV_REMOVE; devices[0].dwFlags |= RIDEV_REMOVE;
devices[1].dwFlags |= RIDEV_REMOVE; devices[1].dwFlags |= RIDEV_REMOVE;
RegisterRawInputDevices(devices, SDL_arraysize(devices), sizeof(devices[0])); RegisterRawInputDevices(devices, count, sizeof(devices[0]));
DestroyWindow(window); DestroyWindow(window);
@@ -119,13 +131,16 @@ static void CleanupRawInputThreadData(RawInputThreadData *data)
} }
} }
static int WIN_SetRawInputEnabled(SDL_VideoDevice *_this, SDL_bool enabled) static int WIN_SetRawInputEnabled(SDL_VideoDevice *_this, Uint32 flags)
{ {
int result = -1; int result = -1;
if (enabled) { CleanupRawInputThreadData(&thread_data);
if (flags) {
HANDLE handles[2]; HANDLE handles[2];
thread_data.flags = flags;
thread_data.ready_event = CreateEvent(NULL, FALSE, FALSE, NULL); thread_data.ready_event = CreateEvent(NULL, FALSE, FALSE, NULL);
if (thread_data.ready_event == INVALID_HANDLE_VALUE) { if (thread_data.ready_event == INVALID_HANDLE_VALUE) {
WIN_SetError("CreateEvent"); WIN_SetError("CreateEvent");
@@ -154,12 +169,11 @@ static int WIN_SetRawInputEnabled(SDL_VideoDevice *_this, SDL_bool enabled)
} }
result = 0; result = 0;
} else { } else {
CleanupRawInputThreadData(&thread_data);
result = 0; result = 0;
} }
done: done:
if (enabled && result < 0) { if (result < 0) {
CleanupRawInputThreadData(&thread_data); CleanupRawInputThreadData(&thread_data);
} }
return result; return result;
@@ -168,10 +182,16 @@ done:
static int WIN_UpdateRawInputEnabled(SDL_VideoDevice *_this) static int WIN_UpdateRawInputEnabled(SDL_VideoDevice *_this)
{ {
SDL_VideoData *data = _this->driverdata; SDL_VideoData *data = _this->driverdata;
SDL_bool enabled = (data->raw_mouse_enabled || data->raw_keyboard_enabled); Uint32 flags = 0;
if (enabled != data->raw_input_enabled) { if (data->raw_mouse_enabled) {
if (WIN_SetRawInputEnabled(_this, enabled) == 0) { flags |= ENABLE_RAW_MOUSE_INPUT;
data->raw_input_enabled = enabled; }
if (data->raw_keyboard_enabled) {
flags |= ENABLE_RAW_KEYBOARD_INPUT;
}
if (flags != data->raw_input_enabled) {
if (WIN_SetRawInputEnabled(_this, flags) == 0) {
data->raw_input_enabled = flags;
} else { } else {
return -1; return -1;
} }

2
src/video/windows/SDL_windowsvideo.h
View File

@@ -419,7 +419,7 @@ struct SDL_VideoData
SDL_bool raw_mouse_enabled; SDL_bool raw_mouse_enabled;
SDL_bool raw_keyboard_enabled; SDL_bool raw_keyboard_enabled;
SDL_bool pending_E1_key_sequence; SDL_bool pending_E1_key_sequence;
SDL_bool raw_input_enabled; Uint32 raw_input_enabled;
#ifndef SDL_DISABLE_WINDOWS_IME #ifndef SDL_DISABLE_WINDOWS_IME
SDL_bool ime_com_initialized; SDL_bool ime_com_initialized;