X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=c9bb7cc25d97ae8d393e8bedd4c155b34cf6b568;hb=5e3dad8c04bf6058e88de6943388c12312eb6624;hp=d8f071d5efa6bd25b63ee4fd68188bf018b3543d;hpb=0ce15daa50a3fe259576430e99f3d6324a5716c6;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index d8f071d..c9bb7cc 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -81,7 +81,7 @@ 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->default_font_desc = pango_font_description_from_string("Serif");
 	priv->monospace_font_desc = pango_font_description_from_string("Monospace");
 	priv->css_file = "style.css";
 	priv->default_styles = g_new0(StyleSet,1);
@@ -99,12 +99,16 @@ chimara_glk_init(ChimaraGlk *self)
 	priv->rearranged = g_cond_new();
 	priv->needs_rearrange = FALSE;
 	priv->ignore_next_arrange_event = FALSE;
-    priv->interrupt_handler = NULL;
+	priv->char_input_queue = g_async_queue_new();
+	priv->line_input_queue = g_async_queue_new();
+	/* Should be g_async_queue_new_full(g_free); but only in GTK >= 2.16 */
+	priv->interrupt_handler = NULL;
     priv->root_window = NULL;
     priv->fileref_list = NULL;
     priv->current_stream = NULL;
     priv->stream_list = NULL;
 	priv->timer_id = 0;
+	priv->style_initialized = FALSE;
 	priv->in_startup = FALSE;
 	priv->current_dir = NULL;
 }
@@ -193,6 +197,10 @@ chimara_glk_finalize(GObject *object)
 	g_mutex_free(priv->arrange_lock);
 	priv->arrange_lock = NULL;
 	
+	/* Unref input queues */
+	g_async_queue_unref(priv->char_input_queue);
+	g_async_queue_unref(priv->line_input_queue);
+	
 	/* Free private data */
 	pango_font_description_free(priv->default_font_desc);
 	pango_font_description_free(priv->monospace_font_desc);
@@ -1044,6 +1052,9 @@ glk_enter(struct StartupData *startup)
 	extern GPrivate *glk_data_key;
 	g_private_set(glk_data_key, startup->glk_data);
 	
+	g_async_queue_ref(startup->glk_data->char_input_queue);
+	g_async_queue_ref(startup->glk_data->line_input_queue);
+	
 	/* Run startup function */
 	if(startup->glkunix_startup_code) {
 		startup->glk_data->in_startup = TRUE;
@@ -1194,3 +1205,47 @@ chimara_glk_get_running(ChimaraGlk *glk)
 	CHIMARA_GLK_USE_PRIVATE(glk, priv);
 	return priv->running;
 }
+
+/**
+ * chimara_glk_feed_char_input:
+ * @glk: a #ChimaraGlk widget
+ * @keyval: a key symbol as defined in <filename 
+ * class="headerfile">gdk/gdkkeysyms.h</filename>
+ * 
+ * Pretend that a key was pressed in the Glk program as a response to a 
+ * character input request. You can call this function even when no window has
+ * requested character input, in which case the key will be saved for the 
+ * following window that requests character input. This has the disadvantage 
+ * that if more than one window has requested character input, it is arbitrary 
+ * which one gets the key press.
+ */
+void 
+chimara_glk_feed_char_input(ChimaraGlk *glk, guint keyval)
+{
+	g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
+	CHIMARA_GLK_USE_PRIVATE(glk, priv);
+	g_async_queue_push(priv->char_input_queue, GUINT_TO_POINTER(keyval));
+	event_throw(glk, evtype_ForcedCharInput, NULL, 0, 0);
+}
+
+/**
+ * chimara_glk_feed_line_input:
+ * @glk: a #ChimaraGlk widget
+ * @text: text to pass to the next line input request
+ * 
+ * Pretend that @text was typed in the Glk program as a response to a line input
+ * request. @text does not need to end with a newline. You can call this 
+ * function even when no window has requested line input, in which case the text
+ * will be saved for the following window that requests line input. This has the 
+ * disadvantage that if more than one window has requested character input, it 
+ * is arbitrary which one gets the text.
+ */
+void 
+chimara_glk_feed_line_input(ChimaraGlk *glk, const gchar *text)
+{
+	g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
+	g_return_if_fail(text);
+	CHIMARA_GLK_USE_PRIVATE(glk, priv);
+	g_async_queue_push(priv->line_input_queue, g_strdup(text));
+	event_throw(glk, evtype_ForcedLineInput, NULL, 0, 0);
+}