X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-if.c;h=efbd5297c41dcd008fc874da3c4e2e1f59db7c85;hb=b026b1ac697815f2bd67e11a8718478dc1d3aed6;hp=cb0f425f012afd47c5382012ef765b560c901781;hpb=b82a2337120f77f26cf3528a78ce64e55390a23f;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-if.c b/libchimara/chimara-if.c
index cb0f425..efbd529 100644
--- a/libchimara/chimara-if.c
+++ b/libchimara/chimara-if.c
@@ -6,6 +6,7 @@
 #include <glib/gi18n-lib.h>
 #include "chimara-if.h"
 #include "chimara-glk.h"
+#include "chimara-glk-private.h"
 #include "chimara-marshallers.h"
 #include "init.h"
 
@@ -103,7 +104,9 @@ chimara_if_waiting(ChimaraGlk *glk)
 	gchar *response = g_string_free(priv->response, FALSE);
 	priv->response = g_string_new("");
 
+	gdk_threads_enter();
 	g_signal_emit_by_name(glk, "command", priv->input, response);
+	gdk_threads_leave();
 
 	g_free(priv->input);
 	g_free(response);
@@ -280,17 +283,21 @@ chimara_if_class_init(ChimaraIFClass *klass)
 	/**
 	 * ChimaraIF::command:
 	 * @self: The widget that received the signal
-	 * @input: The command typed into the game
+	 * @input: The command typed into the game, or %NULL
 	 * @response: The game's response to the command
 	 *
 	 * Emitted once for each input-response cycle of an interactive fiction
 	 * game. Note that games with nontraditional input systems (i.e. not all
 	 * taking place in the same text buffer window) may confuse this signal.
+	 *
+	 * It may happen that @input is %NULL, in which case @response is not due to
+	 * a user command, but contains the text printed at the beginning of the
+	 * game, up until the first prompt.
 	 */
 	chimara_if_signals[COMMAND] = g_signal_new("command",
 		G_OBJECT_CLASS_TYPE(klass), 0,
 		G_STRUCT_OFFSET(ChimaraIFClass, command), NULL, NULL,
-		chimara_marshal_VOID__STRING_STRING,
+		_chimara_marshal_VOID__STRING_STRING,
 		G_TYPE_NONE, 2, G_TYPE_STRING, G_TYPE_STRING);
 
 	/* Properties */
@@ -642,7 +649,14 @@ chimara_if_run_game(ChimaraIF *self, gchar *gamefile, GError **error)
 	GSList *ptr;
 	for(count = 0, ptr = args; ptr; count++, ptr = g_slist_next(ptr))
 		argv[count] = ptr->data;
-
+		
+	/* Set the story name */
+	/* We peek into ChimaraGlk's private data here, because GObject has no
+	equivalent to "protected" */
+	CHIMARA_GLK_USE_PRIVATE(self, glk_priv);
+	glk_priv->story_name = g_path_get_basename(gamefile);
+	g_object_notify(G_OBJECT(self), "story-name");
+	
 	gboolean retval = chimara_glk_run(CHIMARA_GLK(self), pluginpath, argc, argv, error);
 	g_free(argv);
 	if(terpnumstr)