Implemented the signals 'char-input', 'line-input', and 'text-buffer-output' on the...

[rodin/chimara.git] / tests / main.c

diff --git a/tests/main.c b/tests/main.c
index 0a03c3c535a93c0a9df444fc9b4297e01490fa24..9ed6158f2245e49593f63e87e820ec33a8cf463d 100644 (file)
--- a/tests/main.c
+++ b/tests/main.c
@@ -46,6 +46,7 @@
 
 /* Global pointers to widgets */
 GtkBuilder *builder = NULL;
+GtkUIManager *uimanager = NULL;
 GtkWidget *window = NULL;
 GtkWidget *glk = NULL;
 
@@ -61,14 +62,69 @@ on_stopped(ChimaraGlk *glk)
     g_printerr("Stopped!\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)
+{
+       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, "chimara.ui", &error) ) {
+               error_dialog(NULL, error, "Error while building interface: ");  
                return;
        }
 
+       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,
+               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, "chimara.menus", &error) ) {
+               error_dialog(NULL, error, "Error while building interface: ");
+               return;
+       }
+       
        gtk_builder_connect_signals(builder, NULL);
        
        glk = chimara_glk_new();
@@ -77,6 +133,9 @@ create_window(void)
        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, "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)
@@ -85,7 +144,13 @@ 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);
 }
 
 int
@@ -101,22 +166,14 @@ 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) ) {
                error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");