search for: viviappl

...2 02:02:39 2007 +0200 add stubs for missing functions diff --git a/vivified/core/vivi_application.c b/vivified/core/vivi_application.c index b2ec3bd..f93fb16 100644 --- a/vivified/core/vivi_application.c +++ b/vivified/core/vivi_application.c @@ -201,6 +201,9 @@ vivi_application_send_message (ViviAppli va_list args; char *msg; + g_return_if_fail (VIVI_IS_APPLICATION (app)); + g_return_if_fail (format != NULL); + va_start (args, format); msg = g_strdup_vprintf (format, args); va_end (args); @@ -208,3 +211,31 @@ vivi_application_send_message (ViviAppli g_free (msg); } +typ...

...t, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA + */ + +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include <string.h> +#include "vivi_vivi_docklet.h" + +static void +vivi_command_line_execute (ViviApplication *app, const char *command) +{ + char *run; + + if (!strpbrk (command, ";\"',()[]{}")) { + /* special mode: interpret as space-delimited list: + * first argument is function name, following arguemnts are function arguments + */ + char **args = g_strsplit (co...

...14 20:29:22 2007 +0200 remove debugging g_print's diff --git a/vivified/core/vivi_application.c b/vivified/core/vivi_application.c index d822642..585d295 100644 --- a/vivified/core/vivi_application.c +++ b/vivified/core/vivi_application.c @@ -140,7 +140,6 @@ vivi_application_init_player (ViviApplic g_return_if_fail (VIVI_IS_APPLICATION (app)); - g_print ("init\n"); if (app->player_inited) return; @@ -149,7 +148,6 @@ vivi_application_init_player (ViviApplic return; } - g_print ("really init\n"); loader = swfdec_file_loader_new (app-&gt...

...; int *positions = g_new (int, count); - g_print ("reordering %u => %u (%u total)\n", old, new, count); for (i = 0; i < min; i++) { positions[i] = i; } @@ -393,6 +392,16 @@ vivi_movie_list_removed (ViviDebugger *d } static void +vivi_movie_list_reset (ViviApplication *app, GParamSpec *pspec, ViviMovieList *movies) +{ + GNode *walk; + + for (walk = movies->root->children; walk; walk = walk->next) { + vivi_movie_list_removed (NULL, walk->data, movies); + } +} + +static void vivi_movie_list_dispose (GObject *object) { ViviMovieList *m...

...the player is inited when stepping diff --git a/vivified/core/vivi_application_as.c b/vivified/core/vivi_application_as.c index f5e68f9..24814a7 100644 --- a/vivified/core/vivi_application_as.c +++ b/vivified/core/vivi_application_as.c @@ -53,6 +53,7 @@ vivi_application_as_step (SwfdecAsContex ViviApplication *app = VIVI_APPLICATION (cx); int steps; + vivi_application_init_player (app); if (argc > 0) { steps = swfdec_as_value_to_integer (cx, &argv[0]); if (steps <= 1) diff-tree 304e2632c4cf90212677d717ad4adbb2e050de7e (from 9f18261bca69f8c630cb5ba3e2b98694c68fd100) Au...

...ot; +#include "vivi_application.h" +#include "vivi_function.h" + +VIVI_FUNCTION ("player_frame_get", vivi_player_as_frame_get) +void +vivi_player_as_frame_get (SwfdecAsContext *cx, SwfdecAsObject *this, + guint argc, SwfdecAsValue *argv, SwfdecAsValue *retval) +{ + ViviApplication *app = VIVI_APPLICATION (cx); + SwfdecAsObject *obj; + + obj = SWFDEC_AS_OBJECT (swfdec_as_context_get_frame (SWFDEC_AS_CONTEXT (app->player))); + if (obj) + SWFDEC_AS_VALUE_SET_OBJECT (retval, vivi_wrap_object (app, obj)); +} + diff-tree e1b2e3c7a87d7f31d97553e9cc844afca9b8dd1d (fr...

...vivified_SOURCES = \ vivi_command_line.c \ vivi_movie_list.c \ + vivi_movies.c \ vivi_player.c \ vivi_vivi_docklet.c \ main.c diff --git a/vivified/ui/main.c b/vivified/ui/main.c index 8ca2e4b..f497e32 100644 --- a/vivified/ui/main.c +++ b/vivified/ui/main.c @@ -58,7 +58,7 @@ set_title (ViviApplication *app, GParamS static void setup (const char *filename, const char *variables) { - GtkWidget *window, *box, *widget; + GtkWidget *window, *box, *paned, *widget; ViviApplication *app; GtkBuilder *builder; GError *error = NULL; @@ -69,17 +69,22 @@ setup (const char *filename, cons...

.../core/vivi_debugger.c b/vivified/core/vivi_debugger.c index 4d81c45..44149cc 100644 --- a/vivified/core/vivi_debugger.c +++ b/vivified/core/vivi_debugger.c @@ -88,7 +88,7 @@ vivi_debugger_step (SwfdecAsDebugger *de g_signal_emit (debugger, signals[STEP], 0, &retval); if (!retval) { - ViviApplication *app = VIVI_APPLICATION (context); + ViviApplication *app = VIVI_DEBUGGER (debugger)->app; if (app->playback_state == VIVI_APPLICATION_STEPPING) { app->playback_count--; diff --git a/vivified/core/vivi_initialize.as b/vivified/core/vivi_initialize.as index 376e594.....

...ous thing to call. diff --git a/vivified/core/vivi_application.c b/vivified/core/vivi_application.c index 0805396..b9b2811 100644 --- a/vivified/core/vivi_application.c +++ b/vivified/core/vivi_application.c @@ -157,26 +157,6 @@ vivi_application_new (void) } void -vivi_application_init_player (ViviApplication *app) -{ - SwfdecLoader *loader; - - g_return_if_fail (VIVI_IS_APPLICATION (app)); - - if (app->player_inited) - return; - - if (app->filename == NULL) { - vivi_application_error (app, "no file set to play."); - return; - } - - app->player_inited = TRUE; -...

.../ui/vivi_commandline.c b/vivified/ui/vivi_commandline.c index ced3e15..6ae6b03 100644 --- a/vivified/ui/vivi_commandline.c +++ b/vivified/ui/vivi_commandline.c @@ -26,9 +26,29 @@ G_DEFINE_TYPE (ViviCommandLine, vivi_command_line, VIVI_TYPE_DOCKLET) static void +vivi_command_line_append_message (ViviApplication *app, guint type, const char *message, GtkTextView *view) +{ + GtkTextBuffer *buffer = gtk_text_view_get_buffer (view); + GtkTextIter iter; + GtkTextMark *mark; + const char *tag_names[] = { "input", "output", "error" }; + + gtk_text_buffer_get_end_iter (bu...

...rg> Date: Thu Aug 16 13:08:17 2007 +0200 breakpoints are objects diff --git a/vivified/core/vivi_function.c b/vivified/core/vivi_function.c index 4c2608c..686862a 100644 --- a/vivified/core/vivi_function.c +++ b/vivified/core/vivi_function.c @@ -76,6 +76,12 @@ vivi_function_init_context (ViviApplicat 0, functions[i].fun, 0); swfdec_as_native_function_set_construct_type (SWFDEC_AS_NATIVE_FUNCTION (fun), VIVI_TYPE_BREAKPOINT); + obj = swfdec_as_object_new (cx); + if (obj == NULL) + return; + SWFDEC_AS_VALUE_SET_OBJECT (&val, obj); + swfdec_as_object_set_variable (SWF...

...yer_as_variables_set (SwfdecAsCo vivi_application_set_variables (app, s); } +VIVI_FUNCTION ("player_global_get", vivi_player_as_global_get) +void +vivi_player_as_global_get (SwfdecAsContext *cx, SwfdecAsObject *this, + guint argc, SwfdecAsValue *argv, SwfdecAsValue *retval) +{ + ViviApplication *app = VIVI_APPLICATION (cx); + + if (SWFDEC_AS_CONTEXT (app->player)->global) { + SWFDEC_AS_VALUE_SET_OBJECT (retval, vivi_wrap_object (app, + SWFDEC_AS_CONTEXT (app->player)->global)); + } +} + diff-tree 66ab735ff2220bb72c978d827978edda1b215fe9 (from f7aaf7413c4306caf...

...; int *positions = g_new (int, count); - g_print ("reordering %u => %u (%u total)\n", old, new, count); for (i = 0; i < min; i++) { positions[i] = i; } @@ -393,6 +392,16 @@ vivi_movie_list_removed (ViviDebugger *d } static void +vivi_movie_list_reset (ViviApplication *app, GParamSpec *pspec, ViviMovieList *movies) +{ + GNode *walk; + + for (walk = movies->root->children; walk; walk = walk->next) { + vivi_movie_list_removed (NULL, walk->data, movies); + } +} + +static void vivi_movie_list_dispose (GObject *object) { ViviMovieList *m...

...a/vivified/ui/vivi_player.c b/vivified/ui/vivi_player.c index 6fcfee2..e8134b2 100644 --- a/vivified/ui/vivi_player.c +++ b/vivified/ui/vivi_player.c @@ -23,36 +23,14 @@ #include <libswfdec-gtk/swfdec-gtk.h> #include "vivi_vivi_docklet.h" - -static void -vivi_player_notify_app (ViviApplication *app, GParamSpec *pspec, SwfdecGtkWidget *player) -{ - if (g_str_equal (pspec->name, "player")) { - swfdec_gtk_widget_set_player (player, vivi_application_get_player (app)); - } else if (g_str_equal (pspec->name, "interrupted")) { - swfdec_gtk_widget_set_int...

...org> Date: Thu Aug 16 21:42:39 2007 +0200 Set the title correctly diff --git a/vivified/ui/main.c b/vivified/ui/main.c index df123a9..13d03ab 100644 --- a/vivified/ui/main.c +++ b/vivified/ui/main.c @@ -48,6 +48,16 @@ delete_event (GtkWidget *widget, GdkEven } static void +set_title (ViviApplication *app, GParamSpec *pspec, GtkWindow *window) +{ + const char *filename = vivi_application_get_filename (app); + + if (filename == NULL) + filename = "Vivified"; + gtk_window_set_title (window, filename); +} + +static void setup (const char *filename, const char *variables) {...

...toString (SwfdecAsContext *cx, SWFDEC_AS_VALUE_SET_STRING (retval, swfdec_as_context_give_string (cx, s)); } +VIVI_FUNCTION ("wrap_get", vivi_wrap_get) +void +vivi_wrap_get (SwfdecAsContext *cx, SwfdecAsObject *this, + guint argc, SwfdecAsValue *argv, SwfdecAsValue *retval) +{ + ViviApplication *app = VIVI_APPLICATION (cx); + ViviWrap *wrap; + SwfdecAsValue val; + const char *name; + + if (!VIVI_IS_WRAP (this) || argc == 0) + return; + wrap = VIVI_WRAP (this); + if (wrap->wrap == NULL) + return; + + name = swfdec_as_value_to_string (cx, &argv[0]); + swfdec_as...

....c b/vivified/ui/main.c index 7893e7e..1dd43e6 100644 --- a/vivified/ui/main.c +++ b/vivified/ui/main.c @@ -24,18 +24,8 @@ #include <gtk/gtk.h> #include <libswfdec-gtk/swfdec-gtk.h> #include "vivified/core/vivified-core.h" - -static void -entry_activate_cb (GtkEntry *entry, ViviApplication *app) -{ - const char *text = gtk_entry_get_text (entry); - - if (text[0] == '\0') - return; - - //swfdec_player_manager_execute (manager, text); - gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1); -} +#include "vivified/dock/vivified-dock.h" +#include "...

..._IMAGE_TYPE_UNKNOWN: default: g_assert_not_reached (); return "Unknown"; diff --git a/vivified/core/vivi_wrap.c b/vivified/core/vivi_wrap.c index 4be1e76..da86446 100644 --- a/vivified/core/vivi_wrap.c +++ b/vivified/core/vivi_wrap.c @@ -105,6 +105,7 @@ vivi_wrap_value (ViviApplication *app, SwfdecAsValue *dest, const SwfdecAsValue SWFDEC_AS_VALUE_SET_OBJECT (dest, vivi_wrap_object (app, SWFDEC_AS_VALUE_GET_OBJECT (src))); break; + case SWFDEC_AS_TYPE_INT: default: g_assert_not_reached (); break; diff --git a/vivified/ui/vivi_widget....

...39;master' into vivi get rid of debugger bits remove last remains of SwfdecDebugger ad functionality to get notified about object add/remove to GC emit remove debugger function before collecting the object implement add and remove vfuncs make this work with a ViviApplication add a ViviViviDocklet class that tracks the application and provides easy vfuncs make application_(un)set signals compute player widget dynamically make vivified use GtkBuilder for its docklets use the application as default data when connecting signals ad...

...ose (object); +} + +static void +vivi_wrap_class_init (ViviWrapClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->dispose = vivi_wrap_dispose; +} + +static void +vivi_wrap_init (ViviWrap *wrap) +{ +} + +SwfdecAsObject * +vivi_wrap_object (ViviApplication *app, SwfdecAsObject *object) +{ + const char *name; + SwfdecAsContext *cx; + SwfdecAsObject *wrap; + SwfdecAsValue val; + + wrap = g_hash_table_lookup (app->wraps, object); + if (wrap) + return wrap; + + cx = SWFDEC_AS_CONTEXT (app); + if (!swfdec_as_context_use_...