X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tests%2Fmain.c;h=e73df826ca98c0a92f35970d58f6705870f76978;hb=aa81cab268d6b17079c9d04226bdfc47a1b6a289;hp=d7f09bb52c1e236d00d20ab27f57510ef8202c08;hpb=8c5ff2ad80dffbd3d6b80c556ce305c7047fd576;p=projects%2Fchimara%2Fchimara.git

diff --git a/tests/main.c b/tests/main.c
index d7f09bb..e73df82 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -62,6 +62,30 @@ on_stopped(ChimaraGlk *glk)
     g_printerr("Stopped!\n");
 }
 
+static void
+on_waiting(ChimaraGlk *glk)
+{
+	g_printerr("Waiting!\n");
+}
+
+static void
+on_char_input(ChimaraGlk *glk, guint32 window_rock, guint keysym)
+{
+	g_printerr("Character input in window %d: key %d\n", window_rock, keysym);
+}
+
+static void
+on_line_input(ChimaraGlk *glk, guint32 window_rock, gchar *text)
+{
+	g_printerr("Line input in window %d: '%s'\n", window_rock, text);
+}
+
+static void
+on_text_buffer_output(ChimaraGlk *glk, guint32 window_rock, gchar *text)
+{
+	g_printerr("Text buffer output in window %d: '%s'\n", window_rock, text);
+}
+
 static GObject *
 load_object(const gchar *name)
 {
@@ -101,20 +125,22 @@ create_window(void)
 	for(ptr = actions; *ptr; ptr += 2)
 		gtk_action_group_add_action_with_accel(actiongroup, GTK_ACTION(load_object(ptr[0])), ptr[1]);
 
-	GtkUIManager *uimanager = gtk_ui_manager_new();
+	uimanager = gtk_ui_manager_new();
 	if( !gtk_ui_manager_add_ui_from_file(uimanager, "chimara.menus", &error) ) {
 		error_dialog(NULL, error, "Error while building interface: ");
 		return;
 	}
 	
-	gtk_builder_connect_signals(builder, NULL);
-	
 	glk = chimara_glk_new();
 	g_object_set(glk, "border-width", 6, "spacing", 6, 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, "waiting", G_CALLBACK(on_waiting), NULL);
+	g_signal_connect(glk, "char-input", G_CALLBACK(on_char_input), NULL);
+	g_signal_connect(glk, "line-input", G_CALLBACK(on_line_input), NULL);
+	g_signal_connect(glk, "text-buffer-output", G_CALLBACK(on_text_buffer_output), NULL);
 	
 	GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );			
 	if(vbox == NULL)
@@ -130,6 +156,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
@@ -145,16 +173,14 @@ main(int argc, char *argv[])
 
 	if( !g_thread_supported() )
 		g_thread_init(NULL);
-
 	gdk_threads_init();
-    
-	gtk_set_locale();
 	gtk_init(&argc, &argv);
 
 	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) ) {
    		error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");