X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=96750ad05afc0c6d907bbe42f824946785d2f52b;hb=4317ae2d1e6440527b22c0b0f0fcd71d902a5bb6;hp=77ef15809202bd18cdf08ec460d14c77e189a22b;hpb=6478a4f44526dde5ec7b1090d97b2255ed2879a1;p=rodin%2Fchimara.git

diff --git a/libchimara/style.c b/libchimara/style.c
index 77ef158..96750ad 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -1,6 +1,22 @@
+#include <stdio.h>
+#include <fcntl.h>
+#include <string.h>
+#include "chimara-glk-private.h"
+#include "glk.h"
 #include "style.h"
+#include "magic.h"
+#include "stream.h"
+#include "strio.h"
 
-extern ChimaraGlkPrivate *glk_data;
+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_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);
 
 /**
  * glk_set_style:
@@ -18,30 +34,35 @@ extern ChimaraGlkPrivate *glk_data;
 void
 glk_set_style(glui32 styl)
 {
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 	g_return_if_fail(glk_data->current_stream != NULL);
 	glk_set_style_stream(glk_data->current_stream, styl);
 }
 
+static const gchar* TAG_NAMES[] = {
+	"normal",
+	"emphasized",
+	"preformatted",
+	"header",
+	"subheader",
+	"alert",
+	"note",
+	"block-quote",
+	"input",
+	"user1",
+	"user2"
+};
+
 /* Internal function: mapping from style enum to tag name */
