Commit 701c97074f478f7deaeb6f4c9b49ef4b73d39ada
2014-12-12T21:00:25
Removed global variable from test program. On Android starting the application after a previous quit did not always work. Android keeps VM processes for a faster restart and therefore the loaded *.so.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74
diff --git a/test/testgesture.c b/test/testgesture.c
index 9e4f1df..d72d9c4 100644
--- a/test/testgesture.c
+++ b/test/testgesture.c
@@ -33,7 +33,6 @@
#define VERBOSE 0
-static SDL_Window *window;
static SDL_Event events[EVENT_BUF_SIZE];
static int eventWrite;
@@ -123,7 +122,7 @@ void drawKnob(SDL_Surface* screen,Knob k) {
(k.p.y+k.r/2*SDL_sinf(k.ang))*screen->h,k.r/4*screen->w,0);
}
-void DrawScreen(SDL_Surface* screen)
+void DrawScreen(SDL_Surface* screen, SDL_Window* window)
{
int i;
#if 1
@@ -165,7 +164,8 @@ void DrawScreen(SDL_Surface* screen)
SDL_UpdateWindowSurface(window);
}
-SDL_Surface* initScreen(int width,int height)
+/* Returns a new SDL_Window if window is NULL or window if not. */
+SDL_Window* initWindow(SDL_Window *window, int width,int height)
{
if (!window) {
window = SDL_CreateWindow("Gesture Test",
@@ -175,11 +175,12 @@ SDL_Surface* initScreen(int width,int height)
if (!window) {
return NULL;
}
- return SDL_GetWindowSurface(window);
+ return window;
}
int main(int argc, char* argv[])
{
+ SDL_Window *window = NULL;
SDL_Surface *screen;
SDL_Event event;
SDL_bool quitting = SDL_FALSE;
@@ -194,7 +195,8 @@ int main(int argc, char* argv[])
if (SDL_Init(SDL_INIT_VIDEO) < 0 ) return 1;
- if (!(screen = initScreen(WIDTH,HEIGHT)))
+ if (!(window = initWindow(window, WIDTH, HEIGHT)) ||
+ !(screen = SDL_GetWindowSurface(window)))
{
SDL_Quit();
return 1;
@@ -244,7 +246,8 @@ int main(int argc, char* argv[])
break;
case SDL_WINDOWEVENT:
if (event.window.event == SDL_WINDOWEVENT_RESIZED) {
- if (!(screen = initScreen(event.window.data1, event.window.data2)))
+ if (!(window = initWindow(window, event.window.data1, event.window.data2)) ||
+ !(screen = SDL_GetWindowSurface(window)))
{
SDL_Quit();
return 1;
@@ -293,7 +296,7 @@ int main(int argc, char* argv[])
break;
}
}
- DrawScreen(screen);
+ DrawScreen(screen, window);
}
SDL_Quit();
return 0;