X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=96750ad05afc0c6d907bbe42f824946785d2f52b;hb=4317ae2d1e6440527b22c0b0f0fcd71d902a5bb6;hp=5c639cc0481842fa04f4d2e5c418b4102ce588a8;hpb=13b21e2a9ba53c7109ae0bbfd774f16f0c9d4413;p=rodin%2Fchimara.git diff --git a/libchimara/style.c b/libchimara/style.c index 5c639cc..96750ad 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -1,6 +1,12 @@ -#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; @@ -9,6 +15,7 @@ static gboolean style_accept_style_selector(GScanner *scanner); 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 text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list); GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag); /** @@ -74,6 +81,16 @@ glk_set_style_stream(strid_t str, glui32 styl) { str->style = get_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) @@ -89,6 +106,7 @@ style_init_textbuffer(GtkTextBuffer *buffer) g_hash_table_foreach(glk_data->current_styles->text_buffer, style_add_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) @@ -177,19 +195,6 @@ style_init() GHashTable *current_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref); GtkTextTag *tag; - /* Create the CSS file scanner */ - GScanner *scanner = g_scanner_new(NULL); - - int f = open(glk_data->css_file, O_RDONLY); - g_return_if_fail(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; - /* 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); @@ -272,14 +277,38 @@ style_init() g_object_set(tag, "foreground", "#0000ff", "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_hash_table_insert(default_text_buffer_styles, "pager", pager_tag); glk_data->default_styles->text_grid = default_text_grid_styles; glk_data->default_styles->text_buffer = default_text_buffer_styles; - /* 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; + /* Create the CSS file scanner */ + GScanner *scanner = g_scanner_new(NULL); + + if(glk_data->css_file != NULL) { + 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; + } + + g_scanner_destroy(scanner); + } + else + g_warning("Could not find CSS file"); } /* Set the current style to a copy of the default style */ @@ -288,7 +317,7 @@ style_init() glk_data->current_styles->text_grid = current_text_grid_styles; glk_data->current_styles->text_buffer = current_text_buffer_styles; - g_scanner_destroy(scanner); + text_tag_to_attr_list(pager_tag, glk_data->pager_attr_list); glk_data->style_initialized = TRUE; } @@ -504,7 +533,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); @@ -515,9 +544,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; @@ -582,7 +620,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) 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); @@ -592,7 +630,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); @@ -695,12 +733,12 @@ query_tag(GtkTextTag *tag, glui32 hint) case stylehint_TextColor: g_object_get(tag, "foreground-gdk", &colval, NULL); - return color_parse_gdk(colval); + return gdkcolor_to_glkcolor(colval); break; case stylehint_BackColor: g_object_get(tag, "background-gdk", &colval, NULL); - return color_parse_gdk(colval); + return gdkcolor_to_glkcolor(colval); break; case stylehint_ReverseColor: @@ -858,3 +896,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) + ); + } +}