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

diff --git a/tests/main.c b/tests/main.c
index 0a03c3c..82c92bf 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -40,12 +40,13 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "callbacks.h"
 #include "error.h"
 #include <libchimara/chimara-glk.h>
+#include <libchimara/chimara-if.h>
 
 /* Global pointers to widgets */
 GtkBuilder *builder = NULL;
+GtkUIManager *uimanager = NULL;
 GtkWidget *window = NULL;
 GtkWidget *glk = NULL;
 
@@ -61,22 +62,76 @@ on_stopped(ChimaraGlk *glk)
     g_printerr("Stopped!\n");
 }
 
+static void
+on_command(ChimaraGlk *glk, gchar *input, gchar *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 *
+load_object(const gchar *name)
+{
+	GObject *retval;
+	if( (retval = gtk_builder_get_object(builder, name)) == NULL) {
+		error_dialog(NULL, NULL, "Error while getting object '%s'", name);
+		g_error("Error while getting object '%s'", name);
+	}
+	return retval;
+}
+
 static void
 create_window(void)
 {
-	if( (window = GTK_WIDGET(gtk_builder_get_object(builder, "gargoyle-gtk"))) == NULL ) {
-		error_dialog(NULL, NULL, "Error while getting main window object");
+	GError *error = NULL;
+
+   	builder = gtk_builder_new();
+	if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
+		error_dialog(NULL, error, "Error while building interface: ");	
 		return;
 	}
 
-	gtk_builder_connect_signals(builder, NULL);
+	window = GTK_WIDGET(load_object("chimara"));
+	GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
+
+	/* Add all the actions to the action group. This for-loop is a temporary fix
+	and can be removed once Glade supports adding actions and accelerators to an
+	action group. */
+	const gchar *actions[] = { 
+		"game", "",
+		"open", "<ctrl>F7", 
+		"save", NULL, /* NULL means use stock accelerator */
+		"quit", NULL,
+		"hint", "",
+		"char_input", "",
+		"char_input2", "",
+		NULL
+	};
+	const gchar **ptr;
+	for(ptr = actions; *ptr; ptr += 2)
+		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, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
+		error_dialog(NULL, error, "Error while building interface: ");
+		return;
+	}
 	
-	glk = chimara_glk_new();
-	g_object_set(glk, "border-width", 6, "spacing", 6, NULL);
+	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,
+		"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)
@@ -85,7 +140,15 @@ create_window(void)
 		return;
 	}
 
+	gtk_ui_manager_insert_action_group(uimanager, actiongroup, 0);
+	GtkWidget *menubar = gtk_ui_manager_get_widget(uimanager, "/menubar");
+	GtkWidget *toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar");
+
 	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, glk);
 }
 
 int
@@ -101,27 +164,26 @@ main(int argc, char *argv[])
 
 	if( !g_thread_supported() )
 		g_thread_init(NULL);
-
 	gdk_threads_init();
-    
-	gtk_set_locale();
 	gtk_init(&argc, &argv);
 
-   	builder = gtk_builder_new();
-	if( !gtk_builder_add_from_file(builder, "chimara.ui", &error) ) {
-		error_dialog(NULL, error, "Error while building interface: ");	
-		return 1;
-	}
-
 	create_window();
 	gtk_widget_show_all(window);
 
 	g_object_unref( G_OBJECT(builder) );
+	g_object_unref( G_OBJECT(uimanager) );
 
-    if( !chimara_glk_run(CHIMARA_GLK(glk), "../interpreters/frotz/.libs/frotz.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;
 	}
+	//chimara_glk_run( CHIMARA_GLK(glk), ".libs/multiwin.so", argc, argv, NULL);
+
 
     gdk_threads_enter();
 	gtk_main();