X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=dc0d4bb942acb13d4e73ddbeeca3bac7131e1f4f;hb=343e89354b4e079c244867c4b7a5a058a95ca116;hp=0df3bbdd62927c2035f819ba9e1bde2a9ad7d340;hpb=bf5bc4b0d129685482eefea499f39f874744e2fd;p=projects%2Fchimara%2Fchimara.git
diff --git a/libchimara/style.c b/libchimara/style.c
index 0df3bbd..dc0d4bb 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 */
@@ -233,136 +239,108 @@ style_init(ChimaraGlk *glk)
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("default");
- g_object_set(tag, "font-desc", monospace_font_desc, 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");
- //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, "font-desc", monospace_font_desc, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
g_object_set(tag, "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", monospace_font_desc, NULL);
g_hash_table_insert(default_text_grid_styles, "preformatted", tag);
tag = gtk_text_tag_new("header");
- //g_object_set(tag, "font-desc", monospace_font_desc, "weight", PANGO_WEIGHT_BOLD, NULL);
- 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, "font-desc", monospace_font_desc, "weight", PANGO_WEIGHT_BOLD, NULL);
- 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, "font-desc", monospace_font_desc, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL);
- 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, "font-desc", monospace_font_desc, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL);
- 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");
- //g_object_set(tag, "font-desc", monospace_font_desc, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
g_object_set(tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
g_hash_table_insert(default_text_grid_styles, "block-quote", tag);
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_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, "font-desc", default_font_desc, 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");
- //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, "font-desc", default_font_desc, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
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", monospace_font_desc, 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, "font-desc", default_font_desc, "size-points", 18.0, "weight", PANGO_WEIGHT_BOLD, NULL);
- 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, "font-desc", default_font_desc, "size-points", 14.0, "weight", PANGO_WEIGHT_BOLD, NULL);
- 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, "font-desc", default_font_desc, "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL);
- 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, "font-desc", default_font_desc, "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL);
- 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, "font-desc", default_font_desc, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
- 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");
- //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, "font-desc", default_font_desc, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
- 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, "font-desc", default_font_desc, "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);
- 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;
@@ -405,8 +383,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;
@@ -415,8 +391,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 */
@@ -746,11 +721,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;
@@ -1075,6 +1057,9 @@ glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2)
* colors are reversed.
*
*
+ * Signed values, such as the %stylehint_Weight value, are cast to
+ * glui32. They may be cast to glsi32 to be dealt with
+ * in a more natural context.
*
* Returns: TRUE upon successul retrieval, otherwise FALSE.
*/
@@ -1112,21 +1097,45 @@ 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");
+ 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");
+ 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;
- g_object_get( G_OBJECT(tag), "font-desc", &font, NULL );
+ 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 +1174,8 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list)
}
/* Font description updates the following properties simultaniously:
- * family, style, weight, variant, stretch, size
+ * family, style, weight, variant, stretch, size.
+ * FIXME: Except it doesn't really.
*/
g_object_get(tag, "font-desc", &font_desc, NULL);
pango_attr_list_insert(
@@ -1189,7 +1199,7 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list)
}
}
-/* Update pager and reverse video tags */
+/* Update pager tag */
void
style_update(ChimaraGlk *glk)
{
@@ -1262,3 +1272,44 @@ style_stream_colors(strid_t str, GdkColor **foreground, GdkColor **background)
g_object_get(str->window->zcolor, "background-gdk", background, NULL);
}
}
+
+/* Apply styles to a segment of text in a GtkTextBuffer
+ */
+void
+style_apply(winid_t win, GtkTextIter *start, GtkTextIter *end)
+{
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
+ GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+
+ GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default");
+ 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);
+
+ // Player's style overrides
+ gtk_text_buffer_apply_tag(buffer, style_tag, start, end);
+
+ // GLK Program's style overrides
+ gtk_text_buffer_apply_tag(buffer, glk_style_tag, start, end);
+
+ // Default style
+ gtk_text_buffer_apply_tag(buffer, default_tag, start, end);
+
+ // Link style overrides
+ 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_apply_tag(buffer, link_style_tag, start, end);
+ gtk_text_buffer_apply_tag(buffer, link_tag, start, end);
+ }
+
+ // GLK Program's style overrides using garglk_set_zcolors()
+ if(win->zcolor != NULL) {
+ gtk_text_buffer_apply_tag(buffer, win->zcolor, start, end);
+ }
+
+ // GLK Program's style overrides using garglk_set_reversevideo()
+ if(win->zcolor_reversed != NULL) {
+ gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, start, end);
+ }
+}
+