-gchar*
+static gchar*
 get_tag_name(glui32 style)
 {
-	switch(style) {
-		case style_Normal: return "normal";
-		case style_Emphasized: return "emphasized";
-		case style_Preformatted: return "preformatted";
-		case style_Header: return "header";
-		case style_Subheader: return "subheader";
-		case style_Alert: return "alert";
-		case style_Note: return "note";
-		case style_BlockQuote: return "block-quote";
-		case style_Input: return "input";
-		case style_User1: return "user1";
-		case style_User2: return "user2";
+	if(style >= style_NUMSTYLES) {
+		WARNING("Unsupported style");
+		return "normal";
+	} else {
+		return (gchar*) TAG_NAMES[style];
 	}
-
-	WARNING("Unsupported style");
-	return "normal";
 }
 
 /** 
@@ -53,31 +74,469 @@ 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);
 }
 
+/* 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)
 {
 	g_return_if_fail(buffer != NULL);
 
-	gtk_text_buffer_create_tag(buffer, "normal", NULL);
-	gtk_text_buffer_create_tag(buffer, "emphasized", "style", PANGO_STYLE_ITALIC, NULL);
-	gtk_text_buffer_create_tag(buffer, "preformatted", "font-desc", glk_data->monospace_font_desc, NULL);
-	gtk_text_buffer_create_tag(buffer, "header", "size-points", 16.0, "weight", PANGO_WEIGHT_BOLD, NULL);
-	gtk_text_buffer_create_tag(buffer, "subheader", "size-points", 12.0, "weight", PANGO_WEIGHT_BOLD, NULL);
-	gtk_text_buffer_create_tag(buffer, "alert", "foreground", "#aa0000", "weight", PANGO_WEIGHT_BOLD, NULL);
-	gtk_text_buffer_create_tag(buffer, "note", "foreground", "#aaaa00", "weight", PANGO_WEIGHT_BOLD, NULL);
-	gtk_text_buffer_create_tag(buffer, "block-quote", "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, NULL);
-	gtk_text_buffer_create_tag(buffer, "input", NULL);
-	gtk_text_buffer_create_tag(buffer, "user1", NULL);
-	gtk_text_buffer_create_tag(buffer, "user2", 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));
+}
+
+
+/* Internal function: call this to initialize the default styles to a textgrid. */
+void
+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));
+}
+
+/* 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) );
+}
+
+/* Internal function used to iterate over a style table, copying it */
+static void
+style_table_copy(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) ));
+}
+
+/* Internal function that copies a text tag */
+GtkTextTag*
+gtk_text_tag_copy(GtkTextTag *tag)
+{
+	GtkTextTag *copy;
+
+	g_return_val_if_fail(tag != NULL, NULL);
+
+	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);
+		_COPY_FLAG (bg_stipple_set);
+		_COPY_FLAG (fg_color_set);
+		_COPY_FLAG (fg_stipple_set);
+		_COPY_FLAG (justification_set);
+		_COPY_FLAG (left_margin_set);
+		_COPY_FLAG (indent_set);
+		_COPY_FLAG (rise_set);
+		_COPY_FLAG (strikethrough_set);
+		_COPY_FLAG (right_margin_set);
+		_COPY_FLAG (pixels_above_lines_set);
+		_COPY_FLAG (pixels_below_lines_set);
+		_COPY_FLAG (pixels_inside_wrap_set);
+		_COPY_FLAG (tabs_set);
+		_COPY_FLAG (underline_set);
+		_COPY_FLAG (wrap_mode_set);
+		_COPY_FLAG (bg_full_height_set);
+		_COPY_FLAG (invisible_set);
+		_COPY_FLAG (editable_set);
+		_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
-color_format(glui32 val, gchar *buffer)
+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, 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;
+
+	/* 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);
+	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_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_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_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_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_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_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("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);
+
+	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;
+
+	/* 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 */
+	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;
+
+	text_tag_to_attr_list(pager_tag, glk_data->pager_attr_list);
+
+	glk_data->style_initialized = TRUE;
+}
+
+/* Internal function: parses a token */
+static gboolean
+style_accept(GScanner *scanner, GTokenType token)
+{
+	GTokenType next = g_scanner_get_next_token(scanner);
+   	if(next	!= token ) {
+		g_scanner_unexp_token(scanner, token, NULL, NULL, NULL, "CSS Error", 1);
+		return FALSE;
+	} else {
+		return TRUE;
+	}
+}
+
+/* Internal function: parses a style selector */
+static gboolean
+style_accept_style_selector(GScanner *scanner)
+{
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
+	GtkTextTag *current_tag;
+	gchar *field;
+	GTokenType token = g_scanner_get_next_token(scanner);
+	GTokenValue value = g_scanner_cur_value(scanner);
+
+	if(
+		token != G_TOKEN_IDENTIFIER ||
+		( strcmp(value.v_identifier, "buffer") && strcmp(value.v_identifier, "grid") )
+	) {
+		g_scanner_error(scanner, "CSS Error: buffer/grid expected");
+		return FALSE;
+	}
+
+	field = g_strdup(value.v_identifier);
+
+	if( !style_accept(scanner, '.') )
+		return FALSE;
+
+	token = g_scanner_get_next_token(scanner);
+	value = g_scanner_cur_value(scanner);
+
+	if(token != G_TOKEN_IDENTIFIER) {
+		g_scanner_error(scanner, "CSS Error: style selector expected");
+		return FALSE;
+	}
+
+	if( !strcmp(field, "buffer") )
+		current_tag = g_hash_table_lookup(glk_data->default_styles->text_buffer, value.v_identifier);
+	else
+		current_tag = g_hash_table_lookup(glk_data->default_styles->text_grid, value.v_identifier);
+
+	if(current_tag == NULL) {
+		g_scanner_error(scanner, "CSS Error: invalid style identifier");
+		return FALSE;
+	}
+
+	if( !style_accept(scanner, '{') )
+		return FALSE;
+
+	while( g_scanner_peek_next_token(scanner) != '}') {
+		if( !style_accept_style_hint(scanner, current_tag) )
+			return FALSE;
+	}
+		
+	if( !style_accept(scanner, '}') )
+		return FALSE;
+
+	return TRUE;
+}
+
+/* Internal function: parses a style hint */
+static gboolean
+style_accept_style_hint(GScanner *scanner, GtkTextTag *current_tag)
+{
+	GTokenType token = g_scanner_get_next_token(scanner);
+	GTokenValue value = g_scanner_cur_value(scanner);
+	gchar *hint;
+
+	if(token != G_TOKEN_IDENTIFIER) {
+		g_scanner_error(scanner, "CSS Error: style hint expected");
+		return FALSE;
+	}
+
+	hint = g_strdup(value.v_identifier);
+
+	if( !style_accept(scanner, ':') )
+		return FALSE;
+
+	token = g_scanner_get_next_token(scanner);
+	value = g_scanner_cur_value(scanner);
+
+	if( !strcmp(hint, "font-family") ) {
+		if(token != G_TOKEN_STRING) {
+			g_scanner_error(scanner, "CSS Error: string expected");
+			return FALSE;
+		}
+		g_object_set(current_tag, "family", value.v_string, "family-set", TRUE, NULL);
+	}
+	else if( !strcmp(hint, "font-weight") ) {
+		if(token != G_TOKEN_IDENTIFIER) {
+			g_scanner_error(scanner, "CSS Error: bold/normal expected");
+			return FALSE;
+		}
+
+		if( !strcmp(value.v_identifier, "bold") )
+			g_object_set(current_tag, "weight", PANGO_WEIGHT_BOLD, "weight-set", TRUE, NULL);
+		else if( !strcmp(value.v_identifier, "normal") )
+			g_object_set(current_tag, "weight", PANGO_WEIGHT_NORMAL, "weight-set", TRUE, NULL);
+		else {
+			g_scanner_error(scanner, "CSS Error: bold/normal expected");
+			return FALSE;
+		}
+	}
+	else if( !strcmp(hint, "font-style") ) {
+		if(token != G_TOKEN_IDENTIFIER) {
+			g_scanner_error(scanner, "CSS Error: italic/normal expected");
+			return FALSE;
+		}
+
+		if( !strcmp(value.v_identifier, "italic") )
+			g_object_set(current_tag, "style", PANGO_STYLE_ITALIC, "style-set", TRUE, NULL);
+		else if( !strcmp(value.v_identifier, "normal") )
+			g_object_set(current_tag, "style", PANGO_STYLE_NORMAL, "style-set", TRUE, NULL);
+		else {
+			g_scanner_error(scanner, "CSS Error: italic/normal expected");
+			return FALSE;
+		}
+	}
+	else if( !strcmp(hint, "font-size") ) {
+		if(token == G_TOKEN_INT) 
+			g_object_set(current_tag, "size-points", (float)value.v_int, "size-set", TRUE, NULL);
+		else if(token == G_TOKEN_FLOAT)
+			g_object_set(current_tag, "size-points", value.v_float, "size-set", TRUE, NULL);
+		else {
+			g_scanner_error(scanner, "CSS Error: integer or float expected");
+			return FALSE;
+		}
+	}
+	else if( !strcmp(hint, "color") ) {
+		if(token != G_TOKEN_IDENTIFIER) {
+			g_scanner_error(scanner, "CSS Error: hex color expected");
+			return FALSE;
+		}
+
+		g_object_set(current_tag, "foreground", value.v_identifier, "foreground-set", TRUE, NULL);
+	}
+	else if( !strcmp(hint, "background-color") ) {
+		if(token != G_TOKEN_IDENTIFIER) {
+			g_scanner_error(scanner, "CSS Error: hex color expected");
+			return FALSE;
+		}
+		g_object_set(current_tag, "background", value.v_identifier, "background-set", TRUE, NULL);
+	}
+	else if( !strcmp(hint, "text-align") ) {
+		if(token != G_TOKEN_IDENTIFIER) {
+			g_scanner_error(scanner, "CSS Error: left/right/center expected");
+			return FALSE;
+		}
+		
+		if( !strcmp(value.v_identifier, "left") )
+			g_object_set(current_tag, "justification", GTK_JUSTIFY_LEFT, "justification-set", TRUE, NULL);
+		else if( !strcmp(value.v_identifier, "right") )
+			g_object_set(current_tag, "justification", GTK_JUSTIFY_RIGHT, "justification-set", TRUE, NULL);
+		else if( !strcmp(value.v_identifier, "center") )
+			g_object_set(current_tag, "justification", GTK_JUSTIFY_CENTER, "justification-set", TRUE, NULL);
+		else {
+			g_scanner_error(scanner, "CSS Error: left/right/center expected");
+			return FALSE;
+		}
+	}
+	else if( !strcmp(hint, "margin-left") ) {
+		if(token != G_TOKEN_INT) {
+			g_scanner_error(scanner, "CSS Error: integer expected");
+			return FALSE;
+		}
+		g_object_set(current_tag, "left-margin", value.v_int, "left-margin-set", TRUE, NULL);
+	}
+	else if( !strcmp(hint, "margin-right") ) {
+		if(token != G_TOKEN_INT) {
+			g_scanner_error(scanner, "CSS Error: integer expected");
+			return FALSE;
+		}
+		g_object_set(current_tag, "right-margin", value.v_int, "right-margin-set", TRUE, NULL);
+	}
+	else if( !strcmp(hint, "margin-top") ) {
+		if(token != G_TOKEN_INT) {
+			g_scanner_error(scanner, "CSS Error: integer expected");
+			return FALSE;
+		}
+		g_object_set(current_tag, "pixels-above-lines", value.v_int, "pixels-above-lines-set", TRUE, NULL);
+	}
+	else if( !strcmp(hint, "margin-bottom") ) {
+		if(token != G_TOKEN_INT) {
+			g_scanner_error(scanner, "CSS Error: integer expected");
+			return FALSE;
+		}
+		g_object_set(current_tag, "pixels-below-lines", value.v_int, "pixels-below-lines-set", TRUE, NULL);
+	}
+		
+	else {
+		g_scanner_error(scanner, "CSS Error: invalid style hint %s", hint);
+		return FALSE;
+	}
+
+	if( !style_accept(scanner, ';') )
+		return FALSE;
+
+	return TRUE;
+}
+
+/* Internal function: parses a glk color to a #hex-value */
+static void
+glkcolor_to_hex(glui32 val, gchar *buffer)
 {
+	g_return_if_fail(buffer != NULL);
+
 	sprintf(buffer, "#%02X%02X%02X",
 		((val & 0xff0000) >> 16),
 		((val & 0x00ff00) >> 8),
@@ -85,29 +544,44 @@ color_format(glui32 val, gchar *buffer)
 	);
 }
 
