#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"
+#ifndef PLUGINDIR
+#define PLUGINDIR "."
+#endif
+
/**
* SECTION:chimara-if
* @short_description: Widget which plays an interactive fiction game
* @stability: Unstable
- * @include: chimara/chimara-if.h
- *
+ *
* The #ChimaraIF widget, given an interactive fiction game file to run, selects
* an appropriate interpreter plugin and runs it. Interpreter options are set by
* setting properties on the widget.
+ *
+ * Using it in a GTK program is similar to using #ChimaraGlk (which see).
+ * Threads must be initialized before using #ChimaraIF and the call to
+ * gtk_main() must be bracketed between gdk_threads_enter() and
+ * gdk_threads_leave(). Use chimara_if_run_game() to start playing an
+ * interactive fiction game.
*/
static gboolean supported_formats[CHIMARA_IF_NUM_FORMATS][CHIMARA_IF_NUM_INTERPRETERS] = {
- /* Frotz Nitfol Glulxe Git */
- { TRUE, TRUE, FALSE, FALSE }, /* Z5 */
- { TRUE, TRUE, FALSE, FALSE }, /* Z6 */
- { TRUE, TRUE, FALSE, FALSE }, /* Z8 */
- { TRUE, TRUE, FALSE, FALSE }, /* Zblorb */
- { FALSE, FALSE, TRUE, TRUE }, /* Glulx */
- { FALSE, FALSE, TRUE, TRUE } /* Gblorb */
+ /* Frotz Nitfol Glulxe Git Bocfel */
+ { TRUE, TRUE, FALSE, FALSE, TRUE }, /* Z5 */
+ { TRUE, TRUE, FALSE, FALSE, TRUE }, /* Z6 */
+ { TRUE, TRUE, FALSE, FALSE, TRUE }, /* Z8 */
+ { TRUE, TRUE, FALSE, FALSE, TRUE }, /* Zblorb */
+ { FALSE, FALSE, TRUE, TRUE, FALSE }, /* Glulx */
+ { FALSE, FALSE, TRUE, TRUE, FALSE } /* Gblorb */
};
static gchar *format_names[CHIMARA_IF_NUM_FORMATS] = {
N_("Z-code version 5"),
N_("Blorbed Glulx")
};
static gchar *interpreter_names[CHIMARA_IF_NUM_INTERPRETERS] = {
- N_("Frotz"), N_("Nitfol"), N_("Glulxe"), N_("Git")
+ N_("Frotz"), N_("Nitfol"), N_("Glulxe"), N_("Git"), N_("Bocfel")
};
static gchar *plugin_names[CHIMARA_IF_NUM_INTERPRETERS] = {
- "frotz", "nitfol", "glulxe", "git"
+ "frotz", "nitfol", "glulxe", "git", "bocfel"
};
typedef enum _ChimaraIFFlags {
ChimaraIFZmachineVersion interpreter_number;
gint random_seed;
gboolean random_seed_set;
+ gchar *graphics_file;
/* Holding buffers for input and response */
gchar *input;
GString *response;
PROP_TYPO_CORRECTION,
PROP_INTERPRETER_NUMBER,
PROP_RANDOM_SEED,
- PROP_RANDOM_SEED_SET
+ PROP_RANDOM_SEED_SET,
+ PROP_GRAPHICS_FILE
};
enum {
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);
priv->input = NULL;
chimara_if_stopped(ChimaraGlk *glk)
{
CHIMARA_IF_USE_PRIVATE(glk, priv);
-
+
if(priv->input || priv->response->len > 0)
chimara_if_waiting(glk); /* Send one last command signal */
-
+
priv->format = CHIMARA_IF_FORMAT_NONE;
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)
{
static void
chimara_if_init(ChimaraIF *self)
{
+ chimara_init(); /* This is a library entry point */
+
CHIMARA_IF_USE_PRIVATE(self, priv);
priv->preferred_interpreter[CHIMARA_IF_FORMAT_Z5] = CHIMARA_IF_INTERPRETER_FROTZ;
- priv->preferred_interpreter[CHIMARA_IF_FORMAT_Z6] = CHIMARA_IF_INTERPRETER_FROTZ;
+ priv->preferred_interpreter[CHIMARA_IF_FORMAT_Z6] = CHIMARA_IF_INTERPRETER_NITFOL;
priv->preferred_interpreter[CHIMARA_IF_FORMAT_Z8] = CHIMARA_IF_INTERPRETER_FROTZ;
priv->preferred_interpreter[CHIMARA_IF_FORMAT_Z_BLORB] = CHIMARA_IF_INTERPRETER_FROTZ;
priv->preferred_interpreter[CHIMARA_IF_FORMAT_GLULX] = CHIMARA_IF_INTERPRETER_GLULXE;
priv->interpreter = CHIMARA_IF_INTERPRETER_NONE;
priv->flags = CHIMARA_IF_TYPO_CORRECTION;
priv->interpreter_number = CHIMARA_IF_ZMACHINE_DEFAULT;
- priv->random_seed_set = FALSE;
- priv->input = NULL;
priv->response = g_string_new("");
-
+
/* 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);
}
{
case PROP_PIRACY_MODE:
PROCESS_FLAG(priv->flags, CHIMARA_IF_PIRACY_MODE, g_value_get_boolean(value));
+ g_object_notify(object, "piracy-mode");
break;
case PROP_TANDY_BIT:
PROCESS_FLAG(priv->flags, CHIMARA_IF_TANDY_BIT, g_value_get_boolean(value));
+ g_object_notify(object, "tandy-bit");
break;
case PROP_EXPAND_ABBREVIATIONS:
PROCESS_FLAG(priv->flags, CHIMARA_IF_EXPAND_ABBREVIATIONS, g_value_get_boolean(value));
+ g_object_notify(object, "expand-abbreviations");
break;
case PROP_IGNORE_ERRORS:
PROCESS_FLAG(priv->flags, CHIMARA_IF_IGNORE_ERRORS, g_value_get_boolean(value));
+ g_object_notify(object, "ignore-errors");
break;
case PROP_TYPO_CORRECTION:
PROCESS_FLAG(priv->flags, CHIMARA_IF_TYPO_CORRECTION, g_value_get_boolean(value));
+ g_object_notify(object, "typo-correction");
break;
case PROP_INTERPRETER_NUMBER:
priv->interpreter_number = g_value_get_uint(value);
+ g_object_notify(object, "interpreter-number");
break;
case PROP_RANDOM_SEED:
priv->random_seed = g_value_get_int(value);
+ g_object_notify(object, "random-seed");
break;
case PROP_RANDOM_SEED_SET:
priv->random_seed_set = g_value_get_boolean(value);
+ g_object_notify(object, "random-seed-set");
break;
+ case PROP_GRAPHICS_FILE:
+ priv->graphics_file = g_strdup(g_value_get_string(value));
+ g_object_notify(object, "graphics-file");
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
}
case PROP_RANDOM_SEED_SET:
g_value_set_boolean(value, priv->random_seed_set);
break;
+ case PROP_GRAPHICS_FILE:
+ g_value_set_string(value, priv->graphics_file);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
}
static void
chimara_if_finalize(GObject *object)
{
+ CHIMARA_IF_USE_PRIVATE(object, priv);
+ g_free(priv->graphics_file);
G_OBJECT_CLASS(chimara_if_parent_class)->finalize(object);
}
-static void
-chimara_if_command(ChimaraIF *self, gchar *input, gchar *response)
-{
- /* Default signal handler */
-}
-
-/* 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_if_class_init(ChimaraIFClass *klass)
{
object_class->finalize = chimara_if_finalize;
/* Signals */
- klass->command = chimara_if_command;
/**
* 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 throw this signal for a
- * loop.
+ * 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 */
/**
* ChimaraIF:piracy-mode:
- *
+ *
* The Z-machine specification defines a facility for games to ask the
* interpreter they are running on whether this copy of the game is pirated.
* How the interpreter is supposed to magically determine that it is running
* pirate software is unclear, and so the majority of games and interpreters
* ignore this feature. Set this property to %TRUE if you want the
* interpreter to pretend it has detected a pirated game.
- *
+ *
* Only affects Z-machine interpreters.
*/
g_object_class_install_property(object_class, PROP_PIRACY_MODE,
- g_param_spec_boolean("piracy-mode", _("Piracy mode"),
+ g_param_spec_boolean("piracy-mode", _("Piracy mode"),
_("Pretend the game is pirated"), FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
/**
* ChimaraIF:tandy-bit:
- *
+ *
* Some early Infocom games were sold by the Tandy Corporation. Setting this
- * property to %TRUE changes the wording of some Version 3 Infocom games
- * slightly, so as to be less offensive. See <ulink
+ * property to %TRUE changes the wording of some Version 3 Infocom games
+ * slightly, so as to be less offensive. See <ulink
* url="http://www.ifarchive.org/if-archive/infocom/info/tandy_bits.html">
* http://www.ifarchive.org/if-archive/infocom/info/tandy_bits.html</ulink>.
- *
+ *
* Only affects Z-machine interpreters.
*/
g_object_class_install_property(object_class, PROP_TANDY_BIT,
- g_param_spec_boolean("tandy-bit", _("Tandy bit"),
- _("Censor certain Infocom games"), FALSE,
+ g_param_spec_boolean("tandy-bit", _("Tandy bit"),
+ _("Censor certain Infocom games"), FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
/**
* ChimaraIF:expand-abbreviations:
- *
- * Most Z-machine games, in particular ones compiled with the Inform
+ *
+ * Most Z-machine games, in particular ones compiled with the Inform
* library, support the following one-letter abbreviations:
* <simplelist>
* <member>D — Down</member>
* <member>Z — wait (ZZZZ...)</member>
* </simplelist>
* Some early Infocom games might not recognize these abbreviations. Setting
- * this property to %TRUE will cause the interpreter to expand the
- * abbreviations to the full words before passing the commands on to the
- * game. Frotz only expands G, X, and Z; Nitfol expands all of the above
+ * this property to %TRUE will cause the interpreter to expand the
+ * abbreviations to the full words before passing the commands on to the
+ * game. Frotz only expands G, X, and Z; Nitfol expands all of the above
* plus the following nonstandard ones:
* <simplelist>
* <member>C — Close</member>
* <member>R — dRop</member>
* <member>T — Take</member>
* </simplelist>
- *
- * Only affects Z-machine interpreters. Behaves differently on Frotz and
+ *
+ * Only affects Z-machine interpreters. Behaves differently on Frotz and
* Nitfol.
*/
g_object_class_install_property(object_class, PROP_EXPAND_ABBREVIATIONS,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
/**
* ChimaraIF:ignore-errors:
- *
+ *
* Setting this property to %TRUE will cause the interpreter to ignore
* certain Z-machine runtime errors. Frotz will ignore any fatal errors.
* Nitfol by default warns about any shady behavior, and this property will
* turn those warnings off.
- *
- * Only affects Z-machine interpreters. Behaves differently on Frotz and
+ *
+ * Only affects Z-machine interpreters. Behaves differently on Frotz and
* Nitfol.
*/
g_object_class_install_property(object_class, PROP_IGNORE_ERRORS,
- g_param_spec_boolean("ignore-errors", _("Ignore errors"),
+ g_param_spec_boolean("ignore-errors", _("Ignore errors"),
_("Do not warn the user about Z-machine errors"), FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
/**
* ChimaraIF:typo-correction:
- *
+ *
* Nitfol has an automatic typo-correction facility, where it searches the
* game dictionary for words which differ by one letter from any unknown
* input words. Set this property to %FALSE to turn this feature off.
- *
- * Only affects Nitfol.
+ *
+ * Only affects Nitfol.
*/
g_object_class_install_property(object_class, PROP_TYPO_CORRECTION,
g_param_spec_boolean("typo-correction", _("Typo correction"),
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
/**
* ChimaraIF:interpreter-number:
- *
- * Infocom gave each port of their interpreter a different number. The Frotz
+ *
+ * Infocom gave each port of their interpreter a different number. The Frotz
* and Nitfol plugins can emulate any of these platforms. Some games behave
* slightly differently depending on what platform they are on. Set this
* property to a #ChimaraIFZmachineVersion value to emulate a certain
* platform.
- *
+ *
* Note that Nitfol pretends to be an Apple IIe by default.
- *
+ *
* Only affects Z-machine interpreters.
*/
g_object_class_install_property(object_class, PROP_INTERPRETER_NUMBER,
g_param_spec_uint("interpreter-number", _("Interpreter number"),
- _("Platform the Z-machine should pretend it is running on"),
+ _("Platform the Z-machine should pretend it is running on"),
CHIMARA_IF_ZMACHINE_DEFAULT, CHIMARA_IF_ZMACHINE_MAXVAL, CHIMARA_IF_ZMACHINE_DEFAULT,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
/**
* ChimaraIF:random-seed:
- *
+ *
* If the #ChimaraIF:random-seed-set property is %TRUE, then the interpreter
* will use the value of this property as a seed for the random number
* generator. Use this feature to duplicate sequences of random numbers
* for testing games.
- *
+ *
* Note that the value -1 is a valid random number seed for
* Nitfol, whereas it will cause Frotz to pick an arbitrary seed even when
* #ChimaraIF:random-seed-set is %TRUE.
- *
- * Only affects Z-machine interpreters. Behaves slightly differently on
+ *
+ * Only affects Z-machine interpreters. Behaves slightly differently on
* Frotz and Nitfol.
*/
g_object_class_install_property(object_class, PROP_RANDOM_SEED,
G_PARAM_READWRITE | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
/**
* ChimaraIF:random-seed-set:
- *
+ *
* Whether to use or ignore the #ChimaraIF:random-seed property.
- *
+ *
* Only affects Z-machine interpreters.
*/
g_object_class_install_property(object_class, PROP_RANDOM_SEED_SET,
g_param_spec_boolean("random-seed-set", _("Random seed set"),
_("Whether the seed for the random number generator should be set manually"), FALSE,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
-
+ /**
+ * ChimaraIF:graphics-file:
+ *
+ * Some Z-machine interpreters accept an extra argument that indicates a
+ * separate Blorb file containing graphics and sound resources. The
+ * interpreter will check if the file specified in this property really
+ * exists, and if so, use it as a resource file. If this property is set to
+ * %NULL, the interpreter will not look for an extra file.
+ *
+ * Only affects Frotz and Nitfol.
+ */
+ g_object_class_install_property(object_class, PROP_GRAPHICS_FILE,
+ g_param_spec_string("graphics-file", _("Graphics file"),
+ _("Location in which to look for a separate graphics Blorb file"), NULL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT | G_PARAM_LAX_VALIDATION | G_PARAM_STATIC_STRINGS));
/* Private data */
g_type_class_add_private(klass, sizeof(ChimaraIFPrivate));
}
* @self: A #ChimaraIF widget.
* @format: The game format to set the preferred interpreter plugin for.
* @interpreter: The preferred interpreter plugin for @format.
- *
+ *
* The function chimara_if_run_game() picks an appropriate interpreter for the
* type of game file it is given. This function sets which interpreter is picked
* for a certain game file format. Most formats, notably the Z-machine, have
{
g_return_if_fail(self && CHIMARA_IS_IF(self));
g_return_if_fail(format < CHIMARA_IF_NUM_FORMATS);
- g_return_if_fail(format < CHIMARA_IF_NUM_INTERPRETERS);
+ g_return_if_fail(interpreter < CHIMARA_IF_NUM_INTERPRETERS);
CHIMARA_IF_USE_PRIVATE(self, priv);
* chimara_if_get_preferred_interpreter:
* @self: A #ChimaraIF widget.
* @format: The game format to query the preferred interpreter plugin for.
- *
+ *
* Looks up the preferred interpreter for the game file format @format. See
* chimara_if_set_preferred_interpreter().
- *
+ *
* Returns: a #ChimaraIFInterpreter value representing the preferred interpreter
* plugin for @format.
*/
/**
* chimara_if_run_game:
* @self: A #ChimaraIF widget.
- * @gamefile: Path to an interactive fiction game file.
+ * @game_path: Path to an interactive fiction game file.
* @error: Return location for an error, or %NULL.
- *
+ *
* Autodetects the type of a game file and runs it using an appropriate
* interpreter plugin. If there is more than one interpreter that supports the
- * file format, the preferred one will be picked, according to
+ * file format, the preferred one will be picked, according to
* chimara_if_set_preferred_interpreter().
- *
+ *
* Returns: %TRUE if the game was started successfully, %FALSE if not, in which
* case @error is set.
*/
-gboolean
-chimara_if_run_game(ChimaraIF *self, gchar *gamefile, GError **error)
+gboolean
+chimara_if_run_game(ChimaraIF *self, const char *game_path, GError **error)
{
g_return_val_if_fail(self && CHIMARA_IS_IF(self), FALSE);
- g_return_val_if_fail(gamefile, FALSE);
-
+ g_return_val_if_fail(game_path, FALSE);
+ g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
+
CHIMARA_IF_USE_PRIVATE(self, priv);
/* Find out what format the game is */
/* TODO: Look inside the file instead of just looking at the extension */
ChimaraIFFormat format = CHIMARA_IF_FORMAT_Z5;
- if(g_str_has_suffix(gamefile, ".z5"))
+ if(g_str_has_suffix(game_path, ".z5"))
format = CHIMARA_IF_FORMAT_Z5;
- else if(g_str_has_suffix(gamefile, ".z6"))
+ else if(g_str_has_suffix(game_path, ".z6"))
format = CHIMARA_IF_FORMAT_Z6;
- else if(g_str_has_suffix(gamefile, ".z8"))
+ else if(g_str_has_suffix(game_path, ".z8"))
format = CHIMARA_IF_FORMAT_Z8;
- else if(g_str_has_suffix(gamefile, ".zlb") || g_str_has_suffix(gamefile, ".zblorb"))
+ else if(g_str_has_suffix(game_path, ".zlb") || g_str_has_suffix(game_path, ".zblorb"))
format = CHIMARA_IF_FORMAT_Z_BLORB;
- else if(g_str_has_suffix(gamefile, ".ulx"))
+ else if(g_str_has_suffix(game_path, ".ulx"))
format = CHIMARA_IF_FORMAT_GLULX;
- else if(g_str_has_suffix(gamefile, ".blb") || g_str_has_suffix(gamefile, ".blorb") || g_str_has_suffix(gamefile, ".glb") || g_str_has_suffix(gamefile, ".gblorb"))
+ else if(g_str_has_suffix(game_path, ".blb") || g_str_has_suffix(game_path, ".blorb") || g_str_has_suffix(game_path, ".glb") || g_str_has_suffix(game_path, ".gblorb"))
format = CHIMARA_IF_FORMAT_GLULX_BLORB;
-
+
/* Now decide what interpreter to use */
ChimaraIFInterpreter interpreter = priv->preferred_interpreter[format];
gchar *pluginfile = g_strconcat(plugin_names[interpreter], "." G_MODULE_SUFFIX, NULL);
+ gchar *pluginpath;
+#ifdef DEBUG
+#ifndef LT_OBJDIR
+#define LT_OBJDIR ".libs" /* Pre-2.2 libtool, so take a wild guess */
+#endif /* LT_OBJDIR */
/* If there is a plugin in the source tree, use that */
- gchar *pluginpath = g_build_filename("..", "interpreters", plugin_names[interpreter], LT_OBJDIR, pluginfile, NULL);
- if( !g_file_test(pluginpath, G_FILE_TEST_EXISTS) )
+ pluginpath = g_build_filename(PLUGINSOURCEDIR, plugin_names[interpreter], LT_OBJDIR, pluginfile, NULL);
+ if( !g_file_test(pluginpath, G_FILE_TEST_EXISTS) )
{
g_free(pluginpath);
+#endif /* DEBUG */
pluginpath = g_build_filename(PLUGINDIR, pluginfile, NULL);
- if( !g_file_test(pluginpath, G_FILE_TEST_EXISTS) )
+ if( !g_file_test(pluginpath, G_FILE_TEST_EXISTS) )
{
g_free(pluginpath);
g_free(pluginfile);
g_set_error(error, CHIMARA_ERROR, CHIMARA_PLUGIN_NOT_FOUND, _("No appropriate %s interpreter plugin was found"), interpreter_names[interpreter]);
return FALSE;
}
+#ifdef DEBUG
}
+#endif
g_free(pluginfile);
/* Decide what arguments to pass to the interpreters; currently only the
GSList *args = NULL;
gchar *terpnumstr = NULL, *randomstr = NULL;
args = g_slist_prepend(args, pluginpath);
- args = g_slist_prepend(args, gamefile);
switch(interpreter)
{
case CHIMARA_IF_INTERPRETER_FROTZ:
default:
;
}
-
+
+ /* Game file and external blorb file */
+ args = g_slist_prepend(args, (gpointer)game_path);
+ if(priv->graphics_file
+ && (interpreter == CHIMARA_IF_INTERPRETER_FROTZ || interpreter == CHIMARA_IF_INTERPRETER_NITFOL)
+ && g_file_test(priv->graphics_file, G_FILE_TEST_EXISTS)) {
+ args = g_slist_prepend(args, priv->graphics_file);
+ }
+
/* Allocate argv to hold the arguments */
int argc = g_slist_length(args);
args = g_slist_prepend(args, NULL);
char **argv = g_new0(char *, argc + 1);
-
+
/* Fill argv */
args = g_slist_reverse(args);
int count;
GSList *ptr;
for(count = 0, ptr = args; ptr; count++, ptr = g_slist_next(ptr))
- argv[count] = ptr->data;
+ argv[count] = g_strdup(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(game_path);
+ g_object_notify(G_OBJECT(self), "story-name");
gboolean retval = chimara_glk_run(CHIMARA_GLK(self), pluginpath, argc, argv, error);
- g_free(argv);
+ g_strfreev(argv);
if(terpnumstr)
g_free(terpnumstr);
if(randomstr)
g_free(randomstr);
g_free(pluginpath);
-
+
/* Set current format and interpreter if plugin was started successfully */
if(retval)
{
return retval;
}
+/**
+ * chimara_if_run_game_file:
+ * @self: A #ChimaraIF widget.
+ * @game_file: a #GFile pointing to an interactive fiction game file.
+ * @error: Return location for an error, or %NULL.
+ *
+ * Autodetects the type of a game file and runs it using an appropriate
+ * interpreter plugin. See chimara_if_run_game() for more information.
+ *
+ * Returns: %TRUE if the game was started successfully, %FALSE if not, in which
+ * case @error is set.
+ */
+gboolean
+chimara_if_run_game_file(ChimaraIF *self, GFile *game_file, GError **error)
+{
+ g_return_val_if_fail(self || CHIMARA_IS_IF(self), FALSE);
+ g_return_val_if_fail(game_file || G_IS_FILE(game_file), FALSE);
+ g_return_val_if_fail(error == NULL || *error == NULL, FALSE);
+
+ char *path = g_file_get_path(game_file);
+ gboolean retval = chimara_if_run_game(self, path, error);
+ g_free(path);
+ return retval;
+}
+
/**
* chimara_if_get_format:
* @self: A #ChimaraIF widget.
- *
+ *
* Returns the file format of the currently running game.
- *
+ *
* Returns: a #ChimaraIFFormat constant.
*/
ChimaraIFFormat
/**
* chimara_if_get_interpreter:
* @self: A #ChimaraIF widget.
- *
+ *
* Returns the interpreter plugin currently running.
- *
+ *
* Returns: a #ChimaraIFInterpreter constant.
*/
ChimaraIFInterpreter