X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=36d6d2644dce293390f019981420f3a0c8ac0001;hb=a990c9f6e84e43b37e9f1e6b89ea6a1e8646354b;hp=02d9ab2d01300e1f5adda0cab6b57bdedc207561;hpb=47c116d672f1d9f9a8251b4a384e856359e3738f;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/style.c b/libchimara/style.c
index 02d9ab2..36d6d26 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -186,36 +186,43 @@ GtkTextTag *
 gtk_text_tag_copy(GtkTextTag *tag)
 {
 	GtkTextTag *copy;
+	char *tag_name;
+	GParamSpec **properties;
+	unsigned nprops, count;
 
 	g_return_val_if_fail(tag != NULL, NULL);
 
-	copy = gtk_text_tag_new(tag->name);
-	gtk_text_attributes_copy_values(tag->values, copy->values);
-	
-	#define _COPY_FLAG(flag) copy->flag = tag->flag
-		_COPY_FLAG (bg_color_set);
-		_COPY_FLAG (bg_color_set);
-		_COPY_FLAG (bg_stipple_set);
-		_COPY_FLAG (fg_color_set);
-		_COPY_FLAG (fg_stipple_set);
-		_COPY_FLAG (justification_set);
-		_COPY_FLAG (left_margin_set);
-		_COPY_FLAG (indent_set);
-		_COPY_FLAG (rise_set);
-		_COPY_FLAG (strikethrough_set);
-		_COPY_FLAG (right_margin_set);
-		_COPY_FLAG (pixels_above_lines_set);
-		_COPY_FLAG (pixels_below_lines_set);
-		_COPY_FLAG (pixels_inside_wrap_set);
-		_COPY_FLAG (tabs_set);
-		_COPY_FLAG (underline_set);
-		_COPY_FLAG (wrap_mode_set);
-		_COPY_FLAG (bg_full_height_set);
-		_COPY_FLAG (invisible_set);
-		_COPY_FLAG (editable_set);
-		_COPY_FLAG (language_set);
-		_COPY_FLAG (scale_set);
-	#undef _COPY_FLAG
+	g_object_get(tag, "name", &tag_name, NULL);
+	copy = gtk_text_tag_new(tag_name);
+	g_free(tag_name);
+
+	/* Copy all the original tag's properties to the new tag */
+	properties = g_object_class_list_properties( G_OBJECT_GET_CLASS(tag), &nprops );
+	for(count = 0; count < nprops; count++) {
+
+		/* Only copy properties that are readable, writable, not construct-only,
+		and not deprecated */
+		GParamFlags flags = properties[count]->flags;
+		if(flags & G_PARAM_CONSTRUCT_ONLY
+			|| flags & G_PARAM_DEPRECATED
+			|| !(flags & G_PARAM_READABLE)
+			|| !(flags & G_PARAM_WRITABLE))
+			continue;
+
+		const char *prop_name = g_param_spec_get_name(properties[count]);
+		GValue prop_value = G_VALUE_INIT;
+
+		g_value_init( &prop_value, G_PARAM_SPEC_VALUE_TYPE(properties[count]) );
+		g_object_get_property( G_OBJECT(tag), prop_name, &prop_value );
+		/* Don't copy the PangoTabArray if it is NULL, that prints a warning */
+		if(strcmp(prop_name, "tabs") == 0 && g_value_get_boxed(&prop_value) == NULL) {
+			g_value_unset(&prop_value);
+			continue;
+		}
+		g_object_set_property( G_OBJECT(copy), prop_name, &prop_value );
+		g_value_unset(&prop_value);
+	}
+	g_free(properties);
 
 	/* Copy the data that was added manually */
 	gpointer reverse_color = g_object_get_data( G_OBJECT(tag), "reverse-color" );
@@ -239,9 +246,6 @@ style_init(ChimaraGlk *glk)
 	GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
 	GtkTextTag *tag;
 
-	PangoFontDescription *default_font_desc = pango_font_description_from_string("Serif");
-	PangoFontDescription *monospace_font_desc = pango_font_description_from_string("Monospace");
-	
 	/* Initialise the default styles for a text grid */
 	tag = gtk_text_tag_new("default");
 	g_object_set(tag, "family", "Monospace", "family-set", TRUE, NULL);
@@ -344,9 +348,6 @@ style_init(ChimaraGlk *glk)
 	g_hash_table_insert(default_text_buffer_styles, "pager", pager_tag);
 	text_tag_to_attr_list(pager_tag, priv->pager_attr_list);
 
-	pango_font_description_free(default_font_desc);
-	pango_font_description_free(monospace_font_desc);
-	
 	priv->styles->text_grid = default_text_grid_styles;
 	priv->styles->text_buffer = default_text_buffer_styles;
 
@@ -1103,21 +1104,45 @@ PangoFontDescription *
 get_current_font(guint32 wintype)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	GtkTextTag *tag;
+	GHashTable *styles, *glk_styles;
+	PangoFontDescription *font;
 
 	switch(wintype) {
 	case wintype_TextGrid:
-		tag = g_hash_table_lookup(glk_data->styles->text_grid, "default");
+		styles = glk_data->styles->text_grid;
+		glk_styles = glk_data->glk_styles->text_grid;
+		font = pango_font_description_from_string("Monospace");
 		break;
 	case wintype_TextBuffer:
-		tag = g_hash_table_lookup(glk_data->styles->text_buffer, "default");
+		styles = glk_data->styles->text_buffer;
+		glk_styles = glk_data->glk_styles->text_buffer;
+		font = pango_font_description_from_string("Serif");
 		break;
 	default:
 		return NULL;
 	}
 
-	PangoFontDescription *font;
-	g_object_get( G_OBJECT(tag), "font-desc", &font, NULL );
+	PangoAttrList *list = pango_attr_list_new();
+
+	text_tag_to_attr_list( g_hash_table_lookup(styles, "default"), list );
+	PangoAttrIterator *it = pango_attr_list_get_iterator(list);
+	pango_attr_iterator_get_font(it, font, NULL, NULL);
+	pango_attr_iterator_destroy(it);
+
+	text_tag_to_attr_list( g_hash_table_lookup(styles, "normal"), list );
+	it = pango_attr_list_get_iterator(list);
+	pango_attr_iterator_get_font(it, font, NULL, NULL);
+	pango_attr_iterator_destroy(it);
+
+	text_tag_to_attr_list( g_hash_table_lookup(glk_styles, "glk-normal"), list );
+	it = pango_attr_list_get_iterator(list);
+	pango_attr_iterator_get_font(it, font, NULL, NULL);
+	pango_attr_iterator_destroy(it);
+
+	/* Make a copy of the family, preventing it's destruction at the end of this function. */
+	pango_font_description_set_family( font, pango_font_description_get_family(font) );
+
+	pango_attr_list_unref(list);
 
 	return font;
 }
@@ -1156,7 +1181,8 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list)
 	}
 
 	/* Font description updates the following properties simultaniously:
-	 * family, style, weight, variant, stretch, size
+	 * family, style, weight, variant, stretch, size.
+	 * FIXME: Except it doesn't really.
 	 */
 	g_object_get(tag, "font-desc", &font_desc, NULL);
 	pango_attr_list_insert(