search for: jsobject

...f6bc 100644 --- a/libswfdec/swfdec_edittext_movie.c +++ b/libswfdec/swfdec_edittext_movie.c @@ -68,24 +68,23 @@ static void swfdec_edit_text_movie_iterate (SwfdecMovie *movie) { SwfdecEditTextMovie *text = SWFDEC_EDIT_TEXT_MOVIE (movie); - SwfdecPlayer *player; + SwfdecScriptable *parent; + JSObject *jsobj; jsval val; const char *s; if (text->text->variable == NULL) return; - player = SWFDEC_ROOT_MOVIE (movie->root)->player; - if (movie->parent->jsobj == NULL) { - swfdec_js_add_movie (movie->parent); - if (movie->parent->jsobj == NULL) -...

...lddir)/libswfdec/js \ -DXP_UNIX -DDEBUG -fno-strict-aliasing libjs_la_LDFLAGS = -lm diff-tree 6c6af82416ae35dfa7312a66077977a655862051 (from 9b3d71429f674fad30b0dfa1c9ae3f7d7452e8e4) Author: Benjamin Otte <otte@gnome.org> Date: Thu Mar 22 19:50:52 2007 +0100 change all conversions JSObject->SwfdecMovie to not assert on failure but silently return diff --git a/libswfdec/swfdec_js_movie.c b/libswfdec/swfdec_js_movie.c index 2d9b1a1..3f6333c 100644 --- a/libswfdec/swfdec_js_movie.c +++ b/libswfdec/swfdec_js_movie.c @@ -116,7 +116,11 @@ mc_play (JSContext *cx, JSObject *obj, u {...

...decScriptable, swfdec_scriptable, G_TYPE_OBJECT) - -static void -swfdec_scriptable_dispose (GObject *object) -{ - SwfdecScriptable *script = SWFDEC_SCRIPTABLE (object); - - g_assert (script->jsobj == NULL); - - G_OBJECT_CLASS (swfdec_scriptable_parent_class)->dispose (object); -} - -static JSObject * -swfdec_scriptable_create_js_object (SwfdecScriptable *scriptable) -{ - SwfdecScriptableClass *klass; - JSContext *cx; - JSObject *obj; - - klass = SWFDEC_SCRIPTABLE_GET_CLASS (scriptable); - g_return_val_if_fail (klass->jsclass != NULL, NULL); - cx = scriptable->jscx; - - obj = JS_N...

...xtHighestDepth () diff --git a/libswfdec/swfdec_js_movie.c b/libswfdec/swfdec_js_movie.c index 5b730b3..2296078 100644 --- a/libswfdec/swfdec_js_movie.c +++ b/libswfdec/swfdec_js_movie.c @@ -87,7 +87,7 @@ mc_getBytesLoaded (JSContext *cx, JSObje } static JSBool -mc_getBytesTotal(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +mc_getBytesTotal (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) { SwfdecMovie *movie; SwfdecDecoder *dec; @@ -101,6 +101,23 @@ mc_getBytesTotal(JSContext *cx, JSObject } static JSBool +mc_getNextHighestDepth (JSContext *c...

...bswfdec/swfdec_js_net_stream.c b/libswfdec/swfdec_js_net_stream.c index 9f12dd0..ed9c81e 100644 --- a/libswfdec/swfdec_js_net_stream.c +++ b/libswfdec/swfdec_js_net_stream.c @@ -27,6 +27,23 @@ #include "swfdec_player_internal.h" static JSBool +swfdec_js_net_stream_play (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + SwfdecNetStream *stream; + const char *url; + + stream = swfdec_scriptable_from_object (cx, obj, SWFDEC_TYPE_NET_STREAM); + if (stream == NULL) + return JS_TRUE; + url = swfdec_js_to_string (cx, argv[0]); + if (url == NULL) + return JS_FA...

...ave_fun: frame.scopeChain = NULL; /* set below for real, after cx->fp is set */ frame.pc = NULL; frame.spbase = NULL; + frame.spend = NULL; frame.sharpDepth = 0; frame.sharpArray = NULL; frame.dormantNext = NULL; @@ -1138,6 +1139,7 @@ js_Execute(JSContext *cx, JSObject *chai frame.pc = NULL; frame.sp = oldfp ? oldfp->sp : NULL; frame.spbase = NULL; + frame.spend = NULL; frame.sharpDepth = 0; frame.flags = special; frame.dormantNext = NULL; @@ -1502,6 +1504,7 @@ js_Interpret(JSContext *cx, jsval *resul } sp = newsp + d...

...ent swfdec_js_eval_set diff --git a/libswfdec/swfdec_js.c b/libswfdec/swfdec_js.c index bbd6a43..1601b4b 100644 --- a/libswfdec/swfdec_js.c +++ b/libswfdec/swfdec_js.c @@ -322,30 +322,38 @@ swfdec_js_eval_get_property (JSContext * } } -/** - * swfdec_js_eval: - * @cx: a #JSContext - * @obj: #JSObject to use as a source for evaluating - * @str: The string to evaluate - * @ignore_case: TRUE for case insensitive evaluation - * - * This function works like the Actionscript eval function used on @obj. - * It handles both slash-style and dot-style notation. - * - * Returns: the value or JSVAL_VOID if...

...s)) return JS_FALSE; - if (!swfdec_script_ensure_stack (cx, n_args + 2)) - return JS_FALSE; if (!(atom = js_Atomize (cx, s, strlen (s), 0)) || !js_FindProperty (cx, (jsid) atom, &obj, &pobj, &prop)) @@ -709,13 +717,13 @@ swfdec_action_call_method (JSContext *cx JSObject *obj; jsval fun; + if (!swfdec_script_ensure_stack (cx, 3)) + return JS_FALSE; s = swfdec_js_to_string (cx, fp->sp[-1]); if (s == NULL) return JS_FALSE; if (!JS_ValueToECMAUint32 (cx, fp->sp[-3], &n_args)) return JS_FALSE; - if (!swfdec_script_ensure_stack (...

...swfdec_js_video.c @@ -23,78 +23,56 @@ #include "swfdec_video.h" #include "swfdec_debug.h" -#include "swfdec_js.h" #include "swfdec_net_stream.h" #include "swfdec_player_internal.h" -static JSBool -swfdec_js_video_attach_video (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +static void +swfdec_video_attach_video (SwfdecAsContext *cx, SwfdecAsObject *obj, guint argc, SwfdecAsValue *argv, SwfdecAsValue *rval) { + SwfdecVideoMovie *video = SWFDEC_VIDEO_MOVIE (obj); SwfdecNetStream *stream; - SwfdecVideoMovie *video; - -...

...+318,6 @@ swfdec_js_eval_get_property (JSContext * return JS_FALSE; if (!prop) return JS_FALSE; - if (pobj) - obj = pobj; return OBJ_GET_PROPERTY (cx, obj, (jsid) prop->id, ret); } } @@ -345,7 +343,7 @@ static gboolean swfdec_js_eval_internal (JSContext *cx, JSObject *obj, const char *str, jsval *val, gboolean set) { - jsval cur; + jsval cur = JSVAL_NULL; char *work = NULL; SWFDEC_LOG ("eval called with \"%s\" on %p", str, obj); @@ -361,12 +359,10 @@ swfdec_js_eval_internal (JSContext *cx, goto out; obj = cx-...

...USA + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include "swfdec_net_stream.h" +#include "swfdec_debug.h" +#include "swfdec_js.h" +#include "swfdec_player_internal.h" + +static JSBool +swfdec_js_net_stream_to_string (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + JSString *string; + + string = JS_InternString (cx, "[object Object]"); + if (string == NULL) + return JS_FALSE; + + *rval = STRING_TO_JSVAL (string); + return JS_TRUE; +} + +static JSFunctionSpec net_stream_methods[] = { + { &quot...

...ipt; + frame.swf = swf; frame.fun = fun; frame.argc = argc; frame.argv = sp - argc; diff --git a/libswfdec/js/jsinterp.h b/libswfdec/js/jsinterp.h index d68957d..b22166d 100644 --- a/libswfdec/js/jsinterp.h +++ b/libswfdec/js/jsinterp.h @@ -54,7 +54,8 @@ struct JSStackFrame { JSObject *callobj; /* lazily created Call object */ JSObject *argsobj; /* lazily created arguments object */ JSObject *varobj; /* variables object, where vars go */ - JSScript *script; /* script being interpreted */ + JSScript *scr...

.../swfdec_as_interpret.c +++ b/libswfdec/swfdec_as_interpret.c @@ -1192,35 +1192,31 @@ fail: fp->sp[-1] = JSVAL_VOID; return JS_TRUE; } +#endif static void swfdec_action_init_object (SwfdecAsContext *cx, guint action, const guint8 *data, guint len) { - JSStackFrame *fp = cx->fp; - JSObject *object; - guint n_args; - gulong i; + SwfdecAsStack *stack = cx->frame->stack; + SwfdecAsObject *object; + guint i, n_args; - if (!JS_ValueToECMAUint32 (cx, fp->sp[-1], &n_args)) - return JS_FALSE; - if (!swfdec_script_ensure_stack (cx, 2 * n_args + 1)) - return JS_FALS...

...wfdec/swfdec_js_mouse.c +++ b/libswfdec/swfdec_js_mouse.c @@ -23,9 +23,33 @@ #include "swfdec_js.h" #include "swfdec_debug.h" +#include "swfdec_listener.h" #include "swfdec_player_internal.h" static JSBool +swfdec_js_mouse_add_listener (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + SwfdecPlayer *player = JS_GetContextPrivate (cx); + + g_assert (player); + if (!JSVAL_IS_OBJECT (argv[0]) || argv[0] == JSVAL_NULL) + return JS_TRUE; + return swfdec_listener_add (player->mouse_listener, JSVAL_TO_OBJECT (argv[0])); +} + +st...

...1dd6ae..f00a6f1 100644 --- a/libswfdec/swfdec_script.c +++ b/libswfdec/swfdec_script.c @@ -1387,7 +1387,7 @@ static JSBool swfdec_action_new_object (JSContext *cx, guint action, const guint8 *data, guint len) { JSStackFrame *fp = cx->fp; - jsval constructor; + jsval constructor, proto; JSObject *object; const JSClass *clasp; guint n_args; @@ -1414,7 +1414,12 @@ swfdec_action_new_object (JSContext *cx, if (JS_GetClass (object) != &js_FunctionClass) goto fail; clasp = ((JSFunction *) JS_GetPrivate (cx, object))->clasp; - object = JS_NewObject (cx, clasp, NULL, NULL)...

...js_interval_new (guint n_args) +{ + SwfdecJSInterval *ret = g_malloc (sizeof (SwfdecJSInterval) + sizeof (jsval) * (2 + n_args)); + + ret->timeout.callback = swfdec_js_interval_trigger; + ret->n_args = n_args; + return ret; +} + +static JSBool +swfdec_js_global_setInterval (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + SwfdecPlayer *player = JS_GetContextPrivate (cx); + JSObject *object; + jsval fun; + unsigned int i, n_args, first_arg, msecs; + SwfdecJSInterval *interval; + + if (!JSVAL_IS_OBJECT (argv[0])) { + SWFDEC_WARNING ("first argument to setI...

...+0100 get rid of undefined symbols It still sucks that libjs.so needs symbols from libswfdec diff --git a/libswfdec/js/jsobj.c b/libswfdec/js/jsobj.c index 81ac409..0f825ff 100644 --- a/libswfdec/js/jsobj.c +++ b/libswfdec/js/jsobj.c @@ -905,7 +905,7 @@ js_obj_toSource(JSContext *cx, JSObject } #endif /* JS_HAS_INITIALIZERS || JS_HAS_TOSOURCE */ -extern const JSClass movieclip_class; +extern int swfdec_js_is_movieclip (JSContext *cx, JSObject *obj); extern char *swfdec_movie_get_path (void *movieclip); extern void g_free (void *p); JSBool @@ -921,7 +921,7 @@ js_obj_toString(JSCo...

...1301 USA - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "swfdec_net_stream.h" -#include "swfdec_debug.h" -#include "swfdec_js.h" -#include "swfdec_player_internal.h" - -static JSBool -swfdec_js_net_stream_play (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) -{ - SwfdecNetStream *stream; - const char *url; - - stream = swfdec_scriptable_from_object (cx, obj, SWFDEC_TYPE_NET_STREAM); - if (stream == NULL) - return JS_TRUE; - url = swfdec_js_to_string (cx, argv[0]); - if (url == NULL) - return JS_FA...

...git a/libswfdec/swfdec_js_movie.c b/libswfdec/swfdec_js_movie.c index 5137746..2d9b1a1 100644 --- a/libswfdec/swfdec_js_movie.c +++ b/libswfdec/swfdec_js_movie.c @@ -610,12 +610,26 @@ swfdec_js_getURL (JSContext *cx, JSObjec return JS_TRUE; } +static JSBool +swfdec_js_getDepth (JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval) +{ + SwfdecMovie *movie; + + movie = JS_GetPrivate (cx, obj); + if (!movie) + return JS_TRUE; + + *rval = INT_TO_JSVAL (movie->depth); + return JS_TRUE; +} + static JSFunctionSpec movieclip_methods[] = { { "attachMovie", swfdec_js...

...+; + } + return js_Invoke (cx, n_args, flags); +} + +/* FIXME: lots of overlap with swfdec_action_call_method */ +static void +swfdec_action_call_function (SwfdecAsContext *cx, guint action, const guint8 *data, guint len) +{ + JSStackFrame *fp = cx->fp; + const char *s; + guint32 n_args; + JSObject *obj, *pobj; + JSProperty *prop; + jsval fun; + JSAtom *atom; + + if (!swfdec_script_ensure_stack (cx, 2)) + return JS_FALSE; + s = swfdec_js_to_string (cx, fp->sp[-1]); + if (s == NULL) + return JS_FALSE; + if (!JS_ValueToECMAUint32 (cx, fp->sp[-2], &n_args)) + return J...