-/* Internal function: changes a GTK tag to correspond with the given style. */
+/* 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
+gdkcolor_to_glkcolor(GdkColor *color)
+{
+	g_return_val_if_fail(color != NULL, 0);
+	return (glui32) color->pixel;
+}
+
+/* Internal function: changes a GTK tag to correspond with the given style. */
+static void
 apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val)
 {
 	g_return_if_fail(tag != NULL);
 
+	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];
 	switch(hint) {
 	case stylehint_Indentation:
-		g_object_set(tag_object, "left_margin", 5*val, NULL);
-		g_object_set(tag_object, "right_margin", 5*val, NULL);
+		g_object_set(tag_object, "left-margin", 5*val, "left-margin-set", TRUE, NULL);
+		g_object_set(tag_object, "right-margin", 5*val, "right-margin-set", TRUE, NULL);
 		break;
 	
 	case stylehint_ParaIndentation:
-		g_object_set(tag_object, "indent", 5*val, NULL);
+		g_object_set(tag_object, "indent", 5*val, "indent-set", TRUE, NULL);
 		break;
 
 	case stylehint_Justification:
@@ -120,7 +594,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val)
 				WARNING("Unknown justification");
 				i = GTK_JUSTIFY_LEFT;
 		}
-		g_object_set(tag_object, "justification", i, NULL);
+		g_object_set(tag_object, "justification", i, "justification-set", TRUE, NULL);
 		break;
 
 	case stylehint_Weight:
