Mirrors_Framework/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-10-02 16:23:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

x11: Ignore slave button presses when the window lacks keyboard focus
Build (All) / Create test plan (push) Has been cancelled
Build (All) / level1 (push) Has been cancelled
Build (All) / level2 (push) Has been cancelled

Browse Source 
XInput2 can send slave button presses before FocusIn events, which can confuse the click-through suppression logic. A window must have keyboard focus to grab the mouse anyway, so ignore slave presses when lacking keyboard focus.

(cherry picked from commit ef9a5b7040)
This commit is contained in:
Frank Praznik
2026-05-20 13:08:47 -04:00
committed by Ryan C. Gordon
parent 6f9205a3c3
commit b94ffff046
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/video/x11/SDL_x11xinput2.c
+4 -2
View File
@@ -611,8 +611,10 @@ void X11_HandleXinput2Event(SDL_VideoDevice *_this, XGenericEventCookie *cookie)
int x_ticks = 0, y_ticks = 0;
if (xev->deviceid != videodata->xinput_master_pointer_device) {
// Ignore slave button events on non-focused windows, or focus can be incorrectly set while a grab is active.
if (SDL_GetMouseFocus() != windowdata->window) {
/* Ignore slave button events on non-focused windows, as they can arrive before FocusIn events,
* or result in focus being incorrectly set while a grab is active.
*/
if (SDL_GetMouseFocus() != windowdata->window || SDL_GetKeyboardFocus() != windowdata->window) {
break;
}