From: Marijn van Vliet Date: Sun, 30 Jan 2011 14:44:50 +0000 (+0100) Subject: Overhauled the whole reverse video thing. X-Git-Tag: v0.9~153^2~1 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=207745dc22dd7d17bcb7bf26ec991cc1ac8199ed;p=projects%2Fchimara%2Fchimara.git Overhauled the whole reverse video thing. --- diff --git a/libchimara/garglk.c b/libchimara/garglk.c index aacd1d5..4eb59a5 100644 --- a/libchimara/garglk.c +++ b/libchimara/garglk.c @@ -1,4 +1,6 @@ +#include #include +#include #include #include "chimara-glk-private.h" #include "stream.h" @@ -164,11 +166,17 @@ garglk_unput_string_uni(glui32 *str) 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; @@ -183,7 +191,7 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) 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: { @@ -199,7 +207,7 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) fore.blue = current_color->blue; fore_pointer = &fore; } else { - fore_name = "default"; + fore_name = g_strdup("default"); } break; } @@ -219,7 +227,7 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 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: { @@ -235,7 +243,7 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) back.blue = current_color->blue; back_pointer = &back; } else { - back_name = "default"; + back_name = g_strdup("default"); } break; } @@ -249,12 +257,14 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 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); @@ -274,6 +284,8 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) // From now on, text will be drawn in the specified colors window->zcolor = tag; } + + gdk_threads_leave(); } /** @@ -298,25 +310,69 @@ garglk_set_zcolors(glui32 fg, glui32 bg) 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 + ); + } + + // From now on, text will be drawn in the specified colors + str->window->zcolor_reversed = tag; + + gdk_threads_leave(); } /** diff --git a/libchimara/strio.c b/libchimara/strio.c index 125c3c8..d440832 100644 --- a/libchimara/strio.c +++ b/libchimara/strio.c @@ -31,6 +31,9 @@ write_utf8_to_window_buffer(winid_t win, gchar *s) void flush_window_buffer(winid_t win) { +#ifdef DEBUG_STYLES + g_printf("%s\n", win->buffer->str); +#endif if(win->type != wintype_TextBuffer && win->type != wintype_TextGrid) return; @@ -80,6 +83,10 @@ flush_window_buffer(winid_t win) 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); + } ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK)); g_assert(glk); @@ -139,6 +146,11 @@ flush_window_buffer(winid_t win) if(win->zcolor != NULL) gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert); + // GLK Program's style overrides using garglk_set_reversevideo() + if(win->zcolor_reversed != NULL) { + gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, &start, &insert); + } + chars_left -= available_space; gtk_text_iter_forward_line(&insert); available_space = win->width; @@ -172,6 +184,11 @@ flush_window_buffer(winid_t win) // GLK Program's style overrides using garglk_set_zcolors() if(win->zcolor != NULL) gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert); + + // GLK Program's style overrides using garglk_set_reversevideo() + if(win->zcolor_reversed != NULL) { + gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, &start, &insert); + } } gtk_text_buffer_move_mark(buffer, cursor, &start); diff --git a/libchimara/style.c b/libchimara/style.c index 5bbbb5b..6cd3bd0 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -17,6 +17,7 @@ static void style_add_tag_to_textbuffer(gpointer key, gpointer tag, gpointer tag static void style_copy_tag_to_textbuffer(gpointer key, gpointer tag, gpointer target_table); static void text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list); GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag); +static void style_cascade_colors(GtkTextTag *tag, GtkTextTag *glk_tag, GtkTextTag *default_tag, GdkColor **foreground, GdkColor **background); /** * glk_set_style: @@ -111,6 +112,10 @@ get_glk_tag_name(glui32 style) */ void glk_set_style_stream(strid_t str, glui32 styl) { +#ifdef DEBUG_STYLES + g_printf("glk_set_style(str->rock=%d, styl=%d)\n", str->rock, styl); +#endif + if(str->window == NULL) return; @@ -219,10 +224,11 @@ gtk_text_tag_copy(GtkTextTag *tag) #undef _COPY_FLAG /* Copy the data that was added manually */ - gpointer reverse_color = g_object_get_data( G_OBJECT(tag), "reverse_color" ); + gpointer reverse_color = g_object_get_data( G_OBJECT(tag), "reverse-color" ); - if(reverse_color) - g_object_set_data( G_OBJECT(copy), "reverse_color", reverse_color ); + if(reverse_color) { + g_object_set_data( G_OBJECT(copy), "reverse-color", reverse_color ); + } return copy; } @@ -676,7 +682,7 @@ gdkcolor_to_glkcolor(GdkColor *color) /* Internal function: changes a GTK tag to correspond with the given style. */ static void -apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, glui32 hint, glsi32 val) +apply_stylehint_to_tag(GtkTextTag *tag, glui32 wintype, glui32 styl, glui32 hint, glsi32 val) { g_return_if_fail(tag != NULL); @@ -777,36 +783,46 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, break; case stylehint_ReverseColor: - if(reverse_color != val) { + { + // Determine the current colors + + // 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; + + if(wintype == wintype_TextBuffer) { + GtkTextTag* default_tag = g_hash_table_lookup(glk_data->styles->text_buffer, "default"); + GtkTextTag* base_tag = g_hash_table_lookup(glk_data->styles->text_buffer, get_tag_name(styl)); + style_cascade_colors(base_tag, tag, default_tag, ¤t_foreground, ¤t_background); + } + else if(wintype == wintype_TextGrid) { + GtkTextTag* default_tag = g_hash_table_lookup(glk_data->styles->text_grid, "default"); + GtkTextTag* base_tag = g_hash_table_lookup(glk_data->styles->text_grid, get_tag_name(styl)); + style_cascade_colors(base_tag, tag, default_tag, ¤t_foreground, ¤t_background); + } + + if(val) { /* Flip the fore- and background colors */ - GdkColor* foreground_color; - GdkColor* background_color; - gint f_set, b_set, df_set, db_set = 0; - g_object_get(tag_object, "foreground-set", &f_set, "background-set", &b_set, NULL); - g_object_get(default_tag, "foreground-set", &df_set, "background-set", &db_set, NULL); - - if(f_set) - g_object_get(tag_object, "foreground-gdk", &foreground_color, NULL); - else if(df_set) - g_object_get(default_tag, "foreground-gdk", &foreground_color, NULL); - if(b_set) - g_object_get(tag_object, "background-gdk", &background_color, NULL); - else if(db_set) - g_object_get(default_tag, "background-gdk", &background_color, NULL); - - if(b_set || db_set) - g_object_set(tag_object, "foreground-gdk", background_color, NULL); - else - g_object_set(tag_object, "foreground", "#ffffff", NULL); - - if(f_set || df_set) - g_object_set(tag_object, "background-gdk", foreground_color, NULL); - else - g_object_set(tag_object, "background", "#000000", NULL); - - g_object_set_data( tag_object, "reverse-color", GINT_TO_POINTER(val != 0) ); + GdkColor *temp = current_foreground; + current_foreground = current_background; + current_background = temp; } + + g_object_set(tag, + "foreground-gdk", current_foreground, + "foreground-set", TRUE, + "background-gdk", current_background, + "background-set", TRUE, + NULL + ); + + g_object_set_data( tag_object, "reverse-color", GINT_TO_POINTER(val != 0) ); break; + } default: WARNING("Unknown style hint"); @@ -914,19 +930,21 @@ query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint) void glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) { +#ifdef DEBUG_STYLES + g_printf("glk_stylehint_set(wintype=%d, styl=%d, hint=%d, val=%d)\n", wintype, styl, hint, val); +#endif + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - GtkTextTag *to_change, *default_tag; + GtkTextTag *to_change; if(wintype == wintype_TextBuffer || wintype == wintype_AllTypes) { to_change = g_hash_table_lookup( glk_data->glk_styles->text_buffer, get_glk_tag_name(styl) ); - default_tag = g_hash_table_lookup( glk_data->styles->text_buffer, get_tag_name(styl) ); - apply_stylehint_to_tag(to_change, default_tag, wintype_TextBuffer, hint, val); + apply_stylehint_to_tag(to_change, wintype_TextBuffer, styl, hint, val); } if(wintype == wintype_TextGrid || wintype == wintype_AllTypes) { to_change = g_hash_table_lookup( glk_data->glk_styles->text_grid, get_glk_tag_name(styl) ); - default_tag = g_hash_table_lookup( glk_data->styles->text_grid, get_tag_name(styl) ); - apply_stylehint_to_tag(to_change, default_tag, wintype_TextGrid, hint, val); + apply_stylehint_to_tag(to_change, wintype_TextGrid, styl, hint, val); } } @@ -947,6 +965,10 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) void glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint) { +#ifdef DEBUG_STYLES + g_printf("glk_stylehint_clear(wintype=%d, styl=%d, hint=%d)\n", wintype, styl, hint); +#endif + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); GtkTextTag *tag; @@ -986,6 +1008,10 @@ glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint) glui32 glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2) { +#ifdef DEBUG_STYLES + g_printf("glk_style_distinguish(win->rock=%d, styl1=%d, styl2=%d)\n", win->rock, styl1, styl2); +#endif + /* FIXME */ return styl1 != styl2; } @@ -1062,6 +1088,10 @@ glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2) glui32 glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) { +#ifdef DEBUG_STYLES + g_printf("glk_style_measure(win->rock=%d, styl=%d, hint=%d, result=...)\n", win->rock, styl, hint); +#endif + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); GtkTextTag *tag; @@ -1175,3 +1205,67 @@ style_update(ChimaraGlk *glk) GtkTextTag *pager_tag = GTK_TEXT_TAG( g_hash_table_lookup(priv->styles->text_buffer, "pager") ); text_tag_to_attr_list(pager_tag, priv->pager_attr_list); } + +/* Determine the current colors used to render the text for a given stream. + * This can be set in a number of places */ +static void +style_cascade_colors(GtkTextTag *tag, GtkTextTag *glk_tag, GtkTextTag *default_tag, GdkColor **foreground, GdkColor **background) +{ + gboolean foreground_set = FALSE; + gboolean background_set = FALSE; + gint reverse_color; + + // Default color + reverse_color = GPOINTER_TO_INT( g_object_get_data(G_OBJECT(default_tag), "reverse-color") ); + g_object_get(default_tag, "foreground-set", &foreground_set, "background-set", &background_set, NULL); + if(foreground_set) + g_object_get(default_tag, "foreground-gdk", reverse_color ? background:foreground, NULL); + if(background_set) + g_object_get(default_tag, "background-gdk", reverse_color ? foreground:background, NULL); + + // Player defined color + reverse_color = GPOINTER_TO_INT( g_object_get_data(G_OBJECT(tag), "reverse-color") ); + g_object_get(tag, "foreground-set", &foreground_set, "background-set", &background_set, NULL); + if(foreground_set) + g_object_get(tag, "foreground-gdk", reverse_color ? background:foreground, NULL); + if(background_set) + g_object_get(tag, "background-gdk", reverse_color ? foreground:background, NULL); + + // GLK defined color + reverse_color = GPOINTER_TO_INT( g_object_get_data(G_OBJECT(glk_tag), "reverse-color") ); + g_object_get(glk_tag, "foreground-set", &foreground_set, "background-set", &background_set, NULL); + if(foreground_set) + g_object_get(glk_tag, "foreground-gdk", reverse_color ? background:foreground, NULL); + if(background_set) + g_object_get(glk_tag, "background-gdk", reverse_color ? foreground:background, NULL); + +} + +/* Determine the current colors used to render the text for a given stream. + * This can be set in a number of places */ +void +style_stream_colors(strid_t str, GdkColor **foreground, GdkColor **background) +{ + 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); + + GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(str->window->widget) ); + GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); + GtkTextTag* default_tag = gtk_text_tag_table_lookup(tags, "default"); + GtkTextTag* tag = gtk_text_tag_table_lookup(tags, str->style); + GtkTextTag* glk_tag = gtk_text_tag_table_lookup(tags, str->glk_style); + + style_cascade_colors(tag, glk_tag, default_tag, foreground, background); + + gboolean foreground_set, background_set; + + // Windows can have zcolors defined + if(str->window->zcolor) { + g_object_get(str->window->zcolor, "foreground-set", &foreground_set, "background-set", &background_set, NULL); + if(foreground_set) + g_object_get(str->window->zcolor, "foreground-gdk", foreground, NULL); + if(background_set) + g_object_get(str->window->zcolor, "background-gdk", background, NULL); + } +} diff --git a/libchimara/style.h b/libchimara/style.h index 5766f84..0cfbbdd 100644 --- a/libchimara/style.h +++ b/libchimara/style.h @@ -3,6 +3,7 @@ #include #include +#include #include "glk.h" #include "chimara-glk.h" @@ -19,6 +20,7 @@ G_GNUC_INTERNAL void scan_css_file(GScanner *scanner, ChimaraGlk *glk); G_GNUC_INTERNAL PangoFontDescription *get_current_font(guint32 wintype); G_GNUC_INTERNAL GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag); G_GNUC_INTERNAL void glkcolor_to_gdkcolor(glui32 val, GdkColor *color); +G_GNUC_INTERNAL void style_stream_colors(strid_t str, GdkColor **foreground, GdkColor **background); typedef struct StyleSet { GHashTable *text_grid; @@ -27,4 +29,17 @@ typedef struct StyleSet { #define CHIMARA_NUM_STYLES 13 +// #define DEBUG_STYLES + +#define ACTUAL_FG(tag) \ + (GPOINTER_TO_INT( g_object_get_data(G_OBJECT((tag)), "reverse-color")) ? "background-gdk":"foreground-gdk") + +#define ACTUAL_BG(tag) \ + (GPOINTER_TO_INT( g_object_get_data(G_OBJECT((tag)), "reverse-color")) ? "foreground-gdk":"background-gdk") + +#define ASSIGN_COLOR(to, from) \ + (to)->red = (from)->red; \ + (to)->green = (from)->green; \ + (to)->blue = (from)->blue; + #endif diff --git a/libchimara/window.c b/libchimara/window.c index 5b970f5..6272c67 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -951,9 +951,29 @@ glk_window_clear(winid_t win) gtk_text_buffer_set_text(textbuffer, text, -1); g_free(text); - GtkTextIter begin; - gtk_text_buffer_get_start_iter(textbuffer, &begin); - gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &begin); + GtkTextIter start, end; + gtk_text_buffer_get_start_iter(textbuffer, &start); + gtk_text_buffer_get_end_iter(textbuffer, &end); + + /* Determine default style */ + GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(textbuffer); + GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default"); + GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, "normal"); + GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, "normal"); + + // Default style + gtk_text_buffer_apply_tag(textbuffer, default_tag, &start, &end); + + // Player's style overrides + gtk_text_buffer_apply_tag(textbuffer, style_tag, &start, &end); + + // GLK Program's style overrides + gtk_text_buffer_apply_tag(textbuffer, glk_style_tag, &start, &end); + + if(win->zcolor != NULL) + gtk_text_buffer_apply_tag(textbuffer, win->zcolor, &start, &end); + + gtk_text_buffer_move_mark_by_name(textbuffer, "cursor_position", &start); gdk_threads_leave(); } diff --git a/libchimara/window.h b/libchimara/window.h index 7ba3112..2945511 100644 --- a/libchimara/window.h +++ b/libchimara/window.h @@ -82,9 +82,8 @@ struct glk_window_struct gulong pager_adjustment_handler; /* Window buffer */ GString *buffer; - /* Styles */ GtkTextTag *zcolor; - glui32 last_zcolor_id; + GtkTextTag *zcolor_reversed; /* Hyperlinks */ GHashTable *hyperlinks; struct hyperlink *current_hyperlink;