ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Android) native glue code - fix indenting and remove savestate 

leftovers
This commit is contained in:
twinaphex 2012-10-31 18:52:43 +01:00
parent 4d99d93df0
commit 5240f2d9f1
2 changed files with 355 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

258
android/native/jni/android_native_app_glue.c
View File

@ -23,21 +23,6 @@
#include <sys/resource.h> #include <sys/resource.h>
#include "android_native_app_glue.h" #include "android_native_app_glue.h"
#include <android/log.h>
static void free_saved_state(struct android_app* android_app)
{
pthread_mutex_lock(&android_app->mutex);
if (android_app->savedState != NULL)
{
free(android_app->savedState);
android_app->savedState = NULL;
android_app->savedStateSize = 0;
}
pthread_mutex_unlock(&android_app->mutex);
}
int8_t android_app_read_cmd(struct android_app* android_app) int8_t android_app_read_cmd(struct android_app* android_app)
{ {
@ -48,8 +33,7 @@ int8_t android_app_read_cmd(struct android_app* android_app)
switch (cmd) switch (cmd)
{ {
case APP_CMD_SAVE_STATE: case APP_CMD_SAVE_STATE:
free_saved_state(android_app); break;
break;
} }
return cmd; return cmd;
} }
@ -63,72 +47,72 @@ static void print_cur_config(struct android_app* android_app)
AConfiguration_getLanguage(android_app->config, lang); AConfiguration_getLanguage(android_app->config, lang);
AConfiguration_getCountry(android_app->config, country); AConfiguration_getCountry(android_app->config, country);
/* /*
LOGV("Config: mcc=%d mnc=%d lang=%c%c cnt=%c%c orien=%d touch=%d dens=%d " LOGV("Config: mcc=%d mnc=%d lang=%c%c cnt=%c%c orien=%d touch=%d dens=%d "
"keys=%d nav=%d keysHid=%d navHid=%d sdk=%d size=%d long=%d " "keys=%d nav=%d keysHid=%d navHid=%d sdk=%d size=%d long=%d "
"modetype=%d modenight=%d", "modetype=%d modenight=%d",
AConfiguration_getMcc(android_app->config), AConfiguration_getMcc(android_app->config),
AConfiguration_getMnc(android_app->config), AConfiguration_getMnc(android_app->config),
lang[0], lang[1], country[0], country[1], lang[0], lang[1], country[0], country[1],
AConfiguration_getOrientation(android_app->config), AConfiguration_getOrientation(android_app->config),
AConfiguration_getTouchscreen(android_app->config), AConfiguration_getTouchscreen(android_app->config),
AConfiguration_getDensity(android_app->config), AConfiguration_getDensity(android_app->config),
AConfiguration_getKeyboard(android_app->config), AConfiguration_getKeyboard(android_app->config),
AConfiguration_getNavigation(android_app->config), AConfiguration_getNavigation(android_app->config),
AConfiguration_getKeysHidden(android_app->config), AConfiguration_getKeysHidden(android_app->config),
AConfiguration_getNavHidden(android_app->config), AConfiguration_getNavHidden(android_app->config),
AConfiguration_getSdkVersion(android_app->config), AConfiguration_getSdkVersion(android_app->config),
AConfiguration_getScreenSize(android_app->config), AConfiguration_getScreenSize(android_app->config),
AConfiguration_getScreenLong(android_app->config), AConfiguration_getScreenLong(android_app->config),
AConfiguration_getUiModeType(android_app->config), AConfiguration_getUiModeType(android_app->config),
AConfiguration_getUiModeNight(android_app->config)); AConfiguration_getUiModeNight(android_app->config));
*/ */
} }
void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd) void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd)
{ {
switch (cmd) switch (cmd)
{ {
case APP_CMD_INPUT_CHANGED: case APP_CMD_INPUT_CHANGED:
pthread_mutex_lock(&android_app->mutex); pthread_mutex_lock(&android_app->mutex);
if (android_app->inputQueue != NULL) if (android_app->inputQueue != NULL)
AInputQueue_detachLooper(android_app->inputQueue); AInputQueue_detachLooper(android_app->inputQueue);
android_app->inputQueue = android_app->pendingInputQueue; android_app->inputQueue = android_app->pendingInputQueue;
if (android_app->inputQueue != NULL) if (android_app->inputQueue != NULL)
AInputQueue_attachLooper(android_app->inputQueue, AInputQueue_attachLooper(android_app->inputQueue,
android_app->looper, LOOPER_ID_INPUT, NULL, android_app->looper, LOOPER_ID_INPUT, NULL,
&android_app->inputPollSource); &android_app->inputPollSource);
pthread_cond_broadcast(&android_app->cond); pthread_cond_broadcast(&android_app->cond);
pthread_mutex_unlock(&android_app->mutex); pthread_mutex_unlock(&android_app->mutex);
break; break;
case APP_CMD_INIT_WINDOW: case APP_CMD_INIT_WINDOW:
pthread_mutex_lock(&android_app->mutex); pthread_mutex_lock(&android_app->mutex);
android_app->window = android_app->pendingWindow; android_app->window = android_app->pendingWindow;
pthread_cond_broadcast(&android_app->cond); pthread_cond_broadcast(&android_app->cond);
pthread_mutex_unlock(&android_app->mutex); pthread_mutex_unlock(&android_app->mutex);
break; break;
case APP_CMD_TERM_WINDOW: case APP_CMD_TERM_WINDOW:
pthread_cond_broadcast(&android_app->cond); pthread_cond_broadcast(&android_app->cond);
break; break;
case APP_CMD_RESUME: case APP_CMD_RESUME:
case APP_CMD_START: case APP_CMD_START:
case APP_CMD_PAUSE: case APP_CMD_PAUSE:
case APP_CMD_STOP: case APP_CMD_STOP:
pthread_mutex_lock(&android_app->mutex); pthread_mutex_lock(&android_app->mutex);
android_app->activityState = cmd; android_app->activityState = cmd;
pthread_cond_broadcast(&android_app->cond); pthread_cond_broadcast(&android_app->cond);
pthread_mutex_unlock(&android_app->mutex); pthread_mutex_unlock(&android_app->mutex);
break; break;
case APP_CMD_CONFIG_CHANGED: case APP_CMD_CONFIG_CHANGED:
AConfiguration_fromAssetManager(android_app->config, AConfiguration_fromAssetManager(android_app->config,
android_app->activity->assetManager); android_app->activity->assetManager);
print_cur_config(android_app); print_cur_config(android_app);
break; break;
case APP_CMD_DESTROY: case APP_CMD_DESTROY:
android_app->destroyRequested = 1; android_app->destroyRequested = 1;
break; break;
} }
} }
void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd) void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd)
@ -137,19 +121,14 @@ void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd)
{ {
case APP_CMD_TERM_WINDOW: case APP_CMD_TERM_WINDOW:
pthread_mutex_lock(&android_app->mutex); pthread_mutex_lock(&android_app->mutex);
android_app->window = NULL; android_app->window = NULL;
pthread_cond_broadcast(&android_app->cond); pthread_cond_broadcast(&android_app->cond);
pthread_mutex_unlock(&android_app->mutex); pthread_mutex_unlock(&android_app->mutex);
break; break;
case APP_CMD_SAVE_STATE: case APP_CMD_SAVE_STATE:
pthread_mutex_lock(&android_app->mutex); break;
android_app->stateSaved = 1;
pthread_cond_broadcast(&android_app->cond);
pthread_mutex_unlock(&android_app->mutex);
break;
case APP_CMD_RESUME: case APP_CMD_RESUME:
free_saved_state(android_app); break;
break;
} }
} }
@ -159,8 +138,6 @@ void app_dummy()
static void android_app_destroy(struct android_app* android_app) static void android_app_destroy(struct android_app* android_app)
{ {
free_saved_state(android_app);
pthread_mutex_lock(&android_app->mutex); pthread_mutex_lock(&android_app->mutex);
if (android_app->inputQueue != NULL) if (android_app->inputQueue != NULL)
@ -173,7 +150,7 @@ static void android_app_destroy(struct android_app* android_app)
// Can't touch android_app object after this. // Can't touch android_app object after this.
} }
static void process_input(struct android_app* app, struct android_poll_source* source) void process_input(struct android_app* app, struct android_poll_source* source)
{ {
AInputEvent* event = NULL; AInputEvent* event = NULL;
@ -205,34 +182,34 @@ static void process_cmd(struct android_app* app, struct android_poll_source* sou
static void* android_app_entry(void* param) static void* android_app_entry(void* param)
{ {
struct android_app* android_app = (struct android_app*)param; struct android_app* android_app = (struct android_app*)param;
android_app->config = AConfiguration_new(); android_app->config = AConfiguration_new();
AConfiguration_fromAssetManager(android_app->config, android_app->activity->assetManager); AConfiguration_fromAssetManager(android_app->config, android_app->activity->assetManager);
print_cur_config(android_app); print_cur_config(android_app);
android_app->cmdPollSource.id = LOOPER_ID_MAIN; android_app->cmdPollSource.id = LOOPER_ID_MAIN;
android_app->cmdPollSource.app = android_app; android_app->cmdPollSource.app = android_app;
android_app->cmdPollSource.process = process_cmd; android_app->cmdPollSource.process = process_cmd;
android_app->inputPollSource.id = LOOPER_ID_INPUT; android_app->inputPollSource.id = LOOPER_ID_INPUT;
android_app->inputPollSource.app = android_app; android_app->inputPollSource.app = android_app;
android_app->inputPollSource.process = process_input; android_app->inputPollSource.process = process_input;
ALooper* looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS); ALooper* looper = ALooper_prepare(ALOOPER_PREPARE_ALLOW_NON_CALLBACKS);
ALooper_addFd(looper, android_app->msgread, LOOPER_ID_MAIN, ALOOPER_EVENT_INPUT, NULL, ALooper_addFd(looper, android_app->msgread, LOOPER_ID_MAIN, ALOOPER_EVENT_INPUT, NULL,
&android_app->cmdPollSource); &android_app->cmdPollSource);
android_app->looper = looper; android_app->looper = looper;
pthread_mutex_lock(&android_app->mutex); pthread_mutex_lock(&android_app->mutex);
android_app->running = 1; android_app->running = 1;
pthread_cond_broadcast(&android_app->cond); pthread_cond_broadcast(&android_app->cond);
pthread_mutex_unlock(&android_app->mutex); pthread_mutex_unlock(&android_app->mutex);
android_main(android_app); android_main(android_app);
android_app_destroy(android_app); android_app_destroy(android_app);
return NULL; return NULL;
} }
// -------------------------------------------------------------------- // --------------------------------------------------------------------
@ -240,7 +217,7 @@ static void* android_app_entry(void* param)
// -------------------------------------------------------------------- // --------------------------------------------------------------------
static struct android_app* android_app_create(ANativeActivity* activity, static struct android_app* android_app_create(ANativeActivity* activity,
void* savedState, size_t savedStateSize) void* savedState, size_t savedStateSize)
{ {
struct android_app* android_app = (struct android_app*)malloc(sizeof(struct android_app)); struct android_app* android_app = (struct android_app*)malloc(sizeof(struct android_app));
memset(android_app, 0, sizeof(struct android_app)); memset(android_app, 0, sizeof(struct android_app));
@ -249,16 +226,9 @@ static struct android_app* android_app_create(ANativeActivity* activity,
pthread_mutex_init(&android_app->mutex, NULL); pthread_mutex_init(&android_app->mutex, NULL);
pthread_cond_init(&android_app->cond, NULL); pthread_cond_init(&android_app->cond, NULL);
if (savedState != NULL)
{
android_app->savedState = malloc(savedStateSize);
android_app->savedStateSize = savedStateSize;
memcpy(android_app->savedState, savedState, savedStateSize);
}
int msgpipe[2]; int msgpipe[2];
if (pipe(msgpipe)) if (pipe(msgpipe))
return NULL; return NULL;
android_app->msgread = msgpipe[0]; android_app->msgread = msgpipe[0];
android_app->msgwrite = msgpipe[1]; android_app->msgwrite = msgpipe[1];
@ -284,7 +254,7 @@ static void android_app_write_cmd(struct android_app* android_app, int8_t cmd)
} }
static void android_app_set_input(struct android_app* android_app, static void android_app_set_input(struct android_app* android_app,
AInputQueue* inputQueue) AInputQueue* inputQueue)
{ {
pthread_mutex_lock(&android_app->mutex); pthread_mutex_lock(&android_app->mutex);
android_app->pendingInputQueue = inputQueue; android_app->pendingInputQueue = inputQueue;
@ -328,19 +298,19 @@ static void android_app_set_activity_state(struct android_app* android_app, int8
static void android_app_free(struct android_app* android_app) static void android_app_free(struct android_app* android_app)
{ {
pthread_mutex_lock(&android_app->mutex); pthread_mutex_lock(&android_app->mutex);
android_app_write_cmd(android_app, APP_CMD_DESTROY); android_app_write_cmd(android_app, APP_CMD_DESTROY);
while (!android_app->destroyed) while (!android_app->destroyed)
pthread_cond_wait(&android_app->cond, &android_app->mutex); pthread_cond_wait(&android_app->cond, &android_app->mutex);
pthread_mutex_unlock(&android_app->mutex); pthread_mutex_unlock(&android_app->mutex);
close(android_app->msgread); close(android_app->msgread);
close(android_app->msgwrite); close(android_app->msgwrite);
pthread_cond_destroy(&android_app->cond); pthread_cond_destroy(&android_app->cond);
pthread_mutex_destroy(&android_app->mutex); pthread_mutex_destroy(&android_app->mutex);
free(android_app); free(android_app);
} }
static void onDestroy(ANativeActivity* activity) static void onDestroy(ANativeActivity* activity)
@ -360,26 +330,7 @@ static void onResume(ANativeActivity* activity)
static void* onSaveInstanceState(ANativeActivity* activity, size_t* outLen) static void* onSaveInstanceState(ANativeActivity* activity, size_t* outLen)
{ {
struct android_app* android_app = (struct android_app*)activity->instance; return NULL;
void* savedState = NULL;
pthread_mutex_lock(&android_app->mutex);
android_app->stateSaved = 0;
android_app_write_cmd(android_app, APP_CMD_SAVE_STATE);
while (!android_app->stateSaved)
pthread_cond_wait(&android_app->cond, &android_app->mutex);
if (android_app->savedState != NULL)
{
savedState = android_app->savedState;
*outLen = android_app->savedStateSize;
android_app->savedState = NULL;
android_app->savedStateSize = 0;
}
pthread_mutex_unlock(&android_app->mutex);
return savedState;
} }
static void onPause(ANativeActivity* activity) static void onPause(ANativeActivity* activity)
@ -407,7 +358,7 @@ static void onLowMemory(ANativeActivity* activity)
static void onWindowFocusChanged(ANativeActivity* activity, int focused) static void onWindowFocusChanged(ANativeActivity* activity, int focused)
{ {
android_app_write_cmd((struct android_app*)activity->instance, android_app_write_cmd((struct android_app*)activity->instance,
focused ? APP_CMD_GAINED_FOCUS : APP_CMD_LOST_FOCUS); focused ? APP_CMD_GAINED_FOCUS : APP_CMD_LOST_FOCUS);
} }
static void onNativeWindowCreated(ANativeActivity* activity, ANativeWindow* window) static void onNativeWindowCreated(ANativeActivity* activity, ANativeWindow* window)
@ -431,12 +382,11 @@ static void onInputQueueDestroyed(ANativeActivity* activity, AInputQueue* queue)
} }
void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState, void ANativeActivity_onCreate(ANativeActivity* activity, void* savedState,
size_t savedStateSize) size_t savedStateSize)
{ {
activity->callbacks->onDestroy = onDestroy; activity->callbacks->onDestroy = onDestroy;
activity->callbacks->onStart = onStart; activity->callbacks->onStart = onStart;
activity->callbacks->onResume = onResume; activity->callbacks->onResume = onResume;
activity->callbacks->onSaveInstanceState = onSaveInstanceState;
activity->callbacks->onPause = onPause; activity->callbacks->onPause = onPause;
activity->callbacks->onStop = onStop; activity->callbacks->onStop = onStop;
activity->callbacks->onConfigurationChanged = onConfigurationChanged; activity->callbacks->onConfigurationChanged = onConfigurationChanged;

518
android/native/jni/android_native_app_glue.h
View File

@ -30,317 +30,301 @@
extern "C" { extern "C" {
#endif #endif
/** /**
* The native activity interface provided by <android/native_activity.h> * The native activity interface provided by <android/native_activity.h>
* is based on a set of application-provided callbacks that will be called * is based on a set of application-provided callbacks that will be called
* by the Activity's main thread when certain events occur. * by the Activity's main thread when certain events occur.
* *
* This means that each one of this callbacks _should_ _not_ block, or they * This means that each one of this callbacks _should_ _not_ block, or they
* risk having the system force-close the application. This programming * risk having the system force-close the application. This programming
* model is direct, lightweight, but constraining. * model is direct, lightweight, but constraining.
* *
* The 'threaded_native_app' static library is used to provide a different * The 'threaded_native_app' static library is used to provide a different
* execution model where the application can implement its own main event * execution model where the application can implement its own main event
* loop in a different thread instead. Here's how it works: * loop in a different thread instead. Here's how it works:
* *
* 1/ The application must provide a function named "android_main()" that * 1/ The application must provide a function named "android_main()" that
* will be called when the activity is created, in a new thread that is * will be called when the activity is created, in a new thread that is
* distinct from the activity's main thread. * distinct from the activity's main thread.
* *
* 2/ android_main() receives a pointer to a valid "android_app" structure * 2/ android_main() receives a pointer to a valid "android_app" structure
* that contains references to other important objects, e.g. the * that contains references to other important objects, e.g. the
* ANativeActivity obejct instance the application is running in. * ANativeActivity obejct instance the application is running in.
* *
* 3/ the "android_app" object holds an ALooper instance that already * 3/ the "android_app" object holds an ALooper instance that already
* listens to two important things: * listens to two important things:
* *
* - activity lifecycle events (e.g. "pause", "resume"). See APP_CMD_XXX * - activity lifecycle events (e.g. "pause", "resume"). See APP_CMD_XXX
* declarations below. * declarations below.
* *
* - input events coming from the AInputQueue attached to the activity. * - input events coming from the AInputQueue attached to the activity.
* *
* Each of these correspond to an ALooper identifier returned by * Each of these correspond to an ALooper identifier returned by
* ALooper_pollOnce with values of LOOPER_ID_MAIN and LOOPER_ID_INPUT, * ALooper_pollOnce with values of LOOPER_ID_MAIN and LOOPER_ID_INPUT,
* respectively. * respectively.
* *
* Your application can use the same ALooper to listen to additional * Your application can use the same ALooper to listen to additional
* file-descriptors. They can either be callback based, or with return * file-descriptors. They can either be callback based, or with return
* identifiers starting with LOOPER_ID_USER. * identifiers starting with LOOPER_ID_USER.
* *
* 4/ Whenever you receive a LOOPER_ID_MAIN or LOOPER_ID_INPUT event, * 4/ Whenever you receive a LOOPER_ID_MAIN or LOOPER_ID_INPUT event,
* the returned data will point to an android_poll_source structure. You * the returned data will point to an android_poll_source structure. You
* can call the process() function on it, and fill in android_app->onAppCmd * can call the process() function on it, and fill in android_app->onAppCmd
* and android_app->onInputEvent to be called for your own processing * and android_app->onInputEvent to be called for your own processing
* of the event. * of the event.
* *
* Alternatively, you can call the low-level functions to read and process * Alternatively, you can call the low-level functions to read and process
* the data directly... look at the process_cmd() and process_input() * the data directly... look at the process_cmd() and process_input()
* implementations in the glue to see how to do this. * implementations in the glue to see how to do this.
* *
* See the sample named "native-activity" that comes with the NDK with a * See the sample named "native-activity" that comes with the NDK with a
* full usage example. Also look at the JavaDoc of NativeActivity. * full usage example. Also look at the JavaDoc of NativeActivity.
*/ */
struct android_app; struct android_app;
/** /**
* Data associated with an ALooper fd that will be returned as the "outData" * Data associated with an ALooper fd that will be returned as the "outData"
* when that source has data ready. * when that source has data ready.
*/ */
struct android_poll_source { struct android_poll_source {
// The identifier of this source. May be LOOPER_ID_MAIN or // The identifier of this source. May be LOOPER_ID_MAIN or
// LOOPER_ID_INPUT. // LOOPER_ID_INPUT.
int32_t id; int32_t id;
// The android_app this ident is associated with. // The android_app this ident is associated with.
struct android_app* app; struct android_app* app;
// Function to call to perform the standard processing of data from // Function to call to perform the standard processing of data from
// this source. // this source.
void (*process)(struct android_app* app, struct android_poll_source* source); void (*process)(struct android_app* app, struct android_poll_source* source);
}; };
/** /**
* This is the interface for the standard glue code of a threaded * This is the interface for the standard glue code of a threaded
* application. In this model, the application's code is running * application. In this model, the application's code is running
* in its own thread separate from the main thread of the process. * in its own thread separate from the main thread of the process.
* It is not required that this thread be associated with the Java * It is not required that this thread be associated with the Java
* VM, although it will need to be in order to make JNI calls any * VM, although it will need to be in order to make JNI calls any
* Java objects. * Java objects.
*/ */
struct android_app { struct android_app {
// The application can place a pointer to its own state object // Fill this in with the function to process main app commands (APP_CMD_*)
// here if it likes. void (*onAppCmd)(struct android_app* app, int32_t cmd);
void* userData;
// Fill this in with the function to process main app commands (APP_CMD_*) // Fill this in with the function to process input events. At this point
void (*onAppCmd)(struct android_app* app, int32_t cmd); // the event has already been pre-dispatched, and it will be finished upon
// return. Return 1 if you have handled the event, 0 for any default
// dispatching.
int32_t (*onInputEvent)(struct android_app* app, AInputEvent* event);
// Fill this in with the function to process input events. At this point // The ANativeActivity object instance that this app is running in.
// the event has already been pre-dispatched, and it will be finished upon ANativeActivity* activity;
// return. Return 1 if you have handled the event, 0 for any default
// dispatching.
int32_t (*onInputEvent)(struct android_app* app, AInputEvent* event);
// The ANativeActivity object instance that this app is running in. // The current configuration the app is running in.
ANativeActivity* activity; AConfiguration* config;
// The current configuration the app is running in. // The ALooper associated with the app's thread.
AConfiguration* config; ALooper* looper;
// This is the last instance's saved state, as provided at creation time. // When non-NULL, this is the input queue from which the app will
// It is NULL if there was no state. You can use this as you need; the // receive user input events.
// memory will remain around until you call android_app_exec_cmd() for AInputQueue* inputQueue;
// APP_CMD_RESUME, at which point it will be freed and savedState set to NULL.
// These variables should only be changed when processing a APP_CMD_SAVE_STATE,
// at which point they will be initialized to NULL and you can malloc your
// state and place the information here. In that case the memory will be
// freed for you later.
void* savedState;
size_t savedStateSize;
// The ALooper associated with the app's thread. // When non-NULL, this is the window surface that the app can draw in.
ALooper* looper; ANativeWindow* window;
// When non-NULL, this is the input queue from which the app will // Current content rectangle of the window; this is the area where the
// receive user input events. // window's content should be placed to be seen by the user.
AInputQueue* inputQueue; ARect contentRect;
// When non-NULL, this is the window surface that the app can draw in. // Current state of the app's activity. May be either APP_CMD_START,
ANativeWindow* window; // APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP; see below.
int activityState;
// Current content rectangle of the window; this is the area where the // This is non-zero when the application's NativeActivity is being
// window's content should be placed to be seen by the user. // destroyed and waiting for the app thread to complete.
ARect contentRect; int destroyRequested;
// Current state of the app's activity. May be either APP_CMD_START, // -------------------------------------------------
// APP_CMD_RESUME, APP_CMD_PAUSE, or APP_CMD_STOP; see below. // Below are "private" implementation of the glue code.
int activityState;
// This is non-zero when the application's NativeActivity is being pthread_mutex_t mutex;
// destroyed and waiting for the app thread to complete. pthread_cond_t cond;
int destroyRequested;
// ------------------------------------------------- int msgread;
// Below are "private" implementation of the glue code. int msgwrite;
pthread_mutex_t mutex; pthread_t thread;
pthread_cond_t cond;
int msgread; struct android_poll_source cmdPollSource;
int msgwrite; struct android_poll_source inputPollSource;
pthread_t thread; int running;
int destroyed;
int redrawNeeded;
AInputQueue* pendingInputQueue;
ANativeWindow* pendingWindow;
ARect pendingContentRect;
};
struct android_poll_source cmdPollSource; enum {
struct android_poll_source inputPollSource; /**
* Looper data ID of commands coming from the app's main thread, which
* is returned as an identifier from ALooper_pollOnce(). The data for this
* identifier is a pointer to an android_poll_source structure.
* These can be retrieved and processed with android_app_read_cmd()
* and android_app_exec_cmd().
*/
LOOPER_ID_MAIN = 1,
int running; /**
int stateSaved; * Looper data ID of events coming from the AInputQueue of the
int destroyed; * application's window, which is returned as an identifier from
int redrawNeeded; * ALooper_pollOnce(). The data for this identifier is a pointer to an
AInputQueue* pendingInputQueue; * android_poll_source structure. These can be read via the inputQueue
ANativeWindow* pendingWindow; * object of android_app.
ARect pendingContentRect; */
}; LOOPER_ID_INPUT = 2,
enum { /**
/** * Start of user-defined ALooper identifiers.
* Looper data ID of commands coming from the app's main thread, which */
* is returned as an identifier from ALooper_pollOnce(). The data for this LOOPER_ID_USER = 3,
* identifier is a pointer to an android_poll_source structure. };
* These can be retrieved and processed with android_app_read_cmd()
* and android_app_exec_cmd().
*/
LOOPER_ID_MAIN = 1,
/** enum {
* Looper data ID of events coming from the AInputQueue of the /**
* application's window, which is returned as an identifier from * Command from main thread: the AInputQueue has changed. Upon processing
* ALooper_pollOnce(). The data for this identifier is a pointer to an * this command, android_app->inputQueue will be updated to the new queue
* android_poll_source structure. These can be read via the inputQueue * (or NULL).
* object of android_app. */
*/ APP_CMD_INPUT_CHANGED,
LOOPER_ID_INPUT = 2,
/** /**
* Start of user-defined ALooper identifiers. * Command from main thread: a new ANativeWindow is ready for use. Upon
*/ * receiving this command, android_app->window will contain the new window
LOOPER_ID_USER = 3, * surface.
}; */
APP_CMD_INIT_WINDOW,
enum { /**
/** * Command from main thread: the existing ANativeWindow needs to be
* Command from main thread: the AInputQueue has changed. Upon processing * terminated. Upon receiving this command, android_app->window still
* this command, android_app->inputQueue will be updated to the new queue * contains the existing window; after calling android_app_exec_cmd
* (or NULL). * it will be set to NULL.
*/ */
APP_CMD_INPUT_CHANGED, APP_CMD_TERM_WINDOW,
/** /**
* Command from main thread: a new ANativeWindow is ready for use. Upon * Command from main thread: the current ANativeWindow has been resized.
* receiving this command, android_app->window will contain the new window * Please redraw with its new size.
* surface. */
*/ APP_CMD_WINDOW_RESIZED,
APP_CMD_INIT_WINDOW,
/** /**
* Command from main thread: the existing ANativeWindow needs to be * Command from main thread: the system needs that the current ANativeWindow
* terminated. Upon receiving this command, android_app->window still * be redrawn. You should redraw the window before handing this to
* contains the existing window; after calling android_app_exec_cmd * android_app_exec_cmd() in order to avoid transient drawing glitches.
* it will be set to NULL. */
*/ APP_CMD_WINDOW_REDRAW_NEEDED,
APP_CMD_TERM_WINDOW,
/** /**
* Command from main thread: the current ANativeWindow has been resized. * Command from main thread: the content area of the window has changed,
* Please redraw with its new size. * such as from the soft input window being shown or hidden. You can
*/ * find the new content rect in android_app::contentRect.
APP_CMD_WINDOW_RESIZED, */
APP_CMD_CONTENT_RECT_CHANGED,
/** /**
* Command from main thread: the system needs that the current ANativeWindow * Command from main thread: the app's activity window has gained
* be redrawn. You should redraw the window before handing this to * input focus.
* android_app_exec_cmd() in order to avoid transient drawing glitches. */
*/ APP_CMD_GAINED_FOCUS,
APP_CMD_WINDOW_REDRAW_NEEDED,
/** /**
* Command from main thread: the content area of the window has changed, * Command from main thread: the app's activity window has lost
* such as from the soft input window being shown or hidden. You can * input focus.
* find the new content rect in android_app::contentRect. */
*/ APP_CMD_LOST_FOCUS,
APP_CMD_CONTENT_RECT_CHANGED,
/** /**
* Command from main thread: the app's activity window has gained * Command from main thread: the current device configuration has changed.
* input focus. */
*/ APP_CMD_CONFIG_CHANGED,
APP_CMD_GAINED_FOCUS,
/** /**
* Command from main thread: the app's activity window has lost * Command from main thread: the system is running low on memory.
* input focus. * Try to reduce your memory use.
*/ */
APP_CMD_LOST_FOCUS, APP_CMD_LOW_MEMORY,
/** /**
* Command from main thread: the current device configuration has changed. * Command from main thread: the app's activity has been started.
*/ */
APP_CMD_CONFIG_CHANGED, APP_CMD_START,
/** /**
* Command from main thread: the system is running low on memory. * Command from main thread: the app's activity has been resumed.
* Try to reduce your memory use. */
*/ APP_CMD_RESUME,
APP_CMD_LOW_MEMORY,
/** /**
* Command from main thread: the app's activity has been started. * Command from main thread: the app should generate a new saved state
*/ * for itself, to restore from later if needed. If you have saved state,
APP_CMD_START, * allocate it with malloc and place it in android_app.savedState with
* the size in android_app.savedStateSize. The will be freed for you
* later.
*/
APP_CMD_SAVE_STATE,
/** /**
* Command from main thread: the app's activity has been resumed. * Command from main thread: the app's activity has been paused.
*/ */
APP_CMD_RESUME, APP_CMD_PAUSE,
/** /**
* Command from main thread: the app should generate a new saved state * Command from main thread: the app's activity has been stopped.
* for itself, to restore from later if needed. If you have saved state, */
* allocate it with malloc and place it in android_app.savedState with APP_CMD_STOP,
* the size in android_app.savedStateSize. The will be freed for you
* later.
*/
APP_CMD_SAVE_STATE,
/** /**
* Command from main thread: the app's activity has been paused. * Command from main thread: the app's activity is being destroyed,
*/ * and waiting for the app thread to clean up and exit before proceeding.
APP_CMD_PAUSE, */
APP_CMD_DESTROY,
};
/** /**
* Command from main thread: the app's activity has been stopped. * Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next
*/ * app command message.
APP_CMD_STOP, */
int8_t android_app_read_cmd(struct android_app* android_app);
/** /**
* Command from main thread: the app's activity is being destroyed, * Call with the command returned by android_app_read_cmd() to do the
* and waiting for the app thread to clean up and exit before proceeding. * initial pre-processing of the given command. You can perform your own
*/ * actions for the command after calling this function.
APP_CMD_DESTROY, */
}; void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd);
/** /**
* Call when ALooper_pollAll() returns LOOPER_ID_MAIN, reading the next * Call with the command returned by android_app_read_cmd() to do the
* app command message. * final post-processing of the given command. You must have done your own
*/ * actions for the command before calling this function.
int8_t android_app_read_cmd(struct android_app* android_app); */
void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd);
/** /**
* Call with the command returned by android_app_read_cmd() to do the * Dummy function you can call to ensure glue code isn't stripped.
* initial pre-processing of the given command. You can perform your own */
* actions for the command after calling this function. void app_dummy();
*/
void android_app_pre_exec_cmd(struct android_app* android_app, int8_t cmd);
/** /**
* Call with the command returned by android_app_read_cmd() to do the * This is the function that application code must implement, representing
* final post-processing of the given command. You must have done your own * the main entry to the app.
* actions for the command before calling this function. */
*/ extern void android_main(struct android_app* app);
void android_app_post_exec_cmd(struct android_app* android_app, int8_t cmd);
/**
* Dummy function you can call to ensure glue code isn't stripped.
*/
void app_dummy();
/**
* This is the function that application code must implement, representing
* the main entry to the app.
*/
extern void android_main(struct android_app* app);
#ifdef __cplusplus #ifdef __cplusplus
} }