X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fplayer.c;h=10f45d53c4b724145163f66ea91c93e302d74553;hb=6fd0347f330cb24ef6145662023053a1c0f81a64;hp=511449ba0519fdbe4319e241bdbf9fe72ef0fa5e;hpb=11650f9b922f2b520e12b68c34342ec1fa250f22;p=projects%2Fchimara%2Fchimara.git

diff --git a/player/player.c b/player/player.c
index 511449b..10f45d5 100644
--- a/player/player.c
+++ b/player/player.c
@@ -69,15 +69,28 @@ change_window_title(ChimaraGlk *glk, GParamSpec *pspec, GtkWindow *window)
 	g_free(title);
 }
 
+static void
+on_css_changed(GSettings *prefs_settings, char *key, ChimaraPlayer *self)
+{
+	char *user_css;
+	g_settings_get(prefs_settings, "css-file", "ms", &user_css);
+	if(user_css) {
+		if(!chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), user_css, NULL)) {
+			/* If the setting didn't point to a CSS file, fail silently and
+			 null the setting */
+			g_settings_set(prefs_settings, "css-file", "ms", NULL);
+		}
+		g_free(user_css);
+	}
+}
+
 static void
 chimara_player_dispose(GObject *object)
 {
 	ChimaraPlayer *self = CHIMARA_PLAYER(object);
 	if(chimara_glk_get_running(CHIMARA_GLK(self->glk))) {
 		chimara_glk_stop(CHIMARA_GLK(self->glk));
-		g_printerr("Stopping...\n");
 		chimara_glk_wait(CHIMARA_GLK(self->glk));
-		g_printerr("Done Waiting\n");
 	}
 	
 	/* Chain up */
@@ -87,7 +100,6 @@ chimara_player_dispose(GObject *object)
 static void
 chimara_player_finalize(GObject *object)
 {
-	g_printerr("Unreffing\n");
 	g_object_unref(CHIMARA_PLAYER(object)->glk);
 	
 	/* Chain up */
@@ -99,14 +111,8 @@ chimara_player_class_init(ChimaraPlayerClass *klass)
 {
 	/* Override methods of parent classes */
 	GObjectClass *object_class = G_OBJECT_CLASS(klass);
-	//object_class->set_property = chimara_if_set_property;
-	//object_class->get_property = chimara_if_get_property;
 	object_class->dispose = chimara_player_dispose;
 	object_class->finalize = chimara_player_finalize;
-	
-	/* Signals */
-
-	/* Properties */
 
 	/* Private data */
 	g_type_class_add_private(klass, sizeof(ChimaraPlayerPrivate));
@@ -147,10 +153,14 @@ chimara_player_init(ChimaraPlayer *self)
 				 "ignore-errors", TRUE,
 				 /*"interpreter-number", CHIMARA_IF_ZMACHINE_TANDY_COLOR,*/
 				 NULL);
+
+	/* Set the CSS styles for the interpreter */
 	char *default_css = get_data_file_path("style.css");
 	if( !chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), default_css, &error) ) {
 		error_dialog(GTK_WINDOW(self), error, "Couldn't open default CSS file: ");
 	}
+	g_free(default_css);
+	on_css_changed(theapp->prefs_settings, "css-file", self);
 	
 	/* DON'T UNCOMMENT THIS your eyes will burn
 	 but it is a good test of programmatically altering just one style
@@ -183,6 +193,7 @@ chimara_player_init(ChimaraPlayer *self)
 	gtk_builder_connect_signals(builder, self);
 	g_signal_connect(self->glk, "notify::program-name", G_CALLBACK(change_window_title), self);
 	g_signal_connect(self->glk, "notify::story-name", G_CALLBACK(change_window_title), self);
+	g_signal_connect(theapp->prefs_settings, "changed::css-file", G_CALLBACK(on_css_changed), self);
 
 	g_object_unref(builder);
 	g_object_unref(uimanager);
@@ -198,6 +209,13 @@ chimara_player_new(void)
 		NULL));
 }
 
+void
+chimara_player_set_user_css_file(ChimaraPlayer *self, const char *filename)
+{
+	chimara_glk_set_css_to_default(CHIMARA_GLK(self->glk));
+	chimara_glk_set_css_from_file(CHIMARA_GLK(self->glk), filename, NULL);
+}
+
 /* GLADE CALLBACKS */
 
 #if 0