Add ANativeWindow API for directly drawing to the surface bits.
Also other cleanup and fixes:
- We now properly set the default window format to 565.
- New APIs to set the window format and flags from native code.
- Tweaked glue for simpler handling of the "destroy" message.
- Um, other stuff.
Change-Id: Id7790a21a2fa9a19b91854d225324a7c1e7c6ade
diff --git a/core/java/android/view/ViewRoot.java b/core/java/android/view/ViewRoot.java
index e980b17..fb45971 100644
--- a/core/java/android/view/ViewRoot.java
+++ b/core/java/android/view/ViewRoot.java
@@ -452,6 +452,7 @@
((RootViewSurfaceTaker)view).willYouTakeTheSurface();
if (mSurfaceHolderCallback != null) {
mSurfaceHolder = new TakenSurfaceHolder();
+ mSurfaceHolder.setFormat(PixelFormat.UNKNOWN);
}
}
Resources resources = mView.getContext().getResources();
@@ -754,7 +755,7 @@
// object is not initialized to its backing store, but soon it
// will be (assuming the window is visible).
attachInfo.mSurface = mSurface;
- attachInfo.mTranslucentWindow = lp.format != PixelFormat.OPAQUE;
+ attachInfo.mTranslucentWindow = PixelFormat.formatHasAlpha(lp.format);
attachInfo.mHasWindowFocus = false;
attachInfo.mWindowVisibility = viewVisibility;
attachInfo.mRecomputeGlobalAttributes = false;
@@ -926,8 +927,6 @@
if (mSurfaceHolder != null) {
mSurfaceHolder.mSurfaceLock.lock();
mDrawingAllowed = true;
- lp.format = mSurfaceHolder.getRequestedFormat();
- lp.type = mSurfaceHolder.getRequestedType();
}
boolean initialized = false;
diff --git a/core/jni/android_app_NativeActivity.cpp b/core/jni/android_app_NativeActivity.cpp
index af61b80..54a9c2a 100644
--- a/core/jni/android_app_NativeActivity.cpp
+++ b/core/jni/android_app_NativeActivity.cpp
@@ -21,7 +21,8 @@
#include <dlfcn.h>
#include <android_runtime/AndroidRuntime.h>
-#include <android/native_activity.h>
+#include <android_runtime/android_view_Surface.h>
+#include <android_runtime/android_app_NativeActivity.h>
#include <surfaceflinger/Surface.h>
#include <ui/egl/android_natives.h>
#include <ui/InputTransport.h>
@@ -31,7 +32,6 @@
#include "android_os_MessageQueue.h"
#include "android_view_InputChannel.h"
#include "android_view_KeyEvent.h"
-#include "android_view_Surface.h"
namespace android
{
@@ -46,6 +46,48 @@
// ------------------------------------------------------------------------
+struct ActivityWork {
+ int32_t cmd;
+ int32_t arg1;
+ int32_t arg2;
+};
+
+enum {
+ CMD_DEF_KEY = 1,
+ CMD_SET_WINDOW_FORMAT,
+ CMD_SET_WINDOW_FLAGS,
+};
+
+static void write_work(int fd, int32_t cmd, int32_t arg1=0, int32_t arg2=0) {
+ ActivityWork work;
+ work.cmd = cmd;
+ work.arg1 = arg1;
+ work.arg2 = arg2;
+
+restart:
+ int res = write(fd, &work, sizeof(work));
+ if (res < 0 && errno == EINTR) {
+ goto restart;
+ }
+
+ if (res == sizeof(work)) return;
+
+ if (res < 0) LOGW("Failed writing to work fd: %s", strerror(errno));
+ else LOGW("Truncated writing to work fd: %d", res);
+}
+
+static bool read_work(int fd, ActivityWork* outWork) {
+ int res = read(fd, outWork, sizeof(ActivityWork));
+ // no need to worry about EINTR, poll loop will just come back again.
+ if (res == sizeof(ActivityWork)) return true;
+
+ if (res < 0) LOGW("Failed reading work fd: %s", strerror(errno));
+ else LOGW("Truncated reading work fd: %d", res);
+ return false;
+}
+
+// ------------------------------------------------------------------------
+
/*
* Specialized input queue that allows unhandled key events to be dispatched
* back to the native activity's Java framework code.
@@ -59,8 +101,7 @@
mLock.lock();
LOGI("Default key: pending=%d write=%d\n", mPendingKeys.size(), mWorkWrite);
if (mPendingKeys.size() <= 0 && mWorkWrite >= 0) {
- int8_t cmd = 1;
- write(mWorkWrite, &cmd, sizeof(cmd));
+ write_work(mWorkWrite, CMD_DEF_KEY);
}
mPendingKeys.add(keyEvent);
mLock.unlock();
@@ -90,9 +131,9 @@
/*
* Native state for interacting with the NativeActivity class.
*/
-struct NativeCode {
+struct NativeCode : public ANativeActivity {
NativeCode(void* _dlhandle, ANativeActivity_createFunc* _createFunc) {
- memset(&activity, sizeof(activity), 0);
+ memset((ANativeActivity*)this, sizeof(ANativeActivity), 0);
memset(&callbacks, sizeof(callbacks), 0);
dlhandle = _dlhandle;
createActivityFunc = _createFunc;
@@ -103,8 +144,11 @@
}
~NativeCode() {
- if (activity.env != NULL && activity.clazz != NULL) {
- activity.env->DeleteGlobalRef(activity.clazz);
+ if (callbacks.onDestroy != NULL) {
+ callbacks.onDestroy(this);
+ }
+ if (env != NULL && clazz != NULL) {
+ env->DeleteGlobalRef(clazz);
}
if (pollLoop != NULL && mainWorkRead >= 0) {
pollLoop->removeCallback(mainWorkRead);
@@ -114,9 +158,6 @@
}
setSurface(NULL);
setInputChannel(NULL);
- if (callbacks.onDestroy != NULL) {
- callbacks.onDestroy(&activity);
- }
if (mainWorkRead >= 0) close(mainWorkRead);
if (mainWorkWrite >= 0) close(mainWorkWrite);
if (dlhandle != NULL) {
@@ -129,7 +170,7 @@
void setSurface(jobject _surface) {
if (_surface != NULL) {
- nativeWindow = android_Surface_getNativeWindow(activity.env, _surface);
+ nativeWindow = android_Surface_getNativeWindow(env, _surface);
} else {
nativeWindow = NULL;
}
@@ -138,14 +179,14 @@
status_t setInputChannel(jobject _channel) {
if (inputChannel != NULL) {
delete nativeInputQueue;
- activity.env->DeleteGlobalRef(inputChannel);
+ env->DeleteGlobalRef(inputChannel);
}
inputChannel = NULL;
nativeInputQueue = NULL;
if (_channel != NULL) {
- inputChannel = activity.env->NewGlobalRef(_channel);
+ inputChannel = env->NewGlobalRef(_channel);
sp<InputChannel> ic =
- android_view_InputChannel_getInputChannel(activity.env, _channel);
+ android_view_InputChannel_getInputChannel(env, _channel);
if (ic != NULL) {
nativeInputQueue = new MyInputQueue(ic, mainWorkWrite);
if (nativeInputQueue->getConsumer().initialize() != android::OK) {
@@ -160,7 +201,6 @@
return OK;
}
- ANativeActivity activity;
ANativeActivityCallbacks callbacks;
void* dlhandle;
@@ -179,6 +219,18 @@
sp<PollLoop> pollLoop;
};
+void android_NativeActivity_setWindowFormat(
+ ANativeActivity* activity, int32_t format) {
+ NativeCode* code = static_cast<NativeCode*>(activity);
+ write_work(code->mainWorkWrite, CMD_SET_WINDOW_FORMAT, format);
+}
+
+void android_NativeActivity_setWindowFlags(
+ ANativeActivity* activity, int32_t values, int32_t mask) {
+ NativeCode* code = static_cast<NativeCode*>(activity);
+ write_work(code->mainWorkWrite, CMD_SET_WINDOW_FLAGS, values, mask);
+}
+
// ------------------------------------------------------------------------
/*
@@ -186,19 +238,40 @@
*/
static bool mainWorkCallback(int fd, int events, void* data) {
NativeCode* code = (NativeCode*)data;
- if ((events & POLLIN) != 0) {
- KeyEvent* keyEvent;
- while ((keyEvent=code->nativeInputQueue->getNextEvent()) != NULL) {
- jobject inputEventObj = android_view_KeyEvent_fromNative(
- code->activity.env, keyEvent);
- code->activity.env->CallVoidMethod(code->activity.clazz,
- gNativeActivityClassInfo.dispatchUnhandledKeyEvent, inputEventObj);
- int32_t res = code->nativeInputQueue->getConsumer().sendFinishedSignal();
- if (res != OK) {
- LOGW("Failed to send finished signal on channel '%s'. status=%d",
- code->nativeInputQueue->getConsumer().getChannel()->getName().string(), res);
+ if ((events & POLLIN) == 0) {
+ return true;
+ }
+
+ ActivityWork work;
+ if (!read_work(code->mainWorkRead, &work)) {
+ return true;
+ }
+ switch (work.cmd) {
+ case CMD_DEF_KEY: {
+ KeyEvent* keyEvent;
+ while ((keyEvent=code->nativeInputQueue->getNextEvent()) != NULL) {
+ jobject inputEventObj = android_view_KeyEvent_fromNative(
+ code->env, keyEvent);
+ code->env->CallVoidMethod(code->clazz,
+ gNativeActivityClassInfo.dispatchUnhandledKeyEvent, inputEventObj);
+ int32_t res = code->nativeInputQueue->getConsumer().sendFinishedSignal();
+ if (res != OK) {
+ LOGW("Failed to send finished signal on channel '%s'. status=%d",
+ code->nativeInputQueue->getConsumer().getChannel()->getName().string(), res);
+ }
}
- }
+ } break;
+ case CMD_SET_WINDOW_FORMAT: {
+ code->env->CallVoidMethod(code->clazz,
+ gNativeActivityClassInfo.setWindowFormat, work.arg1);
+ } break;
+ case CMD_SET_WINDOW_FLAGS: {
+ code->env->CallVoidMethod(code->clazz,
+ gNativeActivityClassInfo.setWindowFlags, work.arg1, work.arg2);
+ } break;
+ default:
+ LOGW("Unknown work command: %d", work.cmd);
+ break;
}
return true;
@@ -243,28 +316,28 @@
code->mainWorkWrite = msgpipe[1];
code->pollLoop->setCallback(code->mainWorkRead, POLLIN, mainWorkCallback, code);
- code->activity.callbacks = &code->callbacks;
- if (env->GetJavaVM(&code->activity.vm) < 0) {
+ code->ANativeActivity::callbacks = &code->callbacks;
+ if (env->GetJavaVM(&code->vm) < 0) {
LOGW("NativeActivity GetJavaVM failed");
delete code;
return 0;
}
- code->activity.env = env;
- code->activity.clazz = env->NewGlobalRef(clazz);
+ code->env = env;
+ code->clazz = env->NewGlobalRef(clazz);
const char* dirStr = env->GetStringUTFChars(internalDataDir, NULL);
code->internalDataPath = dirStr;
- code->activity.internalDataPath = code->internalDataPath.string();
+ code->internalDataPath = code->internalDataPath.string();
env->ReleaseStringUTFChars(path, dirStr);
dirStr = env->GetStringUTFChars(externalDataDir, NULL);
code->externalDataPath = dirStr;
- code->activity.externalDataPath = code->externalDataPath.string();
+ code->externalDataPath = code->externalDataPath.string();
env->ReleaseStringUTFChars(path, dirStr);
- code->activity.sdkVersion = sdkVersion;
+ code->sdkVersion = sdkVersion;
- code->createActivityFunc(&code->activity, NULL, 0);
+ code->createActivityFunc(code, NULL, 0);
}
return (jint)code;
@@ -285,7 +358,7 @@
if (handle != 0) {
NativeCode* code = (NativeCode*)handle;
if (code->callbacks.onStart != NULL) {
- code->callbacks.onStart(&code->activity);
+ code->callbacks.onStart(code);
}
}
}
@@ -296,7 +369,7 @@
if (handle != 0) {
NativeCode* code = (NativeCode*)handle;
if (code->callbacks.onResume != NULL) {
- code->callbacks.onResume(&code->activity);
+ code->callbacks.onResume(code);
}
}
}
@@ -308,7 +381,7 @@
NativeCode* code = (NativeCode*)handle;
if (code->callbacks.onSaveInstanceState != NULL) {
size_t len = 0;
- code->callbacks.onSaveInstanceState(&code->activity, &len);
+ code->callbacks.onSaveInstanceState(code, &len);
}
}
}
@@ -319,7 +392,7 @@
if (handle != 0) {
NativeCode* code = (NativeCode*)handle;
if (code->callbacks.onPause != NULL) {
- code->callbacks.onPause(&code->activity);
+ code->callbacks.onPause(code);
}
}
}
@@ -330,7 +403,7 @@
if (handle != 0) {
NativeCode* code = (NativeCode*)handle;
if (code->callbacks.onStop != NULL) {
- code->callbacks.onStop(&code->activity);
+ code->callbacks.onStop(code);
}
}
}
@@ -341,7 +414,7 @@
if (handle != 0) {
NativeCode* code = (NativeCode*)handle;
if (code->callbacks.onLowMemory != NULL) {
- code->callbacks.onLowMemory(&code->activity);
+ code->callbacks.onLowMemory(code);
}
}
}
@@ -352,7 +425,7 @@
if (handle != 0) {
NativeCode* code = (NativeCode*)handle;
if (code->callbacks.onWindowFocusChanged != NULL) {
- code->callbacks.onWindowFocusChanged(&code->activity, focused ? 1 : 0);
+ code->callbacks.onWindowFocusChanged(code, focused ? 1 : 0);
}
}
}
@@ -364,7 +437,7 @@
NativeCode* code = (NativeCode*)handle;
code->setSurface(surface);
if (code->nativeWindow != NULL && code->callbacks.onNativeWindowCreated != NULL) {
- code->callbacks.onNativeWindowCreated(&code->activity,
+ code->callbacks.onNativeWindowCreated(code,
code->nativeWindow.get());
}
}
@@ -380,11 +453,11 @@
code->setSurface(surface);
if (oldNativeWindow != code->nativeWindow) {
if (oldNativeWindow != NULL && code->callbacks.onNativeWindowDestroyed != NULL) {
- code->callbacks.onNativeWindowDestroyed(&code->activity,
+ code->callbacks.onNativeWindowDestroyed(code,
oldNativeWindow.get());
}
if (code->nativeWindow != NULL && code->callbacks.onNativeWindowCreated != NULL) {
- code->callbacks.onNativeWindowCreated(&code->activity,
+ code->callbacks.onNativeWindowCreated(code,
code->nativeWindow.get());
}
}
@@ -397,7 +470,7 @@
if (handle != 0) {
NativeCode* code = (NativeCode*)handle;
if (code->nativeWindow != NULL && code->callbacks.onNativeWindowDestroyed != NULL) {
- code->callbacks.onNativeWindowDestroyed(&code->activity,
+ code->callbacks.onNativeWindowDestroyed(code,
code->nativeWindow.get());
}
code->setSurface(NULL);
@@ -416,7 +489,7 @@
return;
}
if (code->callbacks.onInputQueueCreated != NULL) {
- code->callbacks.onInputQueueCreated(&code->activity,
+ code->callbacks.onInputQueueCreated(code,
code->nativeInputQueue);
}
}
@@ -429,7 +502,7 @@
NativeCode* code = (NativeCode*)handle;
if (code->nativeInputQueue != NULL
&& code->callbacks.onInputQueueDestroyed != NULL) {
- code->callbacks.onInputQueueDestroyed(&code->activity,
+ code->callbacks.onInputQueueDestroyed(code,
code->nativeInputQueue);
}
code->setInputChannel(NULL);
diff --git a/core/jni/android_view_Surface.cpp b/core/jni/android_view_Surface.cpp
index a82abc93..7305032 100644
--- a/core/jni/android_view_Surface.cpp
+++ b/core/jni/android_view_Surface.cpp
@@ -33,7 +33,7 @@
#include "jni.h"
#include <android_runtime/AndroidRuntime.h>
-#include "android_view_Surface.h"
+#include <android_runtime/android_view_Surface.h>
#include <utils/misc.h>
diff --git a/core/jni/android_view_Surface.h b/core/jni/android_view_Surface.h
deleted file mode 100644
index c37932e..0000000
--- a/core/jni/android_view_Surface.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (C) 2010 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef _ANDROID_VIEW_SURFACE_H
-#define _ANDROID_VIEW_SURFACE_H
-
-#include <android/native_window.h>
-
-#include "jni.h"
-
-namespace android {
-
-extern sp<ANativeWindow> android_Surface_getNativeWindow(
- JNIEnv* env, jobject clazz);
-
-} // namespace android
-
-#endif // _ANDROID_VIEW_SURFACE_H
diff --git a/core/jni/com_google_android_gles_jni_EGLImpl.cpp b/core/jni/com_google_android_gles_jni_EGLImpl.cpp
index 866c038..941ed63 100644
--- a/core/jni/com_google_android_gles_jni_EGLImpl.cpp
+++ b/core/jni/com_google_android_gles_jni_EGLImpl.cpp
@@ -16,6 +16,7 @@
*/
#include <android_runtime/AndroidRuntime.h>
+#include <android_runtime/android_view_Surface.h>
#include <utils/misc.h>
#include <EGL/egl.h>
@@ -25,8 +26,6 @@
#include <SkBitmap.h>
#include <SkPixelRef.h>
-#include "android_view_Surface.h"
-
namespace android {
static jclass gDisplay_class;