Fixed issue #1. Probably needs some more thorough testing.
[rodin/chimara.git] / src / chimara-glk.c
index 5a62517a584a0378e278e2407030b808ca98e4e4..fd5d0658976c1e0850ca851f72478fad4812952a 100644 (file)
@@ -1,8 +1,10 @@
 /* licensing and copyright information here */
 
+#include <math.h>
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <gmodule.h>
+#include <pango/pango.h>
 #include "chimara-glk.h"
 #include "chimara-glk-private.h"
 #include "glk.h"
 #define CHIMARA_GLK_MIN_WIDTH 0
 #define CHIMARA_GLK_MIN_HEIGHT 0
 
+/**
+ * SECTION:chimara-glk
+ * @short_description: Widget which executes a Glk program
+ * @stability: Unstable
+ * @include: chimara/chimara-glk.h
+ * 
+ * The ChimaraGlk widget opens and runs a Glk program. The program must be
+ * compiled as a plugin module, with a function <function>glk_main()</function>
+ * that the Glk library can hook into.
+ *
+ * On Linux systems, this is a file with a name like 
+ * <filename>plugin.so</filename>. For portability, you can use libtool and 
+ * automake:
+ * <informalexample><programlisting>
+ * pkglib_LTLIBRARIES = plugin.la
+ * plugin_la_SOURCES = plugin.c foo.c bar.c
+ * plugin_la_LDFLAGS = -module -shared -avoid-version -export-symbols-regex "^glk_main$$"
+ * </programlisting></informalexample>
+ * This will produce <filename>plugin.la</filename> which is a text file 
+ * containing the correct plugin file to open (see the relevant section of the
+ * <ulink 
+ * url="http://www.gnu.org/software/libtool/manual/html_node/Finding-the-dlname.html">
+ * Libtool manual</ulink>).
+ */
+
 typedef void (* glk_main_t) (void);
 
 enum {
     PROP_0,
     PROP_INTERACTIVE,
-    PROP_PROTECT
+    PROP_PROTECT,
+       PROP_DEFAULT_FONT_DESCRIPTION,
+       PROP_MONOSPACE_FONT_DESCRIPTION
 };
 
 enum {
@@ -41,6 +70,8 @@ chimara_glk_init(ChimaraGlk *self)
     priv->self = self;
     priv->interactive = TRUE;
     priv->protect = FALSE;
+       priv->default_font_desc = pango_font_description_from_string("Sans");
+       priv->monospace_font_desc = pango_font_description_from_string("Monospace");
     priv->program = NULL;
     priv->thread = NULL;
     priv->event_queue = NULL;
@@ -64,11 +95,17 @@ chimara_glk_set_property(GObject *object, guint prop_id, const GValue *value, GP
     switch(prop_id) 
     {
         case PROP_INTERACTIVE:
-            chimara_glk_set_interactive(glk, g_value_get_boolean(value));
+            chimara_glk_set_interactive( glk, g_value_get_boolean(value) );
             break;
         case PROP_PROTECT:
-            chimara_glk_set_protect(glk, g_value_get_boolean(value));
+            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;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     }
@@ -87,6 +124,12 @@ chimara_glk_get_property(GObject *object, guint prop_id, GValue *value, GParamSp
         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;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     }
@@ -115,9 +158,66 @@ chimara_glk_finalize(GObject *object)
        g_mutex_free(priv->abort_lock);
        priv->abort_lock = NULL;
 
+       /* Free private data */
+       pango_font_description_free(priv->default_font_desc);
+       pango_font_description_free(priv->monospace_font_desc);
+       
     G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object);
 }
 
