From: P. F. Chimento <philip.chimento@gmail.com>
Date: Sat, 29 Jan 2011 14:33:39 +0000 (+0100)
Subject: Merge branch 'master' of github.com:wmvanvliet/Chimara
X-Git-Tag: v0.9~157
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;ds=sidebyside;h=7aabd2ee56aa3de0eafd57e149f632617c8c8ee1;hp=-c;p=projects%2Fchimara%2Fchimara.git

Merge branch 'master' of github.com:wmvanvliet/Chimara
---

7aabd2ee56aa3de0eafd57e149f632617c8c8ee1
diff --combined libchimara/garglk.c
index e7333a6,df5c6b3..19be504
--- a/libchimara/garglk.c
+++ b/libchimara/garglk.c
@@@ -158,14 -158,6 +158,14 @@@ garglk_unput_string_uni(glui32 *str
  	WARNING(_("Not implemented"));
  }
  
 +/* TODO document */
 +void
 +garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg)
 +{
 +	VALID_STREAM(str, return);
 +	WARNING(_("Not implemented"));
 +}
 +
  /**
   * garglk_set_zcolors:
   * @fg: one of the <code>zcolor_</code> constants.
@@@ -186,26 -178,19 +186,30 @@@ garglk_set_zcolors(glui32 fg, glui32 bg
  	g_return_if_fail(glk_data->current_stream != NULL);
  	g_return_if_fail(glk_data->current_stream->window != NULL);
  	
 -	WARNING(_("Not implemented"));
 +	garglk_set_zcolors_stream(glk_data->current_stream, fg, bg);
  }
  
  static void
  apply_reverse_color(GtkTextTag *tag, gpointer data)
  {
- 	g_object_set_data( G_OBJECT(tag), "reverse_color", data );
+ 	const gchar *tag_name;
+ 	g_object_get(tag, "name", &tag_name, NULL);
+ 
+ 	if( g_str_has_prefix(tag_name, "glk-") )
+ 		g_object_set_data( G_OBJECT(tag), "reverse_color", data );
  }
  
 +/* TODO document */
 +void
 +garglk_set_reversevideo_stream(strid_t str, glui32 reverse)
 +{
 +	VALID_STREAM(str, return);
 +	
 +	GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(str->window->widget) );
 +	GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
 +	gtk_text_tag_table_foreach( tags, apply_reverse_color, GINT_TO_POINTER(reverse) );
 +}
 +
  /**
   * garglk_set_reversevideo:
   * @reverse: nonzero for reverse colors, zero for normal colors.
@@@ -221,5 -206,7 +225,5 @@@ garglk_set_reversevideo(glui32 reverse
  	g_return_if_fail(glk_data->current_stream != NULL);
  	g_return_if_fail(glk_data->current_stream->window != NULL);
  
 -	GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(glk_data->current_stream->window->widget) );
 -	GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
 -	gtk_text_tag_table_foreach( tags, apply_reverse_color, GINT_TO_POINTER(reverse) );
 +	garglk_set_reversevideo_stream(glk_data->current_stream, reverse);
  }