X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=tests%2Fmain.c;h=82c92bf1a073a3fc474efa32e7edcea1b808203c;hp=60891d3ea273f92feab5cc818167e794f919b1ca;hb=3c19422ee9cc38e710bd2f262b2b91a3d6e04ab6;hpb=92895be4421d350eb674093c1789d8703c2d8f94

diff --git a/tests/main.c b/tests/main.c
index 60891d3..82c92bf 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_print("Command: %s\nResponse: %s\n", input, response);
+	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 *
@@ -86,7 +88,7 @@ create_window(void)
 	GError *error = NULL;
 
    	builder = gtk_builder_new();
-	if( !gtk_builder_add_from_file(builder, "chimara.ui", &error) ) {
+	if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
 		error_dialog(NULL, error, "Error while building interface: ");	
 		return;
 	}
@@ -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;
@@ -109,12 +114,14 @@ create_window(void)
 		gtk_action_group_add_action_with_accel(actiongroup, GTK_ACTION(load_object(ptr[0])), ptr[1]);
 
 	uimanager = gtk_ui_manager_new();
-	if( !gtk_ui_manager_add_ui_from_file(uimanager, "chimara.menus", &error) ) {
+	if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
 		error_dialog(NULL, error, "Error while building interface: ");
 		return;
 	}
 	
 	glk = chimara_if_new();
+	//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,
@@ -141,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
@@ -175,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();