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

diff --git a/src/android/fg_main_android.c b/src/android/fg_main_android.c
index 77d5b96..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;
@@ -189,9 +172,9 @@ int32_t handle_input(struct android_app* app, AInputEvent* event) {
      and up events happen most often at the exact same time.  This
      makes it impossible to animate based on key press time. */
   /* e.g. down/up/wait/down/up rather than down/wait/down/wait/up */ 
-  /* This looks like a bug in the virtual keyboard system :/  Real
-     buttons such as the Back button appear to work correctly (series
-     of down events with proper getRepeatCount value */
+  /* This looks like a bug in the Android virtual keyboard system :/
+     Real buttons such as the Back button appear to work correctly
+     (series of down events with proper getRepeatCount value). */
   
   if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_KEY) {
     /* LOGI("action: %d", AKeyEvent_getAction(event)); */
@@ -222,12 +205,27 @@ int32_t handle_input(struct android_app* app, AInputEvent* event) {
     }
   }
 
-  if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION) {
-    int32_t action = AMotionEvent_getAction(event);
+  int32_t source = AInputEvent_getSource(event);
+  if (AInputEvent_getType(event) == AINPUT_EVENT_TYPE_MOTION
+      && source == AINPUT_SOURCE_TOUCHSCREEN) {
+    int32_t action = AMotionEvent_getAction(event) & AMOTION_EVENT_ACTION_MASK;
+    /* Pointer ID for clicks */
+    int32_t pidx = AMotionEvent_getAction(event) >> AMOTION_EVENT_ACTION_POINTER_INDEX_SHIFT;
+    /* TODO: Handle multi-touch; also handle multiple sources/devices */
+    /* cf. http://sourceforge.net/mailarchive/forum.php?thread_name=20120518071314.GA28061%40perso.beuc.net&forum_name=freeglut-developer */
+    if (0) {
+      LOGI("motion action=%d index=%d source=%d", action, pidx, source);
+      int count = AMotionEvent_getPointerCount(event);
+      int i;
+      for (i = 0; i < count; i++) {
+        LOGI("multi(%d): %.01f,%.01f",
+             AMotionEvent_getPointerId(event, i),
+             AMotionEvent_getX(event, i), AMotionEvent_getY(event, i));
+      }
+    }
     float x = AMotionEvent_getX(event, 0);
     float y = AMotionEvent_getY(event, 0);
-    LOGI("motion %.01f,%.01f action=%d", x, y, AMotionEvent_getAction(event));
-    
+
     /* Virtual arrows PAD */
     /* Don't interfere with existing mouse move event */
     if (!touchscreen.in_mmotion) {
@@ -285,7 +283,6 @@ int32_t handle_input(struct android_app* app, AInputEvent* event) {
     if (!touchscreen.vpad.on) {
       window->State.MouseX = x;
       window->State.MouseY = y;
-      LOGI("Changed mouse position: %f,%f", x, y);
       if (action == AMOTION_EVENT_ACTION_DOWN && FETCH_WCB(*window, Mouse)) {
 	touchscreen.in_mmotion = true;
 	INVOKE_WCB(*window, Mouse, (GLUT_LEFT_BUTTON, GLUT_DOWN, x, y));
@@ -354,6 +351,7 @@ void handle_cmd(struct android_app* app, int32_t cmd) {
     /* The application is being hidden, but may be restored */
     LOGI("handle_cmd: APP_CMD_TERM_WINDOW");
     fghPlatformCloseWindowEGL(window);
+    window->State.NeedToInitContext = GL_TRUE;
     fgDisplay.pDisplay.single_native_window = NULL;
     break;
   case APP_CMD_STOP:
@@ -437,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) {
@@ -446,7 +446,7 @@ void fgPlatformProcessSingleEvent ( void )
         }
       }
     }
-    /* If coming back from a pause: */
+    /* Coming back from a pause: */
     /* - Recreate window context and surface */
     /* - Call user-defined hook to restore resources (textures...) */
     /* - Exit pause looop */
@@ -457,10 +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, LoadResources/ContextLost/...?); */
-      /* 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, ());
   }
 }