Fixes #2022, do not resume on Android when surfaceChanged
If the app is in landscape mode and the user presses the power button, a pause is followed immediately by a surfaceChanged event because the lock screen is shown in portrait mode. This triggers a "false" resume. So, we just pause and resume following the onWindowFocusChanged events. Also, wait for SDL_APP_WILLENTERBACKGROUND and SDL_APP_DIDENTERBACKGROUND before blocking the event pump.
This commit is contained in:
commit
dad420670f
859 changed files with 310893 additions and 0 deletions
120
test/testtimer.c
Normal file
120
test/testtimer.c
Normal file
|
@ -0,0 +1,120 @@
|
|||
/*
|
||||
Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
|
||||
|
||||
This software is provided 'as-is', without any express or implied
|
||||
warranty. In no event will the authors be held liable for any damages
|
||||
arising from the use of this software.
|
||||
|
||||
Permission is granted to anyone to use this software for any purpose,
|
||||
including commercial applications, and to alter it and redistribute it
|
||||
freely.
|
||||
*/
|
||||
|
||||
/* Test program to check the resolution of the SDL timer on the current
|
||||
platform
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "SDL.h"
|
||||
|
||||
#define DEFAULT_RESOLUTION 1
|
||||
|
||||
static int ticks = 0;
|
||||
|
||||
static Uint32 SDLCALL
|
||||
ticktock(Uint32 interval, void *param)
|
||||
{
|
||||
++ticks;
|
||||
return (interval);
|
||||
}
|
||||
|
||||
static Uint32 SDLCALL
|
||||
callback(Uint32 interval, void *param)
|
||||
{
|
||||
printf("Timer %d : param = %d\n", interval, (int) (uintptr_t) param);
|
||||
return interval;
|
||||
}
|
||||
|
||||
int
|
||||
main(int argc, char *argv[])
|
||||
{
|
||||
int i, desired;
|
||||
SDL_TimerID t1, t2, t3;
|
||||
Uint32 start32, now32;
|
||||
Uint64 start, now;
|
||||
|
||||
if (SDL_Init(SDL_INIT_TIMER) < 0) {
|
||||
fprintf(stderr, "Couldn't initialize SDL: %s\n", SDL_GetError());
|
||||
return (1);
|
||||
}
|
||||
|
||||
/* Start the timer */
|
||||
desired = 0;
|
||||
if (argv[1]) {
|
||||
desired = atoi(argv[1]);
|
||||
}
|
||||
if (desired == 0) {
|
||||
desired = DEFAULT_RESOLUTION;
|
||||
}
|
||||
t1 = SDL_AddTimer(desired, ticktock, NULL);
|
||||
|
||||
/* Wait 10 seconds */
|
||||
printf("Waiting 10 seconds\n");
|
||||
SDL_Delay(10 * 1000);
|
||||
|
||||
/* Stop the timer */
|
||||
SDL_RemoveTimer(t1);
|
||||
|
||||
/* Print the results */
|
||||
if (ticks) {
|
||||
fprintf(stderr,
|
||||
"Timer resolution: desired = %d ms, actual = %f ms\n",
|
||||
desired, (double) (10 * 1000) / ticks);
|
||||
}
|
||||
|
||||
/* Test multiple timers */
|
||||
printf("Testing multiple timers...\n");
|
||||
t1 = SDL_AddTimer(100, callback, (void *) 1);
|
||||
if (!t1)
|
||||
fprintf(stderr, "Could not create timer 1: %s\n", SDL_GetError());
|
||||
t2 = SDL_AddTimer(50, callback, (void *) 2);
|
||||
if (!t2)
|
||||
fprintf(stderr, "Could not create timer 2: %s\n", SDL_GetError());
|
||||
t3 = SDL_AddTimer(233, callback, (void *) 3);
|
||||
if (!t3)
|
||||
fprintf(stderr, "Could not create timer 3: %s\n", SDL_GetError());
|
||||
|
||||
/* Wait 10 seconds */
|
||||
printf("Waiting 10 seconds\n");
|
||||
SDL_Delay(10 * 1000);
|
||||
|
||||
printf("Removing timer 1 and waiting 5 more seconds\n");
|
||||
SDL_RemoveTimer(t1);
|
||||
|
||||
SDL_Delay(5 * 1000);
|
||||
|
||||
SDL_RemoveTimer(t2);
|
||||
SDL_RemoveTimer(t3);
|
||||
|
||||
start = SDL_GetPerformanceCounter();
|
||||
for (i = 0; i < 1000000; ++i) {
|
||||
ticktock(0, NULL);
|
||||
}
|
||||
now = SDL_GetPerformanceCounter();
|
||||
printf("1 million iterations of ticktock took %f ms\n", (double)((now - start)*1000) / SDL_GetPerformanceFrequency());
|
||||
|
||||
printf("Performance counter frequency: %llu\n", (unsigned long long) SDL_GetPerformanceFrequency());
|
||||
start32 = SDL_GetTicks();
|
||||
start = SDL_GetPerformanceCounter();
|
||||
SDL_Delay(1000);
|
||||
now = SDL_GetPerformanceCounter();
|
||||
now32 = SDL_GetTicks();
|
||||
printf("Delay 1 second = %d ms in ticks, %f ms according to performance counter\n", (now32-start32), (double)((now - start)*1000) / SDL_GetPerformanceFrequency());
|
||||
|
||||
SDL_Quit();
|
||||
return (0);
|
||||
}
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
Loading…
Add table
Add a link
Reference in a new issue