X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=0df3bbdd62927c2035f819ba9e1bde2a9ad7d340;hb=8dc72fc5acf19793c8edb5d69ac2d55f7c5a7510;hp=c42a659b39cc73ed24df46cc57914c6c1c3c4806;hpb=66bbd9296bdb139e6abe95661b7d11d72a52f3c3;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/style.c b/libchimara/style.c index c42a659..0df3bbd 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -1,5 +1,6 @@ #include #include +#include #include "chimara-glk-private.h" #include "glk.h" #include "style.h" @@ -12,10 +13,10 @@ extern GPrivate *glk_data_key; static gboolean style_accept(GScanner *scanner, GTokenType token); static gboolean style_accept_style_selector(GScanner *scanner, ChimaraGlk *glk); static gboolean style_accept_style_hint(GScanner *scanner, GtkTextTag *current_tag); -static void style_add_tag_to_textbuffer(gpointer key, gpointer tag, gpointer tag_table); 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: @@ -110,6 +111,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; @@ -137,7 +142,7 @@ style_init_textbuffer(GtkTextBuffer *buffer) ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); /* Place the default text tags in the textbuffer's tag table */ - g_hash_table_foreach(glk_data->styles->text_buffer, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); + g_hash_table_foreach(glk_data->styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); /* Copy the override text tags to the textbuffers's tag table */ g_hash_table_foreach(glk_data->glk_styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); @@ -153,23 +158,12 @@ style_init_textgrid(GtkTextBuffer *buffer) ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); /* Place the default text tags in the textbuffer's tag table */ - g_hash_table_foreach(glk_data->styles->text_grid, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); + g_hash_table_foreach(glk_data->styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); /* Copy the current text tags to the textbuffers's tag table */ g_hash_table_foreach(glk_data->glk_styles->text_grid, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); } -/* Internal function used to iterate over the default text tag table, applying them to a textbuffer */ -static void -style_add_tag_to_textbuffer(gpointer key, gpointer tag, gpointer tag_table) -{ - g_return_if_fail(key != NULL); - g_return_if_fail(tag != NULL); - g_return_if_fail(tag_table != NULL); - - gtk_text_tag_table_add(tag_table, tag); -} - /* Internal function used to iterate over a style table, copying it */ static void style_copy_tag_to_textbuffer(gpointer key, gpointer tag, gpointer target_table) @@ -214,13 +208,15 @@ gtk_text_tag_copy(GtkTextTag *tag) _COPY_FLAG (invisible_set); _COPY_FLAG (editable_set); _COPY_FLAG (language_set); + _COPY_FLAG (scale_set); #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; } @@ -319,12 +315,12 @@ style_init(ChimaraGlk *glk) tag = gtk_text_tag_new("header"); //g_object_set(tag, "font-desc", default_font_desc, "size-points", 18.0, "weight", PANGO_WEIGHT_BOLD, NULL); - g_object_set(tag, "size-points", 18.0, "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL); g_hash_table_insert(default_text_buffer_styles, "header", tag); tag = gtk_text_tag_new("subheader"); //g_object_set(tag, "font-desc", default_font_desc, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL); - g_object_set(tag, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL); g_hash_table_insert(default_text_buffer_styles, "subheader", tag); tag = gtk_text_tag_new("alert"); @@ -392,21 +388,6 @@ reset_default_styles(ChimaraGlk *glk) /* TODO: write this function */ } -/* Copy the default styles to the current styles - FIXME: This function is temporary and will not be needed later on */ -void -copy_default_styles_to_current_styles(ChimaraGlk *glk) -{ - /* - CHIMARA_GLK_USE_PRIVATE(glk, priv); - g_hash_table_foreach(priv->styles->text_grid, style_table_copy, priv->glk_styles->text_grid); - g_hash_table_foreach(priv->styles->text_buffer, style_table_copy, priv->glk_styles->text_buffer); - - 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); - */ -} - /* Create the CSS file scanner */ GScanner * create_css_file_scanner(void) @@ -655,19 +636,6 @@ style_accept_style_hint(GScanner *scanner, GtkTextTag *current_tag) return TRUE; } -/* Internal function: parses a glk color to a #hex-value */ -static void -glkcolor_to_hex(glui32 val, gchar *buffer) -{ - g_return_if_fail(buffer != NULL); - - sprintf(buffer, "#%02X%02X%02X", - ((val & 0xff0000) >> 16), - ((val & 0x00ff00) >> 8), - (val & 0x0000ff) - ); -} - /* Internal function: parses a glk color to a GdkColor */ void glkcolor_to_gdkcolor(glui32 val, GdkColor *color) @@ -677,6 +645,26 @@ glkcolor_to_gdkcolor(glui32 val, GdkColor *color) color->blue = 256 * (val & 0x0000ff); } +/* Internal function: parses a glk color to a hex string */ +gchar* +glkcolor_to_hex(glui32 val) +{ + return g_strdup_printf("%04X%04X%04X", + 256 * ((val & 0xff0000) >> 16), + 256 * ((val & 0x00ff00) >> 8), + 256 * (val & 0x0000ff) + ); +} + +/* Internal function: parses a gdk color to a hex string */ +gchar* +gdkcolor_to_hex(GdkColor *color) +{ + return g_strdup_printf("%04X%04X%04X", + color->red, color->green, color->blue + ); +} + /* Internal function: parses a GdkColor to a glk color */ static glui32 gdkcolor_to_glkcolor(GdkColor *color) @@ -687,7 +675,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); @@ -697,7 +685,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, gint reverse_color = GPOINTER_TO_INT( g_object_get_data(tag_object, "reverse-color") ); int i = 0; - gchar color[20]; + GdkColor color; switch(hint) { case stylehint_Indentation: g_object_set(tag_object, "left-margin", 5*val, "left-margin-set", TRUE, NULL); @@ -732,7 +720,23 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, break; case stylehint_Size: - g_object_set(tag_object, "size", 14+(2*val), "size-set", TRUE, NULL); + { + gdouble scale = PANGO_SCALE_MEDIUM; + switch(val) { + case -3: scale = PANGO_SCALE_XX_SMALL; break; + case -2: scale = PANGO_SCALE_X_SMALL; break; + case -1: scale = PANGO_SCALE_SMALL; break; + case 0: scale = PANGO_SCALE_MEDIUM; break; + case 1: scale = PANGO_SCALE_LARGE; break; + case 2: scale = PANGO_SCALE_X_LARGE; break; + case 3: scale = PANGO_SCALE_XX_LARGE; break; + default: + /* We follow Pango's convention of having each magnification + step be a scaling of 1.2 */ + scale = pow(1.2, (double)val); + } + g_object_set(tag_object, "scale", scale, "scale-set", TRUE, NULL); + } break; case stylehint_Oblique: @@ -744,7 +748,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, gchar *font_family; GtkTextTag *font_tag = g_hash_table_lookup( wintype == wintype_TextBuffer? glk_data->styles->text_buffer : glk_data->styles->text_grid, - val? "normal" : "preformatted"); + val? "default" : "preformatted"); g_object_get(font_tag, "family", &font_family, NULL); g_object_set(tag_object, "family", font_family, "family-set", TRUE, NULL); g_free(font_family); @@ -752,56 +756,66 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, break; case stylehint_TextColor: - glkcolor_to_hex(val, color); + glkcolor_to_gdkcolor(val, &color); if(!reverse_color) - g_object_set(tag_object, "foreground", color, "foreground-set", TRUE, NULL); + g_object_set(tag_object, "foreground-gdk", &color, "foreground-set", TRUE, NULL); else - g_object_set(tag_object, "background", color, "background-set", TRUE, NULL); + g_object_set(tag_object, "background-gdk", &color, "background-set", TRUE, NULL); break; case stylehint_BackColor: - glkcolor_to_hex(val, color); + glkcolor_to_gdkcolor(val, &color); if(!reverse_color) - g_object_set(tag_object, "background", color, "background-set", TRUE, NULL); + g_object_set(tag_object, "background-gdk", &color, "background-set", TRUE, NULL); else - g_object_set(tag_object, "foreground", color, "background-set", TRUE, NULL); + g_object_set(tag_object, "foreground-gdk", &color, "background-set", TRUE, NULL); 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"); @@ -813,6 +827,7 @@ static gint query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint) { gint intval; + gdouble doubleval; GdkColor *colval; g_return_val_if_fail(tag != NULL, 0); @@ -850,8 +865,8 @@ query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint) } case stylehint_Size: - g_object_get(tag, "size", &intval, NULL); - return (intval/2)-14; + g_object_get(tag, "scale", &doubleval, NULL); + return (gint)round(log(doubleval) / log(1.2)); case stylehint_Oblique: g_object_get(tag, "style", &intval , NULL); @@ -908,19 +923,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); } } @@ -941,6 +958,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; @@ -980,6 +1001,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; } @@ -1056,6 +1081,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; @@ -1169,3 +1198,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); + } +}