+/* Internal function: Recursively get the Glk window tree's size request */
+static void
+request_recurse(winid_t win, GtkRequisition *requisition)
+{
+       if(win->type == wintype_Pair)
+       {
+               /* Get children's size requests */
+               GtkRequisition child1, child2;
+               request_recurse(win->window_node->children->data, &child1);
+               request_recurse(win->window_node->children->next->data, &child2);
+               
+               /* If the split is fixed, get the size of the fixed child */
+               if((win->split_method & winmethod_DivisionMask) == winmethod_Fixed)
+               {
+                       switch(win->split_method & winmethod_DirMask)
+                       {
+                               case winmethod_Left:
+                                       child1.width = win->constraint_size * win->key_window->unit_width;
+                                       break;
+                               case winmethod_Right:
+                                       child2.width = win->constraint_size * win->key_window->unit_width;
+                                       break;
+                               case winmethod_Above:
+                                       child1.height = win->constraint_size * win->key_window->unit_height;
+                                       break;
+                               case winmethod_Below:
+                                       child2.height = win->constraint_size * win->key_window->unit_height;
+                                       break;
+                       }
+               }
+               
+               /* Add the children's requests */
+               switch(win->split_method & winmethod_DirMask)
+               {
+                       case winmethod_Left:
+                       case winmethod_Right:
+                               requisition->width = child1.width + child2.width;
+                               requisition->height = MAX(child1.height, child2.height);
+                               break;
+                       case winmethod_Above:
+                       case winmethod_Below:
+                               requisition->width = MAX(child1.width, child2.width);
+                               requisition->height = child1.height + child2.height;
+                               break;
+               }
+       }
+       
+       /* For non-pair windows, just use the size that GTK requests */
+       else
+               gtk_widget_size_request(win->frame, requisition);
+}
+
+/* Overrides gtk_widget_size_request */
 static void
 chimara_glk_size_request(GtkWidget *widget, GtkRequisition *requisition)
 {
@@ -128,16 +228,109 @@ chimara_glk_size_request(GtkWidget *widget, GtkRequisition *requisition)
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(widget);
     
     /* For now, just pass the size request on to the root Glk window */
-    if(priv->root_window) { 
-        GtkWidget *child = ((winid_t)(priv->root_window->data))->frame;
-       if(GTK_WIDGET_VISIBLE(child))
-            gtk_widget_size_request(child, requisition);
-    } else {
+    if(priv->root_window)
+               request_recurse(priv->root_window->data, requisition);
+       else {
         requisition->width = CHIMARA_GLK_MIN_WIDTH;
         requisition->height = CHIMARA_GLK_MIN_HEIGHT;
     }
 }
 
+/* Recursively give the Glk windows their allocated space */
+static void
+allocate_recurse(winid_t win, GtkAllocation *allocation)
+{
+       if(win->type == wintype_Pair)
+       {
+               GtkAllocation child1, child2;
+               child1.x = allocation->x;
+               child1.y = allocation->y;
+               
+               if((win->split_method & winmethod_DivisionMask) == winmethod_Fixed)
+               {
+                       switch(win->split_method & winmethod_DirMask)
+                       {
+                               case winmethod_Left:
+                                       child1.width = win->constraint_size * win->key_window->unit_width;
+                                       if(child1.width > allocation->width)
+                                               child1.width = allocation->width;
+                                       break;
+                               case winmethod_Right:
+                                       child2.width = win->constraint_size * win->key_window->unit_width;
+                                       if(child2.width > allocation->width)
+                                               child2.width = allocation->width;
+                                       break;
+                               case winmethod_Above:
+                                       child1.height = win->constraint_size * win->key_window->unit_height;
+                                       if(child1.height > allocation->height)
+                                               child1.height = allocation->height;
+                                       break;
+                               case winmethod_Below:
+                                       child2.height = win->constraint_size * win->key_window->unit_height;
+                                       if(child2.height > allocation->height)
+                                               child2.height = allocation->height;
+                                       break;
+                       }
+               }
+               else /* proportional */
+               {
+                       switch(win->split_method & winmethod_DirMask)
+                       {
+                               case winmethod_Left:
+                                       child1.width = (glui32)ceil((win->constraint_size / 100.0) * allocation->width);
+                                       break;
+                               case winmethod_Right:
+                                       child2.width = (glui32)ceil((win->constraint_size / 100.0) * allocation->width);
+                                       break;
+                               case winmethod_Above:
+                                       child1.height = (glui32)ceil((win->constraint_size / 100.0) * allocation->height);
+                                       break;
+                               case winmethod_Below:
+                                       child2.height = (glui32)ceil((win->constraint_size / 100.0) * allocation->height);
+                                       break;
+                       }
+               }
+               
+               /* Fill in the rest of the size requisitions according to the child specified above */
+               switch(win->split_method & winmethod_DirMask)
+               {
+                       case winmethod_Left:
+                               child2.width = allocation->width - child1.width;
+                               child2.x = child1.x + child1.width;
+                               child2.y = child1.y;
+                               child1.height = child2.height = allocation->height;
+                               break;
+                       case winmethod_Right:
+                               child1.width = allocation->width - child2.width;
+                               child2.x = child1.x + child1.width;
+                               child2.y = child1.y;
+                               child1.height = child2.height = allocation->height;
+                               break;
+                       case winmethod_Above:
+                               child2.height = allocation->height - child1.height;
+                               child2.x = child1.x;
+                               child2.y = child1.y + child1.height;
+                               child1.width = child2.width = allocation->width;
+                               break;
+                       case winmethod_Below:
+                               child1.height = allocation->height - child2.height;
+                               child2.x = child1.x;
+                               child2.y = child1.y + child1.height;
+                               child1.width = child2.width = allocation->width;
+                               break;
+               }
+               
+               /* Recurse */
+               allocate_recurse(win->window_node->children->data, &child1);
+               allocate_recurse(win->window_node->children->next->data, &child2);
+       }
+       
+       /* For non-pair windows, just give them the size */
+       else
+               gtk_widget_size_allocate(win->frame, allocation);
+}
+
+/* Overrides gtk_widget_size_allocate */
 static void
 chimara_glk_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 {
@@ -149,26 +342,38 @@ chimara_glk_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
     
     widget->allocation = *allocation;
             
-    if(priv->root_window) {
-        GtkWidget *child = ((winid_t)(priv->root_window->data))->frame;
-        if(GTK_WIDGET_VISIBLE(child))
-            gtk_widget_size_allocate(child, allocation);
-    }
+    if(priv->root_window)
+               allocate_recurse(priv->root_window->data, allocation);
 }
 
+/* Recursively invoke callback() on the GtkWidget of each non-pair window in the tree */
 static void
-chimara_glk_forall(GtkContainer *container, gboolean include_internals,
-    GtkCallback callback, gpointer callback_data)
+forall_recurse(winid_t win, GtkCallback callback, gpointer callback_data)
+{
+       if(win->type == wintype_Pair)
+       {
+               forall_recurse(win->window_node->children->data, callback, callback_data);
+               forall_recurse(win->window_node->children->next->data, callback, callback_data);
+       }
+       else
+               (*callback)(win->frame, callback_data);
+}
+
+/* Overrides gtk_container_forall */
+static void
+chimara_glk_forall(GtkContainer *container, gboolean include_internals, GtkCallback callback, gpointer callback_data)
 {
     g_return_if_fail(container);
     g_return_if_fail(CHIMARA_IS_GLK(container));
     
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(container);
     
-    if(priv->root_window) {
-        GtkWidget *child = ((winid_t)(priv->root_window->data))->frame;
-        (*callback)(child, callback_data);
-    }
+       /* All the children are "internal" */
+       if(!include_internals)
+               return;
+       
+    if(priv->root_window)
+               forall_recurse(priv->root_window->data, callback, callback_data);
 }
 
 static void
@@ -187,6 +392,11 @@ chimara_glk_started(ChimaraGlk *self)
        /* TODO: Add default signal handler implementation here */
 }
 
