#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include "callbacks.h"
#include "error.h"
#include <libchimara/chimara-glk.h>
+#include <libchimara/chimara-if.h>
/* Global pointers to widgets */
GtkBuilder *builder = NULL;
g_printerr("Stopped!\n");
}
+static void
+on_command(ChimaraGlk *glk, gchar *input, gchar *response)
+{
+ gchar *ellipsized = g_strdelimit(g_strndup(response, 20), "\n", ' ');
+ g_print("%s - %s%s\n", input, ellipsized,
+ (strlen(ellipsized) < strlen(response))? "..." : "");
+ g_free(ellipsized);
+}
+
static GObject *
load_object(const gchar *name)
{
GError *error = NULL;
builder = gtk_builder_new();
- if( !gtk_builder_add_from_file(builder, "chimara.ui", &error) ) {
+ if( !gtk_builder_add_from_file(builder, PACKAGE_SRC_DIR "/chimara.ui", &error) ) {
error_dialog(NULL, error, "Error while building interface: ");
return;
}
"open", "<ctrl>F7",
"save", NULL, /* NULL means use stock accelerator */
"quit", NULL,
+ "hint", "",
+ "char_input", "",
+ "char_input2", "",
NULL
};
const gchar **ptr;
gtk_action_group_add_action_with_accel(actiongroup, GTK_ACTION(load_object(ptr[0])), ptr[1]);
uimanager = gtk_ui_manager_new();
- if( !gtk_ui_manager_add_ui_from_file(uimanager, "chimara.menus", &error) ) {
+ if( !gtk_ui_manager_add_ui_from_file(uimanager, PACKAGE_SRC_DIR "/chimara.menus", &error) ) {
error_dialog(NULL, error, "Error while building interface: ");
return;
}
- gtk_builder_connect_signals(builder, NULL);
-
- glk = chimara_glk_new();
- g_object_set(glk, "border-width", 6, "spacing", 6, NULL);
+ glk = chimara_if_new();
+ //chimara_if_set_preferred_interpreter( CHIMARA_IF(glk), CHIMARA_IF_FORMAT_Z8, CHIMARA_IF_INTERPRETER_NITFOL);
+
+ g_object_set(glk,
+ "border-width", 6,
+ "spacing", 6,
+ "ignore-errors", TRUE,
+ NULL);
chimara_glk_set_default_font_string(CHIMARA_GLK(glk), "Serif 12");
chimara_glk_set_monospace_font_string(CHIMARA_GLK(glk), "Monospace 12");
g_signal_connect(glk, "started", G_CALLBACK(on_started), NULL);
g_signal_connect(glk, "stopped", G_CALLBACK(on_stopped), NULL);
+ g_signal_connect(glk, "command", G_CALLBACK(on_command), NULL);
GtkBox *vbox = GTK_BOX( gtk_builder_get_object(builder, "vbox") );
if(vbox == NULL)
gtk_box_pack_end(vbox, glk, TRUE, TRUE, 0);
gtk_box_pack_start(vbox, menubar, FALSE, FALSE, 0);
gtk_box_pack_start(vbox, toolbar, FALSE, FALSE, 0);
+
+ gtk_builder_connect_signals(builder, glk);
}
int
g_object_unref( G_OBJECT(builder) );
g_object_unref( G_OBJECT(uimanager) );
- if( !chimara_glk_run(CHIMARA_GLK(glk), "../interpreters/frotz/.libs/frotz.so", argc, argv, &error) ) {
+ if(argc < 2) {
+ error_dialog(GTK_WINDOW(window), NULL, "Must provide a game file");
+ return 1;
+ }
+
+ if( !chimara_if_run_game(CHIMARA_IF(glk), argv[1], &error) ) {
error_dialog(GTK_WINDOW(window), error, "Error starting Glk library: ");
return 1;
}
+ //chimara_glk_run( CHIMARA_GLK(glk), ".libs/multiwin.so", argc, argv, NULL);
+
gdk_threads_enter();
gtk_main();