X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=36d6d2644dce293390f019981420f3a0c8ac0001;hb=a990c9f6e84e43b37e9f1e6b89ea6a1e8646354b;hp=076d5363b4b77b9bb84761c180d383517e93f85f;hpb=e58377549f7512c03a2bf8346e82533d77acbd39;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/style.c b/libchimara/style.c index 076d536..36d6d26 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -146,6 +146,9 @@ style_init_textbuffer(GtkTextBuffer *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 ); } @@ -162,6 +165,9 @@ style_init_textgrid(GtkTextBuffer *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)); + + /* 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 */ @@ -180,36 +186,43 @@ 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); - _COPY_FLAG (scale_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" ); @@ -235,7 +248,7 @@ style_init(ChimaraGlk *glk) /* Initialise the default styles for a text grid */ tag = gtk_text_tag_new("default"); - g_object_set(tag, "family", "Monospace", 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"); @@ -249,19 +262,19 @@ style_init(ChimaraGlk *glk) g_hash_table_insert(default_text_grid_styles, "preformatted", tag); tag = gtk_text_tag_new("header"); - 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, "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, "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, "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"); @@ -278,12 +291,12 @@ style_init(ChimaraGlk *glk) 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, "family", "Serif", 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"); @@ -294,27 +307,27 @@ style_init(ChimaraGlk *glk) g_hash_table_insert(default_text_buffer_styles, "emphasized", tag); tag = gtk_text_tag_new("preformatted"); - g_object_set(tag, "family", "Monospace", 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, "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, "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, "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, "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, "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"); @@ -327,11 +340,11 @@ style_init(ChimaraGlk *glk) g_hash_table_insert(default_text_buffer_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_buffer_styles, "hyperlink", tag); GtkTextTag *pager_tag = gtk_text_tag_new("pager"); - g_object_set(pager_tag, "foreground", "#ffffff", "background", "#000000", NULL); + g_object_set(pager_tag, "family", "Monospace", "family-set", TRUE, "foreground", "#ffffff", "foreground-set", TRUE, "background", "#000000", "background-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "pager", pager_tag); text_tag_to_attr_list(pager_tag, priv->pager_attr_list); @@ -377,8 +390,6 @@ 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; @@ -387,8 +398,7 @@ scan_css_file(GScanner *scanner, ChimaraGlk *glk) 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); + style_update(glk); } /* Internal function: parses a token */ @@ -718,11 +728,18 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 wintype, glui32 styl, glui32 hint 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? "default" : "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; @@ -1087,22 +1104,46 @@ PangoFontDescription * get_current_font(guint32 wintype) { ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - GtkTextTag *tag; + GHashTable *styles, *glk_styles; + PangoFontDescription *font; switch(wintype) { case wintype_TextGrid: - tag = g_hash_table_lookup(glk_data->styles->text_grid, "default"); - return pango_font_description_from_string("Monospace"); + 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: - tag = g_hash_table_lookup(glk_data->styles->text_buffer, "default"); - return pango_font_description_from_string("Serif"); + 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; + 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; } @@ -1165,7 +1206,7 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list) } } -/* Update pager and reverse video tags */ +/* Update pager tag */ void style_update(ChimaraGlk *glk) {