diff options
author | Thomas Martitz <kugel@rockbox.org> | 2010-11-06 01:01:01 +0000 |
---|---|---|
committer | Thomas Martitz <kugel@rockbox.org> | 2010-11-06 01:01:01 +0000 |
commit | 988bdc1cc4d4cbe88da848de80d79aeac195464e (patch) | |
tree | 123bbcdd00fbe1ed9d43b304ccb13e8346980564 /apps/hosted/keyboard.c | |
parent | be51be6a9917574db9cf8fe69089cdb44d5b1eb3 (diff) | |
download | rockbox-988bdc1cc4d4cbe88da848de80d79aeac195464e.tar.gz rockbox-988bdc1cc4d4cbe88da848de80d79aeac195464e.zip |
Android: Use wakeup objects instead of polling for the dialog results in the keyboard and yesno dialog, allowing a lot of code to be removed.
First part of FS#11708
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@28512 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/hosted/keyboard.c')
-rw-r--r-- | apps/hosted/keyboard.c | 66 |
1 files changed, 41 insertions, 25 deletions
diff --git a/apps/hosted/keyboard.c b/apps/hosted/keyboard.c index 2b77825af0..6cc14d654f 100644 --- a/apps/hosted/keyboard.c +++ b/apps/hosted/keyboard.c @@ -23,21 +23,40 @@ #if (CONFIG_PLATFORM&PLATFORM_ANDROID) #include <jni.h> #include <stdbool.h> -#include <stdio.h> -#include <string.h> -#include <system.h> +#include "string-extra.h" +#include "kernel.h" -extern JNIEnv *env_ptr; -static jclass RockboxKeyboardInput_class; -static jobject RockboxKeyboardInput_instance; -static jmethodID kbd_inputfunc, kbd_result; +extern JNIEnv *env_ptr; +static jclass RockboxKeyboardInput_class; +static jobject RockboxKeyboardInput_instance; +static jmethodID kbd_inputfunc; +static struct wakeup kbd_wakeup; +static bool accepted; +static jstring new_string; + +JNIEXPORT void JNICALL +Java_org_rockbox_RockboxKeyboardInput_put_1result(JNIEnv *env, jobject this, + jboolean _accepted, + jstring _new_string) +{ + (void)env;(void)this; + + accepted = (bool)_accepted; + if (accepted) + { + new_string = _new_string; + (*env)->NewGlobalRef(env, new_string); /* prevet GC'ing */ + } + wakeup_signal(&kbd_wakeup); +} static void kdb_init(void) { JNIEnv e = *env_ptr; - jmethodID kbd_is_usable; + static jmethodID kbd_is_usable; if (RockboxKeyboardInput_class == NULL) { + wakeup_init(&kbd_wakeup); /* get the class and its constructor */ RockboxKeyboardInput_class = e->FindClass(env_ptr, "org/rockbox/RockboxKeyboardInput"); @@ -49,12 +68,11 @@ static void kdb_init(void) constructor); kbd_inputfunc = e->GetMethodID(env_ptr, RockboxKeyboardInput_class, "kbd_input", "(Ljava/lang/String;)V"); - kbd_result = e->GetMethodID(env_ptr, RockboxKeyboardInput_class, - "get_result", "()Ljava/lang/String;"); + kbd_is_usable = e->GetMethodID(env_ptr, RockboxKeyboardInput_class, + "is_usable", "()Z"); } + /* need to get it every time incase the activity died/restarted */ - kbd_is_usable = e->GetMethodID(env_ptr, RockboxKeyboardInput_class, - "is_usable", "()Z"); while (!e->CallBooleanMethod(env_ptr, RockboxKeyboardInput_instance, kbd_is_usable)) sleep(HZ/10); @@ -64,24 +82,22 @@ int kbd_input(char* text, int buflen) { JNIEnv e = *env_ptr; jstring str = e->NewStringUTF(env_ptr, text); - jobject ret; - const char* retchars; + const char *utf8_string; kdb_init(); e->CallVoidMethod(env_ptr, RockboxKeyboardInput_instance,kbd_inputfunc,str); - do { - sleep(HZ/10); - ret = e->CallObjectMethod(env_ptr, RockboxKeyboardInput_instance, - kbd_result); - } while (!ret); - - retchars = e->GetStringUTFChars(env_ptr, ret, 0); - if (retchars[0]) - strncpy(text, retchars, buflen); - e->ReleaseStringUTFChars(env_ptr, ret, retchars); + wakeup_wait(&kbd_wakeup, TIMEOUT_BLOCK); + + if (accepted) + { + utf8_string = e->GetStringUTFChars(env_ptr, new_string, 0); + strlcpy(text, utf8_string, buflen); + e->ReleaseStringUTFChars(env_ptr, new_string, utf8_string); + e->DeleteGlobalRef(env_ptr, new_string); + } - return text[0] ? 0 : 1; /* return 0 on success */ + return !accepted; /* return 0 on success */ } int load_kbd(unsigned char* filename) |