Mercurial > sdl-ios-xcode
diff src/video/x11/SDL_x11wm.c @ 88:71774090f286
Hopefully fixed the fullscreen mode code for KDE
| author | Sam Lantinga <slouken@lokigames.com> |
|---|---|
| date | Sat, 07 Jul 2001 07:59:37 +0000 |
| parents | 74212992fb08 |
| children | 8a5aff5c1294 |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11wm.c Sat Jul 07 06:33:33 2001 +0000 +++ b/src/video/x11/SDL_x11wm.c Sat Jul 07 07:59:37 2001 +0000 @@ -258,16 +258,17 @@ True, 0, GrabModeAsync, GrabModeAsync, FSwindow, None, CurrentTime); - if ( result == AlreadyGrabbed ) { + if ( result == GrabSuccess ) { break; } SDL_Delay(100); } + if ( result != GrabSuccess ) { + /* Uh, oh, what do we do here? */ ; + } } -#ifdef GRAB_FULLSCREEN if ( !(this->screen->flags & SDL_FULLSCREEN) ) -#endif - XUngrabKeyboard(SDL_Display, CurrentTime); + XUngrabKeyboard(SDL_Display, CurrentTime); } else { if ( this->screen->flags & SDL_FULLSCREEN ) { /* Unbind the mouse from the fullscreen window */ @@ -278,16 +279,20 @@ result = XGrabPointer(SDL_Display, SDL_Window, True, 0, GrabModeAsync, GrabModeAsync, SDL_Window, None, CurrentTime); - if ( result != AlreadyGrabbed ) { + if ( result == GrabSuccess ) { break; } SDL_Delay(100); } -#ifdef GRAB_FULLSCREEN - if ( !(this->screen->flags & SDL_FULLSCREEN) ) -#endif - XGrabKeyboard(SDL_Display, WMwindow, True, - GrabModeAsync, GrabModeAsync, CurrentTime); + if ( result != GrabSuccess ) { + /* Uh, oh, what do we do here? */ ; + } + /* Grab the keyboard if we're in fullscreen mode */ + if ( !(this->screen->flags & SDL_FULLSCREEN) ) { + XGrabKeyboard(SDL_Display, WMwindow, True, + GrabModeAsync, GrabModeAsync, CurrentTime); + SDL_PrivateAppActive(1, SDL_APPINPUTFOCUS); + } /* Raise the window if we grab the mouse */ if ( !(this->screen->flags & SDL_FULLSCREEN) )