X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fandroid%2Ffg_main_android.c;h=15d31e62394f347e777ef0668d71c002d0ab24dc;hb=4a451851ec51ea7c3b79534fa5faebadceedf4df;hp=09406d56ec3d202c3032613bd4d236c5e16d8f9f;hpb=5e0c2363eddcc91af3574ea5777e686e8998e390;p=freeglut

diff --git a/src/android/fg_main_android.c b/src/android/fg_main_android.c
index 09406d5..15d31e6 100644
--- a/src/android/fg_main_android.c
+++ b/src/android/fg_main_android.c
@@ -28,7 +28,6 @@
 
 #include <GL/freeglut.h>
 #include "fg_internal.h"
-#include "fg_main.h"
 #include "egl/fg_window_egl.h"
 
 #include <android/log.h>
@@ -139,22 +138,6 @@ static unsigned char key_ascii(struct android_app* app, AInputEvent* event) {
   return ascii;
 }
 
-/*
- * Request a window resize
- */
-void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )
-{
-  fprintf(stderr, "fgPlatformReshapeWindow: STUB\n");
-}
-
-/*
- * A static helper function to execute display callback for a window
- */
-void fgPlatformDisplayWindow ( SFG_Window *window )
-{
-  fghRedrawWindow ( window ) ;
-}
-
 unsigned long fgPlatformSystemTime ( void )
 {
   struct timeval now;
@@ -452,6 +435,8 @@ void fgPlatformProcessSingleEvent ( void )
   /* If we're not in RESUME state, Android paused us, so wait */
   struct android_app* app = fgDisplay.pDisplay.app;
   if (app->destroyRequested != 1 && app->activityState != APP_CMD_RESUME) {
+      INVOKE_WCB(*window, Pause, ());
+
     int FOREVER = -1;
     while (app->destroyRequested != 1 && (app->activityState != APP_CMD_RESUME)) {
       if ((ident=ALooper_pollOnce(FOREVER, NULL, &events, (void**)&source)) >= 0) {
@@ -472,11 +457,12 @@ void fgPlatformProcessSingleEvent ( void )
          we'll be paused but not stopped, and keep the current
          surface; in which case fgPlatformOpenWindow will no-op. */
       fgPlatformOpenWindow(window, "", GL_FALSE, 0, 0, GL_FALSE, 0, 0, GL_FALSE, GL_FALSE);
-      /* TODO: INVOKE_WCB(*window, Pause?); */
-      /* TODO: INVOKE_WCB(*window, Resume?); */
+
       if (!FETCH_WCB(*window, InitContext))
           fgWarning("Resuming application, but no callback to reload context resources (glutInitContextFunc)");
     }
+
+    INVOKE_WCB(*window, Resume, ());
   }
 }