From 82c1fc4441b7a3bd3558cf3f94d6961396fd90b3 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Fri, 11 Dec 2009 15:24:53 +0000 Subject: [PATCH] Fixed bug #849 some more: Tim Angus 2009-11-26 14:41:04 PST Fix to the cursor not being responsive when the app doesn't have SDL_APPINPUTFOCUS The problems with the directx driver are similar to the ones I introduced in the windib driver with r4478. Basically if the application did not have focus, the mouse position is not updated. It's not really that the mouse cursor was invisible, it's that it is stuck underneath another window where you can't see it. This behaviour predates my r4478 changes and is the reason I unwittingly broke the windib driver as I had been replicating the way the directx driver deals with focus. Prior to r4478 the directx driver could not be used in windowed mode, so the broken focusing would not have actually been observable. Anyway, the attached patch makes the directx driver behaves like the windib driver in terms of focus. Time for 1.2.15? ;) I've added an additional change of moving the calls to WIN_GrabInput that are made on WM_ACTIVATE messages so that they only occur when the state is SDL_APPINPUTFOCUS. When a fullscreen application is minimised using alt-tab, it still receives WM_ACTIVATE messages when other applications are selected. If WIN_GrabInput is called when the SDL application doesn't have input focus, bad things happen; it shouldn't be being called at all. I've also added a line to make sure that SDL_APPMOUSEFOCUS state is dropped when the application is minimised following an alt-tab. --HG-- branch : SDL-1.2 --- src/video/wincommon/SDL_sysevents.c | 24 +++++++++++------------- src/video/windx5/SDL_dx5events.c | 19 ++++++++++--------- 2 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/video/wincommon/SDL_sysevents.c b/src/video/wincommon/SDL_sysevents.c index f7db2e2ec..70ee037ea 100644 --- a/src/video/wincommon/SDL_sysevents.c +++ b/src/video/wincommon/SDL_sysevents.c @@ -316,10 +316,10 @@ LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if ( active ) { /* Gain the following states */ appstate = SDL_APPACTIVE|SDL_APPINPUTFOCUS; - if ( this->input_grab != SDL_GRAB_OFF ) { - WIN_GrabInput(this, SDL_GRAB_ON); - } - if ( !(SDL_GetAppState()&SDL_APPINPUTFOCUS) ) { + if ( !(SDL_GetAppState() & SDL_APPINPUTFOCUS) ) { + if ( this->input_grab != SDL_GRAB_OFF ) { + WIN_GrabInput(this, SDL_GRAB_ON); + } if ( ! DDRAW_FULLSCREEN() ) { DIB_SwapGamma(this); } @@ -344,14 +344,16 @@ LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) if ( minimized ) { appstate |= SDL_APPACTIVE; } - if ( this->input_grab != SDL_GRAB_OFF ) { - WIN_GrabInput(this, SDL_GRAB_OFF); - } + if ( SDL_GetAppState() & SDL_APPINPUTFOCUS ) { + if ( this->input_grab != SDL_GRAB_OFF ) { + WIN_GrabInput(this, SDL_GRAB_OFF); + } if ( ! DDRAW_FULLSCREEN() ) { DIB_SwapGamma(this); } if ( WINDIB_FULLSCREEN() ) { + appstate |= SDL_APPMOUSEFOCUS; SDL_RestoreDesktopMode(); #if defined(_WIN32_WCE) LoadAygshell(); @@ -372,8 +374,7 @@ LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) case WM_MOUSEMOVE: { #ifdef WM_MOUSELEAVE - /* No need to handle SDL_APPMOUSEFOCUS when fullscreen */ - if ( SDL_VideoSurface && !FULLSCREEN() ) { + if ( SDL_VideoSurface ) { /* mouse has entered the window */ if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { @@ -398,11 +399,8 @@ LRESULT CALLBACK WinMessage(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) #ifdef WM_MOUSELEAVE case WM_MOUSELEAVE: { - /* No need to handle SDL_APPMOUSEFOCUS when fullscreen */ - if ( SDL_VideoSurface && !FULLSCREEN() ) { + if ( SDL_VideoSurface ) { /* mouse has left the window */ - /* or */ - /* Elvis has left the building! */ posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); } } diff --git a/src/video/windx5/SDL_dx5events.c b/src/video/windx5/SDL_dx5events.c index 695004bfe..7959edddd 100644 --- a/src/video/windx5/SDL_dx5events.c +++ b/src/video/windx5/SDL_dx5events.c @@ -149,8 +149,8 @@ struct { #else &c_dfDIMouse, #endif - (DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), - (DISCL_FOREGROUND|DISCL_NONEXCLUSIVE), handle_mouse }, + (DISCL_BACKGROUND|DISCL_NONEXCLUSIVE), + (DISCL_BACKGROUND|DISCL_NONEXCLUSIVE), handle_mouse }, { NULL, NULL, NULL, 0, 0, NULL } }; @@ -297,8 +297,7 @@ static void post_mouse_motion(int relative, Sint16 x, Sint16 y) { extern int mouse_relative; - if ( (SDL_GetAppState() & (SDL_APPINPUTFOCUS|SDL_APPMOUSEFOCUS)) == - (SDL_APPINPUTFOCUS|SDL_APPMOUSEFOCUS) ) { + if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) { posted = SDL_PrivateMouseMotion( 0, relative, x, y); @@ -355,10 +354,6 @@ static void post_mouse_motion(int relative, Sint16 x, Sint16 y) ClientToScreen(SDL_Window, ¢er); SetCursorPos(center.x, center.y); } - } else { - /* No window or mouse focus, control is lost */ - mouse_lost = 1; - ClipCursor(NULL); } } @@ -375,6 +370,12 @@ static void handle_mouse(const int numevents, DIDEVICEOBJECTDATA *ptrbuf) return; } + /* If mouse focus has been lost, make sure we release the cursor. */ + if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { + mouse_lost = 1; + ClipCursor(NULL); + } + /* If the mouse was lost, regain some sense of mouse state */ if ( mouse_lost && (SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { POINT mouse_pos; @@ -667,7 +668,7 @@ static int DX5_CheckInput(_THIS, int timeout, BOOL processInput) } /* Pump the DirectInput flow */ - if ( SDL_GetAppState() & SDL_APPINPUTFOCUS ) { + if ( SDL_GetAppState() & SDL_APPMOUSEFOCUS ) { for ( i=0; i