mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-27 08:52:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Atlas: Updated wxJS to latest SVN version. Made the JS runtime have a greater lifetime than all the wx windows, to avoid garbage collection problems.

Browse Source 
IGUIObject: Cache the JSObject*, to prevent some frequent allocation
while running GUI scripts.
JSInterface_IGUIObject: Fixed garbage collection issues.
JSInterface_IGUIObject, ScriptGlue: Changed to the JS_THREADSAFE form of
JS_GetClass.
Util: Avoid startup warnings on Linux caused by using unimplemented
cpu_* functions that aren't needed for anything important yet.
sysdep/unix: Changed to native line endings.

This was SVN commit r5154.
This commit is contained in:
Ykkrosh
2007-06-08 22:56:01 +00:00
parent d416b6ac83
commit 53bcba3368
363 changed files with 69026 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/tools/atlas/AtlasScript/ScriptInterface.cpp
+41 -19
View File
@@ -10,7 +10,7 @@
#include "wxJS/ext/jsmembuf.h"
#include "wxJS/io/init.h"
#include "wxJS/gui/init.h"
#include "wxJS/gui/control/window.h"
#include "wxJS/gui/control/panel.h"
#include "GameInterface/Shareable.h"
#include "GameInterface/Messages.h"
@@ -70,6 +70,14 @@ template<> bool ScriptInterface::FromJSVal<std::wstring>(JSContext* cx, jsval v,
return true;
}
template<> bool ScriptInterface::FromJSVal<std::string>(JSContext* cx, jsval v, std::string& out)
{
JSString* ret = JS_ValueToString(cx, v); // never returns NULL
char* ch = JS_GetStringBytes(ret);
out = std::string(ch);
return true;
}
template<> jsval ScriptInterface::ToJSVal<float>(JSContext* cx, const float& val)
{
@@ -130,9 +138,10 @@ namespace
}
logMessage << wxString::FromAscii(message);
if (isWarning)
wxLogWarning(logMessage);
wxLogWarning(_T("%s"), logMessage.c_str());
else
wxLogError(logMessage);
wxLogError(_T("%s"), logMessage.c_str());
wxPrintf(_T("wxJS %s: %s\n--------\n"), isWarning ? _T("warning") : _T("error"), logMessage.c_str());
}
JSBool LoadScript(JSContext* cx, JSObject* obj, uintN argc, jsval* argv, jsval* rval)
@@ -157,6 +166,24 @@ namespace
return JS_TRUE;
}
JSBool ForceGC(JSContext* cx, JSObject* WXUNUSED(obj), uintN WXUNUSED(argc), jsval* WXUNUSED(argv), jsval* WXUNUSED(rval))
{
JS_GC(cx);
return JS_TRUE;
}
JSBool print(JSContext* cx, JSObject* WXUNUSED(obj), uintN argc, jsval* argv, jsval* WXUNUSED(rval))
{
for (uintN i = 0; i < argc; ++i)
{
std::string str;
if (! ScriptInterface::FromJSVal(cx, argv[i], str))
return JS_FALSE;
printf("%s", str.c_str());
}
return JS_TRUE;
}
}
ScriptInterface_impl::ScriptInterface_impl()
@@ -185,9 +212,12 @@ ScriptInterface_impl::ScriptInterface_impl()
wxjs::io::InitClass(m_cx, m_glob);
wxjs::ext::MemoryBuffer::JSInit(m_cx, m_glob);
JS_DefineFunction(m_cx, m_glob, "print", ::print, 0, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_PERMANENT);
m_atlas = JS_DefineObject(m_cx, m_glob, "Atlas", NULL, NULL, JSPROP_READONLY|JSPROP_PERMANENT);
JS_DefineFunction(m_cx, m_atlas, "LoadScript", ::LoadScript, 2, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_PERMANENT);
JS_DefineFunction(m_cx, m_atlas, "ForceGC", ::ForceGC, 0, JSPROP_ENUMERATE|JSPROP_READONLY|JSPROP_PERMANENT);
RegisterMessages(m_atlas);
}
@@ -227,16 +257,6 @@ void ScriptInterface::Register(const char* name, JSNative fptr, size_t nargs)
m->Register(name, fptr, nargs);
}
// wxJS requires an object that's a wxWindow* and also a wxjs::Object*,
// so define one based on wxPanel
struct WindowWrapper : public wxPanel, wxjs::Object
{
WindowWrapper(wxWindow* parent)
: wxPanel(parent, -1)
{
}
};
void ScriptInterface::LoadScript(const wxString& filename, const wxString& code)
{
m->LoadScript(filename, code);
@@ -244,13 +264,15 @@ void ScriptInterface::LoadScript(const wxString& filename, const wxString& code)
wxPanel* ScriptInterface::LoadScriptAsPanel(const wxString& name, wxWindow* parent)
{
wxPanel* panel = new WindowWrapper(parent);
jsval jsWindow = wxjs::gui::Window::CreateObject(m->m_cx, panel);
wxPanel* panel = new wxPanel(parent, -1);
JSObject* jsWindow = JSVAL_TO_OBJECT(wxjs::gui::Panel::CreateObject(m->m_cx, panel));
panel->SetClientObject(new wxjs::JavaScriptClientData(m->m_cx, jsWindow, true, false));
jsval jsName = ToJSVal(m->m_cx, name);
const uintN argc = 2;
jsval argv[argc] = { jsName, jsWindow };
jsval argv[argc] = { jsName, OBJECT_TO_JSVAL(jsWindow) };
jsval rval;
JS_CallFunctionName(m->m_cx, m->m_glob, "loadScript", argc, argv, &rval); // TODO: error checking
return panel;