X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=af371d1a52fbd0b1ebb5526507328751c336e829;hb=cbd4cb7f8c62b2ba51329a4cb082a96115a7529d;hp=1b13e61e7ebbd4fbf77f24c17bf92a9478602e7e;hpb=0ce15daa50a3fe259576430e99f3d6324a5716c6;p=rodin%2Fchimara.git diff --git a/libchimara/style.c b/libchimara/style.c index 1b13e61..af371d1 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -1,16 +1,21 @@ -#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 chimara_style_initialized = FALSE; static gboolean style_accept(GScanner *scanner, GTokenType token); 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 GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag); +GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag); /** * glk_set_style: @@ -68,6 +73,10 @@ get_tag_name(glui32 style) */ void glk_set_style_stream(strid_t str, glui32 styl) { + if(str->window == NULL) + return; + + flush_window_buffer(str->window); str->style = get_tag_name(styl); } @@ -77,11 +86,12 @@ style_init_textbuffer(GtkTextBuffer *buffer) { g_return_if_fail(buffer != NULL); - if( G_UNLIKELY(!chimara_style_initialized) ) { + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + if( G_UNLIKELY(!glk_data->style_initialized) ) { style_init(); } - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + /* 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)); } @@ -90,12 +100,13 @@ void style_init_textgrid(GtkTextBuffer *buffer) { g_return_if_fail(buffer != NULL); - - if( G_UNLIKELY(!chimara_style_initialized) ) { + + ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + if( G_UNLIKELY(!glk_data->style_initialized) ) { style_init(); } - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + /* 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)); } @@ -118,7 +129,7 @@ style_table_copy(gpointer key, gpointer tag, gpointer target_table) } /* Internal function that copies a text tag */ -static GtkTextTag* +GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag) { GtkTextTag *copy; @@ -152,35 +163,30 @@ gtk_text_tag_copy(GtkTextTag *tag) _COPY_FLAG (language_set); #undef _COPY_FLAG + /* Copy the data that was added manually */ + 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 ); + return copy; } - + /* Internal function that reads the default styles from a CSS file */ void style_init() { ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - GHashTable *default_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref); - GHashTable *default_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref); - GHashTable *current_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref); - GHashTable *current_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref); + 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); 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 = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ#"; - scanner->config->cset_identifier_nth = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_0123456789"; - scanner->config->symbol_2_token = TRUE; - scanner->config->cpair_comment_single = NULL; - scanner->config->scan_float = FALSE; - - /* Initialise the default styles */ - g_hash_table_insert(default_text_grid_styles, "normal", gtk_text_tag_new("normal")); + /* 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_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); @@ -191,11 +197,11 @@ style_init() g_hash_table_insert(default_text_grid_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, "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, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL); + g_object_set(tag, "weight", PANGO_WEIGHT_BOLD, NULL); g_hash_table_insert(default_text_grid_styles, "subheader", tag); tag = gtk_text_tag_new("alert"); @@ -207,22 +213,85 @@ style_init() g_hash_table_insert(default_text_grid_styles, "note", tag); tag = gtk_text_tag_new("block-quote"); - g_object_set(tag, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, NULL); + g_object_set(tag, "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")); - g_hash_table_foreach(default_text_grid_styles, style_table_copy, default_text_buffer_styles); + 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 */ + tag = gtk_text_tag_new("normal"); + g_object_set(tag, "font-desc", glk_data->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_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_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_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_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_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_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_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("hyperlink"); + g_object_set(tag, "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; - /* 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); + + 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 */ g_hash_table_foreach(default_text_grid_styles, style_table_copy, current_text_grid_styles); @@ -230,9 +299,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); - - chimara_style_initialized = TRUE; + glk_data->style_initialized = TRUE; } /* Internal function: parses a token */ @@ -473,11 +540,8 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); GObject *tag_object = G_OBJECT(tag); - gint reverse_color = 0; - /* FIXME where should we keep track of this? - g_object_get(tag, "reverse_color", &reverse_color, NULL); - */ + gint reverse_color = GPOINTER_TO_INT( g_object_get_data(tag_object, "reverse-color") ); int i = 0; gchar color[20]; @@ -568,6 +632,8 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val) 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) ); } break; @@ -647,8 +713,7 @@ query_tag(GtkTextTag *tag, glui32 hint) break; case stylehint_ReverseColor: - /* FIXME: implement this */ - return 0; + return GPOINTER_TO_INT( g_object_get_data(G_OBJECT(tag), "reverse_color") ); break; default: @@ -678,7 +743,7 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) { ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - if( G_UNLIKELY(!chimara_style_initialized) ) { + if( G_UNLIKELY(!glk_data->style_initialized) ) { style_init(); } @@ -694,6 +759,20 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) } } +/** + * glk_stylehint_clear: + * @wintype: The window type to set a style hint on, or %wintype_AllTypes. + * @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. + * + * There is no equivalent constant to reset a hint for all styles of a single + * window type. + * + */ void glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint) { @@ -713,12 +792,31 @@ 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. + * + * Returns: TRUE if the two styles are visually distinguishable in the given window. + * If they are not, it returns FALSE. + */ glui32 glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2) { return styl1 != styl2; } +/** + * glk_style_measure: + * @win: The window from which to take the style. + * @styl: The style to perform the measurement on. + * @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. + */ glui32 glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) { @@ -739,3 +837,33 @@ glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result) return TRUE; } + +/* 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* +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"); + break; + case wintype_TextBuffer: + normal = g_hash_table_lookup(glk_data->current_styles->text_buffer, "normal"); + break; + default: + return NULL; + } + + PangoFontDescription *font; + g_object_get( G_OBJECT(normal), "font-desc", &font, NULL ); + + return font; +}