* Path fixes

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

diff --git a/player/main.c b/player/main.c
index b86baddb33fec03ba89aa35b7717e315256ff817..8d9bb255d2a94cf38ab53d06e8507e8fc9eb4596 100644 (file)
--- a/player/main.c
+++ b/player/main.c
@@ -44,11 +44,15 @@
 #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;
+/* Static global pointers to widgets */
+static GtkBuilder *builder = NULL;
+static GtkUIManager *uimanager = NULL;
+static GtkWidget *window = NULL;
+static GtkWidget *glk = NULL;
+
+/* Global global pointers */
+GtkWidget *aboutwindow = NULL;
+GtkWidget *prefswindow = NULL;
 
 static GObject *
 load_object(const gchar *name)
@@ -67,12 +71,22 @@ create_window(void)
        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;
+       if( !gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "/chimara.ui", &error) ) {
+#ifdef DEBUG
+               g_error_free(error);
+               error = NULL;
+               if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
+#endif /* DEBUG */
+                       error_dialog(NULL, error, "Error while building interface: ");  
+                       return;
+#ifdef DEBUG
+               }
+#endif /* DEBUG */
        }
 
        window = GTK_WIDGET(load_object("chimara"));
+       aboutwindow = GTK_WIDGET(load_object("aboutwindow"));
+       prefswindow = GTK_WIDGET(load_object("prefswindow"));
        GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup"));
 
        /* Add all the actions to the action group. This for-loop is a temporary fix
@@ -80,34 +94,54 @@ create_window(void)
        action group. */
        const gchar *actions[] = { 
                "game", "",
-               "open", "<ctrl>F7", 
-               "save", NULL, /* NULL means use stock accelerator */
-               "quit", NULL,
-               "hint", "",
-               "char_input", "",
-               "char_input2", "",
+               "open", "<ctrl>O", 
+               "recent", "",
+               "stop", "",
+               "quit_chimara", NULL, /* NULL means use stock accelerator */
+               "command", "",
+               "undo", "<ctrl>Z",
+               "save", NULL, 
+               "restore", "<ctrl>R", 
+               "restart", "",
+               "quit", "",
+               "edit", "",
+               "copy", NULL,
+               "paste", NULL,
+               "preferences", "",
+               "help", "",
+               "about", "",
                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]);
+       GtkRecentFilter *filter = gtk_recent_filter_new();
+       /* TODO: Use mimetypes and construct the filter dynamically depending on 
+       what plugins are installed */
+       const gchar *patterns[] = {
+               "*.z[1-8]", "*.[zg]lb", "*.[zg]blorb", "*.ulx", "*.blb", "*.blorb", NULL
+       };
+       for(ptr = patterns; *ptr; ptr++)
+               gtk_recent_filter_add_pattern(filter, *ptr);
+       GtkRecentChooser *recent = GTK_RECENT_CHOOSER(load_object("recent"));
+       gtk_recent_chooser_add_filter(recent, filter);
 
        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;
+       if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_DATA_DIR "/chimara.menus", &error) ) {
+#ifdef DEBUG
+               g_error_free(error);
+               error = NULL;
+               if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
+#endif /* DEBUG */
+                       error_dialog(NULL, error, "Error while building interface: ");
+                       return;
+#ifdef DEBUG
+               }
+#endif /* DEBUG */
        }
        
        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_object_set(glk, "ignore-errors", TRUE, NULL);
        
        GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );                      
        if(vbox == NULL)
@@ -149,14 +183,11 @@ main(int argc, char *argv[])
        g_object_unref( G_OBJECT(builder) );
        g_object_unref( G_OBJECT(uimanager) );
 
-       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;
+       if(argc >= 2) {
+               if( !chimara_if_run_game(CHIMARA_IF(glk), argv[1], &error) ) {
+                       error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");
+                       return 1;
+               }
        }
 
     gdk_threads_enter();