X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=tests%2Ftest-multisession.c;h=a364bf70773f21cc507f9ddf9e295548efd8795c;hb=0c5e51127206d26290a8e1e1349ab37d847d1d84;hp=7f984c837ea136ed80086852d5387d3d149aa5f3;hpb=a1e50b775982c1eed6f44aa5f027e4b4bddfb8b7;p=projects%2Fchimara%2Fchimara.git

diff --git a/tests/test-multisession.c b/tests/test-multisession.c
index 7f984c8..a364bf7 100644
--- a/tests/test-multisession.c
+++ b/tests/test-multisession.c
@@ -17,32 +17,37 @@ on_stopped(ChimaraGlk *glk, const gchar *data)
     g_printerr("%s stopped!\n", data);
 }
 
+static gboolean
+on_delete_event(void)
+{
+	gtk_main_quit();
+	return TRUE;
+}
+
 int
 main(int argc, char **argv)
 {
-	if( !g_thread_supported() )
-		g_thread_init(NULL);
-
 	gdk_threads_init();
-    
-	gtk_set_locale();
 	gtk_init(&argc, &argv);
 
 	GtkWidget *window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
 	gtk_widget_set_size_request(window, 800, 500);
-	
-	GtkWidget *hpaned = gtk_hpaned_new();
+	g_signal_connect(window, "delete_event", G_CALLBACK(on_delete_event), NULL);
+
+	GtkWidget *hpaned = gtk_paned_new(GTK_ORIENTATION_HORIZONTAL);
 	gtk_paned_set_position(GTK_PANED(hpaned), 400);
 	
 	GtkWidget *frotz = chimara_glk_new();
-	chimara_glk_set_default_font_string(CHIMARA_GLK(frotz), "Lucida Sans Unicode 12");
-	chimara_glk_set_monospace_font_string(CHIMARA_GLK(frotz), "Lucida Console 12");
+	chimara_glk_set_css_from_string(CHIMARA_GLK(frotz),
+	    "buffer.normal { font-family: 'Lucida Sans'; font-size: 12; }"
+	    "grid.normal { font-family: 'Lucida Console'; font-size: 12; }");
 	g_signal_connect(frotz, "started", G_CALLBACK(on_started), "Frotz");
 	g_signal_connect(frotz, "stopped", G_CALLBACK(on_stopped), "Frotz");
 	
 	GtkWidget *nitfol = chimara_glk_new();
-	chimara_glk_set_default_font_string(CHIMARA_GLK(nitfol), "Bitstream Charter 12");
-	chimara_glk_set_monospace_font_string(CHIMARA_GLK(nitfol), "Luxi Mono 12");
+	chimara_glk_set_css_from_string(CHIMARA_GLK(frotz),
+	    "buffer.normal { font-family: 'Bitstream Charter'; font-size: 12; }"
+	    "grid.normal { font-family: 'Luxi Mono'; font-size: 12; }");
 	g_signal_connect(nitfol, "started", G_CALLBACK(on_started), "Nitfol");
 	g_signal_connect(nitfol, "stopped", G_CALLBACK(on_stopped), "Nitfol");
 
@@ -56,11 +61,11 @@ main(int argc, char **argv)
 		return 1;
 	if(!chimara_glk_run(CHIMARA_GLK(nitfol), "../interpreters/nitfol/.libs/nitfol.so", argc, argv, NULL))
 		return 1;
-
+	
     gdk_threads_enter();
 	gtk_main();
 	gdk_threads_leave();
-
+	
 	chimara_glk_stop(CHIMARA_GLK(frotz));
 	chimara_glk_stop(CHIMARA_GLK(nitfol));