We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] toggle mouse tracking on input grab changes

SDL-1.2-bug882.patch (text/plain), 2.49 KB, created by R.Lamprecht on 2009-11-26 07:10:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: R.Lamprecht

Created: 2009-11-26 07:10:42 UTC

Size: 2.49 KB

patch

obsolete

>Index: src/video/wincommon/SDL_sysevents.c
>===================================================================
>--- src/video/wincommon/SDL_sysevents.c	(revision 5160)
>+++ src/video/wincommon/SDL_sysevents.c	(working copy)
>@@ -213,7 +213,7 @@
>    Therefore, we implement our own version of _TrackMouseEvent() which
>    uses our own implementation if TrackMouseEvent() is not available.
> */
>-static BOOL (WINAPI *_TrackMouseEvent)(TRACKMOUSEEVENT *ptme) = NULL;
>+BOOL (WINAPI *_TrackMouseEvent)(TRACKMOUSEEVENT *ptme) = NULL;
> 
> static VOID CALLBACK
> TrackMouseTimerProc(HWND hWnd, UINT uMsg, UINT idEvent, DWORD dwTime)
>@@ -373,7 +373,7 @@
> 
> #ifdef WM_MOUSELEAVE
> 			/* No need to handle SDL_APPMOUSEFOCUS when fullscreen */
>-			if ( SDL_VideoSurface && !FULLSCREEN() ) {
>+			if ( SDL_VideoSurface && !FULLSCREEN() && (this->input_grab == SDL_GRAB_OFF)) {
> 				/* mouse has entered the window */
> 
> 				if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) {
>Index: src/video/wincommon/SDL_syswm.c
>===================================================================
>--- src/video/wincommon/SDL_syswm.c	(revision 5160)
>+++ src/video/wincommon/SDL_syswm.c	(working copy)
>@@ -236,6 +236,17 @@
> SDL_GrabMode WIN_GrabInput(_THIS, SDL_GrabMode mode)
> {
> 	if ( mode == SDL_GRAB_OFF ) {
>+#ifdef WM_MOUSELEAVE
>+		if ( !FULLSCREEN()) {
>+		    printf("WIN_GrabInput switch track on\n");
>+			TRACKMOUSEEVENT tme;
>+
>+			tme.cbSize = sizeof(tme);
>+			tme.dwFlags = TME_LEAVE;
>+			tme.hwndTrack = SDL_Window;
>+			_TrackMouseEvent(&tme);
>+		}
>+#endif /* WM_MOUSELEAVE */
> 		ClipCursor(NULL);
> 		if ( !(SDL_cursorstate & CURSOR_VISIBLE) ) {
> 		/*	RJR: March 28, 2000
>@@ -253,6 +264,18 @@
> 		AllKeys(0);
> #endif
> 	} else {
>+#ifdef WM_MOUSELEAVE
>+		if ( !FULLSCREEN()) {
>+			printf("WIN_GrabInput switch track off\n");
>+			TRACKMOUSEEVENT tme;
>+
>+			tme.cbSize = sizeof(tme);
>+			tme.dwFlags = TME_CANCEL | TME_LEAVE;
>+			tme.hwndTrack = SDL_Window;
>+			_TrackMouseEvent(&tme);
>+		}
>+
>+#endif /* WM_MOUSELEAVE */
> 		ClipCursor(&SDL_bounds);
> 		if ( !(SDL_cursorstate & CURSOR_VISIBLE) ) {
> 		/*	RJR: March 28, 2000
>Index: src/video/wincommon/SDL_syswm_c.h
>===================================================================
>--- src/video/wincommon/SDL_syswm_c.h	(revision 5160)
>+++ src/video/wincommon/SDL_syswm_c.h	(working copy)
>@@ -32,4 +32,4 @@
> extern int WIN_IconifyWindow(_THIS);
> extern SDL_GrabMode WIN_GrabInput(_THIS, SDL_GrabMode mode);
> extern int WIN_GetWMInfo(_THIS, SDL_SysWMinfo *info);
>-
>+extern BOOL (WINAPI *_TrackMouseEvent)(TRACKMOUSEEVENT *ptme);

Actions: View | Diff

Attachments on bug 882: 449

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.