+/* G_PARAM_STATIC_STRINGS only appeared in GTK 2.13.0 */
+#ifndef G_PARAM_STATIC_STRINGS
+#define G_PARAM_STATIC_STRINGS (G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB)
+#endif
+
 static void
 chimara_glk_class_init(ChimaraGlkClass *klass)
 {
@@ -206,10 +416,24 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
     /* Signals */
     klass->stopped = chimara_glk_stopped;
     klass->started = chimara_glk_started;
+    /**
+     * ChimaraGlk::stopped:
+     * @glk: The widget that received the signal
+     *
+     * The ::stopped signal is emitted when the a Glk program finishes
+     * executing in the widget, whether it ended normally, or was interrupted.
+     */ 
     chimara_glk_signals[STOPPED] = g_signal_new("stopped", 
         G_OBJECT_CLASS_TYPE(klass), 0, 
         G_STRUCT_OFFSET(ChimaraGlkClass, stopped), NULL, NULL,
                g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
+       /**
+        * ChimaraGlk::started:
+        * @glk: The widget that received the signal
+        *
+        * The ::started signal is emitted when a Glk program starts executing in
+        * the widget.
+        */
        chimara_glk_signals[STARTED] = g_signal_new ("started",
                G_OBJECT_CLASS_TYPE (klass), 0,
                G_STRUCT_OFFSET(ChimaraGlkClass, started), NULL, NULL,
@@ -220,16 +444,57 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
     pspec = g_param_spec_boolean("interactive", _("Interactive"),
         _("Whether user input is expected in the Glk program"),
         TRUE,
-        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_LAX_VALIDATION |
-        G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+        G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS);
+    /**
+     * ChimaraGlk:interactive:
+     *
+     * Sets whether the widget is interactive. A Glk widget is normally 
+     * interactive, but in non-interactive mode, keyboard and mouse input are 
+     * ignored and the Glk program is controlled by chimara_glk_feed_text(). 
+     * <quote>More</quote> prompts when a lot of text is printed to a text 
+        * buffer are also disabled. This is typically used when you wish to control
+        * an interpreter program by feeding it a predefined list of commands.
+     */
     g_object_class_install_property(object_class, PROP_INTERACTIVE, pspec);
     pspec = g_param_spec_boolean("protect", _("Protected"),
         _("Whether the Glk program is barred from doing file operations"),
         FALSE,
-        G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_LAX_VALIDATION |
-        G_PARAM_STATIC_NAME | G_PARAM_STATIC_NICK | G_PARAM_STATIC_BLURB);
+        G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS);
+    /**
+     * ChimaraGlk:protect:
+     *
+     * Sets whether the Glk program is allowed to do file operations. In protect
+     * mode, all file operations will fail.
+     */
     g_object_class_install_property(object_class, PROP_PROTECT, pspec);
-    
+    pspec = 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);
+       /* 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, pspec);
+       pspec = 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: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, pspec);
     /* Private data */
     g_type_class_add_private(klass, sizeof(ChimaraGlkPrivate));
 }
