X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=player%2Fpreferences.c;h=b457c1ef5e37e0731f78fac8570f7d8033f75e20;hb=HEAD;hp=88e88ff1aade52a8b6664c3ae78856079a14128e;hpb=36d2b1cc41af8ef5d9e67785f9601f11242196ca;p=projects%2Fchimara%2Fchimara.git

diff --git a/player/preferences.c b/player/preferences.c
index 88e88ff..b457c1e 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);
@@ -252,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
@@ -260,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
@@ -268,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
@@ -276,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
@@ -285,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
@@ -295,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
@@ -305,26 +300,28 @@ 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
 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);
+	GdkRGBA color;
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), &color);
+	g_object_set(current_tag,
+		"foreground-rgba", &color,
+		"foreground-set", TRUE,
+		NULL);
 }
 
 void
 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);
+	GdkRGBA color;
+	gtk_color_chooser_get_rgba(GTK_COLOR_CHOOSER(button), &color);
+	g_object_set(current_tag,
+		"background-rgba", &color,
+		"background-set", TRUE,
+		NULL);
 }
 
 void
@@ -333,7 +330,6 @@ 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
@@ -393,4 +389,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
+}