-#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;
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 GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag);
+GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag);
/**
* glk_set_style:
}
/* Internal function that copies a text tag */
-static GtkTextTag*
+GtkTextTag*
gtk_text_tag_copy(GtkTextTag *tag)
{
GtkTextTag *copy;
_COPY_FLAG (language_set);
#undef _COPY_FLAG
- /* Copy the reverse_color attribute, that was added manually */
- g_object_set_data( G_OBJECT(copy), "reverse_color", g_object_get_data(G_OBJECT(tag), "reverse_color") );
+ /* 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;
}
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, g_free, g_object_unref);
- GHashTable *default_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref);
- GHashTable *current_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref);
- GHashTable *current_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_object_unref);
+ 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;
- /* 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);
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, NULL);
+ 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, "note", tag);
tag = gtk_text_tag_new("block-quote");
- g_object_set(tag, "justification", GTK_JUSTIFY_CENTER, "style", PANGO_STYLE_ITALIC, NULL);
+ 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);
+
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);
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;
}