X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fpreferences.c;h=a9f5f43b661634c56fc116e67c20c04ac9908d9b;hb=aa30979369091c96bca34499c28cb01bc16efb1d;hp=ad77ee6b8b63b2810d21569d6159c3457c823208;hpb=7543c5f20317092baacaa868c6fcff273f05e715;p=projects%2Fchimara%2Fchimara.git

diff --git a/player/preferences.c b/player/preferences.c
index ad77ee6..a9f5f43 100644
--- a/player/preferences.c
+++ b/player/preferences.c
@@ -104,11 +104,13 @@ parse_interpreter(const char *interp)
 		return CHIMARA_IF_INTERPRETER_GLULXE;
 	if(strcmp(interp, "git") == 0)
 		return CHIMARA_IF_INTERPRETER_GIT;
+	if(strcmp(interp, "bocfel") == 0)
+		return CHIMARA_IF_INTERPRETER_BOCFEL;
 	return CHIMARA_IF_INTERPRETER_NONE;
 }
 
 static const char *interpreter_strings[CHIMARA_IF_NUM_INTERPRETERS] = {
-	"frotz", "nitfol", "glulxe", "git"
+	"frotz", "nitfol", "glulxe", "git", "bocfel"
 };
 
 static const char *
@@ -123,7 +125,8 @@ static const char *interpreter_display_strings[CHIMARA_IF_NUM_INTERPRETERS] = {
 	N_("Frotz"),
 	N_("Nitfol"),
 	N_("Glulxe"),
-	N_("Git")
+	N_("Git"),
+	N_("Bocfel")
 };
 
 static const char *
@@ -148,8 +151,8 @@ preferences_create(ChimaraGlk *glk)
 	gtk_tree_store_set(style_list, &grid, 0, "Text grid", -1);
 
 	int i;
-    gint num_tags = chimara_glk_get_num_tag_names(glk);
-	const gchar **tag_names = chimara_glk_get_tag_names(glk);
+	unsigned int num_tags;
+	const gchar **tag_names = chimara_glk_get_tag_names(glk, &num_tags);
 	for(i=0; i<num_tags; i++) {
 		gtk_tree_store_append(style_list, &buffer_child, &buffer);
 		gtk_tree_store_append(style_list, &grid_child, &grid);
@@ -168,12 +171,24 @@ preferences_create(ChimaraGlk *glk)
 	GObject *flep = G_OBJECT( load_object("flep") );
 	g_settings_bind(prefs_settings, "flep", flep, "active", G_SETTINGS_BIND_DEFAULT);
 	GtkFileChooser *blorb_chooser = GTK_FILE_CHOOSER( load_object("blorb_file_chooser") );
+	GtkFileChooser *css_chooser = GTK_FILE_CHOOSER( load_object("css-filechooser") );
 	char *filename;
 	g_settings_get(prefs_settings, "resource-path", "ms", &filename);
 	if(filename) {
 		gtk_file_chooser_set_filename(blorb_chooser, filename);
 		g_free(filename);
 	}
+	g_settings_get(prefs_settings, "css-file", "ms", &filename);
+	if(filename) {
+		if(!chimara_glk_set_css_from_file(glk, filename, 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);
+		} else {
+			gtk_file_chooser_set_filename(css_chooser, filename);
+		}
+		g_free(filename);
+	}
 
 	/* Populate the list of available interpreters */
 	GtkListStore *interp_list = GTK_LIST_STORE( load_object("available_interpreters") );
@@ -240,7 +255,6 @@ on_toggle_left(GtkToggleButton *button, ChimaraGlk *glk) {
 	if( !gtk_toggle_button_get_active(button) )
 		return;
 	g_object_set(current_tag, "justification", GTK_JUSTIFY_LEFT, "justification-set", TRUE, NULL);
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -248,7 +262,6 @@ on_toggle_center(GtkToggleButton *button, ChimaraGlk *glk) {
 	if( !gtk_toggle_button_get_active(button) )
 		return;
 	g_object_set(current_tag, "justification", GTK_JUSTIFY_CENTER, "justification-set", TRUE, NULL);
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -256,7 +269,6 @@ on_toggle_right(GtkToggleButton *button, ChimaraGlk *glk) {
 	if( !gtk_toggle_button_get_active(button) )
 		return;
 	g_object_set(current_tag, "justification", GTK_JUSTIFY_RIGHT, "justification-set", TRUE, NULL);
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -264,7 +276,6 @@ on_toggle_justify(GtkToggleButton *button, ChimaraGlk *glk) {
 	if( !gtk_toggle_button_get_active(button) )
 		return;
 	g_object_set(current_tag, "justification", GTK_JUSTIFY_FILL, "justification-set", TRUE, NULL);
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -273,8 +284,6 @@ on_toggle_bold(GtkToggleButton *button, ChimaraGlk *glk) {
 		g_object_set(current_tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
 	else
 		g_object_set(current_tag, "weight", PANGO_WEIGHT_NORMAL, "weight-set", TRUE, NULL);
-
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -283,8 +292,6 @@ on_toggle_italic(GtkToggleButton *button, ChimaraGlk *glk) {
 		g_object_set(current_tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
 	else
 		g_object_set(current_tag, "style", PANGO_STYLE_NORMAL, "style-set", TRUE, NULL);
-
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -293,8 +300,6 @@ on_toggle_underline(GtkToggleButton *button, ChimaraGlk *glk) {
 		g_object_set(current_tag, "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
 	else
 		g_object_set(current_tag, "underline", PANGO_UNDERLINE_NONE, "underline-set", TRUE, NULL);
-
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -303,7 +308,6 @@ on_foreground_color_set(GtkColorButton *button, ChimaraGlk *glk)
 	GdkColor color;
     gtk_color_button_get_color(button, &color);
 	g_object_set(current_tag, "foreground-gdk", &color, "foreground-set", TRUE, NULL);
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -312,7 +316,6 @@ on_background_color_set(GtkColorButton *button, ChimaraGlk *glk)
 	GdkColor color;
     gtk_color_button_get_color(button, &color);
 	g_object_set(current_tag, "background-gdk", &color, "background-set", TRUE, NULL);
-	chimara_glk_update_style(glk);
 }
 
 void
@@ -321,7 +324,21 @@ on_font_set(GtkFontButton *button, ChimaraGlk *glk)
 	const gchar *font_name = gtk_font_button_get_font_name(button);
 	PangoFontDescription *font_description = pango_font_description_from_string(font_name);
 	g_object_set(current_tag, "font-desc", font_description, NULL);
-	chimara_glk_update_style(glk);
+}
+
+void
+on_css_filechooser_file_set(GtkFileChooserButton *button, ChimaraGlk *glk)
+{
+	GError *error = NULL;
+	extern GSettings *prefs_settings;
+	char *filename = gtk_file_chooser_get_filename( GTK_FILE_CHOOSER(button) );
+	if(!chimara_glk_set_css_from_file(glk, filename, &error)) {
+		error_dialog(NULL, error, "There was a problem reading the CSS file: ");
+		g_settings_set(prefs_settings, "css-file", "ms", NULL);
+	} else {
+		g_settings_set(prefs_settings, "css-file", "ms", filename);
+	}
+	g_free(filename);
 }
 
 void
@@ -366,4 +383,4 @@ on_interpreter_cell_changed(GtkCellRendererCombo *combo, char *path_string, GtkT
 	}
 	g_settings_set(prefs_settings, "preferred-interpreters", "a{ss}", builder);
 	g_variant_builder_unref(builder);
-}
\ No newline at end of file
+}