@@ -130,15 +604,15 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val)
 			case  1: i = PANGO_WEIGHT_BOLD; break;
 			default: WARNING("Unknown font weight");
 		}
-		g_object_set(tag_object, "weight", i, NULL);
+		g_object_set(tag_object, "weight", i, "weight-set", TRUE, NULL);
 		break;
 
 	case stylehint_Size:
-		g_object_set(tag_object, "size", 14+(2*val), NULL);
+		g_object_set(tag_object, "size", 14+(2*val), "size-set", TRUE, NULL);
 		break;
 
 	case stylehint_Oblique:
-		g_object_set(tag_object, "style", val ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL, NULL);
+		g_object_set(tag_object, "style", val ? PANGO_STYLE_ITALIC : PANGO_STYLE_NORMAL, "style-set", TRUE, NULL);
 		break;
 
 	case stylehint_Proportional:
@@ -146,36 +620,49 @@ 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, NULL);
+			g_object_set(tag_object, "foreground", color, "foreground-set", TRUE, NULL);
 		else
-			g_object_set(tag_object, "background", color, NULL);
+			g_object_set(tag_object, "background", color, "background-set", TRUE, NULL);
 
 		break;
 
 	case stylehint_BackColor:
-		color_format(val, color);
+		glkcolor_to_hex(val, color);
 
 		if(!reverse_color)
-			g_object_set(tag_object, "background", color, NULL);
+			g_object_set(tag_object, "background", color, "background-set", TRUE, NULL);
 		else
