git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@153
ddfedd41-794f-dd11-ae45-
00112f111e67
void (*unregister_obj)(void *, glui32, gidispatch_rock_t);
gidispatch_rock_t (*register_arr)(void *, glui32, char *);
void (*unregister_arr)(void *, glui32, char *, gidispatch_rock_t);
void (*unregister_obj)(void *, glui32, gidispatch_rock_t);
gidispatch_rock_t (*register_arr)(void *, glui32, char *);
void (*unregister_arr)(void *, glui32, char *, gidispatch_rock_t);
+ /* Have styles been initialized */
+ gboolean style_initialized;
/* *** Platform-dependent Glk library data *** */
/* Flag for functions to find out if they are being called from startup code */
/* *** Platform-dependent Glk library data *** */
/* Flag for functions to find out if they are being called from startup code */
priv->current_stream = NULL;
priv->stream_list = NULL;
priv->timer_id = 0;
priv->current_stream = NULL;
priv->stream_list = NULL;
priv->timer_id = 0;
+ priv->style_initialized = FALSE;
priv->in_startup = FALSE;
priv->current_dir = NULL;
}
priv->in_startup = FALSE;
priv->current_dir = NULL;
}
#include <fcntl.h>
extern GPrivate *glk_data_key;
#include <fcntl.h>
extern GPrivate *glk_data_key;
-static gboolean chimara_style_initialized = FALSE;
static gboolean style_accept(GScanner *scanner, GTokenType token);
static gboolean style_accept_style_selector(GScanner *scanner);
static gboolean style_accept(GScanner *scanner, GTokenType token);
static gboolean style_accept_style_selector(GScanner *scanner);
{
g_return_if_fail(buffer != NULL);
{
g_return_if_fail(buffer != NULL);
- if( G_UNLIKELY(!chimara_style_initialized) ) {
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ if( G_UNLIKELY(!glk_data->style_initialized) ) {
-
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
g_hash_table_foreach(glk_data->current_styles->text_buffer, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
}
g_hash_table_foreach(glk_data->current_styles->text_buffer, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
}
style_init_textgrid(GtkTextBuffer *buffer)
{
g_return_if_fail(buffer != NULL);
style_init_textgrid(GtkTextBuffer *buffer)
{
g_return_if_fail(buffer != NULL);
-
- if( G_UNLIKELY(!chimara_style_initialized) ) {
+
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ if( G_UNLIKELY(!glk_data->style_initialized) ) {
-
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
g_hash_table_foreach(glk_data->current_styles->text_grid, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
}
g_hash_table_foreach(glk_data->current_styles->text_grid, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
}
g_return_if_fail(f != -1);
g_scanner_input_file(scanner, f);
scanner->input_name = glk_data->css_file;
g_return_if_fail(f != -1);
g_scanner_input_file(scanner, f);
scanner->input_name = glk_data->css_file;
- scanner->config->cset_identifier_first = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ#";
- scanner->config->cset_identifier_nth = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ-_0123456789";
+ 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;
scanner->config->symbol_2_token = TRUE;
scanner->config->cpair_comment_single = NULL;
scanner->config->scan_float = FALSE;
g_scanner_destroy(scanner);
g_scanner_destroy(scanner);
- chimara_style_initialized = TRUE;
+ glk_data->style_initialized = TRUE;
}
/* Internal function: parses a token */
}
/* Internal function: parses a token */
{
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
{
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
- if( G_UNLIKELY(!chimara_style_initialized) ) {
+ if( G_UNLIKELY(!glk_data->style_initialized) ) {