Added a "spacing" property which sets the border width between Glk windows.
[projects/chimara/chimara.git] / src / chimara-glk.c
index 4bc1c156bc83f6e75148faa3876460f5b8934416..ad50b0f7306d2dd07138deb23838b1644970b461 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"
@@ -42,7 +44,10 @@ typedef void (* glk_main_t) (void);
 enum {
     PROP_0,
     PROP_INTERACTIVE,
-    PROP_PROTECT
+    PROP_PROTECT,
+       PROP_DEFAULT_FONT_DESCRIPTION,
+       PROP_MONOSPACE_FONT_DESCRIPTION,
+       PROP_SPACING
 };
 
 enum {
@@ -66,6 +71,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;
@@ -89,11 +96,20 @@ 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;
+               case PROP_SPACING:
+                       chimara_glk_set_spacing( glk, g_value_get_uint(value) );
+                       break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     }
@@ -112,6 +128,15 @@ 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;
+               case PROP_SPACING:
+                       g_value_set_uint(value, priv->spacing);
+                       break;
         default:
             G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
     }
@@ -140,9 +165,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, guint spacing)
+{
+       if(win->type == wintype_Pair)
+       {
+               /* Get children's size requests */
+               GtkRequisition child1, child2;
+               request_recurse(win->window_node->children->data, &child1, spacing);
+               request_recurse(win->window_node->children->next->data, &child2, spacing);
+               
+               /* 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 + spacing;
+                               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 + spacing;
+                               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)
 {
@@ -153,16 +235,115 @@ 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 {
-        requisition->width = CHIMARA_GLK_MIN_WIDTH;
-        requisition->height = CHIMARA_GLK_MIN_HEIGHT;
+    if(priv->root_window) 
+       {
+               request_recurse(priv->root_window->data, requisition, priv->spacing);
+               requisition->width += 2 * GTK_CONTAINER(widget)->border_width;
+               requisition->height += 2 * GTK_CONTAINER(widget)->border_width;
+       } 
+       else 
+       {
+        requisition->width = CHIMARA_GLK_MIN_WIDTH + 2 * GTK_CONTAINER(widget)->border_width;
+        requisition->height = CHIMARA_GLK_MIN_HEIGHT + 2 * GTK_CONTAINER(widget)->border_width;
     }
 }
 
+/* Recursively give the Glk windows their allocated space */
+static void
+allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
+{
+       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 - spacing)
+                                               child1.width = allocation->width - spacing;
+                                       break;
+                               case winmethod_Right:
+                                       child2.width = win->constraint_size * win->key_window->unit_width;
+                                       if(child2.width > allocation->width - spacing)
+                                               child2.width = allocation->width - spacing;
+                                       break;
+                               case winmethod_Above:
+                                       child1.height = win->constraint_size * win->key_window->unit_height;
+                                       if(child1.height > allocation->height - spacing)
+                                               child1.height = allocation->height - spacing;
+                                       break;
+                               case winmethod_Below:
+                                       child2.height = win->constraint_size * win->key_window->unit_height;
+                                       if(child2.height > allocation->height - spacing)
+                                               child2.height = allocation->height - spacing;
+                                       break;
+                       }
+               }
+               else /* proportional */
+               {
+                       gdouble fraction = win->constraint_size / 100.0;
+                       switch(win->split_method & winmethod_DirMask)
+                       {
+                               case winmethod_Left:
+                                       child1.width = (glui32) ceil( fraction * (allocation->width - spacing) );
+                                       break;
+                               case winmethod_Right:
+                                       child2.width = (glui32) ceil( fraction * (allocation->width - spacing) );
+                                       break;
+                               case winmethod_Above:
+                                       child1.height = (glui32) ceil( fraction * (allocation->height - spacing) );
+                                       break;
+                               case winmethod_Below:
+                                       child2.height = (glui32) ceil( fraction * (allocation->height - spacing) );
+                                       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 - spacing - child1.width;
+                               child2.x = child1.x + child1.width + spacing;
+                               child2.y = child1.y;
+                               child1.height = child2.height = allocation->height;
+                               break;
+                       case winmethod_Right:
+                               child1.width = allocation->width - spacing - child2.width;
+                               child2.x = child1.x + child1.width + spacing;
+                               child2.y = child1.y;
+                               child1.height = child2.height = allocation->height;
+                               break;
+                       case winmethod_Above:
+                               child2.height = allocation->height - spacing - child1.height;
+                               child2.x = child1.x;
+                               child2.y = child1.y + child1.height + spacing;
+                               child1.width = child2.width = allocation->width;
+                               break;
+                       case winmethod_Below:
+                               child1.height = allocation->height - spacing - child2.height;
+                               child2.x = child1.x;
+                               child2.y = child1.y + child1.height + spacing;
+                               child1.width = child2.width = allocation->width;
+                               break;
+               }
+               
+               /* Recurse */
+               allocate_recurse(win->window_node->children->data, &child1, spacing);
+               allocate_recurse(win->window_node->children->next->data, &child2, spacing);
+       }
+       
+       /* 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)
 {
@@ -175,25 +356,47 @@ 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);
-    }
+               GtkAllocation child;
+               child.x = allocation->x + GTK_CONTAINER(widget)->border_width;
+               child.y = allocation->y + GTK_CONTAINER(widget)->border_width;
+               child.width = allocation->width - 2 * GTK_CONTAINER(widget)->border_width;
+               child.height = allocation->height - 2 * GTK_CONTAINER(widget)->border_width;
+               if(child.width < 0)
+                       child.width = 0;
+               if(child.height < 0)
+                       child.height = 0;
+               allocate_recurse(priv->root_window->data, &child, priv->spacing);
+       }
+}
+
+/* Recursively invoke callback() on the GtkWidget of each non-pair window in the tree */
+static void
+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)
+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
@@ -212,6 +415,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)
 {
@@ -255,36 +463,75 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
                g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 
     /* Properties */
-    GParamSpec *pspec;
-    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);
     /**
      * 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(). 
-     * "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.
+     * <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_object_class_install_property( object_class, PROP_INTERACTIVE, 
+               g_param_spec_boolean("interactive", _("Interactive"),
+        _("Whether user input is expected in the Glk program"),
+        TRUE,
+        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);
-    
+    g_object_class_install_property(object_class, PROP_PROTECT, 
+               g_param_spec_boolean("protect", _("Protected"),
+        _("Whether the Glk program is barred from doing file operations"),
+        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:
+        *
+        * The amount of space between the Glk windows.
+        */
+       g_object_class_install_property(object_class, PROP_SPACING,
+               g_param_spec_uint("spacing", _("Spacing"),
+               _("The amount of space between Glk windows"),
+               0, G_MAXUINT, 0,
+               G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS) );
+       
     /* Private data */
     g_type_class_add_private(klass, sizeof(ChimaraGlkPrivate));
 }