@@ -263,12 +528,7 @@ chimara_glk_new(void)
  * @glk: a #ChimaraGlk widget
  * @interactive: whether the widget should expect user input
  *
- * Sets the #ChimaraGlk:interactive property of @glk. A Glk widget is normally 
- * interactive, but in non-interactive mode, keyboard and mouse input is ignored
- * and the Glk program is controlled by chimara_glk_feed_text(). "More" prompts
- * when a lot of text is printed to a text buffer are also disabled. This is 
- * typically used when you wish to control an interpreter program by feeding it
- * a predefined list of commands.
+ * Sets the #ChimaraGlk:interactive property of @glk. 
  */
 void 
 chimara_glk_set_interactive(ChimaraGlk *glk, gboolean interactive)
@@ -284,7 +544,7 @@ chimara_glk_set_interactive(ChimaraGlk *glk, gboolean interactive)
  * @glk: a #ChimaraGlk widget
  *
  * Returns whether @glk is interactive (expecting user input). See 
- * chimara_glk_set_interactive().
+ * #ChimaraGlk:interactive.
  *
  * Return value: %TRUE if @glk is interactive.
  */
@@ -320,7 +580,7 @@ chimara_glk_set_protect(ChimaraGlk *glk, gboolean protect)
  * @glk: a #ChimaraGlk widget
  *
  * Returns whether @glk is in protect mode (banned from doing file operations).
- * See chimara_glk_set_protect().
+ * See #ChimaraGlk:protect.
  *
  * Return value: %TRUE if @glk is in protect mode.
  */
@@ -333,6 +593,138 @@ chimara_glk_get_protect(ChimaraGlk *glk)
     return priv->protect;
 }
 
+/**
+ * chimara_glk_set_default_font_description:
+ * @glk: a #ChimaraGlk widget
+ * @font: a #PangoFontDescription
+ *
+ * Sets @glk's default proportional font. See 
+ * #ChimaraGlk:default-font-description.
+ */
+void 
+chimara_glk_set_default_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->default_font_desc);
+       priv->default_font_desc = pango_font_description_copy(font);
+       
+       /* TODO: Apply the font description to all the windows and recalculate the sizes */
+}
+
+/**
+ * chimara_glk_set_default_font_string:
+ * @glk: a #ChimaraGlk widget
+ * @font: string representation of a font description
+ *
+ * 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;
+       
+       /* TODO: Apply the font description to all the windows and recalculate the sizes */
+}
+       
+/**
+ * chimara_glk_get_default_font_description:
+ * 
+ * Returns @glk's default proportional font.
+ *
+ * Return value: a newly-allocated #PangoFontDescription which must be freed
+ * using pango_font_description_free(), or %NULL on error.
+ */
+PangoFontDescription *
+chimara_glk_get_default_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->default_font_desc);
+}
+
+/**
+ * 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);
+       
+       /* TODO: Apply the font description to all the windows and recalculate the sizes */
+}
+
+/**
+ * chimara_glk_set_monospace_font_string:
+ * @glk: a #ChimaraGlk widget
+ * @font: string representation of a font description
+ *
+ * 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.
+ */
+void 
+chimara_glk_set_monospace_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->monospace_font_desc);
+       priv->monospace_font_desc = fontdesc;
+       
+       /* TODO: Apply the font description to all the windows and recalculate the sizes */
+}
+       
+/**
+ * chimara_glk_get_monospace_font_description:
+ * 
+ * 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);
+}
+
 /* glk_enter() is the actual function called in the new thread in which glk_main() runs.  */
 static gpointer
 glk_enter(gpointer glk_main)
@@ -347,8 +739,10 @@ glk_enter(gpointer glk_main)
 /**
  * chimara_glk_run:
  * @glk: a #ChimaraGlk widget
- * @plugin: path to a plugin module compiled with glk.h
- * @error: location to store a #GError, or %NULL
+ * @plugin: path to a plugin module compiled with <filename 
+ * class="header">glk.h</filename>
+ * @error: location to store a <link linkend="glib-GError">GError</link>, or 
+ * %NULL
  *
  * Opens a Glk program compiled as a plugin and runs its glk_main() function in
  * a separate thread. On failure, returns %FALSE and sets @error.
@@ -420,4 +814,4 @@ chimara_glk_wait(ChimaraGlk *glk)
     
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
     g_thread_join(priv->thread);
-}
\ No newline at end of file
+}