- Fixed a bug that made Nitfol crash since [130]

[projects/chimara/chimara.git] / tests / main.c

diff --git a/tests/main.c b/tests/main.c
index 4acd4ed4072d13e6e312462c0ee338eb6e91a415..60891d3ea273f92feab5cc818167e794f919b1ca 100644 (file)
--- a/tests/main.c
+++ b/tests/main.c
@@ -43,6 +43,7 @@
 #include "callbacks.h"
 #include "error.h"
 #include <libchimara/chimara-glk.h>
+#include <libchimara/chimara-if.h>
 
 /* Global pointers to widgets */
 GtkBuilder *builder = NULL;
@@ -62,6 +63,12 @@ on_stopped(ChimaraGlk *glk)
     g_printerr("Stopped!\n");
 }
 
+static void
+on_command(ChimaraGlk *glk, gchar *input, gchar *response)
+{
+       g_print("Command: %s\nResponse: %s\n", input, response);
+}
+
 static GObject *
 load_object(const gchar *name)
 {
@@ -107,14 +114,17 @@ create_window(void)
                return;
        }
        
-       gtk_builder_connect_signals(builder, NULL);
-       
-       glk = chimara_glk_new();
-       g_object_set(glk, "border-width", 6, "spacing", 6, NULL);
+       glk = chimara_if_new();
+       g_object_set(glk, 
+               "border-width", 6, 
+               "spacing", 6,
+               "ignore-errors", TRUE,
+               NULL);
        chimara_glk_set_default_font_string(CHIMARA_GLK(glk), "Serif 12");
        chimara_glk_set_monospace_font_string(CHIMARA_GLK(glk), "Monospace 12");
        g_signal_connect(glk, "started", G_CALLBACK(on_started), NULL);
        g_signal_connect(glk, "stopped", G_CALLBACK(on_stopped), NULL);
+       g_signal_connect(glk, "command", G_CALLBACK(on_command), NULL);
        
        GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );                      
        if(vbox == NULL)
@@ -130,6 +140,8 @@ create_window(void)
        gtk_box_pack_end(vbox, glk, TRUE, TRUE, 0);
        gtk_box_pack_start(vbox, menubar, FALSE, FALSE, 0);
        gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);
+       
+       gtk_builder_connect_signals(builder, NULL);
 }
 
 int
@@ -154,7 +166,12 @@ main(int argc, char *argv[])
        g_object_unref( G_OBJECT(builder) );
        g_object_unref( G_OBJECT(uimanager) );
 
-    if( !chimara_glk_run(CHIMARA_GLK(glk), "../interpreters/glulxe/.libs/glulxe.so", argc, argv, &error) ) {
+       if(argc < 2) {
+               error_dialog(GTK_WINDOW(window), NULL, "Must provide a game file");
+               return 1;
+       }
+       
+    if( !chimara_if_run_game(CHIMARA_IF(glk), argv[1], &error) ) {
                error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");
                return 1;
        }