Mercurial > sdl-ios-xcode

comparison src/video/x11/SDL_x11events.c @ 1657:5b0805ceb50f SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge trunk-1.3-2
author Sam Lantinga <slouken@libsdl.org>
date Fri, 28 Apr 2006 16:55:41 +0000
parents 3ba88cb7eb1b
children e49147870aac c546353b1ad4
comparison
equal deleted inserted replaced
1656:96c2f89cc7e1 1657:5b0805ceb50f
664 if ( switch_waiting & SDL_FULLSCREEN ) { 664 if ( switch_waiting & SDL_FULLSCREEN ) {
665 switch_time = now + 1500; 665 switch_time = now + 1500;
666 } else { 666 } else {
667 switch_time = now + 200; 667 switch_time = now + 200;
668 } 668 }
669 } else if ( now >= switch_time ) { 669 } else if ( (int)(switch_time-now) <= 0 ) {
670 Uint32 go_fullscreen; 670 Uint32 go_fullscreen;
671 671
672 go_fullscreen = switch_waiting & SDL_FULLSCREEN; 672 go_fullscreen = switch_waiting & SDL_FULLSCREEN;
673 switch_waiting = 0; 673 switch_waiting = 0;
674 if ( SDL_VideoSurface->flags & SDL_FULLSCREEN ) { 674 if ( SDL_VideoSurface->flags & SDL_FULLSCREEN ) {