X-Git-Url: https://git.stderr.nl/gitweb?p=projects%2Fchimara%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fstyle.c;h=b4aa029367a61443955c413b832235a9caea33b3;hp=74a64378c9b16d2012ad88a1ab8ed3834ebc5718;hb=523811df4155ac5a10b206cb16374d1383e108fc;hpb=5140be18f4a2b3e053da53868e54285c99a8afd4 diff --git a/libchimara/style.c b/libchimara/style.c index 74a6437..b4aa029 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" @@ -7,15 +8,15 @@ #include "stream.h" #include "strio.h" -extern GPrivate *glk_data_key; +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: @@ -33,7 +34,7 @@ GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag); void glk_set_style(glui32 styl) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); g_return_if_fail(glk_data->current_stream != NULL); glk_set_style_stream(glk_data->current_stream, styl); } @@ -52,7 +53,6 @@ static const gchar* TAG_NAMES[] = { "user1", "user2", "hyperlink", - "pager", "default" }; @@ -110,6 +110,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; @@ -118,29 +122,22 @@ glk_set_style_stream(strid_t str, glui32 styl) { str->glk_style = (gchar*) get_glk_tag_name(styl); } -/* Internal function: call this to initialize the layout of the 'more' prompt. */ -void -style_init_more_prompt(winid_t win) -{ - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - - win->pager_layout = gtk_widget_create_pango_layout(win->widget, "More"); - pango_layout_set_attributes(win->pager_layout, glk_data->pager_attr_list); -} - /* Internal function: call this to initialize the default styles to a textbuffer. */ void style_init_textbuffer(GtkTextBuffer *buffer) { g_return_if_fail(buffer != NULL); - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + 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)); + + /* Assign the 'default' tag the lowest priority */ + gtk_text_tag_set_priority( gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "default"), 0 ); } @@ -149,25 +146,17 @@ void style_init_textgrid(GtkTextBuffer *buffer) { g_return_if_fail(buffer != NULL); - - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + + 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); + /* Assign the 'default' tag the lowest priority */ + gtk_text_tag_set_priority( gtk_text_tag_table_lookup(gtk_text_buffer_get_tag_table(buffer), "default"), 0 ); } /* Internal function used to iterate over a style table, copying it */ @@ -186,41 +175,50 @@ GtkTextTag * gtk_text_tag_copy(GtkTextTag *tag) { GtkTextTag *copy; + char *tag_name; + GParamSpec **properties; + unsigned nprops, count; g_return_val_if_fail(tag != NULL, NULL); - copy = gtk_text_tag_new(tag->name); - gtk_text_attributes_copy_values(tag->values, copy->values); - - #define _COPY_FLAG(flag) copy->flag = tag->flag - _COPY_FLAG (bg_color_set); - _COPY_FLAG (bg_color_set); - _COPY_FLAG (bg_stipple_set); - _COPY_FLAG (fg_color_set); - _COPY_FLAG (fg_stipple_set); - _COPY_FLAG (justification_set); - _COPY_FLAG (left_margin_set); - _COPY_FLAG (indent_set); - _COPY_FLAG (rise_set); - _COPY_FLAG (strikethrough_set); - _COPY_FLAG (right_margin_set); - _COPY_FLAG (pixels_above_lines_set); - _COPY_FLAG (pixels_below_lines_set); - _COPY_FLAG (pixels_inside_wrap_set); - _COPY_FLAG (tabs_set); - _COPY_FLAG (underline_set); - _COPY_FLAG (wrap_mode_set); - _COPY_FLAG (bg_full_height_set); - _COPY_FLAG (invisible_set); - _COPY_FLAG (editable_set); - _COPY_FLAG (language_set); - #undef _COPY_FLAG + g_object_get(tag, "name", &tag_name, NULL); + copy = gtk_text_tag_new(tag_name); + g_free(tag_name); + + /* Copy all the original tag's properties to the new tag */ + properties = g_object_class_list_properties( G_OBJECT_GET_CLASS(tag), &nprops ); + for(count = 0; count < nprops; count++) { + + /* Only copy properties that are readable, writable, not construct-only, + and not deprecated */ + GParamFlags flags = properties[count]->flags; + if(flags & G_PARAM_CONSTRUCT_ONLY + || flags & G_PARAM_DEPRECATED + || !(flags & G_PARAM_READABLE) + || !(flags & G_PARAM_WRITABLE)) + continue; + + const char *prop_name = g_param_spec_get_name(properties[count]); + GValue prop_value = G_VALUE_INIT; + + g_value_init( &prop_value, G_PARAM_SPEC_VALUE_TYPE(properties[count]) ); + g_object_get_property( G_OBJECT(tag), prop_name, &prop_value ); + /* Don't copy the PangoTabArray if it is NULL, that prints a warning */ + if(strcmp(prop_name, "tabs") == 0 && g_value_get_boxed(&prop_value) == NULL) { + g_value_unset(&prop_value); + continue; + } + g_object_set_property( G_OBJECT(copy), prop_name, &prop_value ); + g_value_unset(&prop_value); + } + g_free(properties); /* 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; } @@ -233,143 +231,122 @@ style_init(ChimaraGlk *glk) GHashTable *default_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); GHashTable *default_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - GHashTable *glk_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); GtkTextTag *tag; - PangoFontDescription *default_font_desc = pango_font_description_from_string("Serif"); - PangoFontDescription *monospace_font_desc = pango_font_description_from_string("Monospace"); - /* Initialise the default styles for a text grid */ tag = gtk_text_tag_new("default"); - g_object_set(tag, "font-desc", monospace_font_desc, NULL); + g_object_set(tag, "family", "Monospace", "family-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "default", tag); tag = gtk_text_tag_new("normal"); - //g_object_set(tag, "font-desc", monospace_font_desc, NULL); g_hash_table_insert(default_text_grid_styles, "normal", tag); tag = gtk_text_tag_new("emphasized"); - //g_object_set(tag, "font-desc", monospace_font_desc, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_object_set(tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "emphasized", tag); tag = gtk_text_tag_new("preformatted"); - g_object_set(tag, "font-desc", monospace_font_desc, NULL); g_hash_table_insert(default_text_grid_styles, "preformatted", tag); tag = gtk_text_tag_new("header"); - //g_object_set(tag, "font-desc", monospace_font_desc, "weight", PANGO_WEIGHT_BOLD, NULL); - g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "header", tag); tag = gtk_text_tag_new("subheader"); - //g_object_set(tag, "font-desc", monospace_font_desc, "weight", PANGO_WEIGHT_BOLD, NULL); - g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "subheader", tag); tag = gtk_text_tag_new("alert"); - //g_object_set(tag, "font-desc", monospace_font_desc, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL); - g_object_set(tag, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "foreground", "#aa0000", "foreground-set", TRUE, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "alert", tag); tag = gtk_text_tag_new("note"); - //g_object_set(tag, "font-desc", monospace_font_desc, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL); - g_object_set(tag, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "foreground", "#aaaa00", "foreground-set", TRUE, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "note", tag); tag = gtk_text_tag_new("block-quote"); - //g_object_set(tag, "font-desc", monospace_font_desc, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_object_set(tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "block-quote", tag); tag = gtk_text_tag_new("input"); - //g_object_set(tag, "font-desc", monospace_font_desc, NULL); g_hash_table_insert(default_text_grid_styles, "input", tag); tag = gtk_text_tag_new("user1"); - //g_object_set(tag, "font-desc", monospace_font_desc, NULL); g_hash_table_insert(default_text_grid_styles, "user1", tag); tag = gtk_text_tag_new("user2"); - //g_object_set(tag, "font-desc", monospace_font_desc, NULL); g_hash_table_insert(default_text_grid_styles, "user2", tag); tag = gtk_text_tag_new("hyperlink"); - g_object_set(tag, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL); + g_object_set(tag, "foreground", "#0000ff", "foreground-set", TRUE, "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "hyperlink", tag); /* Initialise the default styles for a text buffer */ tag = gtk_text_tag_new("default"); - g_object_set(tag, "font-desc", default_font_desc, NULL); + g_object_set(tag, "family", "Serif", "family-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "default", tag); tag = gtk_text_tag_new("normal"); - //g_object_set(tag, "font-desc", default_font_desc, NULL); g_hash_table_insert(default_text_buffer_styles, "normal", tag); tag = gtk_text_tag_new("emphasized"); - //g_object_set(tag, "font-desc", default_font_desc, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_object_set(tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "emphasized", tag); tag = gtk_text_tag_new("preformatted"); - g_object_set(tag, "font-desc", monospace_font_desc, NULL); + g_object_set(tag, "family", "Monospace", "family-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "preformatted", tag); 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, "weight-set", TRUE, 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, "weight-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "subheader", tag); tag = gtk_text_tag_new("alert"); - //g_object_set(tag, "font-desc", default_font_desc, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL); - g_object_set(tag, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "foreground", "#aa0000", "foreground-set", TRUE, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "alert", tag); tag = gtk_text_tag_new("note"); - //g_object_set(tag, "font-desc", default_font_desc, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL); - g_object_set(tag, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "foreground", "#aaaa00", "foreground-set", TRUE, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "note", tag); tag = gtk_text_tag_new("block-quote"); - //g_object_set(tag, "font-desc", default_font_desc, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); - g_object_set(tag, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); + g_object_set(tag, "justification", GTK_JUSTIFY_CENTER, "justification-set", TRUE, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "block-quote", tag); tag = gtk_text_tag_new("input"); - //g_object_set(tag, "font-desc", default_font_desc, NULL); g_hash_table_insert(default_text_buffer_styles, "input", tag); tag = gtk_text_tag_new("user1"); - //g_object_set(tag, "font-desc", default_font_desc, NULL); g_hash_table_insert(default_text_buffer_styles, "user1", tag); tag = gtk_text_tag_new("user2"); - //g_object_set(tag, "font-desc", default_font_desc, NULL); g_hash_table_insert(default_text_buffer_styles, "user2", tag); tag = gtk_text_tag_new("hyperlink"); - //g_object_set(tag, "font-desc", default_font_desc, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL); - g_object_set(tag, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL); + g_object_set(tag, "foreground", "#0000ff", "foreground-set", TRUE, "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "hyperlink", tag); - GtkTextTag *pager_tag = gtk_text_tag_new("pager"); - g_object_set(pager_tag, "font-desc", default_font_desc, "foreground", "#ffffff", "background", "#000000", NULL); - g_hash_table_insert(default_text_buffer_styles, "pager", pager_tag); - text_tag_to_attr_list(pager_tag, priv->pager_attr_list); - - pango_font_description_free(default_font_desc); - pango_font_description_free(monospace_font_desc); - priv->styles->text_grid = default_text_grid_styles; priv->styles->text_buffer = default_text_buffer_styles; + style_reset_glk(glk); +} + +/* Reset the style hints set from the Glk program to be blank. Call this when +starting a new game so that style hints from the previous game don't carry +over. */ +void +style_reset_glk(ChimaraGlk *glk) +{ + CHIMARA_GLK_USE_PRIVATE(glk, priv); + + GHashTable *glk_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); + GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); + GtkTextTag *tag; /* Initialize the GLK styles to empty tags */ int i; @@ -392,21 +369,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) @@ -424,18 +386,12 @@ create_css_file_scanner(void) void scan_css_file(GScanner *scanner, ChimaraGlk *glk) { - CHIMARA_GLK_USE_PRIVATE(glk, priv); - while( g_scanner_peek_next_token(scanner) != G_TOKEN_EOF) { if( !style_accept_style_selector(scanner, glk) ) break; } g_scanner_destroy(scanner); - - /* Update the pager prompt to the new style */ - 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); } /* Internal function: parses a token */ @@ -655,19 +611,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 +620,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,17 +650,17 @@ 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); - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); GObject *tag_object = G_OBJECT(tag); 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 +695,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: @@ -742,66 +721,83 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, case stylehint_Proportional: { 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"); - g_object_get(font_tag, "family", &font_family, NULL); - g_object_set(tag_object, "family", font_family, "family-set", TRUE, NULL); + gboolean family_set; + + if(wintype != wintype_TextBuffer) { + if(val) + WARNING("Style hint 'propotional' only supported on text buffers."); + + break; + } + + GtkTextTag *font_tag = g_hash_table_lookup(glk_data->styles->text_buffer, val? "default" : "preformatted"); + g_object_get(font_tag, "family", &font_family, "family-set", &family_set, NULL); + g_object_set(tag_object, "family", font_family, "family-set", family_set, NULL); g_free(font_family); } 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,11 +809,12 @@ static gint query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint) { gint intval; + gdouble doubleval; GdkColor *colval; g_return_val_if_fail(tag != NULL, 0); - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); switch(hint) { case stylehint_Indentation: @@ -850,8 +847,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 +905,21 @@ query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint) void glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); +#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,7 +940,11 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) void glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); +#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; switch(wintype) { @@ -980,6 +983,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; } @@ -1050,13 +1057,20 @@ glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2) * colors are reversed. * * + * Signed values, such as the %stylehint_Weight value, are cast to + * glui32. They may be cast to glsi32 to be dealt with + * in a more natural context. * * Returns: TRUE upon successul retrieval, otherwise FALSE. */ glui32 glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); +#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; switch(win->type) { @@ -1082,22 +1096,46 @@ glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) PangoFontDescription * get_current_font(guint32 wintype) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - GtkTextTag *normal; + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); + GHashTable *styles, *glk_styles; + PangoFontDescription *font; switch(wintype) { case wintype_TextGrid: - normal = g_hash_table_lookup(glk_data->styles->text_grid, "normal"); + styles = glk_data->styles->text_grid; + glk_styles = glk_data->glk_styles->text_grid; + font = pango_font_description_from_string("Monospace"); break; case wintype_TextBuffer: - normal = g_hash_table_lookup(glk_data->styles->text_buffer, "normal"); + styles = glk_data->styles->text_buffer; + glk_styles = glk_data->glk_styles->text_buffer; + font = pango_font_description_from_string("Serif"); break; default: return NULL; } - PangoFontDescription *font; - g_object_get( G_OBJECT(normal), "font-desc", &font, NULL ); + PangoAttrList *list = pango_attr_list_new(); + + text_tag_to_attr_list( g_hash_table_lookup(styles, "default"), list ); + PangoAttrIterator *it = pango_attr_list_get_iterator(list); + pango_attr_iterator_get_font(it, font, NULL, NULL); + pango_attr_iterator_destroy(it); + + text_tag_to_attr_list( g_hash_table_lookup(styles, "normal"), list ); + it = pango_attr_list_get_iterator(list); + pango_attr_iterator_get_font(it, font, NULL, NULL); + pango_attr_iterator_destroy(it); + + text_tag_to_attr_list( g_hash_table_lookup(glk_styles, "glk-normal"), list ); + it = pango_attr_list_get_iterator(list); + pango_attr_iterator_get_font(it, font, NULL, NULL); + pango_attr_iterator_destroy(it); + + /* Make a copy of the family, preventing it's destruction at the end of this function. */ + pango_font_description_set_family( font, pango_font_description_get_family(font) ); + + pango_attr_list_unref(list); return font; } @@ -1136,7 +1174,8 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list) } /* Font description updates the following properties simultaniously: - * family, style, weight, variant, stretch, size + * family, style, weight, variant, stretch, size. + * FIXME: Except it doesn't really. */ g_object_get(tag, "font-desc", &font_desc, NULL); pango_attr_list_insert( @@ -1160,12 +1199,108 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list) } } -/* Update pager and reverse video tags */ +/* 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_update(ChimaraGlk *glk) +style_stream_colors(strid_t str, GdkColor **foreground, GdkColor **background) { - CHIMARA_GLK_USE_PRIVATE(glk, priv); + 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); + } +} - 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); +/* Apply styles to a segment of text in a GtkTextBuffer, combining multiple + * GtkTextTags. + */ +void +style_apply(winid_t win, GtkTextIter *start, GtkTextIter *end) +{ + GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) ); + GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); + + GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default"); + GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->style); + GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->glk_style); + + // Player's style overrides + gtk_text_buffer_apply_tag(buffer, style_tag, start, end); + + // GLK Program's style overrides + gtk_text_buffer_apply_tag(buffer, glk_style_tag, start, end); + + // Default style + gtk_text_buffer_apply_tag(buffer, default_tag, start, end); + + // Link style overrides + if(win->window_stream->hyperlink_mode) { + GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink"); + GtkTextTag *link_tag = win->current_hyperlink->tag; + gtk_text_buffer_apply_tag(buffer, link_style_tag, start, end); + gtk_text_buffer_apply_tag(buffer, link_tag, start, end); + } + + // GLK Program's style overrides using garglk_set_zcolors() + if(win->zcolor != NULL) { + 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); + } } +