geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't change mouse capture based on touch events 

Fixes https://github.com/libsdl-org/SDL/issues/5652
main
Sam Lantinga 2022-08-11 16:13:14 -07:00
parent bf925b9ecd
commit f42291ce68
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/events/SDL_mouse.c
View File

@ -230,14 +230,16 @@ SDL_GetMouse(void)
return &SDL_mouse; return &SDL_mouse;
} }
static Uint32 GetButtonState(SDL_Mouse *mouse) static Uint32 GetButtonState(SDL_Mouse *mouse, SDL_bool include_touch)
{ {
int i; int i;
Uint32 buttonstate = 0; Uint32 buttonstate = 0;
for (i = 0; i < mouse->num_sources; ++i) { for (i = 0; i < mouse->num_sources; ++i) {
if (include_touch || mouse->sources[i].mouseID != SDL_TOUCH_MOUSEID) {
buttonstate |= mouse->sources[i].buttonstate; buttonstate |= mouse->sources[i].buttonstate;
} }
}
return buttonstate; return buttonstate;
} }
@ -331,7 +333,7 @@ SDL_SendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relative, int
{ {
if (window && !relative) { if (window && !relative) {
SDL_Mouse *mouse = SDL_GetMouse(); SDL_Mouse *mouse = SDL_GetMouse();
if (!SDL_UpdateMouseFocus(window, x, y, GetButtonState(mouse), (mouseID == SDL_TOUCH_MOUSEID) ? SDL_FALSE : SDL_TRUE)) { if (!SDL_UpdateMouseFocus(window, x, y, GetButtonState(mouse, SDL_TRUE), (mouseID == SDL_TOUCH_MOUSEID) ? SDL_FALSE : SDL_TRUE)) {
return 0; return 0;
} }
} }
@ -432,7 +434,7 @@ SDL_PrivateSendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relativ
} }
/* Ignore relative motion positioning the first touch */ /* Ignore relative motion positioning the first touch */
if (mouseID == SDL_TOUCH_MOUSEID && !GetButtonState(mouse)) { if (mouseID == SDL_TOUCH_MOUSEID && !GetButtonState(mouse, SDL_TRUE)) {
xrel = 0; xrel = 0;
yrel = 0; yrel = 0;
} }
@ -506,7 +508,7 @@ SDL_PrivateSendMouseMotion(SDL_Window * window, SDL_MouseID mouseID, int relativ
event.motion.which = mouseID; event.motion.which = mouseID;
/* Set us pending (or clear during a normal mouse movement event) as having triggered */ /* Set us pending (or clear during a normal mouse movement event) as having triggered */
mouse->was_touch_mouse_events = (mouseID == SDL_TOUCH_MOUSEID)? SDL_TRUE : SDL_FALSE; mouse->was_touch_mouse_events = (mouseID == SDL_TOUCH_MOUSEID)? SDL_TRUE : SDL_FALSE;
event.motion.state = GetButtonState(mouse); event.motion.state = GetButtonState(mouse, SDL_TRUE);
event.motion.x = mouse->x; event.motion.x = mouse->x;
event.motion.y = mouse->y; event.motion.y = mouse->y;
event.motion.xrel = xrel; event.motion.xrel = xrel;
@ -840,7 +842,7 @@ SDL_GetMouseState(int *x, int *y)
if (y) { if (y) {
*y = mouse->y; *y = mouse->y;
} }
return GetButtonState(mouse); return GetButtonState(mouse, SDL_TRUE);
} }
Uint32 Uint32
@ -856,7 +858,7 @@ SDL_GetRelativeMouseState(int *x, int *y)
} }
mouse->xdelta = 0; mouse->xdelta = 0;
mouse->ydelta = 0; mouse->ydelta = 0;
return GetButtonState(mouse); return GetButtonState(mouse, SDL_TRUE);
} }
Uint32 Uint32
@ -1041,7 +1043,7 @@ SDL_UpdateMouseCapture(SDL_bool force_release)
if (!force_release) { if (!force_release) {
if (SDL_GetMessageBoxCount() == 0 && if (SDL_GetMessageBoxCount() == 0 &&
(mouse->capture_desired || (mouse->auto_capture && SDL_GetMouseState(NULL, NULL) != 0))) { (mouse->capture_desired || (mouse->auto_capture && GetButtonState(mouse, SDL_FALSE) != 0))) {
if (!mouse->relative_mode) { if (!mouse->relative_mode) {
capture_window = SDL_GetKeyboardFocus(); capture_window = SDL_GetKeyboardFocus();
} }