+#include <glib.h>
#include <glib/gi18n.h>
+#include <glib/gprintf.h>
#include <libchimara/glk.h>
#include "chimara-glk-private.h"
#include "stream.h"
void
garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg)
{
+#ifdef DEBUG_STYLES
+ g_printf("garglk_set_zcolors_stream(str->rock=%d, fg=%08X, bg=%08X)\n", str->rock, fg, bg);
+#endif
+
VALID_STREAM(str, return);
g_return_if_fail(str->window != NULL);
winid_t window = str->window;
+ gdk_threads_enter();
+
GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(window->widget) );
GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
GdkColor fore, back;
WARNING(_("zcolor_Transparent, zcolor_Cursor not implemented"));
// Fallthrough to default
case zcolor_Default:
- fore_name = "default";
+ fore_name = g_strdup("default");
break;
case zcolor_Current:
{
// Get the current foreground color
GdkColor *current_color;
g_object_get(window->zcolor, "foreground-gdk", ¤t_color, NULL);
- fore_name = g_strdup_printf("%02X%02X%02X", current_color->red, current_color->green, current_color->blue);
+ fore_name = gdkcolor_to_hex(current_color);
// Copy the color and use it
fore.red = current_color->red;
fore.blue = current_color->blue;
fore_pointer = &fore;
} else {
- fore_name = "default";
+ fore_name = g_strdup("default");
}
break;
}
default:
glkcolor_to_gdkcolor(fg, &fore);
fore_pointer = &fore;
- fore_name = g_strdup_printf("%02X%02X%02X",
- ((fg & 0xff0000) >> 16),
- ((fg & 0x00ff00) >> 8),
- (fg & 0x0000ff)
- );
+ fore_name = glkcolor_to_hex(fg);
}
switch(bg) {
WARNING(_("zcolor_Transparent, zcolor_Cursor not implemented"));
// Fallthrough to default
case zcolor_Default:
- back_name = "default";
+ back_name = g_strdup("default");
break;
case zcolor_Current:
{
// Get the current background color
GdkColor *current_color;
g_object_get(window->zcolor, "background-gdk", ¤t_color, NULL);
- back_name = g_strdup_printf("%02X%02X%02X", current_color->red, current_color->green, current_color->blue);
+ back_name = gdkcolor_to_hex(current_color);
// Copy the color and use it
back.red = current_color->red;
back.blue = current_color->blue;
back_pointer = &back;
} else {
- back_name = "default";
+ back_name = g_strdup("default");
}
break;
}
default:
glkcolor_to_gdkcolor(bg, &back);
back_pointer = &back;
- back_name = g_strdup_printf("%02X%02X%02X",
- ((bg & 0xff0000) >> 16),
- ((bg & 0x00ff00) >> 8),
- (bg & 0x0000ff)
- );
+ back_name = glkcolor_to_hex(bg);
}
- char *name = g_strdup_printf("zcolor:#%s/#%s", fore_name, back_name);
-
if(fore_pointer == NULL && back_pointer == NULL) {
// NULL value means to ignore the zcolor property altogether
window->zcolor = NULL;
} else {
+ char *name = g_strdup_printf("zcolor:#%s/#%s", fore_name, back_name);
+ g_free(fore_name);
+ g_free(back_name);
+
// See if we have used this color combination before
GtkTextTag *tag = gtk_text_tag_table_lookup(tags, name);
// From now on, text will be drawn in the specified colors
window->zcolor = tag;
+
+ // Update the reversed version if necessary
+ if(str->window->zcolor_reversed) {
+ gint reversed = GPOINTER_TO_INT( g_object_get_data( G_OBJECT(str->window->zcolor_reversed), "reverse-color" ) );
+
+ gdk_threads_leave();
+ garglk_set_reversevideo_stream(str, reversed != 0);
+ gdk_threads_enter();
+ }
+
}
+
+ gdk_threads_leave();
}
/**
garglk_set_zcolors_stream(glk_data->current_stream, fg, bg);
}
-static void
-apply_reverse_color(GtkTextTag *tag, gpointer 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)
{
+#ifdef DEBUG_STYLES
+ g_printf("garglk_set_reversevideo_stream(str->rock=%d, reverse=%d)\n", str->rock, reverse);
+#endif
+
VALID_STREAM(str, return);
+ g_return_if_fail(str->window != NULL);
+ g_return_if_fail(str->window->type != wintype_TextBuffer || str->window->type != wintype_TextGrid);
+
+ // Determine the current colors
- GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(str->window->widget) );
+ // If all fails, use black/white
+ // FIXME: Use system theme here
+ GdkColor foreground, background;
+ gdk_color_parse("black", &foreground);
+ gdk_color_parse("white", &background);
+ GdkColor *current_foreground = &foreground;
+ GdkColor *current_background = &background;
+
+ gdk_threads_enter();
+
+ style_stream_colors(str, ¤t_foreground, ¤t_background);
+
+ if(reverse) {
+ GdkColor *temp = current_foreground;
+ current_foreground = current_background;
+ current_background = temp;
+ }
+
+ // Name the color
+ gchar *name = g_strdup_printf(
+ "zcolor:#%04X%04X%04X/#%04X%04X%04X",
+ current_foreground->red,
+ current_foreground->green,
+ current_foreground->blue,
+ current_background->red,
+ current_background->green,
+ current_background->blue
+ );
+
+ // Create a tag for the new colors if it doesn't exist yet
+ 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) );
+ GtkTextTag *tag = gtk_text_tag_table_lookup(tags, name);
+ if(tag == NULL) {
+ tag = gtk_text_buffer_create_tag(
+ buffer,
+ name,
+ "foreground-gdk", current_foreground,
+ "foreground-set", TRUE,
+ "background-gdk", current_background,
+ "background-set", TRUE,
+ NULL
+ );
+ g_object_set_data( G_OBJECT(tag), "reverse-color", GINT_TO_POINTER(reverse) );
+ }
+
+ // From now on, text will be drawn in the specified colors
+ str->window->zcolor_reversed = tag;
+
+ // Update the background of the gtktextview to correspond with the current background color
+ if(current_background != NULL) {
+ gtk_widget_modify_base(str->window->widget, GTK_STATE_NORMAL, current_background);
+ }
+
+ gdk_threads_leave();
}
/**