#include <stdio.h>
-#include <fcntl.h>
#include <string.h>
#include "chimara-glk-private.h"
#include "glk.h"
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_selector(GScanner *scanner, ChimaraGlk *glk);
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 style_copy_tag_to_textbuffer(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);
* @styl: The style to apply
*
* Changes the style of the current output stream. @styl should be one of the
- * <code>style_</code> constants listed above. However, any value is actually
- * legal; if the interpreter does not recognize the style value, it will treat
- * it as %style_Normal.
+ * <code>style_</code> constants. However, any value is actually legal; if the
+ * interpreter does not recognize the style value, it will treat it as
+ * %style_Normal.
* <note><para>
* This policy allows for the future definition of styles without breaking old
* Glk libraries.
glk_set_style_stream(glk_data->current_stream, styl);
}
+#define NUM_STYLES 13
static const gchar* TAG_NAMES[] = {
"normal",
"emphasized",
"block-quote",
"input",
"user1",
- "user2"
+ "user2",
+ "hyperlink",
+ "pager"
+};
+
+static const gchar* GLK_TAG_NAMES[] = {
+ "glk-normal",
+ "glk-emphasized",
+ "glk-preformatted",
+ "glk-header",
+ "glk-subheader",
+ "glk-alert",
+ "glk-note",
+ "glk-block-quote",
+ "glk-input",
+ "glk-user1",
+ "glk-user2"
};
/* Internal function: mapping from style enum to tag name */
static gchar*
get_tag_name(glui32 style)
{
- if(style >= style_NUMSTYLES) {
+ if(style >= NUM_STYLES) {
WARNING("Unsupported style");
return "normal";
} else {
}
}
+/* Internal function: mapping from glk style enum to tag name */
+static gchar*
+get_glk_tag_name(glui32 style)
+{
+ if(style >= style_NUMSTYLES) {
+ WARNING("Unsupported style");
+ return "normal";
+ } else {
+ return (gchar*) GLK_TAG_NAMES[style];
+ }
+}
+
/**
* glk_set_style_stream:
* @str: Output stream to change the style of
flush_window_buffer(str->window);
str->style = get_tag_name(styl);
+ str->glk_style = get_glk_tag_name(styl);
}
/* Internal function: call this to initialize the layout of the 'more' prompt. */
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 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));
+ /* Place the default text tags in the textbuffer's tag table */
+ g_hash_table_foreach(glk_data->styles->text_buffer, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
+
+ /* Copy the override text tags to the textbuffers's tag table */
+ g_hash_table_foreach(glk_data->glk_styles->text_buffer, style_copy_tag_to_textbuffer, gtk_text_buffer_get_tag_table(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));
+ /* Place the default text tags in the textbuffer's tag table */
+ g_hash_table_foreach(glk_data->styles->text_grid, style_add_tag_to_textbuffer, gtk_text_buffer_get_tag_table(buffer));
+
+ /* Copy the current text tags to the textbuffers's tag table */
+ g_hash_table_foreach(glk_data->glk_styles->text_grid, style_copy_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) );
+ g_return_if_fail(key != NULL);
+ g_return_if_fail(tag != NULL);
+ g_return_if_fail(tag_table != NULL);
+
+ gtk_text_tag_table_add(tag_table, tag);
}
/* Internal function used to iterate over a style table, copying it */
static void
-style_table_copy(gpointer key, gpointer tag, gpointer target_table)
+style_copy_tag_to_textbuffer(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) ));
+ gtk_text_tag_table_add(target_table, gtk_text_tag_copy( GTK_TEXT_TAG(tag) ));
}
/* Internal function that copies a text tag */
-GtkTextTag*
+GtkTextTag *
gtk_text_tag_copy(GtkTextTag *tag)
{
GtkTextTag *copy;
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);
return copy;
}
-/* Internal function that reads the default styles from a CSS file */
+/* Internal function that constructs the default styles */
void
-style_init()
+style_init(ChimaraGlk *glk)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ CHIMARA_GLK_USE_PRIVATE(glk, priv);
+
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);
+ GHashTable *glk_text_grid_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
+ GHashTable *glk_text_buffer_styles = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, g_object_unref);
GtkTextTag *tag;
+ PangoFontDescription *default_font_desc = pango_font_description_from_string("Serif");
+ PangoFontDescription *monospace_font_desc = pango_font_description_from_string("Monospace");
+
/* 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_object_set(tag, "font-desc", 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_object_set(tag, "font-desc", monospace_font_desc, "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_object_set(tag, "font-desc", 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_object_set(tag, "font-desc", monospace_font_desc, "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_object_set(tag, "font-desc", monospace_font_desc, "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_object_set(tag, "font-desc", monospace_font_desc, "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_object_set(tag, "font-desc", monospace_font_desc, "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_object_set(tag, "font-desc", monospace_font_desc, "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("input");
+ g_object_set(tag, "font-desc", monospace_font_desc, NULL);
+ g_hash_table_insert(default_text_grid_styles, "input", tag);
+
+ tag = gtk_text_tag_new("user1");
+ g_object_set(tag, "font-desc", monospace_font_desc, NULL);
+ g_hash_table_insert(default_text_grid_styles, "user1", tag);
+
+ tag = gtk_text_tag_new("user2");
+ g_object_set(tag, "font-desc", monospace_font_desc, NULL);
+ g_hash_table_insert(default_text_grid_styles, "user2", tag);
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 */
+ /* Initialise the default styles for a text buffer */
tag = gtk_text_tag_new("normal");
- g_object_set(tag, "font-desc", glk_data->default_font_desc, NULL);
+ g_object_set(tag, "font-desc", 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_object_set(tag, "font-desc", default_font_desc, "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_object_set(tag, "font-desc", 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_object_set(tag, "font-desc", default_font_desc, "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_object_set(tag, "font-desc", default_font_desc, "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_object_set(tag, "font-desc", default_font_desc, "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_object_set(tag, "font-desc", default_font_desc, "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_object_set(tag, "font-desc", default_font_desc, "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("input");
+ g_object_set(tag, "font-desc", default_font_desc, NULL);
+ g_hash_table_insert(default_text_buffer_styles, "input", tag);
+
+ tag = gtk_text_tag_new("user1");
+ g_object_set(tag, "font-desc", default_font_desc, NULL);
+ g_hash_table_insert(default_text_buffer_styles, "user1", tag);
+
+ tag = gtk_text_tag_new("user2");
+ g_object_set(tag, "font-desc", default_font_desc, NULL);
+ g_hash_table_insert(default_text_buffer_styles, "user2", tag);
tag = gtk_text_tag_new("hyperlink");
- g_object_set(tag, "foreground", "#0000ff", "underline", PANGO_UNDERLINE_SINGLE, "underline-set", TRUE, NULL);
+ g_object_set(tag, "font-desc", default_font_desc, "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_object_set(pager_tag, "font-desc", default_font_desc, "foreground", "#ffffff", "background", "#000000", NULL);
g_hash_table_insert(default_text_buffer_styles, "pager", pager_tag);
+ text_tag_to_attr_list(pager_tag, priv->pager_attr_list);
- glk_data->default_styles->text_grid = default_text_grid_styles;
- glk_data->default_styles->text_buffer = default_text_buffer_styles;
+ pango_font_description_free(default_font_desc);
+ pango_font_description_free(monospace_font_desc);
+
+ priv->styles->text_grid = default_text_grid_styles;
+ priv->styles->text_buffer = default_text_buffer_styles;
- /* Create the CSS file scanner */
+
+ /* Initialize the GLK styles to empty tags */
+ int i;
+ for(i=0; i<style_NUMSTYLES; i++) {
+ tag = gtk_text_tag_new(GLK_TAG_NAMES[i]);
+ g_hash_table_insert(glk_text_grid_styles, (gchar*) GLK_TAG_NAMES[i], tag);
+ g_hash_table_insert(glk_text_buffer_styles, (gchar*) GLK_TAG_NAMES[i], tag);
+ }
+
+ priv->glk_styles->text_grid = glk_text_grid_styles;
+ priv->glk_styles->text_buffer = glk_text_buffer_styles;
+
+}
+
+/* Reset style tables to the library's internal defaults */
+void
+reset_default_styles(ChimaraGlk *glk)
+{
+ /* TODO: write this function */
+}
+
+/* Copy the default styles to the current styles
+ FIXME: This function is temporary and will not be needed later on */
+void
+copy_default_styles_to_current_styles(ChimaraGlk *glk)
+{
+ /*
+ CHIMARA_GLK_USE_PRIVATE(glk, priv);
+ g_hash_table_foreach(priv->styles->text_grid, style_table_copy, priv->glk_styles->text_grid);
+ g_hash_table_foreach(priv->styles->text_buffer, style_table_copy, priv->glk_styles->text_buffer);
+
+ 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);
+ */
+}
+
+/* Create the CSS file scanner */
+GScanner *
+create_css_file_scanner(void)
+{
GScanner *scanner = g_scanner_new(NULL);
+ 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;
+ return scanner;
+}
- 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;
- }
+/* Run the scanner over the CSS file, overriding the default styles */
+void
+scan_css_file(GScanner *scanner, ChimaraGlk *glk)
+{
+ CHIMARA_GLK_USE_PRIVATE(glk, priv);
- g_scanner_destroy(scanner);
+ while( g_scanner_peek_next_token(scanner) != G_TOKEN_EOF) {
+ if( !style_accept_style_selector(scanner, glk) )
+ break;
}
- 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;
+ g_scanner_destroy(scanner);
- text_tag_to_attr_list(pager_tag, glk_data->pager_attr_list);
-
- glk_data->style_initialized = TRUE;
+ /* Update the pager prompt to the new style */
+ 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);
}
/* Internal function: parses a token */
style_accept(GScanner *scanner, GTokenType token)
{
GTokenType next = g_scanner_get_next_token(scanner);
- if(next != token ) {
+ if(next != token) {
g_scanner_unexp_token(scanner, token, NULL, NULL, NULL, "CSS Error", 1);
return FALSE;
- } else {
- return TRUE;
}
+ return TRUE;
}
/* Internal function: parses a style selector */
static gboolean
-style_accept_style_selector(GScanner *scanner)
+style_accept_style_selector(GScanner *scanner, ChimaraGlk *glk)
{
- ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ CHIMARA_GLK_USE_PRIVATE(glk, priv);
GtkTextTag *current_tag;
gchar *field;
}
if( !strcmp(field, "buffer") )
- current_tag = g_hash_table_lookup(glk_data->default_styles->text_buffer, value.v_identifier);
+ current_tag = g_hash_table_lookup(priv->styles->text_buffer, value.v_identifier);
else
- current_tag = g_hash_table_lookup(glk_data->default_styles->text_grid, value.v_identifier);
+ current_tag = g_hash_table_lookup(priv->styles->text_grid, value.v_identifier);
if(current_tag == NULL) {
g_scanner_error(scanner, "CSS Error: invalid style identifier");
/* Internal function: changes a GTK tag to correspond with the given style. */
static void
-apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val)
+apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, glui32 hint, glsi32 val)
{
g_return_if_fail(tag != NULL);
break;
case stylehint_Proportional:
- g_object_set(tag_object, "font-desc", val ? glk_data->default_font_desc : glk_data->monospace_font_desc, NULL);
+ {
+ gchar *font_family;
+ GtkTextTag *font_tag = g_hash_table_lookup(
+ wintype == wintype_TextBuffer? glk_data->styles->text_buffer : glk_data->styles->text_grid,
+ val? "normal" : "preformatted");
+ g_object_get(font_tag, "family", &font_family, NULL);
+ g_object_set(tag_object, "family", font_family, "family-set", TRUE, NULL);
+ g_free(font_family);
+ }
break;
case stylehint_TextColor:
/* Flip the fore- and background colors */
GdkColor* foreground_color;
GdkColor* background_color;
- gint f_set, b_set = 0;
+ gint f_set, b_set, df_set, db_set = 0;
g_object_get(tag_object, "foreground-set", &f_set, "background-set", &b_set, NULL);
+ g_object_get(default_tag, "foreground-set", &df_set, "background-set", &db_set, NULL);
if(f_set)
g_object_get(tag_object, "foreground-gdk", &foreground_color, NULL);
+ else if(df_set)
+ g_object_get(default_tag, "foreground-gdk", &foreground_color, NULL);
if(b_set)
g_object_get(tag_object, "background-gdk", &background_color, NULL);
+ else if(db_set)
+ g_object_get(default_tag, "background-gdk", &background_color, NULL);
- if(b_set)
+ if(b_set || db_set)
g_object_set(tag_object, "foreground-gdk", background_color, NULL);
else
g_object_set(tag_object, "foreground", "#ffffff", NULL);
- if(f_set)
+ if(f_set || df_set)
g_object_set(tag_object, "background-gdk", foreground_color, NULL);
else
g_object_set(tag_object, "background", "#000000", NULL);
WARNING("Unknown style hint");
}
}
-/*Internal function: queries a text tag for the value of a given style hint */
+
+/* Internal function: queries a text tag for the value of a given style hint */
static gint
-query_tag(GtkTextTag *tag, glui32 hint)
+query_tag(GtkTextTag *tag, glui32 wintype, glui32 hint)
{
gint intval;
- GObject *objval;
GdkColor *colval;
g_return_val_if_fail(tag != NULL, 0);
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;
+ case GTK_JUSTIFY_LEFT: return stylehint_just_LeftFlush;
+ case GTK_JUSTIFY_FILL: return stylehint_just_LeftRight;
+ case GTK_JUSTIFY_CENTER: return stylehint_just_Centered;
+ case GTK_JUSTIFY_RIGHT: return stylehint_just_RightFlush;
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;
+ case PANGO_WEIGHT_LIGHT: return -1;
+ case PANGO_WEIGHT_NORMAL: return 0;
+ case PANGO_WEIGHT_BOLD: return 1;
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;
+ /* Use pango_font_family_is_monospace()? */
+ {
+ gchar *font_family, *query_font_family;
+ GtkTextTag *font_tag = g_hash_table_lookup(
+ wintype == wintype_TextBuffer? glk_data->styles->text_buffer : glk_data->styles->text_grid,
+ "preformatted");
+ g_object_get(font_tag, "family", &font_family, NULL);
+ g_object_get(tag, "family", &query_font_family, NULL);
+ gint retval = strcmp(font_family, query_font_family)? 0 : 1;
+ g_free(font_family);
+ g_free(query_font_family);
+ return retval;
+ }
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");
* @val: The style hint. The meaning of this depends on @hint.
*
* Sets a hint about the appearance of one style for a particular type of
- * window. You can also set wintype to %wintype_AllTypes, which sets a hint for
+ * window. You can also set @wintype to %wintype_AllTypes, which sets a hint for
* all types of window.
* <note><para>
* There is no equivalent constant to set a hint for all styles of a single
{
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
- if( G_UNLIKELY(!glk_data->style_initialized) ) {
- style_init();
- }
-
- GtkTextTag *to_change;
+ GtkTextTag *to_change, *default_tag;
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);
+ to_change = g_hash_table_lookup( glk_data->glk_styles->text_buffer, get_glk_tag_name(styl) );
+ default_tag = g_hash_table_lookup( glk_data->styles->text_buffer, get_tag_name(styl) );
+ apply_stylehint_to_tag(to_change, default_tag, wintype_TextBuffer, 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);
+ to_change = g_hash_table_lookup( glk_data->glk_styles->text_grid, get_glk_tag_name(styl) );
+ default_tag = g_hash_table_lookup( glk_data->styles->text_grid, get_tag_name(styl) );
+ apply_stylehint_to_tag(to_change, default_tag, wintype_TextGrid, hint, val);
}
}
* @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.
+ * Clears a hint about the appearance of one style for a particular type of
+ * window to its default value. You can also set @wintype to %wintype_AllTypes,
+ * which clears 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.
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) );
+ 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) );
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) );
+ 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) );
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.
+ * @styl2: The second style 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.
+ * Decides whether two styles are visually distinguishable in the given window.
+ * The exact meaning of this is left for the library to determine.
+ * <note><title>Chimara</title><para>
+ * Currently, all styles of one window are assumed to be mutually
+ * distinguishable.
+ * </para></note>
+ *
+ * Returns: %TRUE (1) if the two styles are visually distinguishable. If they
+ * are not, it returns %FALSE (0).
*/
glui32
glk_style_distinguish(winid_t win, glui32 styl1, glui32 styl2)
{
+ /* FIXME */
return styl1 != styl2;
}
* @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.
+ * Tries to test an attribute of one style in the given window @win. The library
+ * may not be able to determine the attribute; if not, this returns %FALSE (0).
+ * If it can, it returns %TRUE (1) and stores the value in the location pointed
+ * at by @result.
+ * <note><para>
+ * As usual, it is legal for @result to be %NULL, although fairly pointless.
+ * </para></note>
+ *
+ * The meaning of the value depends on the hint which was tested:
+ * <variablelist>
+ * <varlistentry>
+ * <term>%stylehint_Indentation, %stylehint_ParaIndentation</term>
+ * <listitem><para>The indentation and paragraph indentation. These are in a
+ * metric which is platform-dependent.</para>
+ * <note><para>Most likely either characters or pixels.</para></note>
+ * </listitem>
+ * </varlistentry>
+ * <varlistentry>
+ * <term>%stylehint_Justification</term>
+ * <listitem><para>One of the constants %stylehint_just_LeftFlush,
+ * %stylehint_just_LeftRight, %stylehint_just_Centered, or
+ * %stylehint_just_RightFlush.</para></listitem>
+ * </varlistentry>
+ * <varlistentry>
+ * <term>%stylehint_Size</term>
+ * <listitem><para>The font size. Again, this is in a platform-dependent
+ * metric.</para>
+ * <note><para>Pixels, points, or simply 1 if the library does not support
+ * varying font sizes.</para></note>
+ * </listitem>
+ * </varlistentry>
+ * <varlistentry>
+ * <term>%stylehint_Weight</term>
+ * <listitem><para>1 for heavy-weight fonts (boldface), 0 for normal weight,
+ * and -1 for light-weight fonts.</para></listitem>
+ * </varlistentry>
+ * <varlistentry>
+ * <term>%stylehint_Oblique</term>
+ * <listitem><para>1 for oblique fonts (italic), or 0 for normal angle.</para>
+ * </listitem>
+ * </varlistentry>
+ * <varlistentry>
+ * <term>%stylehint_Proportional</term>
+ * <listitem><para>1 for proportional-width fonts, or 0 for fixed-width.
+ * </para></listitem>
+ * </varlistentry>
+ * <varlistentry>
+ * <term>%stylehint_TextColor, %stylehint_BackColor</term>
+ * <listitem><para>These are values from 0x00000000 to 0x00FFFFFF, encoded as
+ * described in <link
+ * linkend="chimara-Suggesting-the-Appearance-of-Styles">Suggesting the
+ * Appearance of Styles</link>.</para></listitem>
+ * </varlistentry>
+ * <varlistentry>
+ * <term>%stylehint_ReverseColor</term>
+ * <listitem><para>0 for normal printing, 1 if the foreground and background
+ * colors are reversed.</para></listitem>
+ * </varlistentry>
+ * </variablelist>
+ *
+ * Returns: TRUE upon successul retrieval, otherwise FALSE.
*/
glui32
glk_style_measure(winid_t win, glui32 styl, glui32 hint, glui32 *result)
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);
+ tag = g_hash_table_lookup( glk_data->glk_styles->text_buffer, get_glk_tag_name(styl) );
+ if(result)
+ *result = query_tag(tag, win->type, 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);
+ tag = g_hash_table_lookup( glk_data->glk_styles->text_grid, get_glk_tag_name(styl) );
+ if(result)
+ *result = query_tag(tag, win->type, hint);
default:
return FALSE;
}
/* 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*
+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");
+ normal = g_hash_table_lookup(glk_data->styles->text_grid, "normal");
break;
case wintype_TextBuffer:
- normal = g_hash_table_lookup(glk_data->current_styles->text_buffer, "normal");
+ normal = g_hash_table_lookup(glk_data->styles->text_buffer, "normal");
break;
default:
return NULL;
projects / rodin / chimara.git / blobdiff