The-Homebrew-Cloud/Ryujinx-SDL
2
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-09-22 15:08:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cocoa: deal with mouse focus when warping the cursor from outside a window.

Browse Source 
Otherwise, you might not get appropriate mouse enter/leave events.

Better fix for Bugzilla #2984.
This commit is contained in:
Ryan C. Gordon 2015-05-31 21:43:36 -04:00
parent 5b2ff76c12
commit 7619ad3430
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/video/cocoa/SDL_cocoamouse.m
View File

@ -195,6 +195,21 @@ Cocoa_ShowCursor(SDL_Cursor * cursor)
return 0; return 0;
}} }}
static SDL_Window *
SDL_FindWindowAtPoint(const int x, const int y)
{
const SDL_Point pt = { x, y };
SDL_Window *i;
for (i = SDL_GetVideoDevice()->windows; i; i = i->next) {
const SDL_Rect r = { i->x, i->y, i->w, i->h };
if (SDL_PointInRect(&pt, &r)) {
return i;
}
}
return NULL;
}
static void static void
Cocoa_WarpMouseGlobal(int x, int y) Cocoa_WarpMouseGlobal(int x, int y)
{ {
@ -207,7 +222,7 @@ Cocoa_WarpMouseGlobal(int x, int y)
return; return;
} }
} }
CGPoint point = CGPointMake((float)x, (float)y); const CGPoint point = CGPointMake((float)x, (float)y);
Cocoa_HandleMouseWarp(point.x, point.y); Cocoa_HandleMouseWarp(point.x, point.y);
@ -219,21 +234,22 @@ Cocoa_WarpMouseGlobal(int x, int y)
CGWarpMouseCursorPosition(point); CGWarpMouseCursorPosition(point);
CGSetLocalEventsSuppressionInterval(0.25); CGSetLocalEventsSuppressionInterval(0.25);
if (!mouse->relative_mode && mouse->focus) { /* CGWarpMouseCursorPosition doesn't generate a window event, unlike our
/* CGWarpMouseCursorPosition doesn't generate a window event, unlike our * other implementations' APIs. Send what's appropriate.
* other implementations' APIs. */
*/ if (!mouse->relative_mode) {
SDL_SendMouseMotion(mouse->focus, mouse->mouseID, 0, x - mouse->focus->x, y - mouse->focus->y); SDL_Window *win = SDL_FindWindowAtPoint(x, y);
SDL_SetMouseFocus(win);
if (win) {
SDL_assert(win == mouse->focus);
SDL_SendMouseMotion(win, mouse->mouseID, 0, x - win->x, y - win->y);
}
} }
} }
static void static void
Cocoa_WarpMouse(SDL_Window * window, int x, int y) Cocoa_WarpMouse(SDL_Window * window, int x, int y)
{ {
/* pretend we have the mouse focus, even if we don't, so
Cocoa_WarpMouseGlobal() will properly fake a mouse motion event. */
SDL_Mouse *mouse = SDL_GetMouse();
mouse->focus = window;
Cocoa_WarpMouseGlobal(x + window->x, y + window->y); Cocoa_WarpMouseGlobal(x + window->x, y + window->y);
} }