From: Marijn van Vliet <w.m.vanvliet@gmail.com>
Date: Sat, 15 Sep 2012 16:13:59 +0000 (+0200)
Subject: Merge branch 'master' into gtk3
X-Git-Tag: v0.9~14
X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=commitdiff_plain;h=2b44d8d468ed734afd0bed5b3577c871782eb00d;hp=-c

Merge branch 'master' into gtk3
---

2b44d8d468ed734afd0bed5b3577c871782eb00d
diff --combined libchimara/style.c
index 36d6d26,dc0d4bb..65d6c4e
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@@ -186,43 -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" );
@@@ -1279,3 -1272,44 +1279,44 @@@ style_stream_colors(strid_t str, GdkCol
  			g_object_get(str->window->zcolor, "background-gdk", background, NULL);
  	}
  }
+ 
+ /* Apply styles to a segment of text in a GtkTextBuffer
+  */
+ void
+ style_apply(winid_t win, GtkTextIter *start, GtkTextIter *end)
+ {
+ 	GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
+ 	GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+ 
+ 	GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default");
+ 	GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->style);
+ 	GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->glk_style);
+ 
+ 	// Player's style overrides
+ 	gtk_text_buffer_apply_tag(buffer, style_tag, start, end);
+ 
+ 	// GLK Program's style overrides
+ 	gtk_text_buffer_apply_tag(buffer, glk_style_tag, start, end);
+ 
+ 	// Default style
+ 	gtk_text_buffer_apply_tag(buffer, default_tag, start, end);
+ 
+ 	// Link style overrides
+ 	if(win->window_stream->hyperlink_mode) {
+ 		GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink");
+ 		GtkTextTag *link_tag = win->current_hyperlink->tag;
+ 		gtk_text_buffer_apply_tag(buffer, link_style_tag, start, end);
+ 		gtk_text_buffer_apply_tag(buffer, link_tag, start, end);
+ 	}
+ 
+ 	// GLK Program's style overrides using garglk_set_zcolors()
+ 	if(win->zcolor != NULL) {
+ 		gtk_text_buffer_apply_tag(buffer, win->zcolor, start, end);
+ 	}
+ 
+ 	// GLK Program's style overrides using garglk_set_reversevideo()
+ 	if(win->zcolor_reversed != NULL) {
+ 		gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, start, end);
+ 	}
+ }
+