#include <glib/gi18n-lib.h>
#include <gmodule.h>
#include <pango/pango.h>
+#include <gio/gio.h>
#include "chimara-glk.h"
#include "chimara-glk-private.h"
#include "chimara-marshallers.h"
priv->resource_lock = g_mutex_new();
priv->resource_loaded = g_cond_new();
priv->resource_info_available = g_cond_new();
+ priv->resource_load_callback = NULL;
+ priv->resource_load_callback_data = NULL;
priv->image_cache = NULL;
priv->program_name = NULL;
priv->program_info = NULL;
_chimara_marshal_VOID__UINT_STRING,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
/**
- * ChimaraGlk::iliad-update-screen:
+ * ChimaraGlk::iliad-screen-update:
* @self: The widget that received the signal
* @typing: Whether to perform a typing or full screen update
*
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));
+ if(error)
+ *error = g_error_new(G_IO_ERROR, g_io_error_from_errno(errno),
+ _("Error opening file \"%s\": %s"), filename, g_strerror(errno));
return FALSE;
}
scan_css_file(scanner, glk);
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));
+ if(error)
+ *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_get_tag:
- * @glk: a #ChimarGlk widget
+ * @glk: a #ChimaraGlk widget
* @window: The type of window to retrieve the tag for
* @name: The name of the tag to retrieve
*
* Use this function to get a #GtkTextTag so style properties can be changed.
- * See also #chimara_glk_set_css_from_string.
+ * See also chimara_glk_set_css_from_string().
*
* The layout of the text in Chimara is controlled by two sets of tags: one set
* describing the style in text buffers and one for text grids. See also the
- * GLK specification for the difference between the two. The main narrative of
+ * Glk specification for the difference between the two. The main narrative of
* a game is usually rendered in text buffers, whereas text grids are mostly
* used for status bars and in game menus.
*
* <listitem><para>user2</para></listitem>
* <listitem><para>hyperlink</para></listitem>
* <listitem><para>pager</para></listitem>
- * </itenizedlist>
+ * </itemizedlist>
*/
-GtkTextTag*
+GtkTextTag *
chimara_glk_get_tag(ChimaraGlk *glk, ChimaraGlkWindowType window, const gchar *name)
{
CHIMARA_GLK_USE_PRIVATE(glk, priv);
}
/**
- * chimara_glk_get_tag:
- * @glk: a #ChimarGlk widget
+ * chimara_glk_get_tag_names:
+ * @glk: a #ChimaraGlk widget
*
- * Retrieves the possible tag names to use in #chimara_glk_get_tag.
+ * Retrieves the possible tag names to use in chimara_glk_get_tag().
*/
-const gchar**
+const gchar **
chimara_glk_get_tag_names(ChimaraGlk *glk)
{
return style_get_tag_names();
* chimara_glk_get_num_tag_names:
* @glk: a #ChimaraGlk widget
*
- * Retrieves the number of style tags returned by #chimara_glk_get_tag_names.
+ * Retrieves the number of style tags returned by chimara_glk_get_tag_names().
*/
gint
chimara_glk_get_num_tag_names(ChimaraGlk *glk)
*
* Processes style updates and updates the widget to reflect the new style.
* Call this every time you change a property of a #GtkTextTag retrieved by
- * #chimara_glk_get_tag.
+ * chimara_glk_get_tag().
*/
void
chimara_glk_update_style(ChimaraGlk *glk)
g_mutex_unlock(priv->arrange_lock);
gtk_widget_queue_resize( GTK_WIDGET(priv->self) );
}
+
+/**
+ * chimara_glk_set_resource_load_callback:
+ * @glk: a #ChimaraGlk widget
+ * @func: a function to call for loading resources, or %NULL
+ * @user_data: user data to pass to @func, or %NULL
+ *
+ * Sometimes it is preferable to load image and sound resources from somewhere
+ * else than a Blorb file, for example while developing a game. Section 14 of
+ * the <ulink url="http://eblong.com/zarf/blorb/blorb.html#s14">Blorb
+ * specification</ulink> allows for this possibility. This function sets @func
+ * to be called when the Glk program requests loading an image or sound without
+ * a Blorb resource map having been loaded, optionally passing @user_data as an
+ * extra parameter.
+ *
+ * Note that @func is only called if no Blorb resource map has been set; having
+ * a resource map in place overrides this function.
+ *
+ * To deactivate the callback, call this function with @func set to %NULL.
+ */
+void
+chimara_glk_set_resource_load_callback(ChimaraGlk *glk, ChimaraResourceLoadFunc func, gpointer user_data)
+{
+ CHIMARA_GLK_USE_PRIVATE(glk, priv);
+ priv->resource_load_callback = func;
+ priv->resource_load_callback_data = user_data;
+}
projects / projects / chimara / chimara.git / blobdiff