X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fstyle.c;h=8c6ca121bfc3d1756d30a4923b62708c45380881;hb=bdca86598f7604d7c20f91ac810d825513c72090;hp=5c639cc0481842fa04f4d2e5c418b4102ce588a8;hpb=13b21e2a9ba53c7109ae0bbfd774f16f0c9d4413;p=rodin%2Fchimara.git

diff --git a/libchimara/style.c b/libchimara/style.c
index 5c639cc..8c6ca12 100644
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -1,6 +1,12 @@
-#include "style.h"
 #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 GPrivate *glk_data_key;
 
@@ -177,19 +183,6 @@ style_init()
 	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 = 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;
-
 	/* 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);
@@ -272,15 +265,33 @@ style_init()
 	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);
@@ -288,8 +299,6 @@ 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);
-
 	glk_data->style_initialized = TRUE;
 }
 
@@ -504,7 +513,7 @@ style_accept_style_hint(GScanner *scanner, GtkTextTag *current_tag)
 
 /* Internal function: parses a glk color to a #hex-value */
 static void
-color_format(glui32 val, gchar *buffer)
+glkcolor_to_hex(glui32 val, gchar *buffer)
 {
 	g_return_if_fail(buffer != NULL);
 
@@ -515,9 +524,21 @@ color_format(glui32 val, gchar *buffer)
 	);
 }
 
+/* Internal function: parses a glk color to a GdkColor */
+GdkColor*
+glkcolor_to_gdkcolor(glui32 val)
+{
+	GdkColor* color = g_new0(GdkColor, 1);
+	color->red = (val & 0xff0000) >> 16;
+	color->green = (val & 0x00ff00) >> 8;
+	color->blue = val & 0x0000ff;
+
+	return color;
+}
+
 /* Internal function: parses a GdkColor to a glk color */
 static glui32
-color_parse_gdk(GdkColor *color)
+gdkcolor_to_glkcolor(GdkColor *color)
 {
 	g_return_val_if_fail(color != NULL, 0);
 	return (glui32) color->pixel;
@@ -582,7 +603,7 @@ 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, "foreground-set", TRUE, NULL);
@@ -592,7 +613,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val)
 		break;
 
 	case stylehint_BackColor:
-		color_format(val, color);
+		glkcolor_to_hex(val, color);
 
 		if(!reverse_color)
 			g_object_set(tag_object, "background", color, "background-set", TRUE, NULL);
@@ -695,12 +716,12 @@ query_tag(GtkTextTag *tag, glui32 hint)
 
 	case stylehint_TextColor:
 		g_object_get(tag, "foreground-gdk", &colval, NULL);
-		return color_parse_gdk(colval);
+		return gdkcolor_to_glkcolor(colval);
 		break;
 
 	case stylehint_BackColor:
 		g_object_get(tag, "background-gdk", &colval, NULL);
-		return color_parse_gdk(colval);
+		return gdkcolor_to_glkcolor(colval);
 		break;
 
 	case stylehint_ReverseColor: