X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=a466cdd5c09a72efa27ad7c8cd13952a017c76b2;hb=e2aad0fc9a4c2bc75db8f0b3f1d2d3c70e55e7bb;hp=f31f2d660943d0d04b455e0e8b38cce8ea7b33c5;hpb=268cb7d6d08efc2fcbe52aa7b1e0d27ec19b6dc0;p=rodin%2Fchimara.git

diff --git a/libchimara/style.c b/libchimara/style.c
index f31f2d6..a466cdd 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -38,7 +38,6 @@ 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",
@@ -69,11 +68,17 @@ static const gchar* GLK_TAG_NAMES[] = {
 	"glk-user2"
 };
 
+const gchar**
+style_get_tag_names()
+{
+	return TAG_NAMES;
+}
+
 /* Internal function: mapping from style enum to tag name */
-static gchar*
+static const gchar*
 get_tag_name(glui32 style)
 {
-	if(style >= NUM_STYLES) {
+	if(style >= CHIMARA_NUM_STYLES) {
 		WARNING("Unsupported style");
 		return "normal";
 	} else {
@@ -82,7 +87,7 @@ get_tag_name(glui32 style)
 }
 
 /* Internal function: mapping from glk style enum to tag name */
-static gchar*
+static const gchar*
 get_glk_tag_name(glui32 style)
 {
 	if(style >= style_NUMSTYLES) {
@@ -106,8 +111,8 @@ glk_set_style_stream(strid_t str, glui32 styl) {
 		return;
 
 	flush_window_buffer(str->window);
-	str->style = get_tag_name(styl);
-	str->glk_style = get_glk_tag_name(styl);
+	str->style = (gchar*) get_tag_name(styl);
+	str->glk_style = (gchar*) get_glk_tag_name(styl);
 }
 
 /* Internal function: call this to initialize the layout of the 'more' prompt. */
@@ -907,12 +912,16 @@ glk_stylehint_clear(glui32 wintype, glui32 styl, glui32 hint)
 
 	switch(wintype) {
 	case wintype_TextBuffer:
-		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) );
+		tag = g_hash_table_lookup( glk_data->glk_styles->text_buffer, get_glk_tag_name(styl) );
+		if(tag) {
+			glk_stylehint_set( wintype, styl, hint, query_tag(tag, wintype, hint) );
+		}
 		break;
 	case wintype_TextGrid:
-		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) );
+		tag = g_hash_table_lookup( glk_data->glk_styles->text_grid, get_glk_tag_name(styl) );
+		if(tag) {
+			glk_stylehint_set( wintype, styl, hint, query_tag(tag, wintype, hint) );
+		}
 	default:
 		return;
 	}
@@ -1116,3 +1125,13 @@ text_tag_to_attr_list(GtkTextTag *tag, PangoAttrList *list)
 		);
 	}
 }
+
+/* Update pager and reverse video tags */
+void
+style_update(ChimaraGlk *glk)
+{
+	CHIMARA_GLK_USE_PRIVATE(glk, priv);
+
+	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);
+}