X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-if.c;h=2048f95d8783ee7df28adf825ce05f72da824f18;hb=28c8862dc3d26a9a3735d0c2eb22ceb04be632c8;hp=efbd5297c41dcd008fc874da3c4e2e1f59db7c85;hpb=481077fe3d12bab741ad10594bf213fe97862ca8;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-if.c b/libchimara/chimara-if.c
index efbd529..2048f95 100644
--- a/libchimara/chimara-if.c
+++ b/libchimara/chimara-if.c
@@ -125,6 +125,17 @@ chimara_if_stopped(ChimaraGlk *glk)
 	priv->interpreter = CHIMARA_IF_INTERPRETER_NONE;
 }
 
+static void
+chimara_if_char_input(ChimaraGlk *glk, guint32 win_rock, guint keysym)
+{
+	CHIMARA_IF_USE_PRIVATE(glk, priv);
+	g_assert(priv->input == NULL);
+
+	gchar outbuf[6];
+	gint outbuflen = g_unichar_to_utf8(gdk_keyval_to_unicode(keysym), outbuf);
+	priv->input = g_strndup(outbuf, outbuflen);
+}
+
 static void
 chimara_if_line_input(ChimaraGlk *glk, guint32 win_rock, gchar *input)
 {
@@ -161,6 +172,7 @@ chimara_if_init(ChimaraIF *self)
 	/* Connect to signals of ChimaraGlk parent */
 	g_signal_connect(self, "stopped", G_CALLBACK(chimara_if_stopped), NULL);
 	g_signal_connect(self, "waiting", G_CALLBACK(chimara_if_waiting), NULL);
+	g_signal_connect(self, "char-input", G_CALLBACK(chimara_if_char_input), NULL);
 	g_signal_connect(self, "line-input", G_CALLBACK(chimara_if_line_input), NULL);
 	g_signal_connect(self, "text-buffer-output", G_CALLBACK(chimara_if_text_buffer_output), NULL);
 }
@@ -638,6 +650,24 @@ chimara_if_run_game(ChimaraIF *self, gchar *gamefile, GError **error)
 			;
 	}
 
+	/* Check if an external blorb file is present */
+	/* FIXME: hardcoded path */
+	if(format == CHIMARA_IF_FORMAT_Z5 || format == CHIMARA_IF_FORMAT_Z6 || format == CHIMARA_IF_FORMAT_Z8) {
+		gchar *path = g_path_get_dirname(gamefile);
+		gchar *scratch = g_path_get_basename(gamefile);
+		*(strrchr(scratch, '.')) = '\0';
+		gchar *blorbfile = g_strconcat(path, "/../Resources/", scratch, ".blb", NULL);
+		g_printerr("Looking for %s\n", blorbfile);
+		if(g_file_test(blorbfile, G_FILE_TEST_EXISTS)) {
+			args = g_slist_prepend(args, blorbfile);
+			g_printerr("Prepending graphics file to args\n");
+		} else {
+			g_free(blorbfile);
+		}
+		g_free(path);
+		g_free(scratch);
+	}
+
 	/* Allocate argv to hold the arguments */
 	int argc = g_slist_length(args);
 	args = g_slist_prepend(args, NULL);