X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tests%2Fmain.c;h=5cadc226533c872299e57c58e1a2a39cd0d09d36;hb=13b21e2a9ba53c7109ae0bbfd774f16f0c9d4413;hp=5c38111167ad9e63571cb7a17bbe0967b22cbc93;hpb=b2786d791c97b51fee5f5c628d2819fc58c03d8e;p=rodin%2Fchimara.git

diff --git a/tests/main.c b/tests/main.c
index 5c38111..5cadc22 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -40,7 +40,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "callbacks.h"
 #include "error.h"
 #include <libchimara/chimara-glk.h>
 #include <libchimara/chimara-if.h>
@@ -66,7 +65,10 @@ on_stopped(ChimaraGlk *glk)
 static void
 on_command(ChimaraGlk *glk, gchar *input, gchar *response)
 {
-	g_printerr("Command!\n");
+	gchar *ellipsized = g_strdelimit(g_strndup(response, 20), "\n", ' ');
+	g_print("%s - %s%s\n", input, ellipsized, 
+		(strlen(ellipsized) < strlen(response))? "..." : "");
+	g_free(ellipsized);
 }
 
 static GObject *
@@ -102,6 +104,9 @@ create_window(void)
 		"open", "<ctrl>F7", 
 		"save", NULL, /* NULL means use stock accelerator */
 		"quit", NULL,
+		"hint", "",
+		"char_input", "",
+		"char_input2", "",
 		NULL
 	};
 	const gchar **ptr;
@@ -115,7 +120,13 @@ create_window(void)
 	}
 	
 	glk = chimara_if_new();
-	g_object_set(glk, "border-width", 6, "spacing", 6, NULL);
+	//chimara_if_set_preferred_interpreter( CHIMARA_IF(glk), CHIMARA_IF_FORMAT_Z8, CHIMARA_IF_INTERPRETER_NITFOL);
+
+	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);
@@ -137,7 +148,7 @@ create_window(void)
 	gtk_box_pack_start(vbox, menubar, FALSE, FALSE, 0);
 	gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);
 	
-	gtk_builder_connect_signals(builder, NULL);
+	gtk_builder_connect_signals(builder, glk);
 }
 
 int
@@ -171,6 +182,8 @@ main(int argc, char *argv[])
    		error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");
 		return 1;
 	}
+	//chimara_glk_run( CHIMARA_GLK(glk), ".libs/multiwin.so", argc, argv, NULL);
+
 
     gdk_threads_enter();
 	gtk_main();