From: rodin Date: Tue, 18 May 2010 13:59:27 +0000 (+0000) Subject: Backend support for using dynamic styles. See also Ticket #49. X-Git-Tag: v0.9~189 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=07c4e25bfcbc35efcdd99139cff3ba61e03a507e;p=projects%2Fchimara%2Fchimara.git Backend support for using dynamic styles. See also Ticket #49. --- diff --git a/libchimara/chimara-glk-private.h b/libchimara/chimara-glk-private.h index 6743ecd..44a2a49 100644 --- a/libchimara/chimara-glk-private.h +++ b/libchimara/chimara-glk-private.h @@ -27,9 +27,9 @@ struct _ChimaraGlkPrivate { guint spacing; /* The CSS file to read style defaults from */ gchar *css_file; - /* Hashtable containing the default and current style */ - struct StyleSet *default_styles; - struct StyleSet *current_styles; + /* Hashtable containing the current styles set by CSS and GLK */ + struct StyleSet *styles; + struct StyleSet *glk_styles; PangoAttrList *pager_attr_list; /* Final message displayed when game exits */ gchar *final_message; diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c index b422ef1..6254602 100644 --- a/libchimara/chimara-glk.c +++ b/libchimara/chimara-glk.c @@ -156,8 +156,8 @@ chimara_glk_init(ChimaraGlk *self) priv->self = self; priv->interactive = TRUE; priv->protect = FALSE; - priv->default_styles = g_new0(StyleSet,1); - priv->current_styles = g_new0(StyleSet,1); + priv->styles = g_new0(StyleSet,1); + priv->glk_styles = g_new0(StyleSet,1); priv->pager_attr_list = pango_attr_list_new(); priv->final_message = g_strdup("[ The game has finished ]"); priv->running = FALSE; @@ -257,10 +257,10 @@ chimara_glk_finalize(GObject *object) /* Free widget properties */ g_free(priv->final_message); /* Free styles */ - g_hash_table_destroy(priv->default_styles->text_buffer); - g_hash_table_destroy(priv->default_styles->text_grid); - g_hash_table_destroy(priv->current_styles->text_buffer); - g_hash_table_destroy(priv->current_styles->text_grid); + g_hash_table_destroy(priv->styles->text_buffer); + g_hash_table_destroy(priv->styles->text_grid); + g_hash_table_destroy(priv->glk_styles->text_buffer); + g_hash_table_destroy(priv->glk_styles->text_grid); pango_attr_list_unref(priv->pager_attr_list); /* Free the event queue */ @@ -1067,10 +1067,6 @@ chimara_glk_set_css_from_file(ChimaraGlk *glk, const gchar *filename, GError **e scanner->input_name = filename; scan_css_file(scanner, glk); - /* Set the current style to a copy of the default style */ - /* FIXME this is not correct */ - copy_default_styles_to_current_styles(glk); - if(close(fd) == -1) { *error = g_error_new(G_IO_ERROR, g_io_error_from_errno(errno), _("Error closing file \"%s\": %s"), filename, g_strerror(errno)); @@ -1099,10 +1095,6 @@ chimara_glk_set_css_from_string(ChimaraGlk *glk, const gchar *css) g_scanner_input_text(scanner, css, strlen(css)); scanner->input_name = ""; scan_css_file(scanner, glk); - - /* Set the current style to a copy of the default style */ - /* FIXME this is not correct */ - copy_default_styles_to_current_styles(glk); } /** diff --git a/libchimara/stream.h b/libchimara/stream.h index ef6b1f0..b60e022 100644 --- a/libchimara/stream.h +++ b/libchimara/stream.h @@ -50,6 +50,7 @@ struct glk_stream_struct gchar *filename; /* Displayable filename in UTF-8 for error handling */ gchar *style; /* Name of the current style */ + gchar *glk_style; /* Name of the current glk style override */ gboolean hyperlink_mode; /* When turned on, text written to the stream will be a hyperlink */ }; diff --git a/libchimara/strio.c b/libchimara/strio.c index 66fb989..218adb2 100644 --- a/libchimara/strio.c +++ b/libchimara/strio.c @@ -49,13 +49,14 @@ flush_window_buffer(winid_t win) GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); 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); 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_insert_with_tags(buffer, &iter, win->buffer->str, -1, style_tag, link_style_tag, link_tag, NULL); + gtk_text_buffer_insert_with_tags(buffer, &iter, win->buffer->str, -1, style_tag, glk_style_tag, link_style_tag, link_tag, NULL); } else { - gtk_text_buffer_insert_with_tags(buffer, &iter, win->buffer->str, -1, style_tag, NULL); + gtk_text_buffer_insert_with_tags(buffer, &iter, win->buffer->str, -1, style_tag, glk_style_tag, NULL); } ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK)); @@ -86,13 +87,14 @@ flush_window_buffer(winid_t win) GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); 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); 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_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, style_tag, link_style_tag, link_tag, NULL); + gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, style_tag, glk_style_tag, link_style_tag, link_tag, NULL); } else { - gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, style_tag, NULL); + gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, style_tag, glk_style_tag, NULL); } chars_left -= available_space; @@ -107,13 +109,14 @@ flush_window_buffer(winid_t win) GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); 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); 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_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, style_tag, link_style_tag, link_tag, NULL); + gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, style_tag, glk_style_tag, link_style_tag, link_tag, NULL); } else { - gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, style_tag, NULL); + gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), -1, style_tag, glk_style_tag, NULL); } } diff --git a/libchimara/style.c b/libchimara/style.c index 76ef5d7..f31f2d6 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -13,7 +13,7 @@ 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_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); @@ -38,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", @@ -49,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 { @@ -64,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 @@ -78,6 +107,7 @@ 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. */ @@ -98,8 +128,11 @@ style_init_textbuffer(GtkTextBuffer *buffer) 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)); + /* 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)); } @@ -111,26 +144,33 @@ style_init_textgrid(GtkTextBuffer *buffer) 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)); + /* 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 */ @@ -177,7 +217,7 @@ 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(ChimaraGlk *glk) { @@ -185,8 +225,8 @@ 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 *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"); @@ -198,7 +238,7 @@ style_init(ChimaraGlk *glk) 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"); @@ -206,40 +246,48 @@ 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, "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", 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"); @@ -247,47 +295,64 @@ style_init(ChimaraGlk *glk) 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); GtkTextTag *pager_tag = gtk_text_tag_new("pager"); - g_object_set(pager_tag, "foreground", "#ffffff", "background", "#000000", NULL); + 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->default_styles->text_grid = default_text_grid_styles; - priv->default_styles->text_buffer = default_text_buffer_styles; - priv->current_styles->text_grid = current_text_grid_styles; - priv->current_styles->text_buffer = current_text_buffer_styles; + 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; - /* Set the current style to a copy of the default style */ - copy_default_styles_to_current_styles(glk); } /* Reset style tables to the library's internal defaults */ @@ -302,12 +367,14 @@ reset_default_styles(ChimaraGlk *glk) void copy_default_styles_to_current_styles(ChimaraGlk *glk) { + /* CHIMARA_GLK_USE_PRIVATE(glk, priv); - g_hash_table_foreach(priv->default_styles->text_grid, style_table_copy, priv->current_styles->text_grid); - g_hash_table_foreach(priv->default_styles->text_buffer, style_table_copy, priv->current_styles->text_buffer); + 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->default_styles->text_buffer, "pager") ); + 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 */ @@ -327,12 +394,18 @@ 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 */ @@ -380,9 +453,9 @@ style_accept_style_selector(GScanner *scanner, ChimaraGlk *glk) } if( !strcmp(field, "buffer") ) - current_tag = g_hash_table_lookup(priv->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(priv->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"); @@ -575,7 +648,7 @@ 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, glui32 wintype, 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); @@ -631,7 +704,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 wintype, glui32 hint, glsi32 val) { gchar *font_family; GtkTextTag *font_tag = g_hash_table_lookup( - wintype == wintype_TextBuffer? glk_data->default_styles->text_buffer : glk_data->default_styles->text_grid, + 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); @@ -664,20 +737,25 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 wintype, 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); @@ -745,7 +823,7 @@ query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint) { gchar *font_family, *query_font_family; GtkTextTag *font_tag = g_hash_table_lookup( - wintype == wintype_TextBuffer? glk_data->default_styles->text_buffer : glk_data->default_styles->text_grid, + 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); @@ -793,15 +871,17 @@ glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val) { ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); - 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, wintype_TextBuffer, 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, wintype_TextGrid, 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); } } @@ -827,11 +907,11 @@ 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) ); + 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) ); + 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; @@ -938,12 +1018,12 @@ 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) ); + 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) ); + 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: @@ -964,10 +1044,10 @@ get_current_font(guint32 wintype) 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; diff --git a/libchimara/style.h b/libchimara/style.h index 6916439..ea27c9a 100644 --- a/libchimara/style.h +++ b/libchimara/style.h @@ -11,7 +11,7 @@ G_GNUC_INTERNAL void style_init_textgrid(GtkTextBuffer *buffer); G_GNUC_INTERNAL void style_init_more_prompt(winid_t win); G_GNUC_INTERNAL void style_init(ChimaraGlk *glk); G_GNUC_INTERNAL void reset_default_styles(ChimaraGlk *glk); -G_GNUC_INTERNAL void copy_default_styles_to_current_styles(ChimaraGlk *glk); +/*G_GNUC_INTERNAL void copy_default_styles_to_current_styles(ChimaraGlk *glk);*/ G_GNUC_INTERNAL GScanner *create_css_file_scanner(void); G_GNUC_INTERNAL void scan_css_file(GScanner *scanner, ChimaraGlk *glk); G_GNUC_INTERNAL PangoFontDescription *get_current_font(guint32 wintype); diff --git a/libchimara/window.c b/libchimara/window.c index 94042d1..826eacd 100644 --- a/libchimara/window.c +++ b/libchimara/window.c @@ -26,6 +26,7 @@ window_new_common(glui32 rock) win->window_stream->type = STREAM_TYPE_WINDOW; win->window_stream->window = win; win->window_stream->style = "normal"; + win->window_stream->glk_style = "normal"; win->echo_stream = NULL; win->input_request_type = INPUT_REQUEST_NONE; diff --git a/tests/styletest.c b/tests/styletest.c index 7b976d0..8ed7737 100644 --- a/tests/styletest.c +++ b/tests/styletest.c @@ -16,6 +16,10 @@ void glk_main(void) { char stringbuffer[128]; event_t ev; + + /* Define some custom styles */ + glk_stylehint_set(wintype_AllTypes, style_User1, stylehint_TextColor, 0x00FF0000); + mainwin = glk_window_open(0, 0, 0, wintype_TextBuffer, 0); if(!mainwin) return; @@ -28,7 +32,6 @@ void glk_main(void) assert(buffer); glk_put_string("Welcome to the style test\n"); - glk_put_string("int finish_text_grid_line_input(winid_t win, gboolean\n 11 static void cancel_old_input_request(winid_t win);\n 12 \n 13 /* Internal function: code common to both flavors of char ev\n 14 void\n 15 request_char_event_common(winid_t win, gboolean unicode)\n 16 {\n 17 VALID_WINDOW(win, return);\n 18 g_return_if_fail(win->type != wintype_TextBuffer || win-\n 19 \n 20 cancel_old_input_request(win);\n 21 \n 22 flush_window_buffer(win);\n 23 \n 24 ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key\n 25 \n 26 win->input_request_type = unicode? INPUT_REQUEST_CHARACT\n 27 g_signal_handler_unblock( win->widget, win->char_input_k\n 28 \n 29 gdk_threads_enter();\n 30 \n 31 /*\n 32 if(win->type == wintype_TextBuffer)\n 33 {\n 34 GtkTextBuffer *buffer = gtk_text_view_get_buffer( GT\n 35 GtkTextIter iter;\n 36 gtk_text_buffer_get_end_iter(buffer, &iter);\n 37 gtk_text_buffer_place_cursor(buffer, &iter);\n 38 gtk_text_view_scroll_mark_onscreen(GTK_TEXT_VIEW(win\n 39 // Why doesn't this always work?? \n 40 } */\n 41 \n 42 gtk_widget_grab_focus( GTK_WIDGET(win->widget) );\n 43 gdk_threads_leave();\n 44 \n 47 }\n 48 \n 49 /**\n 50 * glk_request_char_event:\n 51 * @win: A window to request char events from.\n 52 *\n 53 * Request input of a Latin-1 character or special key. A wi\n 54 * requests for both character and line input at the same ti\n 55 * requests for character input of both types (Latin-1 and U\n 56 * illegal to call glk_request_char_event() if the window al\n 57 * request for either character or\n"); glk_request_line_event(mainwin, buffer, 255, 0); while(strncmp(buffer, "quit", 4)) {