aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

JS_VERSION at least 185 is required for ECMASCript (xulrunner-2.0 or later)

Browse Source 
The code wasn't tested. It compiles
This commit is contained in:
witekfl 2011-04-19 22:41:05 +02:00
parent 9e4d7d1883
commit 2844f8b715
20 changed files with 352 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure.in
View File

@ -652,7 +652,14 @@ if test -z "$disable_spidermonkey"; then
CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS" CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define XP_UNIX AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define XP_UNIX
#include <jsapi.h>]], [[JS_GetReservedSlot(NULL, NULL, 0, NULL)]])],[cf_result=yes],[cf_result=no]) #include <jsapi.h>]], [[
#ifndef JS_VERSION
#error JS_VERSION
#endif
#if JS_VERSION < 185
#error too old
#endif]])],
[cf_result=yes],[cf_result=no])
else else
for spidermonkeydir in "$withval" "" /usr /usr/local /opt/spidermonkey /opt/js; do for spidermonkeydir in "$withval" "" /usr /usr/local /opt/spidermonkey /opt/js; do
for spidermonkeyinclude in "/include" "/include/js" "/include/smjs" "/include/mozjs"; do for spidermonkeyinclude in "/include" "/include/js" "/include/smjs" "/include/mozjs"; do
@ -666,7 +673,15 @@ if test -z "$disable_spidermonkey"; then
CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS" CPPFLAGS="$CPPFLAGS_X $SPIDERMONKEY_CFLAGS"
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define XP_UNIX AC_LINK_IFELSE([AC_LANG_PROGRAM([[#define XP_UNIX
#include <jsapi.h>]], [[JS_GetReservedSlot(NULL, NULL, 0, NULL)]])],[cf_result=yes],[cf_result=no]) #define XP_UNIX
#include <jsapi.h>]], [[
#ifndef JS_VERSION
#error JS_VERSION
#endif
#if JS_VERSION < 185
#error too old
#endif]])],
[cf_result=yes],[cf_result=no])
fi fi
done done
done done

13
src/ecmascript/spidermonkey-shared.h
View File

@ -50,6 +50,7 @@ JSObject *spidermonkey_InitClass(JSContext *cx, JSObject *obj,
static void undef_to_jsval(JSContext *ctx, jsval *vp); static void undef_to_jsval(JSContext *ctx, jsval *vp);
static unsigned char *jsval_to_string(JSContext *ctx, jsval *vp); static unsigned char *jsval_to_string(JSContext *ctx, jsval *vp);
static unsigned char *jsid_to_string(JSContext *ctx, jsid *id);
/* Inline functions */ /* Inline functions */
@ -68,7 +69,17 @@ jsval_to_string(JSContext *ctx, jsval *vp)
return ""; return "";
} }
return empty_string_or_(JS_GetStringBytes(JS_ValueToString(ctx, val))); return empty_string_or_(JS_EncodeString(ctx, JS_ValueToString(ctx, val)));
}
static inline unsigned char *
jsid_to_string(JSContext *ctx, jsid *id)
{
jsval v;
/* TODO: check returned value */
JS_IdToValue(ctx, *id, &v);
return jsval_to_string(ctx, &v);
} }
#endif #endif

11
src/ecmascript/spidermonkey.c
View File

@ -169,19 +169,14 @@ spidermonkey_get_interpreter(struct ecmascript_interpreter *interpreter)
return NULL; return NULL;
interpreter->backend_data = ctx; interpreter->backend_data = ctx;
JS_SetContextPrivate(ctx, interpreter); JS_SetContextPrivate(ctx, interpreter);
/* TODO: Make JSOPTION_STRICT and JSOPTION_WERROR configurable. */ JS_SetOptions(ctx, JSOPTION_VAROBJFIX | JSOPTION_JIT | JSOPTION_METHODJIT);
#ifndef JSOPTION_COMPILE_N_GO JS_SetVersion(ctx, JSVERSION_LATEST);
#define JSOPTION_COMPILE_N_GO 0 /* Older SM versions don't have it. */
#endif
/* XXX: JSOPTION_COMPILE_N_GO will go (will it?) when we implement
* some kind of bytecode cache. (If we will ever do that.) */
JS_SetOptions(ctx, JSOPTION_VAROBJFIX | JSOPTION_COMPILE_N_GO);
JS_SetErrorReporter(ctx, error_reporter); JS_SetErrorReporter(ctx, error_reporter);
#if defined(CONFIG_ECMASCRIPT_SMJS_HEARTBEAT) #if defined(CONFIG_ECMASCRIPT_SMJS_HEARTBEAT)
JS_SetOperationCallback(ctx, heartbeat_callback); JS_SetOperationCallback(ctx, heartbeat_callback);
#endif #endif
window_obj = JS_NewObject(ctx, (JSClass *) &window_class, NULL, NULL); window_obj = JS_NewCompartmentAndGlobalObject(ctx, (JSClass *) &window_class, NULL);
if (!window_obj) goto release_and_fail; if (!window_obj) goto release_and_fail;
if (!JS_InitStandardClasses(ctx, window_obj)) goto release_and_fail; if (!JS_InitStandardClasses(ctx, window_obj)) goto release_and_fail;
if (!JS_DefineProperties(ctx, window_obj, (JSPropertySpec *) window_props)) if (!JS_DefineProperties(ctx, window_obj, (JSPropertySpec *) window_props))

44
src/ecmascript/spidermonkey/document.c
View File

@ -47,8 +47,8 @@
#include "viewer/text/vs.h" #include "viewer/text/vs.h"
static JSBool document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool document_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
static JSBool document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool document_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
/* Each @document_class object must have a @window_class parent. */ /* Each @document_class object must have a @window_class parent. */
const JSClass document_class = { const JSClass document_class = {
@ -81,7 +81,7 @@ const JSPropertySpec document_props[] = {
/* @document_class.getProperty */ /* @document_class.getProperty */
static JSBool static JSBool
document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) document_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
struct view_state *vs; struct view_state *vs;
@ -104,9 +104,9 @@ document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
document = doc_view->document; document = doc_view->document;
ses = doc_view->session; ses = doc_view->session;
if (JSVAL_IS_STRING(id)) { if (JSID_IS_STRING(id)) {
struct form *form; struct form *form;
unsigned char *string = jsval_to_string(ctx, &id); unsigned char *string = jsid_to_string(ctx, &id);
#ifdef CONFIG_COOKIES #ifdef CONFIG_COOKIES
if (!strcmp(string, "cookie")) { if (!strcmp(string, "cookie")) {
@ -135,12 +135,12 @@ document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
return JS_TRUE; return JS_TRUE;
} }
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_DOC_LOC: case JSP_DOC_LOC:
JS_GetProperty(ctx, parent_win, "location", vp); JS_GetProperty(ctx, parent_win, "location", vp);
break; break;
@ -188,7 +188,7 @@ document_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @document_class.setProperty */ /* @document_class.setProperty */
static JSBool static JSBool
document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) document_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
struct view_state *vs; struct view_state *vs;
@ -209,9 +209,9 @@ document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
doc_view = vs->doc_view; doc_view = vs->doc_view;
document = doc_view->document; document = doc_view->document;
if (JSVAL_IS_STRING(id)) { if (JSID_IS_STRING(id)) {
#ifdef CONFIG_COOKIES #ifdef CONFIG_COOKIES
if (!strcmp(jsval_to_string(ctx, &id), "cookie")) { if (!strcmp(jsid_to_string(ctx, &id), "cookie")) {
set_cookie(vs->uri, jsval_to_string(ctx, vp)); set_cookie(vs->uri, jsval_to_string(ctx, vp));
/* Do NOT touch our .cookie property, evil /* Do NOT touch our .cookie property, evil
* SpiderMonkey!! */ * SpiderMonkey!! */
@ -221,10 +221,10 @@ document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
return JS_TRUE; return JS_TRUE;
} }
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_DOC_TITLE: case JSP_DOC_TITLE:
mem_free_set(&document->title, stracpy(jsval_to_string(ctx, vp))); mem_free_set(&document->title, stracpy(jsval_to_string(ctx, vp)));
print_screen_status(doc_view->session); print_screen_status(doc_view->session);
@ -242,8 +242,8 @@ document_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
return JS_TRUE; return JS_TRUE;
} }
static JSBool document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool document_write(JSContext *ctx, uintN argc, jsval *rval);
static JSBool document_writeln(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool document_writeln(JSContext *ctx, uintN argc, jsval *rval);
const spidermonkeyFunctionSpec document_funcs[] = { const spidermonkeyFunctionSpec document_funcs[] = {
{ "write", document_write, 1 }, { "write", document_write, 1 },
@ -252,11 +252,12 @@ const spidermonkeyFunctionSpec document_funcs[] = {
}; };
static JSBool static JSBool
document_write_do(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, document_write_do(JSContext *ctx, uintN argc, jsval *rval, int newline)
jsval *rval, int newline)
{ {
jsval val;
struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx); struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
struct string *ret = interpreter->ret; struct string *ret = interpreter->ret;
jsval *argv = JS_ARGV(ctx, rval);
if (argc >= 1 && ret) { if (argc >= 1 && ret) {
int i = 0; int i = 0;
@ -281,22 +282,23 @@ document_write_do(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv,
set_led_value(interpreter->vs->doc_view->session->status.ecmascript_led, 'J'); set_led_value(interpreter->vs->doc_view->session->status.ecmascript_led, 'J');
#endif #endif
boolean_to_jsval(ctx, rval, 0); boolean_to_jsval(ctx, &val, 0);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
/* @document_funcs{"write"} */ /* @document_funcs{"write"} */
static JSBool static JSBool
document_write(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) document_write(JSContext *ctx, uintN argc, jsval *rval)
{ {
return document_write_do(ctx, obj, argc, argv, rval, 0); return document_write_do(ctx, argc, rval, 0);
} }
/* @document_funcs{"writeln"} */ /* @document_funcs{"writeln"} */
static JSBool static JSBool
document_writeln(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) document_writeln(JSContext *ctx, uintN argc, jsval *rval)
{ {
return document_write_do(ctx, obj, argc, argv, rval, 1); return document_write_do(ctx, argc, rval, 1);
} }

192
src/ecmascript/spidermonkey/form.c
View File

@ -55,8 +55,8 @@ static const JSClass form_class; /* defined below */
* HTMLInputElement. The difference could be spotted only by some clever tricky * HTMLInputElement. The difference could be spotted only by some clever tricky
* JS code, but I hope it doesn't matter anywhere. --pasky */ * JS code, but I hope it doesn't matter anywhere. --pasky */
static JSBool input_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool input_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
static JSBool input_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool input_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
static void input_finalize(JSContext *ctx, JSObject *obj); static void input_finalize(JSContext *ctx, JSObject *obj);
/* Each @input_class object must have a @form_class parent. */ /* Each @input_class object must have a @form_class parent. */
@ -116,10 +116,10 @@ static const JSPropertySpec input_props[] = {
{ NULL } { NULL }
}; };
static JSBool input_blur(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool input_blur(JSContext *ctx, uintN argc, jsval *rval);
static JSBool input_click(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool input_click(JSContext *ctx, uintN argc, jsval *rval);
static JSBool input_focus(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool input_focus(JSContext *ctx, uintN argc, jsval *rval);
static JSBool input_select(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool input_select(JSContext *ctx, uintN argc, jsval *rval);
static const spidermonkeyFunctionSpec input_funcs[] = { static const spidermonkeyFunctionSpec input_funcs[] = {
{ "blur", input_blur, 0 }, { "blur", input_blur, 0 },
@ -150,7 +150,7 @@ input_get_form_state(JSContext *ctx, JSObject *jsinput)
/* @input_class.getProperty */ /* @input_class.getProperty */
static JSBool static JSBool
input_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) input_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
JSObject *parent_form; /* instance of @form_class */ JSObject *parent_form; /* instance of @form_class */
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
@ -189,7 +189,7 @@ input_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
assert(fc); assert(fc);
assert(fc->form && fs); assert(fc->form && fs);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
linknum = get_form_control_link(document, fc); linknum = get_form_control_link(document, fc);
@ -198,7 +198,7 @@ input_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_INPUT_ACCESSKEY: case JSP_INPUT_ACCESSKEY:
{ {
JSString *keystr; JSString *keystr;
@ -301,7 +301,7 @@ input_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @input_class.setProperty */ /* @input_class.setProperty */
static JSBool static JSBool
input_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) input_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
JSObject *parent_form; /* instance of @form_class */ JSObject *parent_form; /* instance of @form_class */
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
@ -341,14 +341,14 @@ input_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
assert(fc); assert(fc);
assert(fc->form && fs); assert(fc->form && fs);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
linknum = get_form_control_link(document, fc); linknum = get_form_control_link(document, fc);
/* Hiddens have no link. */ /* Hiddens have no link. */
if (linknum >= 0) link = &document->links[linknum]; if (linknum >= 0) link = &document->links[linknum];
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_INPUT_ACCESSKEY: case JSP_INPUT_ACCESSKEY:
accesskey = jsval_to_accesskey(ctx, vp); accesskey = jsval_to_accesskey(ctx, vp);
if (accesskey == UCS_NO_CHAR) if (accesskey == UCS_NO_CHAR)
@ -422,7 +422,7 @@ input_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @input_funcs{"blur"} */ /* @input_funcs{"blur"} */
static JSBool static JSBool
input_blur(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) input_blur(JSContext *ctx, uintN argc, jsval *rval)
{ {
/* We are a text-mode browser and there *always* has to be something /* We are a text-mode browser and there *always* has to be something
* selected. So we do nothing for now. (That was easy.) */ * selected. So we do nothing for now. (That was easy.) */
@ -431,11 +431,14 @@ input_blur(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
/* @input_funcs{"click"} */ /* @input_funcs{"click"} */
static JSBool static JSBool
input_click(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) input_click(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
JSObject *parent_form; /* instance of @form_class */ JSObject *parent_form; /* instance of @form_class */
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
struct view_state *vs; struct view_state *vs;
struct document_view *doc_view; struct document_view *doc_view;
struct document *document; struct document *document;
@ -479,17 +482,21 @@ input_click(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
else else
print_screen_status(ses); print_screen_status(ses);
boolean_to_jsval(ctx, rval, 0); boolean_to_jsval(ctx, &val, 0);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
/* @input_funcs{"focus"} */ /* @input_funcs{"focus"} */
static JSBool static JSBool
input_focus(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) input_focus(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
JSObject *parent_form; /* instance of @form_class */ JSObject *parent_form; /* instance of @form_class */
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
struct view_state *vs; struct view_state *vs;
struct document_view *doc_view; struct document_view *doc_view;
struct document *document; struct document *document;
@ -528,13 +535,14 @@ input_focus(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
jump_to_link_number(ses, doc_view, linknum); jump_to_link_number(ses, doc_view, linknum);
boolean_to_jsval(ctx, rval, 0); boolean_to_jsval(ctx, &val, 0);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
/* @input_funcs{"select"} */ /* @input_funcs{"select"} */
static JSBool static JSBool
input_select(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) input_select(JSContext *ctx, uintN argc, jsval *rval)
{ {
/* We support no text selecting yet. So we do nothing for now. /* We support no text selecting yet. So we do nothing for now.
* (That was easy, too.) */ * (That was easy, too.) */
@ -662,19 +670,22 @@ get_form_control_object(JSContext *ctx, JSObject *jsform,
static struct form_view *form_get_form_view(JSContext *ctx, JSObject *jsform, jsval *argv); static struct form_view *form_get_form_view(JSContext *ctx, JSObject *jsform, jsval *argv);
static JSBool form_elements_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool form_elements_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
/* Each @form_elements_class object must have a @form_class parent. */ /* Each @form_elements_class object must have a @form_class parent. */
static const JSClass form_elements_class = { static const JSClass form_elements_class = {
"elements", "elements",
JSCLASS_HAS_PRIVATE, JSCLASS_HAS_PRIVATE,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
form_elements_get_property, JS_PropertyStub, form_elements_get_property, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
}; };
static JSBool form_elements_item(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool form_elements_item2(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
static JSBool form_elements_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool form_elements_namedItem2(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
static JSBool form_elements_item(JSContext *ctx, uintN argc, jsval *rval);
static JSBool form_elements_namedItem(JSContext *ctx, uintN argc, jsval *rval);
static const spidermonkeyFunctionSpec form_elements_funcs[] = { static const spidermonkeyFunctionSpec form_elements_funcs[] = {
{ "item", form_elements_item, 1 }, { "item", form_elements_item, 1 },
@ -696,8 +707,9 @@ static const JSPropertySpec form_elements_props[] = {
/* @form_elements_class.getProperty */ /* @form_elements_class.getProperty */
static JSBool static JSBool
form_elements_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) form_elements_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
jsval idval;
JSObject *parent_form; /* instance of @form_class */ JSObject *parent_form; /* instance of @form_class */
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
@ -730,32 +742,46 @@ form_elements_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
if (!form_view) return JS_FALSE; /* detached */ if (!form_view) return JS_FALSE; /* detached */
form = find_form_by_form_view(document, form_view); form = find_form_by_form_view(document, form_view);
if (JSVAL_IS_STRING(id)) { if (JSID_IS_STRING(id)) {
form_elements_namedItem(ctx, obj, 1, &id, vp); JS_IdToValue(ctx, id, &idval);
form_elements_namedItem2(ctx, obj, 1, &idval, vp);
return JS_TRUE; return JS_TRUE;
} }
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_FORM_ELEMENTS_LENGTH: case JSP_FORM_ELEMENTS_LENGTH:
int_to_jsval(ctx, vp, list_size(&form->items)); int_to_jsval(ctx, vp, list_size(&form->items));
break; break;
default: default:
/* Array index. */ /* Array index. */
form_elements_item(ctx, obj, 1, &id, vp); JS_IdToValue(ctx, id, &idval);
form_elements_item2(ctx, obj, 1, &idval, vp);
break; break;
} }
return JS_TRUE; return JS_TRUE;
} }
static JSBool
form_elements_item(JSContext *ctx, uintN argc, jsval *rval)
{
jsval val;
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
JSBool ret = form_elements_item2(ctx, obj, argc, argv, &val);
JS_SET_RVAL(ctx, rval, val);
return ret;
}
/* @form_elements_funcs{"item"} */ /* @form_elements_funcs{"item"} */
static JSBool static JSBool
form_elements_item(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) form_elements_item2(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
{ {
JSObject *parent_form; /* instance of @form_class */ JSObject *parent_form; /* instance of @form_class */
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
@ -813,9 +839,21 @@ form_elements_item(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval
return JS_TRUE; return JS_TRUE;
} }
static JSBool
form_elements_namedItem(JSContext *ctx, uintN argc, jsval *rval)
{
jsval val;
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
JSBool ret = form_elements_namedItem2(ctx, obj, argc, argv, &val);
JS_SET_RVAL(ctx, rval, val);
return ret;
}
/* @form_elements_funcs{"namedItem"} */ /* @form_elements_funcs{"namedItem"} */
static JSBool static JSBool
form_elements_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) form_elements_namedItem2(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
{ {
JSObject *parent_form; /* instance of @form_class */ JSObject *parent_form; /* instance of @form_class */
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
@ -876,8 +914,8 @@ form_elements_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv,
static JSBool form_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool form_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
static JSBool form_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool form_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
static void form_finalize(JSContext *ctx, JSObject *obj); static void form_finalize(JSContext *ctx, JSObject *obj);
/* Each @form_class object must have a @document_class parent. */ /* Each @form_class object must have a @document_class parent. */
@ -914,8 +952,8 @@ static const JSPropertySpec form_props[] = {
{ NULL } { NULL }
}; };
static JSBool form_reset(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool form_reset(JSContext *ctx, uintN argc, jsval *rval);
static JSBool form_submit(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool form_submit(JSContext *ctx, uintN argc, jsval *rval);
static const spidermonkeyFunctionSpec form_funcs[] = { static const spidermonkeyFunctionSpec form_funcs[] = {
{ "reset", form_reset, 0 }, { "reset", form_reset, 0 },
@ -940,7 +978,7 @@ form_get_form_view(JSContext *ctx, JSObject *jsform, jsval *argv)
/* @form_class.getProperty */ /* @form_class.getProperty */
static JSBool static JSBool
form_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) form_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
/* DBG("doc %p %s\n", parent_doc, JS_GetStringBytes(JS_ValueToString(ctx, OBJECT_TO_JSVAL(parent_doc)))); */ /* DBG("doc %p %s\n", parent_doc, JS_GetStringBytes(JS_ValueToString(ctx, OBJECT_TO_JSVAL(parent_doc)))); */
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
@ -971,11 +1009,11 @@ form_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
assert(form); assert(form);
if (JSVAL_IS_STRING(id)) { if (JSID_IS_STRING(id)) {
struct form_control *fc; struct form_control *fc;
unsigned char *string; unsigned char *string;
string = jsval_to_string(ctx, &id); string = jsid_to_string(ctx, &id);
foreach (fc, form->items) { foreach (fc, form->items) {
JSObject *fcobj = NULL; JSObject *fcobj = NULL;
struct form_state *fs; struct form_state *fs;
@ -996,12 +1034,12 @@ form_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
return JS_TRUE; return JS_TRUE;
} }
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_FORM_ACTION: case JSP_FORM_ACTION:
string_to_jsval(ctx, vp, form->action); string_to_jsval(ctx, vp, form->action);
break; break;
@ -1076,7 +1114,7 @@ form_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @form_class.setProperty */ /* @form_class.setProperty */
static JSBool static JSBool
form_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) form_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
@ -1107,10 +1145,10 @@ form_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
assert(form); assert(form);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_FORM_ACTION: case JSP_FORM_ACTION:
string = stracpy(jsval_to_string(ctx, vp)); string = stracpy(jsval_to_string(ctx, vp));
if (form->action) { if (form->action) {
@ -1162,10 +1200,13 @@ form_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @form_funcs{"reset"} */ /* @form_funcs{"reset"} */
static JSBool static JSBool
form_reset(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) form_reset(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
struct view_state *vs; struct view_state *vs;
struct document_view *doc_view; struct document_view *doc_view;
struct form_view *fv; struct form_view *fv;
@ -1191,17 +1232,21 @@ form_reset(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
do_reset_form(doc_view, form); do_reset_form(doc_view, form);
draw_forms(doc_view->session->tab->term, doc_view); draw_forms(doc_view->session->tab->term, doc_view);
boolean_to_jsval(ctx, rval, 0); boolean_to_jsval(ctx, &val, 0);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
/* @form_funcs{"submit"} */ /* @form_funcs{"submit"} */
static JSBool static JSBool
form_submit(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) form_submit(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
struct view_state *vs; struct view_state *vs;
struct document_view *doc_view; struct document_view *doc_view;
struct session *ses; struct session *ses;
@ -1227,7 +1272,8 @@ form_submit(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
assert(form); assert(form);
submit_given_form(ses, doc_view, form, 0); submit_given_form(ses, doc_view, form, 0);
boolean_to_jsval(ctx, rval, 0); boolean_to_jsval(ctx, &val, 0);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
@ -1308,19 +1354,20 @@ spidermonkey_detach_form_view(struct form_view *fv)
} }
static JSBool forms_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool forms_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
/* Each @forms_class object must have a @document_class parent. */ /* Each @forms_class object must have a @document_class parent. */
const JSClass forms_class = { const JSClass forms_class = {
"forms", "forms",
JSCLASS_HAS_PRIVATE, JSCLASS_HAS_PRIVATE,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
forms_get_property, JS_PropertyStub, forms_get_property, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
}; };
static JSBool forms_item(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool forms_item(JSContext *ctx, uintN argc, jsval *rval);
static JSBool forms_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool forms_item2(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval);
static JSBool forms_namedItem(JSContext *ctx, uintN argc, jsval *rval);
const spidermonkeyFunctionSpec forms_funcs[] = { const spidermonkeyFunctionSpec forms_funcs[] = {
{ "item", forms_item, 1 }, { "item", forms_item, 1 },
@ -1365,8 +1412,9 @@ find_form_by_name(JSContext *ctx, JSObject *jsdoc,
/* @forms_class.getProperty */ /* @forms_class.getProperty */
static JSBool static JSBool
forms_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) forms_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
jsval idval;
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
struct view_state *vs; struct view_state *vs;
@ -1390,36 +1438,50 @@ forms_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
doc_view = vs->doc_view; doc_view = vs->doc_view;
document = doc_view->document; document = doc_view->document;
if (JSVAL_IS_STRING(id)) { if (JSID_IS_STRING(id)) {
/* When SMJS evaluates forms.namedItem("foo"), it first /* When SMJS evaluates forms.namedItem("foo"), it first
* calls forms_get_property with id = JSString "namedItem" * calls forms_get_property with id = JSString "namedItem"
* and *vp = JSObject JSFunction forms_namedItem. * and *vp = JSObject JSFunction forms_namedItem.
* If we don't find a form whose name is id, * If we don't find a form whose name is id,
* we must leave *vp unchanged here, to avoid * we must leave *vp unchanged here, to avoid
* "TypeError: forms.namedItem is not a function". */ * "TypeError: forms.namedItem is not a function". */
find_form_by_name(ctx, parent_doc, doc_view, id, vp); JS_IdToValue(ctx, id, &idval);
find_form_by_name(ctx, parent_doc, doc_view, idval, vp);
return JS_TRUE; return JS_TRUE;
} }
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_FORMS_LENGTH: case JSP_FORMS_LENGTH:
int_to_jsval(ctx, vp, list_size(&document->forms)); int_to_jsval(ctx, vp, list_size(&document->forms));
break; break;
default: default:
/* Array index. */ /* Array index. */
forms_item(ctx, obj, 1, &id, vp); JS_IdToValue(ctx, id, &idval);
forms_item2(ctx, obj, 1, &idval, vp);
break; break;
} }
return JS_TRUE; return JS_TRUE;
} }
static JSBool
forms_item(JSContext *ctx, uintN argc, jsval *rval)
{
jsval val;
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
JSBool ret = forms_item2(ctx, obj, argc, argv, &val);
JS_SET_RVAL(ctx, rval, val);
return ret;
}
/* @forms_funcs{"item"} */ /* @forms_funcs{"item"} */
static JSBool static JSBool
forms_item(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) forms_item2(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
{ {
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
@ -1459,10 +1521,13 @@ forms_item(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
/* @forms_funcs{"namedItem"} */ /* @forms_funcs{"namedItem"} */
static JSBool static JSBool
forms_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) forms_namedItem(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
JSObject *parent_doc; /* instance of @document_class */ JSObject *parent_doc; /* instance of @document_class */
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
struct view_state *vs; struct view_state *vs;
struct document_view *doc_view; struct document_view *doc_view;
@ -1481,8 +1546,9 @@ forms_namedItem(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *r
if (argc != 1) if (argc != 1)
return JS_TRUE; return JS_TRUE;
undef_to_jsval(ctx, rval); undef_to_jsval(ctx, &val);
find_form_by_name(ctx, parent_doc, doc_view, argv[0], rval); find_form_by_name(ctx, parent_doc, doc_view, argv[0], &val);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
@ -1519,13 +1585,13 @@ static unicode_val_T
jsval_to_accesskey(JSContext *ctx, jsval *vp) jsval_to_accesskey(JSContext *ctx, jsval *vp)
{ {
size_t len; size_t len;
const jschar *chr; const char *chr;
/* Convert the value in place, to protect the result from GC. */ /* Convert the value in place, to protect the result from GC. */
if (JS_ConvertValue(ctx, *vp, JSTYPE_STRING, vp) == JS_FALSE) if (JS_ConvertValue(ctx, *vp, JSTYPE_STRING, vp) == JS_FALSE)
return UCS_NO_CHAR; return UCS_NO_CHAR;
len = JS_GetStringLength(JSVAL_TO_STRING(*vp)); len = JS_GetStringEncodingLength(ctx, JSVAL_TO_STRING(*vp));
chr = JS_GetStringChars(JSVAL_TO_STRING(*vp)); chr = JS_EncodeString(ctx, JSVAL_TO_STRING(*vp));
/* This implementation ignores extra characters in the string. */ /* This implementation ignores extra characters in the string. */
if (len < 1) if (len < 1)

42
src/ecmascript/spidermonkey/location.c
View File

@ -45,15 +45,15 @@
#include "viewer/text/vs.h" #include "viewer/text/vs.h"
static JSBool history_back(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool history_back(JSContext *ctx, uintN argc, jsval *rval);
static JSBool history_forward(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool history_forward(JSContext *ctx, uintN argc, jsval *rval);
static JSBool history_go(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool history_go(JSContext *ctx, uintN argc, jsval *rval);
const JSClass history_class = { const JSClass history_class = {
"history", "history",
JSCLASS_HAS_PRIVATE, JSCLASS_HAS_PRIVATE,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
}; };
@ -66,7 +66,7 @@ const spidermonkeyFunctionSpec history_funcs[] = {
/* @history_funcs{"back"} */ /* @history_funcs{"back"} */
static JSBool static JSBool
history_back(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) history_back(JSContext *ctx, uintN argc, jsval *rval)
{ {
struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx); struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
struct document_view *doc_view = interpreter->vs->doc_view; struct document_view *doc_view = interpreter->vs->doc_view;
@ -83,7 +83,7 @@ history_back(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
/* @history_funcs{"forward"} */ /* @history_funcs{"forward"} */
static JSBool static JSBool
history_forward(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) history_forward(JSContext *ctx, uintN argc, jsval *rval)
{ {
struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx); struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
struct document_view *doc_view = interpreter->vs->doc_view; struct document_view *doc_view = interpreter->vs->doc_view;
@ -96,11 +96,12 @@ history_forward(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *r
/* @history_funcs{"go"} */ /* @history_funcs{"go"} */
static JSBool static JSBool
history_go(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) history_go(JSContext *ctx, uintN argc, jsval *rval)
{ {
struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx); struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
struct document_view *doc_view = interpreter->vs->doc_view; struct document_view *doc_view = interpreter->vs->doc_view;
struct session *ses = doc_view->session; struct session *ses = doc_view->session;
jsval *argv = JS_ARGV(ctx, rval);
int index; int index;
struct location *loc; struct location *loc;
@ -124,8 +125,8 @@ history_go(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
} }
static JSBool location_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool location_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
static JSBool location_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool location_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
/* Each @location_class object must have a @window_class parent. */ /* Each @location_class object must have a @window_class parent. */
const JSClass location_class = { const JSClass location_class = {
@ -150,7 +151,7 @@ const JSPropertySpec location_props[] = {
/* @location_class.getProperty */ /* @location_class.getProperty */
static JSBool static JSBool
location_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) location_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
struct view_state *vs; struct view_state *vs;
@ -167,12 +168,12 @@ location_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
vs = JS_GetInstancePrivate(ctx, parent_win, vs = JS_GetInstancePrivate(ctx, parent_win,
(JSClass *) &window_class, NULL); (JSClass *) &window_class, NULL);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_LOC_HREF: case JSP_LOC_HREF:
astring_to_jsval(ctx, vp, get_uri_string(vs->uri, URI_ORIGINAL)); astring_to_jsval(ctx, vp, get_uri_string(vs->uri, URI_ORIGINAL));
break; break;
@ -191,7 +192,7 @@ location_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @location_class.setProperty */ /* @location_class.setProperty */
static JSBool static JSBool
location_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) location_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
struct view_state *vs; struct view_state *vs;
@ -210,10 +211,10 @@ location_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
(JSClass *) &window_class, NULL); (JSClass *) &window_class, NULL);
doc_view = vs->doc_view; doc_view = vs->doc_view;
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_LOC_HREF: case JSP_LOC_HREF:
location_goto(doc_view, jsval_to_string(ctx, vp)); location_goto(doc_view, jsval_to_string(ctx, vp));
break; break;
@ -222,7 +223,7 @@ location_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
return JS_TRUE; return JS_TRUE;
} }
static JSBool location_toString(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool location_toString(JSContext *ctx, uintN argc, jsval *rval);
const spidermonkeyFunctionSpec location_funcs[] = { const spidermonkeyFunctionSpec location_funcs[] = {
{ "toString", location_toString, 0 }, { "toString", location_toString, 0 },
@ -232,9 +233,14 @@ const spidermonkeyFunctionSpec location_funcs[] = {
/* @location_funcs{"toString"}, @location_funcs{"toLocaleString"} */ /* @location_funcs{"toString"}, @location_funcs{"toLocaleString"} */
static JSBool static JSBool
location_toString(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) location_toString(JSContext *ctx, uintN argc, jsval *rval)
{ {
return JS_GetProperty(ctx, obj, "href", rval); jsval val;
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
JSBool ret = JS_GetProperty(ctx, obj, "href", &val);
JS_SET_RVAL(ctx, rval, val);
return ret;
} }
struct delayed_goto { struct delayed_goto {

10
src/ecmascript/spidermonkey/navigator.c
View File

@ -44,13 +44,13 @@
#include "viewer/text/vs.h" #include "viewer/text/vs.h"
static JSBool navigator_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool navigator_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
const JSClass navigator_class = { const JSClass navigator_class = {
"navigator", "navigator",
JSCLASS_HAS_PRIVATE, JSCLASS_HAS_PRIVATE,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
navigator_get_property, JS_PropertyStub, navigator_get_property, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
}; };
@ -81,14 +81,14 @@ const JSPropertySpec navigator_props[] = {
/* @navigator_class.getProperty */ /* @navigator_class.getProperty */
static JSBool static JSBool
navigator_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) navigator_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_NAVIGATOR_APP_CODENAME: case JSP_NAVIGATOR_APP_CODENAME:
string_to_jsval(ctx, vp, "Mozilla"); /* More like a constant nowadays. */ string_to_jsval(ctx, vp, "Mozilla"); /* More like a constant nowadays. */
break; break;

16
src/ecmascript/spidermonkey/unibar.c
View File

@ -45,8 +45,8 @@
#include "viewer/text/vs.h" #include "viewer/text/vs.h"
static JSBool unibar_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool unibar_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
static JSBool unibar_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool unibar_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
/* Each @menubar_class object must have a @window_class parent. */ /* Each @menubar_class object must have a @window_class parent. */
const JSClass menubar_class = { const JSClass menubar_class = {
@ -80,7 +80,7 @@ const JSPropertySpec unibar_props[] = {
/* @menubar_class.getProperty, @statusbar_class.getProperty */ /* @menubar_class.getProperty, @statusbar_class.getProperty */
static JSBool static JSBool
unibar_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) unibar_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
struct view_state *vs; struct view_state *vs;
@ -104,10 +104,10 @@ unibar_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
status = &doc_view->session->status; status = &doc_view->session->status;
bar = JS_GetPrivate(ctx, obj); /* from @menubar_class or @statusbar_class */ bar = JS_GetPrivate(ctx, obj); /* from @menubar_class or @statusbar_class */
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_UNIBAR_VISIBLE: case JSP_UNIBAR_VISIBLE:
#define unibar_fetch(bar) \ #define unibar_fetch(bar) \
boolean_to_jsval(ctx, vp, status->force_show_##bar##_bar >= 0 \ boolean_to_jsval(ctx, vp, status->force_show_##bar##_bar >= 0 \
@ -139,7 +139,7 @@ unibar_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @menubar_class.setProperty, @statusbar_class.setProperty */ /* @menubar_class.setProperty, @statusbar_class.setProperty */
static JSBool static JSBool
unibar_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) unibar_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
JSObject *parent_win; /* instance of @window_class */ JSObject *parent_win; /* instance of @window_class */
struct view_state *vs; struct view_state *vs;
@ -163,10 +163,10 @@ unibar_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
status = &doc_view->session->status; status = &doc_view->session->status;
bar = JS_GetPrivate(ctx, obj); /* from @menubar_class or @statusbar_class */ bar = JS_GetPrivate(ctx, obj); /* from @menubar_class or @statusbar_class */
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_UNIBAR_VISIBLE: case JSP_UNIBAR_VISIBLE:
switch (*bar) { switch (*bar) {
case 's': case 's':

57
src/ecmascript/spidermonkey/window.c
View File

@ -44,12 +44,12 @@
#include "viewer/text/vs.h" #include "viewer/text/vs.h"
static JSBool window_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool window_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp);
static JSBool window_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp); static JSBool window_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp);
const JSClass window_class = { const JSClass window_class = {
"window", "window",
JSCLASS_HAS_PRIVATE, /* struct view_state * */ JSCLASS_HAS_PRIVATE | JSCLASS_GLOBAL_FLAGS, /* struct view_state * */
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
window_get_property, window_set_property, window_get_property, window_set_property,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
@ -122,7 +122,7 @@ find_child_frame(struct document_view *doc_view, struct frame_desc *tframe)
/* @window_class.getProperty */ /* @window_class.getProperty */
static JSBool static JSBool
window_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) window_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
struct view_state *vs; struct view_state *vs;
@ -138,11 +138,11 @@ window_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
* location is then evaluated in string context, toString() * location is then evaluated in string context, toString()
* is called which we overrode for that class below, so * is called which we overrode for that class below, so
* everything's fine. */ * everything's fine. */
if (JSVAL_IS_STRING(id)) { if (JSID_IS_STRING(id)) {
struct document_view *doc_view = vs->doc_view; struct document_view *doc_view = vs->doc_view;
JSObject *obj; JSObject *obj;
obj = try_resolve_frame(doc_view, jsval_to_string(ctx, &id)); obj = try_resolve_frame(doc_view, jsid_to_string(ctx, &id));
/* TODO: Try other lookups (mainly element lookup) until /* TODO: Try other lookups (mainly element lookup) until
* something yields data. */ * something yields data. */
if (obj) { if (obj) {
@ -151,12 +151,12 @@ window_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
return JS_TRUE; return JS_TRUE;
} }
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_WIN_CLOSED: case JSP_WIN_CLOSED:
/* TODO: It will be a major PITA to implement this properly. /* TODO: It will be a major PITA to implement this properly.
* Well, perhaps not so much if we introduce reference tracking * Well, perhaps not so much if we introduce reference tracking
@ -254,7 +254,7 @@ void location_goto(struct document_view *doc_view, unsigned char *url);
/* @window_class.setProperty */ /* @window_class.setProperty */
static JSBool static JSBool
window_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) window_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
struct view_state *vs; struct view_state *vs;
@ -266,8 +266,8 @@ window_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
vs = JS_GetInstancePrivate(ctx, obj, (JSClass *) &window_class, NULL); vs = JS_GetInstancePrivate(ctx, obj, (JSClass *) &window_class, NULL);
if (JSVAL_IS_STRING(id)) { if (JSID_IS_STRING(id)) {
if (!strcmp(jsval_to_string(ctx, &id), "location")) { if (!strcmp(jsid_to_string(ctx, &id), "location")) {
struct document_view *doc_view = vs->doc_view; struct document_view *doc_view = vs->doc_view;
location_goto(doc_view, jsval_to_string(ctx, vp)); location_goto(doc_view, jsval_to_string(ctx, vp));
@ -278,10 +278,10 @@ window_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
return JS_TRUE; return JS_TRUE;
} }
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_TRUE; return JS_TRUE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case JSP_WIN_STATUS: case JSP_WIN_STATUS:
mem_free_set(&vs->doc_view->session->status.window_status, stracpy(jsval_to_string(ctx, vp))); mem_free_set(&vs->doc_view->session->status.window_status, stracpy(jsval_to_string(ctx, vp)));
print_screen_status(vs->doc_view->session); print_screen_status(vs->doc_view->session);
@ -298,9 +298,9 @@ window_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
} }
static JSBool window_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool window_alert(JSContext *ctx, uintN argc, jsval *rval);
static JSBool window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool window_open(JSContext *ctx, uintN argc, jsval *rval);
static JSBool window_setTimeout(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval); static JSBool window_setTimeout(JSContext *ctx, uintN argc, jsval *rval);
const spidermonkeyFunctionSpec window_funcs[] = { const spidermonkeyFunctionSpec window_funcs[] = {
{ "alert", window_alert, 1 }, { "alert", window_alert, 1 },
@ -311,8 +311,11 @@ const spidermonkeyFunctionSpec window_funcs[] = {
/* @window_funcs{"alert"} */ /* @window_funcs{"alert"} */
static JSBool static JSBool
window_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) window_alert(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
struct view_state *vs; struct view_state *vs;
unsigned char *string; unsigned char *string;
@ -330,14 +333,18 @@ window_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
info_box(vs->doc_view->session->tab->term, MSGBOX_FREE_TEXT, info_box(vs->doc_view->session->tab->term, MSGBOX_FREE_TEXT,
N_("JavaScript Alert"), ALIGN_CENTER, stracpy(string)); N_("JavaScript Alert"), ALIGN_CENTER, stracpy(string));
undef_to_jsval(ctx, rval); undef_to_jsval(ctx, &val);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
/* @window_funcs{"open"} */ /* @window_funcs{"open"} */
static JSBool static JSBool
window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) window_open(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
JSObject *obj = JS_THIS_OBJECT(ctx, rval);
jsval *argv = JS_ARGV(ctx, rval);
struct view_state *vs; struct view_state *vs;
struct document_view *doc_view; struct document_view *doc_view;
struct session *ses; struct session *ses;
@ -407,7 +414,7 @@ window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
deo->uri = get_uri_reference(uri); deo->uri = get_uri_reference(uri);
deo->target = stracpy(frame); deo->target = stracpy(frame);
register_bottom_half(delayed_goto_uri_frame, deo); register_bottom_half(delayed_goto_uri_frame, deo);
boolean_to_jsval(ctx, rval, 1); boolean_to_jsval(ctx, &val, 1);
goto end; goto end;
} }
} }
@ -418,7 +425,7 @@ window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
&& can_open_in_new(ses->tab->term)) { && can_open_in_new(ses->tab->term)) {
open_uri_in_new_window(ses, uri, NULL, ENV_ANY, open_uri_in_new_window(ses, uri, NULL, ENV_ANY,
CACHE_MODE_NORMAL, TASK_NONE); CACHE_MODE_NORMAL, TASK_NONE);
boolean_to_jsval(ctx, rval, 1); boolean_to_jsval(ctx, &val, 1);
} else { } else {
/* When opening a new tab, we might get rerendered, losing our /* When opening a new tab, we might get rerendered, losing our
* context and triggerring a disaster, so postpone that. */ * context and triggerring a disaster, so postpone that. */
@ -428,9 +435,9 @@ window_open(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
deo->ses = ses; deo->ses = ses;
deo->uri = get_uri_reference(uri); deo->uri = get_uri_reference(uri);
register_bottom_half(delayed_open, deo); register_bottom_half(delayed_open, deo);
boolean_to_jsval(ctx, rval, 1); boolean_to_jsval(ctx, &val, 1);
} else { } else {
undef_to_jsval(ctx, rval); undef_to_jsval(ctx, &val);
} }
} }
@ -438,13 +445,15 @@ end:
done_uri(uri); done_uri(uri);
mem_free_if(frame); mem_free_if(frame);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
/* @window_funcs{"setTimeout"} */ /* @window_funcs{"setTimeout"} */
static JSBool static JSBool
window_setTimeout(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) window_setTimeout(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval *argv = JS_ARGV(ctx, rval);
struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx); struct ecmascript_interpreter *interpreter = JS_GetContextPrivate(ctx);
unsigned char *code; unsigned char *code;
int timeout; int timeout;

29
src/scripting/smjs/action_object.c
View File

@ -40,25 +40,31 @@ smjs_action_fn_finalize(JSContext *ctx, JSObject *obj)
/* @action_fn_class.call */ /* @action_fn_class.call */
static JSBool static JSBool
smjs_action_fn_callback(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, smjs_action_fn_callback(JSContext *ctx, uintN argc, jsval *rval)
jsval *rval)
{ {
jsval value;
jsval *argv = JS_ARGV(ctx, rval);
struct smjs_action_fn_callback_hop *hop; struct smjs_action_fn_callback_hop *hop;
JSObject *fn_obj; JSObject *fn_obj;
assert(smjs_ctx); assert(smjs_ctx);
if_assert_failed return JS_FALSE; if_assert_failed return JS_FALSE;
*rval = JS_FALSE; value = JS_FALSE;
if (JS_TRUE != JS_ValueToObject(ctx, argv[-2], &fn_obj)) if (JS_TRUE != JS_ValueToObject(ctx, argv[-2], &fn_obj)) {
JS_SET_RVAL(ctx, rval, value);
return JS_TRUE; return JS_TRUE;
}
assert(JS_InstanceOf(ctx, fn_obj, (JSClass *) &action_fn_class, NULL)); assert(JS_InstanceOf(ctx, fn_obj, (JSClass *) &action_fn_class, NULL));
if_assert_failed return JS_FALSE; if_assert_failed return JS_FALSE;
hop = JS_GetInstancePrivate(ctx, fn_obj, hop = JS_GetInstancePrivate(ctx, fn_obj,
(JSClass *) &action_fn_class, NULL); (JSClass *) &action_fn_class, NULL);
if (!hop) return JS_TRUE; if (!hop) {
JS_SET_RVAL(ctx, rval, value);
return JS_TRUE;
}
if (argc >= 1) { if (argc >= 1) {
int32 val; int32 val;
@ -70,7 +76,8 @@ smjs_action_fn_callback(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv,
do_action(hop->ses, hop->action_id, 1); do_action(hop->ses, hop->action_id, 1);
*rval = JS_TRUE; value = JS_TRUE;
JS_SET_RVAL(ctx, rval, value);
return JS_TRUE; return JS_TRUE;
} }
@ -79,7 +86,7 @@ static const JSClass action_fn_class = {
"action_fn", "action_fn",
JSCLASS_HAS_PRIVATE, /* struct smjs_action_fn_callback_hop * */ JSCLASS_HAS_PRIVATE, /* struct smjs_action_fn_callback_hop * */
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub,
smjs_action_fn_finalize, smjs_action_fn_finalize,
NULL, NULL, NULL, NULL,
@ -124,14 +131,16 @@ smjs_get_action_fn_object(unsigned char *action_str)
/* @action_class.getProperty */ /* @action_class.getProperty */
static JSBool static JSBool
action_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) action_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
jsval val;
JSObject *action_fn; JSObject *action_fn;
unsigned char *action_str; unsigned char *action_str;
*vp = JSVAL_NULL; *vp = JSVAL_NULL;
action_str = JS_GetStringBytes(JS_ValueToString(ctx, id)); JS_IdToValue(ctx, id, &val);
action_str = JS_EncodeString(ctx, JS_ValueToString(ctx, val));
if (!action_str) return JS_TRUE; if (!action_str) return JS_TRUE;
action_fn = smjs_get_action_fn_object(action_str); action_fn = smjs_get_action_fn_object(action_str);
@ -146,7 +155,7 @@ static const JSClass action_class = {
"action", "action",
0, 0,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
action_get_property, JS_PropertyStub, action_get_property, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
}; };

24
src/scripting/smjs/bookmarks.c
View File

@ -113,29 +113,29 @@ jsval_to_bookmark_string(JSContext *ctx, jsval val, unsigned char **result)
unsigned char *str; unsigned char *str;
/* jsstring_to_utf8() might GC; protect the string to come. */ /* jsstring_to_utf8() might GC; protect the string to come. */
if (!JS_AddNamedRoot(ctx, &jsstr, "jsval_to_bookmark_string")) if (!JS_AddNamedStringRoot(ctx, &jsstr, "jsval_to_bookmark_string"))
return JS_FALSE; return JS_FALSE;
jsstr = JS_ValueToString(ctx, val); jsstr = JS_ValueToString(ctx, val);
if (jsstr == NULL) { if (jsstr == NULL) {
JS_RemoveRoot(ctx, &jsstr); JS_RemoveStringRoot(ctx, &jsstr);
return JS_FALSE; return JS_FALSE;
} }
str = jsstring_to_utf8(ctx, jsstr, NULL); str = jsstring_to_utf8(ctx, jsstr, NULL);
if (str == NULL) { if (str == NULL) {
JS_RemoveRoot(ctx, &jsstr); JS_RemoveStringRoot(ctx, &jsstr);
return JS_FALSE; return JS_FALSE;
} }
JS_RemoveRoot(ctx, &jsstr); JS_RemoveStringRoot(ctx, &jsstr);
mem_free_set(result, str); mem_free_set(result, str);
return JS_TRUE; return JS_TRUE;
} }
/* @bookmark_class.getProperty */ /* @bookmark_class.getProperty */
static JSBool static JSBool
bookmark_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) bookmark_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
struct bookmark *bookmark; struct bookmark *bookmark;
@ -152,10 +152,10 @@ bookmark_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_FALSE; return JS_FALSE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case BOOKMARK_TITLE: case BOOKMARK_TITLE:
return bookmark_string_to_jsval(ctx, bookmark->title, vp); return bookmark_string_to_jsval(ctx, bookmark->title, vp);
case BOOKMARK_URL: case BOOKMARK_URL:
@ -177,7 +177,7 @@ bookmark_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @bookmark_class.setProperty */ /* @bookmark_class.setProperty */
static JSBool static JSBool
bookmark_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) bookmark_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
struct bookmark *bookmark; struct bookmark *bookmark;
unsigned char *title = NULL; unsigned char *title = NULL;
@ -195,10 +195,10 @@ bookmark_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
if (!bookmark) return JS_FALSE; if (!bookmark) return JS_FALSE;
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_FALSE; return JS_FALSE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case BOOKMARK_TITLE: case BOOKMARK_TITLE:
if (!jsval_to_bookmark_string(ctx, *vp, &title)) if (!jsval_to_bookmark_string(ctx, *vp, &title))
return JS_FALSE; return JS_FALSE;
@ -250,7 +250,7 @@ smjs_get_bookmark_object(struct bookmark *bookmark)
/* @bookmark_folder_class.getProperty */ /* @bookmark_folder_class.getProperty */
static JSBool static JSBool
bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) bookmark_folder_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
struct bookmark *bookmark; struct bookmark *bookmark;
struct bookmark *folder; struct bookmark *folder;
@ -283,7 +283,7 @@ static const JSClass bookmark_folder_class = {
"bookmark_folder", "bookmark_folder",
JSCLASS_HAS_PRIVATE, /* struct bookmark * */ JSCLASS_HAS_PRIVATE, /* struct bookmark * */
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
bookmark_folder_get_property, JS_PropertyStub, bookmark_folder_get_property, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, bookmark_finalize, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, bookmark_finalize,
}; };

18
src/scripting/smjs/cache_object.c
View File

@ -40,7 +40,7 @@ static const JSPropertySpec cache_entry_props[] = {
/* @cache_entry_class.getProperty */ /* @cache_entry_class.getProperty */
static JSBool static JSBool
cache_entry_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) cache_entry_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
struct cache_entry *cached; struct cache_entry *cached;
JSBool ret; JSBool ret;
@ -66,9 +66,9 @@ cache_entry_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
ret = JS_FALSE; ret = JS_FALSE;
else switch (JSVAL_TO_INT(id)) { else switch (JSID_TO_INT(id)) {
case CACHE_ENTRY_CONTENT: { case CACHE_ENTRY_CONTENT: {
struct fragment *fragment = get_cache_fragment(cached); struct fragment *fragment = get_cache_fragment(cached);
@ -121,7 +121,7 @@ cache_entry_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @cache_entry_class.setProperty */ /* @cache_entry_class.setProperty */
static JSBool static JSBool
cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) cache_entry_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
struct cache_entry *cached; struct cache_entry *cached;
JSBool ret; JSBool ret;
@ -145,12 +145,12 @@ cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
* eventually unlock the object. */ * eventually unlock the object. */
object_lock(cached); object_lock(cached);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
ret = JS_FALSE; ret = JS_FALSE;
else switch (JSVAL_TO_INT(id)) { else switch (JSID_TO_INT(id)) {
case CACHE_ENTRY_CONTENT: { case CACHE_ENTRY_CONTENT: {
JSString *jsstr = JS_ValueToString(smjs_ctx, *vp); JSString *jsstr = JS_ValueToString(smjs_ctx, *vp);
unsigned char *str = JS_GetStringBytes(jsstr); unsigned char *str = JS_EncodeString(smjs_ctx, jsstr);
size_t len = JS_GetStringLength(jsstr); size_t len = JS_GetStringLength(jsstr);
add_fragment(cached, 0, str, len); add_fragment(cached, 0, str, len);
@ -161,7 +161,7 @@ cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
} }
case CACHE_ENTRY_TYPE: { case CACHE_ENTRY_TYPE: {
JSString *jsstr = JS_ValueToString(smjs_ctx, *vp); JSString *jsstr = JS_ValueToString(smjs_ctx, *vp);
unsigned char *str = JS_GetStringBytes(jsstr); unsigned char *str = JS_EncodeString(smjs_ctx, jsstr);
mem_free_set(&cached->content_type, stracpy(str)); mem_free_set(&cached->content_type, stracpy(str));
@ -170,7 +170,7 @@ cache_entry_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
} }
case CACHE_ENTRY_HEAD: { case CACHE_ENTRY_HEAD: {
JSString *jsstr = JS_ValueToString(smjs_ctx, *vp); JSString *jsstr = JS_ValueToString(smjs_ctx, *vp);
unsigned char *str = JS_GetStringBytes(jsstr); unsigned char *str = JS_EncodeString(smjs_ctx, jsstr);
mem_free_set(&cached->head, stracpy(str)); mem_free_set(&cached->head, stracpy(str));

11
src/scripting/smjs/core.c
View File

@ -94,11 +94,11 @@ smjs_do_file(unsigned char *path)
} }
static JSBool static JSBool
smjs_do_file_wrapper(JSContext *ctx, JSObject *obj, uintN argc, smjs_do_file_wrapper(JSContext *ctx, uintN argc, jsval *rval)
jsval *argv, jsval *rval)
{ {
jsval *argv = JS_ARGV(ctx, rval);
JSString *jsstr = JS_ValueToString(smjs_ctx, *argv); JSString *jsstr = JS_ValueToString(smjs_ctx, *argv);
unsigned char *path = JS_GetStringBytes(jsstr); unsigned char *path = JS_EncodeString(smjs_ctx, jsstr);
if (smjs_do_file(path)) if (smjs_do_file(path))
return JS_TRUE; return JS_TRUE;
@ -136,6 +136,9 @@ init_smjs(struct module *module)
return; return;
} }
JS_SetOptions(smjs_ctx, JSOPTION_VAROBJFIX | JSOPTION_JIT | JSOPTION_METHODJIT);
JS_SetVersion(smjs_ctx, JSVERSION_LATEST);
JS_SetErrorReporter(smjs_ctx, error_reporter); JS_SetErrorReporter(smjs_ctx, error_reporter);
smjs_init_global_object(); smjs_init_global_object();
@ -308,7 +311,7 @@ jsstring_to_utf8(JSContext *ctx, JSString *jsstr, int *length)
struct string utf8; struct string utf8;
utf16_len = JS_GetStringLength(jsstr); utf16_len = JS_GetStringLength(jsstr);
utf16 = JS_GetStringChars(jsstr); /* stays owned by jsstr */ utf16 = JS_GetStringCharsZ(ctx, jsstr); /* stays owned by jsstr */
if (utf16 == NULL) { if (utf16 == NULL) {
/* JS_GetStringChars doesn't have a JSContext * /* JS_GetStringChars doesn't have a JSContext *
* parameter so it can't report the error * parameter so it can't report the error

26
src/scripting/smjs/elinks_object.c
View File

@ -27,7 +27,7 @@
static JSBool static JSBool
elinks_get_home(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) elinks_get_home(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(smjs_ctx, elinks_home)); *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(smjs_ctx, elinks_home));
@ -35,7 +35,7 @@ elinks_get_home(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
} }
static JSBool static JSBool
elinks_get_location(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) elinks_get_location(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
struct uri *uri; struct uri *uri;
@ -51,7 +51,7 @@ elinks_get_location(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
} }
static JSBool static JSBool
elinks_set_location(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) elinks_set_location(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
JSString *jsstr; JSString *jsstr;
unsigned char *url; unsigned char *url;
@ -61,7 +61,7 @@ elinks_set_location(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
jsstr = JS_ValueToString(smjs_ctx, *vp); jsstr = JS_ValueToString(smjs_ctx, *vp);
if (!jsstr) return JS_FALSE; if (!jsstr) return JS_FALSE;
url = JS_GetStringBytes(jsstr); url = JS_EncodeString(smjs_ctx, jsstr);
if (!url) return JS_FALSE; if (!url) return JS_FALSE;
goto_url(smjs_ses, url); goto_url(smjs_ses, url);
@ -71,8 +71,10 @@ elinks_set_location(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @elinks_funcs{"alert"} */ /* @elinks_funcs{"alert"} */
static JSBool static JSBool
elinks_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) elinks_alert(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
jsval *argv = JS_ARGV(ctx, rval);
unsigned char *string; unsigned char *string;
if (argc != 1) if (argc != 1)
@ -85,15 +87,18 @@ elinks_alert(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval
info_box(smjs_ses->tab->term, MSGBOX_NO_TEXT_INTL, info_box(smjs_ses->tab->term, MSGBOX_NO_TEXT_INTL,
N_("User script alert"), ALIGN_LEFT, string); N_("User script alert"), ALIGN_LEFT, string);
undef_to_jsval(ctx, rval); undef_to_jsval(ctx, &val);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
/* @elinks_funcs{"execute"} */ /* @elinks_funcs{"execute"} */
static JSBool static JSBool
elinks_execute(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) elinks_execute(JSContext *ctx, uintN argc, jsval *rval)
{ {
jsval val;
jsval *argv = JS_ARGV(ctx, rval);
unsigned char *string; unsigned char *string;
if (argc != 1) if (argc != 1)
@ -104,8 +109,9 @@ elinks_execute(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, jsval *rv
return JS_TRUE; return JS_TRUE;
exec_on_terminal(smjs_ses->tab->term, string, "", TERM_EXEC_BG); exec_on_terminal(smjs_ses->tab->term, string, "", TERM_EXEC_BG);
undef_to_jsval(ctx, rval);
undef_to_jsval(ctx, &val);
JS_SET_RVAL(ctx, rval, val);
return JS_TRUE; return JS_TRUE;
} }
@ -113,7 +119,7 @@ static const JSClass elinks_class = {
"elinks", "elinks",
0, 0,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
}; };
@ -142,7 +148,7 @@ smjs_get_elinks_object(void)
return NULL; return NULL;
if (!JS_DefineProperty(smjs_ctx, jsobj, "home", JSVAL_NULL, if (!JS_DefineProperty(smjs_ctx, jsobj, "home", JSVAL_NULL,
elinks_get_home, JS_PropertyStub, elinks_get_home, JS_StrictPropertyStub,
JSPROP_ENUMERATE JSPROP_ENUMERATE
| JSPROP_PERMANENT | JSPROP_PERMANENT
| JSPROP_READONLY)) | JSPROP_READONLY))

6
src/scripting/smjs/global_object.c
View File

@ -16,9 +16,9 @@ JSObject *smjs_global_object;
static const JSClass global_class = { static const JSClass global_class = {
"global", 0, "global", JSCLASS_GLOBAL_FLAGS,
JS_PropertyStub, JS_PropertyStub,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub
}; };
@ -29,7 +29,7 @@ smjs_get_global_object(void)
assert(smjs_ctx); assert(smjs_ctx);
jsobj = JS_NewObject(smjs_ctx, (JSClass *) &global_class, NULL, NULL); jsobj = JS_NewCompartmentAndGlobalObject(smjs_ctx, (JSClass *) &global_class, NULL);
if (!jsobj) return NULL; if (!jsobj) return NULL;

22
src/scripting/smjs/globhist.c
View File

@ -51,7 +51,7 @@ static const JSPropertySpec smjs_globhist_item_props[] = {
/* @smjs_globhist_item_class.getProperty */ /* @smjs_globhist_item_class.getProperty */
static JSBool static JSBool
smjs_globhist_item_get_property(JSContext *ctx, JSObject *obj, jsval id, smjs_globhist_item_get_property(JSContext *ctx, JSObject *obj, jsid id,
jsval *vp) jsval *vp)
{ {
struct global_history_item *history_item; struct global_history_item *history_item;
@ -70,10 +70,10 @@ smjs_globhist_item_get_property(JSContext *ctx, JSObject *obj, jsval id,
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_FALSE; return JS_FALSE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case GLOBHIST_TITLE: case GLOBHIST_TITLE:
*vp = STRING_TO_JSVAL(JS_NewStringCopyZ(smjs_ctx, *vp = STRING_TO_JSVAL(JS_NewStringCopyZ(smjs_ctx,
history_item->title)); history_item->title));
@ -117,7 +117,7 @@ smjs_globhist_item_get_property(JSContext *ctx, JSObject *obj, jsval id,
/* @smjs_globhist_item_class.setProperty */ /* @smjs_globhist_item_class.setProperty */
static JSBool static JSBool
smjs_globhist_item_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) smjs_globhist_item_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
struct global_history_item *history_item; struct global_history_item *history_item;
@ -133,13 +133,13 @@ smjs_globhist_item_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *
if (!history_item) return JS_FALSE; if (!history_item) return JS_FALSE;
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_FALSE; return JS_FALSE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case GLOBHIST_TITLE: { case GLOBHIST_TITLE: {
JSString *jsstr = JS_ValueToString(smjs_ctx, *vp); JSString *jsstr = JS_ValueToString(smjs_ctx, *vp);
unsigned char *str = JS_GetStringBytes(jsstr); unsigned char *str = JS_EncodeString(smjs_ctx, jsstr);
mem_free_set(&history_item->title, stracpy(str)); mem_free_set(&history_item->title, stracpy(str));
@ -147,7 +147,7 @@ smjs_globhist_item_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *
} }
case GLOBHIST_URL: { case GLOBHIST_URL: {
JSString *jsstr = JS_ValueToString(smjs_ctx, *vp); JSString *jsstr = JS_ValueToString(smjs_ctx, *vp);
unsigned char *str = JS_GetStringBytes(jsstr); unsigned char *str = JS_EncodeString(smjs_ctx, jsstr);
mem_free_set(&history_item->url, stracpy(str)); mem_free_set(&history_item->url, stracpy(str));
@ -201,13 +201,13 @@ smjs_get_globhist_item_object(struct global_history_item *history_item)
/* @smjs_globhist_class.getProperty */ /* @smjs_globhist_class.getProperty */
static JSBool static JSBool
smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) smjs_globhist_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
JSObject *jsobj; JSObject *jsobj;
unsigned char *uri_string; unsigned char *uri_string;
struct global_history_item *history_item; struct global_history_item *history_item;
uri_string = JS_GetStringBytes(JS_ValueToString(ctx, id)); uri_string = JS_EncodeString(ctx, JS_ValueToString(ctx, id));
if (!uri_string) goto ret_null; if (!uri_string) goto ret_null;
history_item = get_global_history_item(uri_string); history_item = get_global_history_item(uri_string);
@ -229,7 +229,7 @@ ret_null:
static const JSClass smjs_globhist_class = { static const JSClass smjs_globhist_class = {
"global_history", 0, "global_history", 0,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
smjs_globhist_get_property, JS_PropertyStub, smjs_globhist_get_property, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
}; };

4
src/scripting/smjs/hooks.c
View File

@ -41,7 +41,7 @@ script_hook_url(va_list ap, void *data)
ret = EVENT_HOOK_STATUS_LAST; ret = EVENT_HOOK_STATUS_LAST;
} else { } else {
JSString *jsstr = JS_ValueToString(smjs_ctx, rval); JSString *jsstr = JS_ValueToString(smjs_ctx, rval);
unsigned char *str = JS_GetStringBytes(jsstr); unsigned char *str = JS_EncodeString(smjs_ctx, jsstr);
mem_free_set(url, stracpy(str)); mem_free_set(url, stracpy(str));
} }
@ -58,7 +58,7 @@ script_hook_pre_format_html(va_list ap, void *data)
struct session *ses = va_arg(ap, struct session *); struct session *ses = va_arg(ap, struct session *);
struct cache_entry *cached = va_arg(ap, struct cache_entry *); struct cache_entry *cached = va_arg(ap, struct cache_entry *);
enum evhook_status ret = EVENT_HOOK_STATUS_NEXT; enum evhook_status ret = EVENT_HOOK_STATUS_NEXT;
JSObject *cache_entry_object, *view_state_object = JSVAL_NULL; JSObject *cache_entry_object, *view_state_object = NULL;
jsval args[2], rval; jsval args[2], rval;
evhook_use_params(ses && cached); evhook_use_params(ses && cached);

12
src/scripting/smjs/keybinding.c
View File

@ -17,7 +17,7 @@ static const JSClass keymap_class; /* defined below */
/* @keymap_class.getProperty */ /* @keymap_class.getProperty */
static JSBool static JSBool
keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) keymap_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
unsigned char *action_str; unsigned char *action_str;
const unsigned char *keystroke_str; const unsigned char *keystroke_str;
@ -32,7 +32,7 @@ keymap_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
data = JS_GetInstancePrivate(ctx, obj, data = JS_GetInstancePrivate(ctx, obj,
(JSClass *) &keymap_class, NULL); (JSClass *) &keymap_class, NULL);
keystroke_str = JS_GetStringBytes(JS_ValueToString(ctx, id)); keystroke_str = JS_EncodeString(ctx, JS_ValueToString(ctx, id));
if (!keystroke_str) goto ret_null; if (!keystroke_str) goto ret_null;
action_str = get_action_name_from_keystroke((enum keymap_id) *data, action_str = get_action_name_from_keystroke((enum keymap_id) *data,
@ -70,7 +70,7 @@ smjs_keybinding_action_callback(va_list ap, void *data)
/* @keymap_class.setProperty */ /* @keymap_class.setProperty */
static JSBool static JSBool
keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) keymap_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
int *data; int *data;
unsigned char *keymap_str; unsigned char *keymap_str;
@ -90,13 +90,13 @@ keymap_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
keymap_str = get_keymap_name((enum keymap_id) *data); keymap_str = get_keymap_name((enum keymap_id) *data);
if (!keymap_str) return JS_FALSE; if (!keymap_str) return JS_FALSE;
keystroke_str = JS_GetStringBytes(JS_ValueToString(ctx, id)); keystroke_str = JS_EncodeString(ctx, JS_ValueToString(ctx, id));
if (!keystroke_str) return JS_FALSE; if (!keystroke_str) return JS_FALSE;
if (JSVAL_IS_STRING(*vp)) { if (JSVAL_IS_STRING(*vp)) {
unsigned char *action_str; unsigned char *action_str;
action_str = JS_GetStringBytes(JS_ValueToString(ctx, *vp)); action_str = JS_EncodeString(ctx, JS_ValueToString(ctx, *vp));
if (!action_str) return JS_FALSE; if (!action_str) return JS_FALSE;
if (bind_do(keymap_str, keystroke_str, action_str, 0)) if (bind_do(keymap_str, keystroke_str, action_str, 0))
@ -203,7 +203,7 @@ static const JSClass keymaps_hash_class = {
"keymaps_hash", "keymaps_hash",
JSCLASS_HAS_PRIVATE, JSCLASS_HAS_PRIVATE,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_PropertyStub,
JS_PropertyStub, JS_PropertyStub, JS_PropertyStub, JS_StrictPropertyStub,
JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub, JS_EnumerateStub, JS_ResolveStub, JS_ConvertStub, JS_FinalizeStub,
}; };

10
src/scripting/smjs/load_uri.c
View File

@ -56,7 +56,7 @@ smjs_loading_callback(struct download *download, void *data)
end: end:
if (download->cached) if (download->cached)
object_unlock(download->cached); object_unlock(download->cached);
JS_RemoveRoot(smjs_ctx, &hop->callback); JS_RemoveValueRoot(smjs_ctx, &hop->callback);
mem_free(download->data); mem_free(download->data);
mem_free(download); mem_free(download);
@ -64,9 +64,9 @@ end:
} }
static JSBool static JSBool
smjs_load_uri(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv, smjs_load_uri(JSContext *ctx, uintN argc, jsval *rval)
jsval *rval)
{ {
jsval *argv = JS_ARGV(ctx, rval);
struct smjs_load_uri_hop *hop; struct smjs_load_uri_hop *hop;
struct download *download; struct download *download;
JSString *jsstr; JSString *jsstr;
@ -76,7 +76,7 @@ smjs_load_uri(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv,
if (argc < 2) return JS_FALSE; if (argc < 2) return JS_FALSE;
jsstr = JS_ValueToString(smjs_ctx, argv[0]); jsstr = JS_ValueToString(smjs_ctx, argv[0]);
uri_string = JS_GetStringBytes(jsstr); uri_string = JS_EncodeString(smjs_ctx, jsstr);
uri = get_uri(uri_string, 0); uri = get_uri(uri_string, 0);
if (!uri) return JS_FALSE; if (!uri) return JS_FALSE;
@ -96,7 +96,7 @@ smjs_load_uri(JSContext *ctx, JSObject *obj, uintN argc, jsval *argv,
hop->callback = argv[1]; hop->callback = argv[1];
hop->ses = smjs_ses; hop->ses = smjs_ses;
if (!JS_AddNamedRoot(smjs_ctx, &hop->callback, if (!JS_AddNamedValueRoot(smjs_ctx, &hop->callback,
"smjs_load_uri_hop.callback")) { "smjs_load_uri_hop.callback")) {
mem_free(hop); mem_free(hop);
mem_free(download); mem_free(download);

16
src/scripting/smjs/view_state_object.c
View File

@ -39,7 +39,7 @@ static const JSPropertySpec view_state_props[] = {
/* @view_state_class.getProperty */ /* @view_state_class.getProperty */
static JSBool static JSBool
view_state_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) view_state_get_property(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
struct view_state *vs; struct view_state *vs;
@ -54,10 +54,10 @@ view_state_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
undef_to_jsval(ctx, vp); undef_to_jsval(ctx, vp);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_FALSE; return JS_FALSE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case VIEW_STATE_PLAIN: case VIEW_STATE_PLAIN:
*vp = INT_TO_JSVAL(vs->plain); *vp = INT_TO_JSVAL(vs->plain);
@ -80,7 +80,7 @@ view_state_get_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
/* @view_state_class.setProperty */ /* @view_state_class.setProperty */
static JSBool static JSBool
view_state_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) view_state_set_property(JSContext *ctx, JSObject *obj, jsid id, JSBool strict, jsval *vp)
{ {
struct view_state *vs; struct view_state *vs;
@ -93,10 +93,10 @@ view_state_set_property(JSContext *ctx, JSObject *obj, jsval id, jsval *vp)
vs = JS_GetInstancePrivate(ctx, obj, vs = JS_GetInstancePrivate(ctx, obj,
(JSClass *) &view_state_class, NULL); (JSClass *) &view_state_class, NULL);
if (!JSVAL_IS_INT(id)) if (!JSID_IS_INT(id))
return JS_FALSE; return JS_FALSE;
switch (JSVAL_TO_INT(id)) { switch (JSID_TO_INT(id)) {
case VIEW_STATE_PLAIN: { case VIEW_STATE_PLAIN: {
vs->plain = atol(jsval_to_string(ctx, vp)); vs->plain = atol(jsval_to_string(ctx, vp));
@ -143,7 +143,7 @@ smjs_get_view_state_object(struct view_state *vs)
} }
static JSBool static JSBool
smjs_elinks_get_view_state(JSContext *ctx, JSObject *obj, jsval id, jsval *vp) smjs_elinks_get_view_state(JSContext *ctx, JSObject *obj, jsid id, jsval *vp)
{ {
JSObject *vs_obj; JSObject *vs_obj;
struct view_state *vs; struct view_state *vs;
@ -170,6 +170,6 @@ smjs_init_view_state_interface(void)
return; return;
JS_DefineProperty(smjs_ctx, smjs_elinks_object, "vs", JSVAL_NULL, JS_DefineProperty(smjs_ctx, smjs_elinks_object, "vs", JSVAL_NULL,
smjs_elinks_get_view_state, JS_PropertyStub, smjs_elinks_get_view_state, JS_StrictPropertyStub,
JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY); JSPROP_ENUMERATE | JSPROP_PERMANENT | JSPROP_READONLY);
} }