X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=blobdiff_plain;f=player%2Fmain.c;h=a4739f79f8ebd2d31d017690a4b612ddad486c53;hp=8d9bb255d2a94cf38ab53d06e8507e8fc9eb4596;hb=a03ca60f975be1f4636e42ca19f9e6eafc3fad12;hpb=ee1307a67f01a3f5e2d2d47983c2055d22836276 diff --git a/player/main.c b/player/main.c index 8d9bb25..a4739f7 100644 --- a/player/main.c +++ b/player/main.c @@ -38,23 +38,33 @@ #include #include +#include #include +/* Use a custom GSettings backend for our preferences file */ +#define G_SETTINGS_ENABLE_BACKEND +#include + #include "error.h" #include #include +#include "preferences.h" + /* Static global pointers to widgets */ -static GtkBuilder *builder = NULL; static GtkUIManager *uimanager = NULL; static GtkWidget *window = NULL; static GtkWidget *glk = NULL; /* Global global pointers */ +GtkBuilder *builder = NULL; GtkWidget *aboutwindow = NULL; GtkWidget *prefswindow = NULL; +GtkWidget *toolbar = NULL; +GSettings *prefs_settings = NULL; +GSettings *state_settings = NULL; -static GObject * +GObject * load_object(const gchar *name) { GObject *retval; @@ -66,6 +76,26 @@ load_object(const gchar *name) } static void +change_window_title(ChimaraGlk *glk, GParamSpec *pspec, GtkWindow *window) +{ + gchar *program_name, *story_name, *title; + g_object_get(glk, "program-name", &program_name, "story-name", &story_name, NULL); + if(!program_name) { + gtk_window_set_title(window, "Chimara"); + return; + } + else if(!story_name) + title = g_strdup_printf("%s - Chimara", program_name); + else + title = g_strdup_printf("%s - %s - Chimara", program_name, story_name); + + g_free(program_name); + g_free(story_name); + gtk_window_set_title(window, title); + g_free(title); +} + +static gboolean create_window(void) { GError *error = NULL; @@ -77,8 +107,7 @@ create_window(void) 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; + return FALSE; #ifdef DEBUG } #endif /* DEBUG */ @@ -89,38 +118,21 @@ create_window(void) 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 - 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 - }; + /* 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]); 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")); @@ -131,34 +143,59 @@ create_window(void) #ifdef DEBUG g_error_free(error); error = NULL; - if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) { + 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; + return FALSE; + } + + glk = chimara_if_new(); + 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); + error = NULL; + if( !chimara_glk_set_css_from_file(CHIMARA_GLK(glk), PACKAGE_SRC_DIR "/style.css", &error) ) #endif /* DEBUG */ + return FALSE; } - glk = chimara_if_new(); - g_object_set(glk, "ignore-errors", TRUE, NULL); + /* DON'T UNCOMMENT THIS your eyes will burn + but it is a good test of programmatically altering just one style + chimara_glk_set_css_from_string(CHIMARA_GLK(glk), + "buffer { font-family: 'Comic Sans MS'; }");*/ GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") ); if(vbox == NULL) - { - error_dialog(NULL, NULL, "Could not find vbox"); - return; - } + return FALSE; 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_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)); + + return TRUE; } int @@ -172,17 +209,39 @@ main(int argc, char *argv[]) textdomain(GETTEXT_PACKAGE); #endif - if( !g_thread_supported() ) - g_thread_init(NULL); gdk_threads_init(); gtk_init(&argc, &argv); - create_window(); + /* 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); + + if( !create_window() ) { + error_dialog(NULL, NULL, "Error while building interface."); + return 1; + } gtk_widget_show_all(window); - g_object_unref( G_OBJECT(builder) ); 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: "); @@ -197,5 +256,7 @@ main(int argc, char *argv[]) chimara_glk_stop(CHIMARA_GLK(glk)); chimara_glk_wait(CHIMARA_GLK(glk)); + g_object_unref( G_OBJECT(builder) ); + return 0; }