/* licensing and copyright information here */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+#include <errno.h>
#include <math.h>
#include <gtk/gtk.h>
#include <config.h>
PROP_0,
PROP_INTERACTIVE,
PROP_PROTECT,
- PROP_DEFAULT_FONT_DESCRIPTION,
- PROP_MONOSPACE_FONT_DESCRIPTION,
PROP_SPACING,
};
priv->self = self;
priv->interactive = TRUE;
priv->protect = FALSE;
- priv->default_font_desc = pango_font_description_from_string("Serif");
- priv->monospace_font_desc = pango_font_description_from_string("Monospace");
- priv->css_file = NULL;
priv->default_styles = g_new0(StyleSet,1);
priv->current_styles = g_new0(StyleSet,1);
priv->pager_attr_list = pango_attr_list_new();
- priv->style_initialized = FALSE;
priv->final_message = g_strdup("[ The game has finished ]");
priv->running = FALSE;
priv->program = NULL;
priv->timer_id = 0;
priv->in_startup = FALSE;
priv->current_dir = NULL;
+
+ style_init(self);
}
static void
case PROP_PROTECT:
chimara_glk_set_protect( glk, g_value_get_boolean(value) );
break;
- case PROP_DEFAULT_FONT_DESCRIPTION:
- chimara_glk_set_default_font_description( glk, (PangoFontDescription *)g_value_get_pointer(value) );
- break;
- case PROP_MONOSPACE_FONT_DESCRIPTION:
- chimara_glk_set_monospace_font_description( glk, (PangoFontDescription *)g_value_get_pointer(value) );
- break;
case PROP_SPACING:
chimara_glk_set_spacing( glk, g_value_get_uint(value) );
break;
case PROP_PROTECT:
g_value_set_boolean(value, priv->protect);
break;
- case PROP_DEFAULT_FONT_DESCRIPTION:
- g_value_set_pointer(value, priv->default_font_desc);
- break;
- case PROP_MONOSPACE_FONT_DESCRIPTION:
- g_value_set_pointer(value, priv->monospace_font_desc);
- break;
case PROP_SPACING:
g_value_set_uint(value, priv->spacing);
break;
CHIMARA_GLK_USE_PRIVATE(self, priv);
/* Free widget properties */
- pango_font_description_free(priv->default_font_desc);
- pango_font_description_free(priv->monospace_font_desc);
g_free(priv->final_message);
/* Free styles */
g_hash_table_destroy(priv->default_styles->text_buffer);
g_hash_table_destroy(priv->current_styles->text_buffer);
g_hash_table_destroy(priv->current_styles->text_grid);
pango_attr_list_unref(priv->pager_attr_list);
- priv->style_initialized = FALSE;
/* Free the event queue */
g_mutex_lock(priv->event_lock);
g_async_queue_unref(priv->line_input_queue);
/* Free other stuff */
- if(priv->current_dir)
- g_free(priv->current_dir);
+ g_free(priv->current_dir);
/* Chain up to parent */
G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object);
FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS) );
- /* We can't use G_PARAM_CONSTRUCT on these because then the constructor will
- initialize them with NULL */
- /**
- * ChimaraGlk:default-font-description:
- *
- * Pointer to a #PangoFontDescription describing the default proportional
- * font, to be used in text buffer windows for example.
- *
- * Default value: font description created from the string
- * <quote>Sans</quote>
- */
- g_object_class_install_property(object_class, PROP_DEFAULT_FONT_DESCRIPTION,
- g_param_spec_pointer("default-font-description", _("Default Font"),
- _("Font description of the default proportional font"),
- G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS) );
-
- /**
- * ChimaraGlk:monospace-font-description:
- *
- * Pointer to a #PangoFontDescription describing the default monospace font,
- * to be used in text grid windows and %style_Preformatted, for example.
- *
- * Default value: font description created from the string
- * <quote>Monospace</quote>
- */
- g_object_class_install_property(object_class, PROP_MONOSPACE_FONT_DESCRIPTION,
- g_param_spec_pointer("monospace-font-description", _("Monospace Font"),
- _("Font description of the default monospace font"),
- G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS) );
-
/**
* ChimaraGlk:spacing:
*
}
/**
- * chimara_glk_set_default_font_description:
+ * chimara_glk_set_css_to_default:
* @glk: a #ChimaraGlk widget
- * @font: a #PangoFontDescription
*
- * Sets @glk's default proportional font. See
- * #ChimaraGlk:default-font-description.
+ * Resets the styles for text buffer and text grid windows to their defaults.
*/
-void
-chimara_glk_set_default_font_description(ChimaraGlk *glk, PangoFontDescription *font)
+void
+chimara_glk_set_css_to_default(ChimaraGlk *glk)
{
- g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
- g_return_if_fail(font);
-
- ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
- pango_font_description_free(priv->default_font_desc);
- priv->default_font_desc = pango_font_description_copy(font);
- g_object_notify(G_OBJECT(glk), "default-font-description");
- /* TODO: Apply the font description to all the windows and recalculate the sizes */
+ reset_default_styles(glk);
}
/**
- * chimara_glk_set_default_font_string:
+ * chimara_glk_set_css_from_file:
* @glk: a #ChimaraGlk widget
- * @font: string representation of a font description
+ * @filename: path to a CSS file, or %NULL
+ * @error: location to store a <link linkend="glib-GError">GError</link>, or
+ * %NULL
*
- * Sets @glk's default proportional font according to the string @font, which
- * must be a string in the form <quote><replaceable>FAMILY-LIST</replaceable>
- * [<replaceable>STYLE-OPTIONS</replaceable>]
- * [<replaceable>SIZE</replaceable>]</quote>, such as <quote>Charter,Utopia
- * Italic 12</quote> or <quote>Sans</quote>. See
- * #ChimaraGlk:default-font-description.
- */
-void
-chimara_glk_set_default_font_string(ChimaraGlk *glk, const gchar *font)
-{
- g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
- g_return_if_fail(font || *font);
-
- PangoFontDescription *fontdesc = pango_font_description_from_string(font);
- g_return_if_fail(fontdesc);
-
- ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
- pango_font_description_free(priv->default_font_desc);
- priv->default_font_desc = fontdesc;
- g_object_notify(G_OBJECT(glk), "default-font-description");
-
- /* TODO: Apply the font description to all the windows and recalculate the sizes */
-}
-
-/**
- * chimara_glk_get_default_font_description:
- * @glk: a #ChimaraGlk widget
- *
- * Returns @glk's default proportional font.
+ * Sets the styles for text buffer and text grid windows according to the CSS
+ * file @filename. Note that the styles are set cumulatively on top of whatever
+ * the styles are at the time this function is called; to reset the styles to
+ * their defaults, use chimara_glk_set_css_to_default().
*
- * Return value: a newly-allocated #PangoFontDescription which must be freed
- * using pango_font_description_free(), or %NULL on error.
+ * Returns: %TRUE on success, %FALSE if an error occurred, in which case @error
+ * will be set.
*/
-PangoFontDescription *
-chimara_glk_get_default_font_description(ChimaraGlk *glk)
+gboolean
+chimara_glk_set_css_from_file(ChimaraGlk *glk, const gchar *filename, GError **error)
{
- g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), NULL);
-
- ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
- return pango_font_description_copy(priv->default_font_desc);
-}
+ g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), FALSE);
+ g_return_val_if_fail(filename, FALSE);
+ g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
-/**
- * chimara_glk_set_monospace_font_description:
- * @glk: a #ChimaraGlk widget
- * @font: a #PangoFontDescription
- *
- * Sets @glk's default monospace font. See
- * #ChimaraGlk:monospace-font-description.
- */
-void
-chimara_glk_set_monospace_font_description(ChimaraGlk *glk, PangoFontDescription *font)
-{
- g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
- g_return_if_fail(font);
-
- ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
- pango_font_description_free(priv->monospace_font_desc);
- priv->monospace_font_desc = pango_font_description_copy(font);
- g_object_notify(G_OBJECT(glk), "monospace-font-description");
+ int fd = open(filename, O_RDONLY);
+ if(fd == -1) {
+ *error = g_error_new(G_IO_ERROR, g_io_error_from_errno(errno),
+ _("Error opening file \"%s\": %s"), filename, g_strerror(errno));
+ return FALSE;
+ }
+
+ GScanner *scanner = create_css_file_scanner();
+ g_scanner_input_file(scanner, fd);
+ scanner->input_name = filename;
+ scan_css_file(scanner, glk);
+
+ /* Set the current style to a copy of the default style */
+ /* FIXME this is not correct */
+ copy_default_styles_to_current_styles(glk);
- /* TODO: Apply the font description to all the windows and recalculate the sizes */
+ if(close(fd) == -1) {
+ *error = g_error_new(G_IO_ERROR, g_io_error_from_errno(errno),
+ _("Error closing file \"%s\": %s"), filename, g_strerror(errno));
+ return FALSE;
+ }
+ return TRUE;
}
/**
- * chimara_glk_set_monospace_font_string:
+ * chimara_glk_set_css_from_string:
* @glk: a #ChimaraGlk widget
- * @font: string representation of a font description
+ * @filename: a string containing CSS code
*
- * Sets @glk's default monospace font according to the string @font, which must
- * be a string in the form <quote><replaceable>FAMILY-LIST</replaceable>
- * [<replaceable>STYLE-OPTIONS</replaceable>]
- * [<replaceable>SIZE</replaceable>]</quote>, such as <quote>Courier
- * Bold 12</quote> or <quote>Monospace</quote>. See
- * #ChimaraGlk:monospace-font-description.
+ * Sets the styles for text buffer and text grid windows according to @css. Note
+ * that the styles are set cumulatively on top of whatever the styles are at the
+ * time this function is called; to reset the styles to their defaults, use
+ * chimara_glk_set_css_to_default().
*/
void
-chimara_glk_set_monospace_font_string(ChimaraGlk *glk, const gchar *font)
+chimara_glk_set_css_from_string(ChimaraGlk *glk, const gchar *css)
{
g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
- g_return_if_fail(font || *font);
+ g_return_if_fail(css || *css);
- PangoFontDescription *fontdesc = pango_font_description_from_string(font);
- g_return_if_fail(fontdesc);
-
- ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
- pango_font_description_free(priv->monospace_font_desc);
- priv->monospace_font_desc = fontdesc;
- g_object_notify(G_OBJECT(glk), "monospace-font-description");
-
- /* TODO: Apply the font description to all the windows and recalculate the sizes */
-}
-
-/**
- * chimara_glk_get_monospace_font_description:
- * @glk: a #ChimaraGlk widget
- *
- * Returns @glk's default monospace font.
- *
- * Return value: a newly-allocated #PangoFontDescription which must be freed
- * using pango_font_description_free(), or %NULL on error.
- */
-PangoFontDescription *
-chimara_glk_get_monospace_font_description(ChimaraGlk *glk)
-{
- g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), NULL);
-
- ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
- return pango_font_description_copy(priv->monospace_font_desc);
+ GScanner *scanner = create_css_file_scanner();
+ g_scanner_input_text(scanner, css, strlen(css));
+ scanner->input_name = "<string>";
+ scan_css_file(scanner, glk);
+
+ /* Set the current style to a copy of the default style */
+ /* FIXME this is not correct */
+ copy_default_styles_to_current_styles(glk);
}
/**
{
g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), FALSE);
g_return_val_if_fail(plugin, FALSE);
+ g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
+
if(chimara_glk_get_running(glk)) {
g_set_error(error, CHIMARA_ERROR, CHIMARA_PLUGIN_ALREADY_RUNNING, _("There was already a plugin running."));
return FALSE;
#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);
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));
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));
}
/* 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);
/* Internal function that reads the default styles from a CSS file */
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);
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_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");
/* Tags for the textbuffer */
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_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(pager_tag, "foreground", "#ffffff", "background", "#000000", NULL);
g_hash_table_insert(default_text_buffer_styles, "pager", pager_tag);
- 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->default_styles->text_grid = default_text_grid_styles;
+ priv->default_styles->text_buffer = default_text_buffer_styles;
+ priv->current_styles->text_grid = current_text_grid_styles;
+ priv->current_styles->text_buffer = current_text_buffer_styles;
- /* Create the CSS file scanner */
- GScanner *scanner = g_scanner_new(NULL);
+ /* Set the current style to a copy of the default style */
+ copy_default_styles_to_current_styles(glk);
- if(glk_data->css_file != 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");
- }
+ text_tag_to_attr_list(pager_tag, priv->pager_attr_list);
+}
- /* 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;
+/* Reset style tables to the library's internal defaults */
+void
+reset_default_styles(ChimaraGlk *glk)
+{
+ /* TODO: write this function */
+}
- text_tag_to_attr_list(pager_tag, glk_data->pager_attr_list);
+/* 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->default_styles->text_grid, style_table_copy, priv->current_styles->text_grid);
+ g_hash_table_foreach(priv->default_styles->text_buffer, style_table_copy, priv->current_styles->text_buffer);
+}
- glk_data->style_initialized = TRUE;
+/* 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;
+}
+
+/* Run the scanner over the CSS file, overriding the default styles */
+void
+scan_css_file(GScanner *scanner, ChimaraGlk *glk)
+{
+ while( g_scanner_peek_next_token(scanner) != G_TOKEN_EOF) {
+ if( !style_accept_style_selector(scanner, glk) )
+ break;
+ }
+
+ g_scanner_destroy(scanner);
}
/* 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->default_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->default_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, 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->default_styles->text_buffer : glk_data->default_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:
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->default_styles->text_buffer : glk_data->default_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");
{
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
- if( G_UNLIKELY(!glk_data->style_initialized) ) {
- style_init();
- }
-
GtkTextTag *to_change;
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);
+ apply_stylehint_to_tag(to_change, 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);
+ apply_stylehint_to_tag(to_change, wintype_TextGrid, hint, val);
}
}
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) );
+ 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) );
+ 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.
* @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.
+ * 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);
+ *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);
+ *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");
projects / projects / chimara / chimara.git / commitdiff