@@ -383,6 +630,174 @@ 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:
+ * @glk: a #ChimaraGlk widget
+ * 
+ * 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:
+ * @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);
+}
+
+/**
+ * chimara_glk_set_spacing:
+ * @glk: a #ChimaraGlk widget
+ * @spacing: the number of pixels to put between Glk windows
+ *
+ * Sets the #ChimaraGlk:spacing property of @glk, which is the border width in
+ * pixels between Glk windows.
+ */
+void 
+chimara_glk_set_spacing(ChimaraGlk *glk, guint spacing)
+{
+       g_return_if_fail( glk || CHIMARA_IS_GLK(glk) );
+       
+       ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
+       priv->spacing = spacing;
+}
+
+/**
+ * chimara_glk_get_spacing:
+ * @glk: a #ChimaraGlk widget
+ *
+ * Gets the value set by chimara_glk_set_spacing().
+ *
+ * Return value: pixels of spacing between Glk windows
+ */
+guint 
+chimara_glk_get_spacing(ChimaraGlk *glk)
+{
+       g_return_val_if_fail(glk || CHIMARA_IS_GLK(glk), 0);
+       
+       ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
+       return priv->spacing;
+}
+
 /* glk_enter() is the actual function called in the new thread in which glk_main() runs.  */
 static gpointer
 glk_enter(gpointer glk_main)