-			g_object_set(tag_object, "foreground", color, NULL);
+			g_object_set(tag_object, "foreground", color, "background-set", TRUE, NULL);
 
 		break;
 
 	case stylehint_ReverseColor:
 		if(reverse_color != val) {
 			/* Flip the fore- and background colors */
-			gchar* foreground_color;
-			gchar* background_color;
-			g_object_get(tag_object, "foreground", &foreground_color, NULL);
-			g_object_get(tag_object, "background", &background_color, NULL);
-			g_object_set(tag_object, "foreground", background_color, NULL);
-			g_object_set(tag_object, "background", foreground_color, NULL);
-			g_free(foreground_color);
-			g_free(background_color);
+			GdkColor* foreground_color;
+			GdkColor* background_color;
+			gint f_set, b_set = 0;
+			g_object_get(tag_object, "foreground-set", &f_set, "background-set", &b_set, NULL);
+
+			if(f_set)
+				g_object_get(tag_object, "foreground-gdk", &foreground_color, NULL);
+			if(b_set)
+				g_object_get(tag_object, "background-gdk", &background_color, NULL);
+
+			if(b_set)
+				g_object_set(tag_object, "foreground-gdk", background_color, NULL);
+			else
+				g_object_set(tag_object, "foreground", "#ffffff", NULL);
+
+			if(f_set)
+				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;
 
@@ -183,6 +670,87 @@ 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 */
+static gint
+query_tag(GtkTextTag *tag, glui32 hint)
+{
+	gint intval;
+	GObject *objval;
+	GdkColor *colval;
+
+	g_return_val_if_fail(tag != NULL, 0);
+
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
+	switch(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;
+			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;
+			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;
+
+	case stylehint_TextColor:
+		g_object_get(tag, "foreground-gdk", &colval, NULL);
+		return gdkcolor_to_glkcolor(colval);
+		break;
+
+	case stylehint_BackColor:
+		g_object_get(tag, "background-gdk", &colval, NULL);
+		return gdkcolor_to_glkcolor(colval);
+		break;
+
+	case stylehint_ReverseColor:
+		return GPOINTER_TO_INT( g_object_get_data(G_OBJECT(tag), "reverse_color") );
+		break;
+
+	default:
+		WARNING("Unknown style hint");
+	}
+	
+	return 0;
+}
 
 /**
  * glk_stylehint_set:
@@ -202,32 +770,187 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val)
 void
 glk_stylehint_set(glui32 wintype, glui32 styl, glui32 hint, glsi32 val)
 {
-	gchar *tag_name = get_tag_name(styl);
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 
-	/* Iterate over all the window and update their styles if nessecary */
-	winid_t win = glk_window_iterate(NULL, NULL);
-	while(win != NULL) {
-		if(wintype != wintype_TextBuffer)
-			continue; /* FIXME: add support for text grid windows */
+	if( G_UNLIKELY(!glk_data->style_initialized) ) {
+		style_init();
+	}
 
-		if(wintype == wintype_AllTypes || glk_window_get_type(win) == wintype) {
-			GtkWidget *textview = win->widget;
-			GtkTextBuffer *textbuffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(textview) );
-			GtkTextTagTable *table = gtk_text_buffer_get_tag_table(textbuffer);
-			GtkTextTag *to_change = gtk_text_tag_table_lookup(table, tag_name);
+	GtkTextTag *to_change;
+	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);
+	}
 
-			apply_stylehint_to_tag(to_change, 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);
 	}
 }
 
+/**
+ * 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 <code>stylehint_</code> 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.
+ * <note><para>
+ *  There is no equivalent constant to reset a hint for all styles of a single 
+ *  window type.
+ * </para></note>
+ */
 void
 glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint)
 {
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	GtkTextTag *tag;
+
+	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) );
+		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) );
+	default:
+		return;
+	}
 }
 
+/**
+ * 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)
+{
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+	GtkTextTag *tag;
+
+	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);
+		break;
+	case wintype_TextGrid:
+		tag = g_hash_table_lookup( glk_data->current_styles->text_grid, get_tag_name(styl) );
+		*result = query_tag(tag, hint);
+	default:
+		return FALSE;
+	}
+
+	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;
+}
+
+/* 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)
+		);
+	}
+}