X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=93f95c73cb400a3d57d68b3e137b561a104ad664;hb=5d29fc8d5b231c0390f8a4cbebec97c7a51b8f69;hp=eae3988b1fb7a25afa9e29fee8e6640af49de289;hpb=92895be4421d350eb674093c1789d8703c2d8f94;p=rodin%2Fchimara.git
diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index eae3988..93f95c7 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -11,10 +11,12 @@
#include "chimara-marshallers.h"
#include "glk.h"
#include "abort.h"
+#include "stream.h"
#include "window.h"
#include "glkstart.h"
#include "glkunix.h"
#include "init.h"
+#include "magic.h"
#define CHIMARA_GLK_MIN_WIDTH 0
#define CHIMARA_GLK_MIN_HEIGHT 0
@@ -25,7 +27,7 @@
* @stability: Unstable
* @include: chimara/chimara-glk.h
*
- * The ChimaraGlk widget opens and runs a Glk program. The program must be
+ * The #ChimaraGlk widget opens and runs a Glk program. The program must be
* compiled as a plugin module, with a function glk_main()
* that the Glk library can hook into.
*
@@ -81,7 +83,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 +101,17 @@ 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->needs_reset = FALSE;
priv->in_startup = FALSE;
priv->current_dir = NULL;
}
@@ -163,12 +170,9 @@ chimara_glk_get_property(GObject *object, guint prop_id, GValue *value, GParamSp
}
}
-static void
-chimara_glk_finalize(GObject *object)
+void
+_chimara_glk_free_nonwindow_private_data(ChimaraGlkPrivate *priv)
{
- ChimaraGlk *self = CHIMARA_GLK(object);
- ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(self);
-
/* Free the event queue */
g_mutex_lock(priv->event_lock);
g_queue_foreach(priv->event_queue, (GFunc)g_free, NULL);
@@ -179,26 +183,85 @@ chimara_glk_finalize(GObject *object)
g_mutex_unlock(priv->event_lock);
g_mutex_free(priv->event_lock);
- /* Free the abort signalling mechanism */
+ /* Free the abort signaling mechanism */
g_mutex_lock(priv->abort_lock);
/* Make sure no other thread is busy with this */
g_mutex_unlock(priv->abort_lock);
g_mutex_free(priv->abort_lock);
priv->abort_lock = NULL;
- /* Free the window arrangement signalling */
- g_mutex_lock(priv->arrange_lock);
- g_cond_free(priv->rearranged);
- g_mutex_unlock(priv->arrange_lock);
- 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 */
+ /* Free styles */
pango_font_description_free(priv->default_font_desc);
pango_font_description_free(priv->monospace_font_desc);
+
g_free(priv->current_dir);
- g_hash_table_destroy(priv->default_styles);
+ g_hash_table_destroy(priv->default_styles->text_buffer);
+ g_hash_table_destroy(priv->default_styles->text_grid);
+ g_hash_table_destroy(priv->current_styles->text_buffer);
+ g_hash_table_destroy(priv->current_styles->text_grid);
+}
+
+/* Internal function: main thread version of destroy_windows_below, only more
+ DESTRUCTO-MATIC! */
+static void
+trash_windows_recursive(ChimaraGlkPrivate *priv, winid_t win)
+{
+ switch(win->type)
+ {
+ case wintype_Blank:
+ case wintype_TextGrid:
+ case wintype_TextBuffer:
+ gtk_widget_unparent(win->frame);
+ break;
+
+ case wintype_Pair:
+ trash_windows_recursive(priv, win->window_node->children->data);
+ trash_windows_recursive(priv, win->window_node->children->next->data);
+ break;
+
+ default:
+ ILLEGAL_PARAM("Unknown window type: %u", win->type);
+ return;
+ }
+ trash_stream_thread_independent(priv, win->window_stream);
+ trash_window_thread_independent(priv, win);
+}
+
+void
+_chimara_glk_free_window_private_data(ChimaraGlkPrivate *priv)
+{
+ /* Destroy the window tree */
+ if(priv->root_window) {
+ trash_windows_recursive(priv, priv->root_window->data);
+ g_node_destroy(priv->root_window);
+ }
+ /* Free the window arrangement signaling */
+ g_mutex_lock(priv->arrange_lock);
+ g_cond_free(priv->rearranged);
+ g_mutex_unlock(priv->arrange_lock);
+ g_mutex_free(priv->arrange_lock);
+ priv->arrange_lock = NULL;
+
+ /* Remove the dispatch callbacks */
+ priv->register_obj = NULL;
+ priv->unregister_obj = NULL;
+ priv->register_arr = NULL;
+ priv->unregister_arr = NULL;
+}
+
+static void
+chimara_glk_finalize(GObject *object)
+{
+ ChimaraGlk *self = CHIMARA_GLK(object);
+ CHIMARA_GLK_USE_PRIVATE(self, priv);
+ _chimara_glk_free_nonwindow_private_data(priv);
+ _chimara_glk_free_window_private_data(priv);
+
G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object);
}
@@ -540,6 +603,7 @@ static void
chimara_glk_stopped(ChimaraGlk *self)
{
CHIMARA_GLK_USE_PRIVATE(self, priv);
+ printf("stopped signal received\n");
priv->running = FALSE;
/* Free the plugin */
@@ -551,6 +615,7 @@ static void
chimara_glk_started(ChimaraGlk *self)
{
CHIMARA_GLK_USE_PRIVATE(self, priv);
+ printf("started signal received\n");
priv->running = TRUE;
}
@@ -610,11 +675,11 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
* ChimaraGlk::stopped:
* @glk: The widget that received the signal
*
- * The ::stopped signal is emitted when the a Glk program finishes
- * executing in the widget, whether it ended normally, or was interrupted.
+ * Emitted when the a Glk program finishes executing in the widget, whether
+ * it ended normally, or was interrupted.
*/
chimara_glk_signals[STOPPED] = g_signal_new("stopped",
- G_OBJECT_CLASS_TYPE(klass), 0,
+ G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
/* FIXME: Should be G_SIGNAL_RUN_CLEANUP but that segfaults??! */
G_STRUCT_OFFSET(ChimaraGlkClass, stopped), NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
@@ -622,31 +687,60 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
* ChimaraGlk::started:
* @glk: The widget that received the signal
*
- * The ::started signal is emitted when a Glk program starts executing in
- * the widget.
+ * Emitted when a Glk program starts executing in the widget.
*/
chimara_glk_signals[STARTED] = g_signal_new ("started",
- G_OBJECT_CLASS_TYPE(klass), 0,
+ G_OBJECT_CLASS_TYPE(klass), G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET(ChimaraGlkClass, started), NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
+ /**
+ * ChimaraGlk::waiting:
+ * @glk: The widget that received the signal
+ *
+ * Emitted when glk_select() is called by the Glk program and the event
+ * queue is empty, which means that the widget is waiting for input.
+ */
chimara_glk_signals[WAITING] = g_signal_new("waiting",
G_OBJECT_CLASS_TYPE(klass), 0,
G_STRUCT_OFFSET(ChimaraGlkClass, waiting), NULL, NULL,
g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
+ /**
+ * ChimaraGlk::char-input:
+ * @glk: The widget that received the signal
+ * @window_rock: The rock value of the window that received character input
+ * (see Rocks)
+ * @keysym: The key that was typed, in the form of a key symbol from
+ * gdk/gdkkeysyms.h
+ *
+ * Emitted when a Glk window receives character input.
+ */
chimara_glk_signals[CHAR_INPUT] = g_signal_new("char-input",
G_OBJECT_CLASS_TYPE(klass), 0,
G_STRUCT_OFFSET(ChimaraGlkClass, char_input), NULL, NULL,
chimara_marshal_VOID__UINT_UINT,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_UINT);
-
+ /**
+ * ChimaraGlk::line-input:
+ * @glk: The widget that received the signal
+ * @window_rock: The rock value of the window that received line input (see
+ * Rocks)
+ * @text: The text that was typed
+ *
+ * Emitted when a Glk window receives line input.
+ */
chimara_glk_signals[LINE_INPUT] = g_signal_new("line-input",
G_OBJECT_CLASS_TYPE(klass), 0,
G_STRUCT_OFFSET(ChimaraGlkClass, line_input), NULL, NULL,
chimara_marshal_VOID__UINT_STRING,
G_TYPE_NONE, 2, G_TYPE_UINT, G_TYPE_STRING);
-
+ /**
+ * ChimaraGlk::text-buffer-output:
+ * @glk: The widget that received the signal
+ * @window_rock: The rock value of the window that was printed to (see Rocks)
+ *
+ * Emitted when text is printed to a text buffer window.
+ */
chimara_glk_signals[TEXT_BUFFER_OUTPUT] = g_signal_new("text-buffer-output",
G_OBJECT_CLASS_TYPE(klass), 0,
G_STRUCT_OFFSET(ChimaraGlkClass, text_buffer_output), NULL, NULL,
@@ -1012,6 +1106,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;
@@ -1031,6 +1128,10 @@ glk_enter(struct StartupData *startup)
g_signal_emit_by_name(startup->glk_data->self, "started");
(startup->glk_main)();
g_signal_emit_by_name(startup->glk_data->self, "stopped");
+ /* FIXME: hack. should be done by the signal above but for some reason
+ * this doesn't work */
+ chimara_glk_stopped(startup->glk_data->self);
+
g_slice_free(struct StartupData, startup);
return NULL;
}
@@ -1063,7 +1164,14 @@ chimara_glk_run(ChimaraGlk *glk, const gchar *plugin, int argc, char *argv[], GE
ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
struct StartupData *startup = g_slice_new0(struct StartupData);
-
+
+ /* If anything was left over from the previous run, destroy it */
+ if(priv->needs_reset) {
+ _chimara_glk_free_window_private_data(priv);
+ priv->needs_reset = FALSE;
+ chimara_glk_init(glk);
+ }
+
/* Open the module to run */
g_assert( g_module_supported() );
priv->program = g_module_open(plugin, G_MODULE_BIND_LAZY);
@@ -1115,6 +1223,8 @@ chimara_glk_stop(ChimaraGlk *glk)
{
g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
CHIMARA_GLK_USE_PRIVATE(glk, priv);
+
+ printf("stopping (%d)...\n", priv->running);
/* Don't do anything if not running a program */
if(!priv->running)
return;
@@ -1146,6 +1256,15 @@ chimara_glk_wait(ChimaraGlk *glk)
g_thread_join(priv->thread);
}
+/**
+ * chimara_glk_get_running:
+ * @glk: a #ChimaraGlk widget
+ *
+ * Use this function to tell whether a program is currently running in the
+ * widget.
+ *
+ * Returns: %TRUE if @glk is executing a Glk program, %FALSE otherwise.
+ */
gboolean
chimara_glk_get_running(ChimaraGlk *glk)
{
@@ -1153,3 +1272,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 gdk/gdkkeysyms.h
+ *
+ * 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);
+}