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

[projects/chimara/chimara.git] / libchimara / garglk.c

diff --git a/libchimara/garglk.c b/libchimara/garglk.c
index e7333a6d2bc1cfaa575b04c9665659bf978f47e3..02f032c38de3da4f0b6eb247dad308216f817e87 100644 (file)
--- a/libchimara/garglk.c
+++ b/libchimara/garglk.c
@@ -3,6 +3,7 @@
 #include "chimara-glk-private.h"
 #include "stream.h"
 #include "fileref.h"
+#include "style.h"
 
 extern GPrivate *glk_data_key;
 
@@ -185,14 +186,38 @@ garglk_set_zcolors(glui32 fg, glui32 bg)
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
        g_return_if_fail(glk_data->current_stream != NULL);
        g_return_if_fail(glk_data->current_stream->window != NULL);
+
+       winid_t window = glk_data->current_stream->window;
+       GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(window->widget) );
+       //GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+       GdkColor fore, back;
+       glkcolor_to_gdkcolor(fg, &fore);
+       glkcolor_to_gdkcolor(bg, &back);
+
+       gchar *id = g_strdup_printf("%d", ++window->last_zcolor_id);
+       printf("id = %s\nfg = %08X\nbg = %08X\n\n", id, fg, bg);
        
-       garglk_set_zcolors_stream(glk_data->current_stream, fg, bg);
+       GtkTextTag *tag = gtk_text_buffer_create_tag(
+               buffer,
+               g_strdup_printf("%d", ++window->last_zcolor_id),
+               "foreground-gdk", &fore,
+               "foreground-set", TRUE,
+               "background-gdk", &back,
+               "background-set", TRUE,
+               NULL
+       );
+
+       window->zcolor = tag;
 }
 
 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 */