X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fmain.c;h=bd007b4ee128b0a7966822a37c547ca98c7b7c85;hb=7cbc2c68d146433b1d438d60406ca05e14a523ce;hp=7eef7f740c8228db1fb2a050faa4c542bcc853fb;hpb=87504b58306f29cf833637a9e9983e947e684ee1;p=projects%2Fchimara%2Fchimara.git diff --git a/player/main.c b/player/main.c index 7eef7f7..bd007b4 100644 --- a/player/main.c +++ b/player/main.c @@ -38,8 +38,13 @@ #include #include +#include #include +/* Use a custom GSettings backend for our preferences file */ +#define G_SETTINGS_ENABLE_BACKEND +#include + #include "error.h" #include #include @@ -55,6 +60,9 @@ static GtkWidget *glk = NULL; GtkBuilder *builder = NULL; GtkWidget *aboutwindow = NULL; GtkWidget *prefswindow = NULL; +GtkWidget *toolbar = NULL; +GSettings *prefs_settings = NULL; +GSettings *state_settings = NULL; GObject * load_object(const gchar *name) @@ -110,52 +118,22 @@ create_window(void) aboutwindow = GTK_WIDGET(load_object("aboutwindow")); prefswindow = GTK_WIDGET(load_object("prefswindow")); GtkActionGroup *actiongroup = GTK_ACTION_GROUP(load_object("actiongroup")); - GtkActionGroup *style_actiongroup = GTK_ACTION_GROUP(load_object("style-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", "O", - "recent", "", - "stop", "", - "quit_chimara", NULL, /* NULL means use stock accelerator */ - "command", "", - "undo", "Z", - "save", NULL, - "restore", "R", - "restart", "", - "quit", "", - "edit", "", - "copy", NULL, - "paste", NULL, - "preferences", "", - "help", "", - "about", "", - NULL - }; - const gchar *style_actions[] = { - "align-left", - "align-justify", - "align-right", - "bold", - "italic", - "underline", - NULL - }; + + /* Set the default value of the "View/Toolbar" menu item upon creation of a + new window to the "show-toolbar-default" setting, but bind the setting + one-way only - we don't want toolbars to disappear suddenly */ + GtkToggleAction *toolbar_action = GTK_TOGGLE_ACTION(load_object("toolbar")); + gtk_toggle_action_set_active(toolbar_action, g_settings_get_boolean(state_settings, "show-toolbar-default")); + g_settings_bind(state_settings, "show-toolbar-default", toolbar_action, "active", G_SETTINGS_BIND_SET); + 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]); - for(ptr = style_actions; *ptr; ptr ++) - gtk_action_group_add_action(style_actiongroup, GTK_ACTION(load_object(*ptr))); 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")); @@ -174,9 +152,12 @@ create_window(void) } #endif /* DEBUG */ } - + glk = chimara_if_new(); - g_object_set(glk, "ignore-errors", TRUE, NULL); + g_object_set(glk, + "ignore-errors", TRUE, + /*"interpreter-number", CHIMARA_IF_ZMACHINE_TANDY_COLOR,*/ + NULL); if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_DATA_DIR "/style.css", &error) ) { #ifdef DEBUG g_error_free(error); @@ -204,18 +185,27 @@ create_window(void) 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"); + toolbar = gtk_ui_manager_get_widget(uimanager, "/toolbar"); + gtk_widget_set_no_show_all(toolbar, TRUE); + if(gtk_toggle_action_get_active(toolbar_action)) + gtk_widget_show(toolbar); + else + gtk_widget_hide(toolbar); + + /* Connect the accelerators */ + GtkAccelGroup *accels = gtk_ui_manager_get_accel_group(uimanager); + gtk_window_add_accel_group(GTK_WINDOW(window), accels); 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_box_pack_start(vbox, toolbar, FALSE, FALSE, 0); gtk_builder_connect_signals(builder, glk); g_signal_connect(glk, "notify::program-name", G_CALLBACK(change_window_title), window); g_signal_connect(glk, "notify::story-name", G_CALLBACK(change_window_title), window); /* Create preferences window */ - //preferences_create(CHIMARA_GLK(glk)); + preferences_create(CHIMARA_GLK(glk)); } int @@ -234,11 +224,33 @@ main(int argc, char *argv[]) gdk_threads_init(); gtk_init(&argc, &argv); + /* Create configuration dir ~/.chimara */ + gchar *configdir = g_build_filename(g_get_home_dir(), ".chimara", NULL); + if(!g_file_test(configdir, G_FILE_TEST_IS_DIR) + && g_mkdir(configdir, S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) != 0) + g_error(_("Cannot create configuration directory ~/.chimara")); + g_free(configdir); + + /* Initialize settings file; it can be overridden by a "chimara-config" file + in the current directory */ + gchar *keyfile; + if(g_file_test("chimara-config", G_FILE_TEST_IS_REGULAR)) + keyfile = g_strdup("chimara-config"); + else + keyfile = g_build_filename(g_get_home_dir(), ".chimara", "config", NULL); + GSettingsBackend *backend = g_keyfile_settings_backend_new(keyfile, "/org/chimara-if/player/", NULL); + prefs_settings = g_settings_new_with_backend("org.chimara-if.player.preferences", backend); + state_settings = g_settings_new_with_backend("org.chimara-if.player.state", backend); + g_free(keyfile); + create_window(); gtk_widget_show_all(window); g_object_unref( G_OBJECT(uimanager) ); + if(argc == 3) { + g_object_set(glk, "graphics-file", argv[2], NULL); + } if(argc >= 2) { if( !chimara_if_run_game(CHIMARA_IF(glk), argv[1], &error) ) { error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");