X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fstyle.c;h=f31f2d660943d0d04b455e0e8b38cce8ea7b33c5;hp=4a6b5119a52da9e04ca57244730c128a564e53a8;hb=268cb7d6d08efc2fcbe52aa7b1e0d27ec19b6dc0;hpb=57ceef742182d6f0d1f7844256863a37c2d80d6a diff --git a/libchimara/style.c b/libchimara/style.c index 4a6b511..f31f2d6 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -1,14 +1,20 @@ -#include "style.h" #include -#include +#include +#include "chimara-glk-private.h" +#include "glk.h" +#include "style.h" +#include "magic.h" +#include "stream.h" +#include "strio.h" extern GPrivate *glk_data_key; static gboolean style_accept(GScanner *scanner, GTokenType token); -static gboolean style_accept_style_selector(GScanner *scanner); +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_table_copy(gpointer key, gpointer tag, gpointer target_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); /** @@ -16,9 +22,9 @@ GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag); * @styl: The style to apply * * Changes the style of the current output stream. @styl should be one of the - * style_ constants listed above. However, any value is actually - * legal; if the interpreter does not recognize the style value, it will treat - * it as %style_Normal. + * style_ constants. However, any value is actually legal; if the + * interpreter does not recognize the style value, it will treat it as + * %style_Normal. * * This policy allows for the future definition of styles without breaking old * Glk libraries. @@ -32,6 +38,7 @@ glk_set_style(glui32 styl) glk_set_style_stream(glk_data->current_stream, styl); } +#define NUM_STYLES 13 static const gchar* TAG_NAMES[] = { "normal", "emphasized", @@ -43,14 +50,30 @@ static const gchar* TAG_NAMES[] = { "block-quote", "input", "user1", - "user2" + "user2", + "hyperlink", + "pager" +}; + +static const gchar* GLK_TAG_NAMES[] = { + "glk-normal", + "glk-emphasized", + "glk-preformatted", + "glk-header", + "glk-subheader", + "glk-alert", + "glk-note", + "glk-block-quote", + "glk-input", + "glk-user1", + "glk-user2" }; /* Internal function: mapping from style enum to tag name */ static gchar* get_tag_name(glui32 style) { - if(style >= style_NUMSTYLES) { + if(style >= NUM_STYLES) { WARNING("Unsupported style"); return "normal"; } else { @@ -58,6 +81,18 @@ get_tag_name(glui32 style) } } +/* Internal function: mapping from glk style enum to tag name */ +static gchar* +get_glk_tag_name(glui32 style) +{ + if(style >= style_NUMSTYLES) { + WARNING("Unsupported style"); + return "normal"; + } else { + return (gchar*) GLK_TAG_NAMES[style]; + } +} + /** * glk_set_style_stream: * @str: Output stream to change the style of @@ -72,6 +107,17 @@ glk_set_style_stream(strid_t str, glui32 styl) { flush_window_buffer(str->window); str->style = get_tag_name(styl); + str->glk_style = 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. */ @@ -81,14 +127,15 @@ style_init_textbuffer(GtkTextBuffer *buffer) g_return_if_fail(buffer != NULL); ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - if( G_UNLIKELY(!glk_data->style_initialized) ) { - style_init(); - } - /* Copy the current text tags to the textbuffer's tag table */ - g_hash_table_foreach(glk_data->current_styles->text_buffer, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); + /* 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)); + + /* 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)); } + /* Internal function: call this to initialize the default styles to a textgrid. */ void style_init_textgrid(GtkTextBuffer *buffer) @@ -96,34 +143,38 @@ style_init_textgrid(GtkTextBuffer *buffer) g_return_if_fail(buffer != NULL); ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - if( G_UNLIKELY(!glk_data->style_initialized) ) { - style_init(); - } - /* Copy the current text tags to the textgrid's tag table */ - g_hash_table_foreach(glk_data->current_styles->text_grid, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer)); + /* 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)); + + /* 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) { - gtk_text_tag_table_add( tag_table, gtk_text_tag_copy(tag) ); + 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_table_copy(gpointer key, gpointer tag, gpointer target_table) +style_copy_tag_to_textbuffer(gpointer key, gpointer tag, gpointer target_table) { g_return_if_fail(key != NULL); g_return_if_fail(tag != NULL); g_return_if_fail(target_table != NULL); - g_hash_table_insert(target_table, key, gtk_text_tag_copy( GTK_TEXT_TAG(tag) )); + gtk_text_tag_table_add(target_table, gtk_text_tag_copy( GTK_TEXT_TAG(tag) )); } /* Internal function that copies a text tag */ -GtkTextTag* +GtkTextTag * gtk_text_tag_copy(GtkTextTag *tag) { GtkTextTag *copy; @@ -132,7 +183,7 @@ gtk_text_tag_copy(GtkTextTag *tag) 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); @@ -166,134 +217,195 @@ gtk_text_tag_copy(GtkTextTag *tag) return copy; } -/* Internal function that reads the default styles from a CSS file */ +/* Internal function that constructs the default styles */ void -style_init() +style_init(ChimaraGlk *glk) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + CHIMARA_GLK_USE_PRIVATE(glk, priv); + 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 *current_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); - GHashTable *current_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("normal"); - g_object_set(tag, "font-desc", glk_data->monospace_font_desc, NULL); + 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, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); + g_object_set(tag, "font-desc", monospace_font_desc, "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", glk_data->monospace_font_desc, NULL); + 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, "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "font-desc", monospace_font_desc, "weight", PANGO_WEIGHT_BOLD, 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, "font-desc", monospace_font_desc, "weight", PANGO_WEIGHT_BOLD, 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, "font-desc", monospace_font_desc, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, 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, "font-desc", monospace_font_desc, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL); g_hash_table_insert(default_text_grid_styles, "note", tag); tag = gtk_text_tag_new("block-quote"); - g_object_set(tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); + g_object_set(tag, "font-desc", monospace_font_desc, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_hash_table_insert(default_text_grid_styles, "block-quote", tag); - g_hash_table_insert(default_text_grid_styles, "input", gtk_text_tag_new("input")); - g_hash_table_insert(default_text_grid_styles, "user1", gtk_text_tag_new("user1")); - g_hash_table_insert(default_text_grid_styles, "user2", gtk_text_tag_new("user2")); + 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_hash_table_insert(default_text_grid_styles, "hyperlink", tag); - /* Tags for the textbuffer */ + /* Initialise the default styles for a text buffer */ tag = gtk_text_tag_new("normal"); - g_object_set(tag, "font-desc", glk_data->default_font_desc, NULL); + 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, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); + g_object_set(tag, "font-desc", default_font_desc, "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", glk_data->monospace_font_desc, NULL); + g_object_set(tag, "font-desc", monospace_font_desc, NULL); g_hash_table_insert(default_text_buffer_styles, "preformatted", tag); tag = gtk_text_tag_new("header"); - g_object_set(tag, "size-points", 18.0, "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "font-desc", default_font_desc, "size-points", 18.0, "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, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "font-desc", default_font_desc, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, 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, "font-desc", default_font_desc, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, 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, "font-desc", default_font_desc, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, 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, "font-desc", default_font_desc, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "block-quote", tag); - g_hash_table_insert(default_text_buffer_styles, "input", gtk_text_tag_new("input")); - g_hash_table_insert(default_text_buffer_styles, "user1", gtk_text_tag_new("user1")); - g_hash_table_insert(default_text_buffer_styles, "user2", gtk_text_tag_new("user2")); + 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, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL); + g_object_set(tag, "font-desc", default_font_desc, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL); g_hash_table_insert(default_text_buffer_styles, "hyperlink", tag); - glk_data->default_styles->text_grid = default_text_grid_styles; - glk_data->default_styles->text_buffer = default_text_buffer_styles; + 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; + + + /* Initialize the GLK styles to empty tags */ + int i; + for(i=0; iglk_styles->text_grid = glk_text_grid_styles; + priv->glk_styles->text_buffer = glk_text_buffer_styles; + +} + +/* Reset style tables to the library's internal defaults */ +void +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 */ +/* Create the CSS file scanner */ +GScanner * +create_css_file_scanner(void) +{ GScanner *scanner = g_scanner_new(NULL); + scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "#"; + scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z "-_" G_CSET_DIGITS; + scanner->config->symbol_2_token = TRUE; + scanner->config->cpair_comment_single = NULL; + scanner->config->scan_float = FALSE; + return scanner; +} - int f = open(glk_data->css_file, O_RDONLY); - if(f != -1) - { - g_scanner_input_file(scanner, f); - scanner->input_name = glk_data->css_file; - scanner->config->cset_identifier_first = G_CSET_a_2_z G_CSET_A_2_Z "#"; - scanner->config->cset_identifier_nth = G_CSET_a_2_z G_CSET_A_2_Z "-_" G_CSET_DIGITS; - scanner->config->symbol_2_token = TRUE; - scanner->config->cpair_comment_single = NULL; - scanner->config->scan_float = FALSE; - - /* Run the scanner over the CSS file, overriding defaults */ - while( g_scanner_peek_next_token(scanner) != G_TOKEN_EOF) { - if( !style_accept_style_selector(scanner) ) - break; - } +/* Run the scanner over the CSS file, overriding the default styles */ +void +scan_css_file(GScanner *scanner, ChimaraGlk *glk) +{ + CHIMARA_GLK_USE_PRIVATE(glk, priv); - g_scanner_destroy(scanner); + while( g_scanner_peek_next_token(scanner) != G_TOKEN_EOF) { + if( !style_accept_style_selector(scanner, glk) ) + break; } - else - g_warning("Could not find CSS file"); - /* Set the current style to a copy of the default style */ - g_hash_table_foreach(default_text_grid_styles, style_table_copy, current_text_grid_styles); - g_hash_table_foreach(default_text_buffer_styles, style_table_copy, current_text_buffer_styles); - glk_data->current_styles->text_grid = current_text_grid_styles; - glk_data->current_styles->text_buffer = current_text_buffer_styles; + g_scanner_destroy(scanner); - glk_data->style_initialized = TRUE; + /* 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 */ @@ -301,19 +413,18 @@ static gboolean style_accept(GScanner *scanner, GTokenType token) { GTokenType next = g_scanner_get_next_token(scanner); - if(next != token ) { + if(next != token) { g_scanner_unexp_token(scanner, token, NULL, NULL, NULL, "CSS Error", 1); return FALSE; - } else { - return TRUE; } + return TRUE; } /* Internal function: parses a style selector */ static gboolean -style_accept_style_selector(GScanner *scanner) +style_accept_style_selector(GScanner *scanner, ChimaraGlk *glk) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + CHIMARA_GLK_USE_PRIVATE(glk, priv); GtkTextTag *current_tag; gchar *field; @@ -342,9 +453,9 @@ style_accept_style_selector(GScanner *scanner) } if( !strcmp(field, "buffer") ) - current_tag = g_hash_table_lookup(glk_data->default_styles->text_buffer, value.v_identifier); + current_tag = g_hash_table_lookup(priv->styles->text_buffer, value.v_identifier); else - current_tag = g_hash_table_lookup(glk_data->default_styles->text_grid, value.v_identifier); + current_tag = g_hash_table_lookup(priv->styles->text_grid, value.v_identifier); if(current_tag == NULL) { g_scanner_error(scanner, "CSS Error: invalid style identifier"); @@ -507,7 +618,7 @@ style_accept_style_hint(GScanner *scanner, GtkTextTag *current_tag) /* Internal function: parses a glk color to a #hex-value */ static void -color_format(glui32 val, gchar *buffer) +glkcolor_to_hex(glui32 val, gchar *buffer) { g_return_if_fail(buffer != NULL); @@ -518,9 +629,18 @@ color_format(glui32 val, gchar *buffer) ); } +/* Internal function: parses a glk color to a GdkColor */ +void +glkcolor_to_gdkcolor(glui32 val, GdkColor *color) +{ + color->red = 256 * ((val & 0xff0000) >> 16); + color->green = 256 * ((val & 0x00ff00) >> 8); + color->blue = 256 * (val & 0x0000ff); +} + /* Internal function: parses a GdkColor to a glk color */ static glui32 -color_parse_gdk(GdkColor *color) +gdkcolor_to_glkcolor(GdkColor *color) { g_return_val_if_fail(color != NULL, 0); return (glui32) color->pixel; @@ -528,7 +648,7 @@ color_parse_gdk(GdkColor *color) /* Internal function: changes a GTK tag to correspond with the given style. */ static void -apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) +apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, glui32 hint, glsi32 val) { g_return_if_fail(tag != NULL); @@ -581,11 +701,19 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) break; case stylehint_Proportional: - g_object_set(tag_object, "font-desc", val ? glk_data->default_font_desc : glk_data->monospace_font_desc, NULL); + { + 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); + g_free(font_family); + } break; case stylehint_TextColor: - color_format(val, color); + glkcolor_to_hex(val, color); if(!reverse_color) g_object_set(tag_object, "foreground", color, "foreground-set", TRUE, NULL); @@ -595,7 +723,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) break; case stylehint_BackColor: - color_format(val, color); + glkcolor_to_hex(val, color); if(!reverse_color) g_object_set(tag_object, "background", color, "background-set", TRUE, NULL); @@ -609,20 +737,25 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) /* Flip the fore- and background colors */ GdkColor* foreground_color; GdkColor* background_color; - gint f_set, b_set = 0; + 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) + 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) + if(f_set || df_set) g_object_set(tag_object, "background-gdk", foreground_color, NULL); else g_object_set(tag_object, "background", "#000000", NULL); @@ -635,12 +768,12 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) WARNING("Unknown style hint"); } } -/*Internal function: queries a text tag for the value of a given style hint */ + +/* Internal function: queries a text tag for the value of a given style hint */ static gint -query_tag(GtkTextTag *tag, glui32 hint) +query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint) { gint intval; - GObject *objval; GdkColor *colval; g_return_val_if_fail(tag != NULL, 0); @@ -651,64 +784,65 @@ query_tag(GtkTextTag *tag, glui32 hint) case stylehint_Indentation: g_object_get(tag, "left_margin", &intval, NULL); return intval/5; - break; case stylehint_ParaIndentation: g_object_get(tag, "indent", &intval, NULL); return intval/5; - break; case stylehint_Justification: g_object_get(tag, "justification", &intval, NULL); switch(intval) { - case GTK_JUSTIFY_LEFT: return stylehint_just_LeftFlush; break; - case GTK_JUSTIFY_FILL: return stylehint_just_LeftRight; break; - case GTK_JUSTIFY_CENTER: return stylehint_just_Centered; break; - case GTK_JUSTIFY_RIGHT: return stylehint_just_RightFlush; break; + case GTK_JUSTIFY_LEFT: return stylehint_just_LeftFlush; + case GTK_JUSTIFY_FILL: return stylehint_just_LeftRight; + case GTK_JUSTIFY_CENTER: return stylehint_just_Centered; + case GTK_JUSTIFY_RIGHT: return stylehint_just_RightFlush; default: WARNING("Unknown justification"); return stylehint_just_LeftFlush; } - break; case stylehint_Weight: g_object_get(tag, "weight", &intval, NULL); switch(intval) { - case PANGO_WEIGHT_LIGHT: return -1; break; - case PANGO_WEIGHT_NORMAL: return 0; break; - case PANGO_WEIGHT_BOLD: return 1; break; + case PANGO_WEIGHT_LIGHT: return -1; + case PANGO_WEIGHT_NORMAL: return 0; + case PANGO_WEIGHT_BOLD: return 1; default: WARNING("Unknown font weight"); return 0; } - break; case stylehint_Size: g_object_get(tag, "size", &intval, NULL); return (intval/2)-14; - break; case stylehint_Oblique: g_object_get(tag, "style", &intval , NULL); return intval == PANGO_STYLE_ITALIC ? 1 : 0; - break; case stylehint_Proportional: - g_object_get(tag, "font-desc", &objval, NULL); - return objval == (GObject *)glk_data->monospace_font_desc ? 0 : 1; - break; + /* Use pango_font_family_is_monospace()? */ + { + gchar *font_family, *query_font_family; + GtkTextTag *font_tag = g_hash_table_lookup( + wintype == wintype_TextBuffer? glk_data->styles->text_buffer : glk_data->styles->text_grid, + "preformatted"); + g_object_get(font_tag, "family", &font_family, NULL); + g_object_get(tag, "family", &query_font_family, NULL); + gint retval = strcmp(font_family, query_font_family)? 0 : 1; + g_free(font_family); + g_free(query_font_family); + return retval; + } case stylehint_TextColor: g_object_get(tag, "foreground-gdk", &colval, NULL); - return color_parse_gdk(colval); - break; + return gdkcolor_to_glkcolor(colval); case stylehint_BackColor: g_object_get(tag, "background-gdk", &colval, NULL); - return color_parse_gdk(colval); - break; + return gdkcolor_to_glkcolor(colval); case stylehint_ReverseColor: return GPOINTER_TO_INT( g_object_get_data(G_OBJECT(tag), "reverse_color") ); - break; default: WARNING("Unknown style hint"); @@ -725,7 +859,7 @@ query_tag(GtkTextTag *tag, glui32 hint) * @val: The style hint. The meaning of this depends on @hint. * * Sets a hint about the appearance of one style for a particular type of - * window. You can also set wintype to %wintype_AllTypes, which sets a hint for + * window. You can also set @wintype to %wintype_AllTypes, which sets a hint for * all types of window. * * There is no equivalent constant to set a hint for all styles of a single @@ -737,19 +871,17 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) { ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - if( G_UNLIKELY(!glk_data->style_initialized) ) { - style_init(); - } - - GtkTextTag *to_change; + GtkTextTag *to_change, *default_tag; if(wintype == wintype_TextBuffer || wintype == wintype_AllTypes) { - to_change = g_hash_table_lookup( glk_data->current_styles->text_buffer, get_tag_name(styl) ); - apply_stylehint_to_tag(to_change, hint, val); + 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); } if(wintype == wintype_TextGrid || wintype == wintype_AllTypes) { - to_change = g_hash_table_lookup( glk_data->current_styles->text_grid, get_tag_name(styl) ); - apply_stylehint_to_tag(to_change, hint, val); + 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); } } @@ -759,9 +891,9 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) * @styl: The style to set a hint for. * @hint: The type of style hint, one of the stylehint_ constants. * - * Resets a hint about the appearance of one style for a particular type of - * window to it's default value. You can also set wintype to %wintype_AllTypes, which resets a hint for - * all types of window. + * Clears a hint about the appearance of one style for a particular type of + * window to its default value. You can also set @wintype to %wintype_AllTypes, + * which clears a hint for all types of window. * * There is no equivalent constant to reset a hint for all styles of a single * window type. @@ -775,12 +907,12 @@ glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint) switch(wintype) { case wintype_TextBuffer: - tag = g_hash_table_lookup( glk_data->default_styles->text_buffer, get_tag_name(styl) ); - glk_stylehint_set( wintype, styl, hint, query_tag(tag, hint) ); + tag = g_hash_table_lookup( glk_data->styles->text_buffer, get_glk_tag_name(styl) ); + glk_stylehint_set( wintype, styl, hint, query_tag(tag, wintype, hint) ); break; case wintype_TextGrid: - tag = g_hash_table_lookup( glk_data->default_styles->text_grid, get_tag_name(styl) ); - glk_stylehint_set( wintype, styl, hint, query_tag(tag, hint) ); + tag = g_hash_table_lookup( glk_data->styles->text_grid, get_glk_tag_name(styl) ); + glk_stylehint_set( wintype, styl, hint, query_tag(tag, wintype, hint) ); default: return; } @@ -790,14 +922,22 @@ glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint) * glk_style_distinguish: * @win: The window in which the styles are to be distinguished. * @styl1: The first style to be distinguished from the second style. - * @styl2: The second styel to be distinguished from the first style. + * @styl2: The second style to be distinguished from the first style. * - * Returns: TRUE if the two styles are visually distinguishable in the given window. - * If they are not, it returns FALSE. + * Decides whether two styles are visually distinguishable in the given window. + * The exact meaning of this is left for the library to determine. + * Chimara + * Currently, all styles of one window are assumed to be mutually + * distinguishable. + * + * + * Returns: %TRUE (1) if the two styles are visually distinguishable. If they + * are not, it returns %FALSE (0). */ glui32 glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2) { + /* FIXME */ return styl1 != styl2; } @@ -808,8 +948,67 @@ glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2) * @hint: The stylehint to measure. * @result: Address to write the result to. * - * This function can be used to query the current value of a particular style hint. - * Returns: TRUE upon successul retrievel, otherwise FALSE. + * Tries to test an attribute of one style in the given window @win. The library + * may not be able to determine the attribute; if not, this returns %FALSE (0). + * If it can, it returns %TRUE (1) and stores the value in the location pointed + * at by @result. + * + * As usual, it is legal for @result to be %NULL, although fairly pointless. + * + * + * The meaning of the value depends on the hint which was tested: + * + * + * %stylehint_Indentation, %stylehint_ParaIndentation + * The indentation and paragraph indentation. These are in a + * metric which is platform-dependent. + * Most likely either characters or pixels. + * + * + * + * %stylehint_Justification + * One of the constants %stylehint_just_LeftFlush, + * %stylehint_just_LeftRight, %stylehint_just_Centered, or + * %stylehint_just_RightFlush. + * + * + * %stylehint_Size + * The font size. Again, this is in a platform-dependent + * metric. + * Pixels, points, or simply 1 if the library does not support + * varying font sizes. + * + * + * + * %stylehint_Weight + * 1 for heavy-weight fonts (boldface), 0 for normal weight, + * and -1 for light-weight fonts. + * + * + * %stylehint_Oblique + * 1 for oblique fonts (italic), or 0 for normal angle. + * + * + * + * %stylehint_Proportional + * 1 for proportional-width fonts, or 0 for fixed-width. + * + * + * + * %stylehint_TextColor, %stylehint_BackColor + * These are values from 0x00000000 to 0x00FFFFFF, encoded as + * described in Suggesting the + * Appearance of Styles. + * + * + * %stylehint_ReverseColor + * 0 for normal printing, 1 if the foreground and background + * colors are reversed. + * + * + * + * Returns: TRUE upon successul retrieval, otherwise FALSE. */ glui32 glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) @@ -819,12 +1018,14 @@ glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) switch(win->type) { case wintype_TextBuffer: - tag = g_hash_table_lookup( glk_data->current_styles->text_buffer, get_tag_name(styl) ); - *result = query_tag(tag, hint); + tag = g_hash_table_lookup( glk_data->glk_styles->text_buffer, get_glk_tag_name(styl) ); + if(result) + *result = query_tag(tag, win->type, hint); break; case wintype_TextGrid: - tag = g_hash_table_lookup( glk_data->current_styles->text_grid, get_tag_name(styl) ); - *result = query_tag(tag, hint); + tag = g_hash_table_lookup( glk_data->glk_styles->text_grid, get_glk_tag_name(styl) ); + if(result) + *result = query_tag(tag, win->type, hint); default: return FALSE; } @@ -835,22 +1036,18 @@ glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) /* Internal function returning the current default font for a window type * This can be used later for size calculations. Only wintype_TextGrid and wintype_TextBuffer are * supported for now */ -PangoFontDescription* +PangoFontDescription * get_current_font(guint32 wintype) { ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); GtkTextTag *normal; - if( G_UNLIKELY(!glk_data->style_initialized) ) { - style_init(); - } - switch(wintype) { case wintype_TextGrid: - normal = g_hash_table_lookup(glk_data->current_styles->text_grid, "normal"); + normal = g_hash_table_lookup(glk_data->styles->text_grid, "normal"); break; case wintype_TextBuffer: - normal = g_hash_table_lookup(glk_data->current_styles->text_buffer, "normal"); + normal = g_hash_table_lookup(glk_data->styles->text_buffer, "normal"); break; default: return NULL; @@ -861,3 +1058,61 @@ get_current_font(guint32 wintype) return font; } + +/* Internal function copying the attributes of a text tag to a pango attribute list */ +static void +text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list) +{ + gboolean set; + GdkColor *foreground, *background; + gchar *string; + PangoFontDescription *font_desc; + gboolean strikethrough; + PangoUnderline underline; + + g_object_get(tag, "foreground-set", &set, "foreground-gdk", &foreground, NULL); + if(set) { + pango_attr_list_insert( + list, + pango_attr_foreground_new(foreground->red, foreground->green, foreground->blue) + ); + } + g_object_get(tag, "background-set", &set, "background-gdk", &background, NULL); + if(set) { + pango_attr_list_insert( + list, + pango_attr_background_new(background->red, background->green, background->blue) + ); + } + g_object_get(tag, "language-set", &set, "language", &string, NULL); + if(set) { + pango_attr_list_insert( + list, + pango_attr_language_new( pango_language_from_string(string) ) + ); + } + + /* Font description updates the following properties simultaniously: + * family, style, weight, variant, stretch, size + */ + g_object_get(tag, "font-desc", &font_desc, NULL); + pango_attr_list_insert( + list, + pango_attr_font_desc_new(font_desc) + ); + + g_object_get(tag, "strikethrough-set", &set, "strikethrough", &strikethrough, NULL); + if(set) { + pango_attr_list_insert( + list, + pango_attr_strikethrough_new(strikethrough) + ); + } + g_object_get(tag, "underline-set", &set, "underline", &underline, NULL); + if(set) { + pango_attr_list_insert( + list, + pango_attr_underline_new(underline) + ); + } +}