Merge pull request #66 from dcampbell-macadamian/TIMOB-8990

TIMOB-8990: Ti functions don't work in event callbacks
Macadamian · Jun 1, 2012 · 71aa8b1 · 71aa8b1
2 parents 23f6cc5 + 29b4d98
commit 71aa8b1
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/blackberry/tibb/TiRootObject.cpp b/blackberry/tibb/TiRootObject.cpp
@@ -52,19 +52,20 @@ TiRootObject* TiRootObject::createRootObject()
     return obj;
 }
 
-int TiRootObject::executeScript(NativeObjectFactory* objectFactory, const char* javaScript)
+int TiRootObject::executeScript(NativeObjectFactory* objectFactory, const char* javaScript,
+                                MESSAGELOOPENTRY messageLoopEntry, void* context)
 {
     HandleScope handleScope;
     objectFactory_ = objectFactory;
     initializeTiObject(NULL);
     globalTemplate_ = ObjectTemplate::New();
-    globalTemplate_->SetInternalFieldCount(2);
     TiV8EventContainerFactory* eventFactory = TiV8EventContainerFactory::createEventContainerFactory(globalTemplate_);
     objectFactory->setEventContainerFactory(eventFactory);
     onSetGetPropertyCallback(&globalTemplate_);
     onSetFunctionCallback(&globalTemplate_);
     context_ = Context::New(NULL, globalTemplate_);
     context_->Global()->SetHiddenValue(String::New("globalTemplate_"), External::New(&globalTemplate_));
+    context_->Global()->SetHiddenValue(String::New("context_"), External::New(&context_));
     setTiObjectToJsObject(context_->Global(), this);
     Context::Scope context_scope(context_);
 
@@ -85,7 +86,7 @@ int TiRootObject::executeScript(NativeObjectFactory* objectFactory, const char*
         return -1;
     }
     onStartMessagePump();
-    return 0;
+    return (messageLoopEntry)(context);
 }
 
 /* Methods defined by Global */

diff --git a/blackberry/tibb/TiRootObject.h b/blackberry/tibb/TiRootObject.h
@@ -18,11 +18,15 @@ struct FUNCTION_ENTRY;
  *
  * Root namespace in Titanium
  */
+
+typedef int (*MESSAGELOOPENTRY)(void*);
+
 class TiRootObject : public TiObject
 {
 public:
     static TiRootObject* createRootObject();
-    int executeScript(NativeObjectFactory* objectFactory, const char* javaScript);
+    int executeScript(NativeObjectFactory* objectFactory, const char* javaScript,
+                      MESSAGELOOPENTRY messageLoopEntry, void* context);
 
 protected:
     virtual ~TiRootObject();

diff --git a/blackberry/tibb/TitaniumRuntime.cpp b/blackberry/tibb/TitaniumRuntime.cpp
@@ -56,18 +56,26 @@ int TitaniumRuntime::internalRun(int argc, char** argv)
     TiCascadesApp mainApp;
     mainApp.initializeApp();
     NativeObjectFactory objFactory(&mainApp);
-    obj->executeScript(&objFactory, javaScript_);
-    NativeObject* nativeObject = objFactory.getRootContainer();
-    mainApp.setScene(nativeObject);
-    if (nativeObject != NULL)
-    {
-        nativeObject->release();
-    }
-    // TODO: implement a message pump here
-    return bb::cascades::Application::exec();
+    objectFactory_ = &objFactory;
+    mainApp_ = &mainApp;
+    int ret = obj->executeScript(&objFactory, javaScript_, messageLoop, this);
+    // TODO: handle non-zero return code here
+    return ret;
 }
 
 void TitaniumRuntime::Log(const char* msg)
 {
     fprintf(stderr, "%s\n", msg);
 }
+
+int TitaniumRuntime::messageLoop(void* context)
+{
+    TitaniumRuntime* self = (TitaniumRuntime*)context;
+    NativeObject* nativeObject = self->objectFactory_->getRootContainer();
+    self->mainApp_->setScene(nativeObject);
+    if (nativeObject != NULL)
+    {
+        nativeObject->release();
+    }
+    return bb::cascades::Application::exec();
+}
diff --git a/blackberry/tibb/TitaniumRuntime.h b/blackberry/tibb/TitaniumRuntime.h
@@ -17,6 +17,9 @@
  * Main runtime startup class
  */
 
+class NativeObjectFactory;
+class TiCascadesApp;
+
 class TitaniumRuntime
 {
 public:
@@ -28,9 +31,12 @@ class TitaniumRuntime
     virtual ~TitaniumRuntime();
     int internalRun(int argc, char** argv);
     void Log(const char* msg);
+    static int messageLoop(void* context);
 
     char* javaScript_;
     TiObjectScope rootObject_;
+    NativeObjectFactory* objectFactory_;
+    TiCascadesApp* mainApp_;
 };
 
 #endif /* TITANIUMRUNTIME_H_ */