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);
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->in_startup = FALSE;
priv->current_dir = NULL;
}
}
static void
-chimara_glk_finalize(GObject *object)
+chimara_glk_free_private_data(ChimaraGlk *self)
{
- 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);
g_mutex_free(priv->arrange_lock);
priv->arrange_lock = NULL;
- /* Free private data */
+ /* Unref input queues */
+ g_async_queue_unref(priv->char_input_queue);
+ g_async_queue_unref(priv->line_input_queue);
+
+ /* 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->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);
+}
+static void
+chimara_glk_finalize(GObject *object)
+{
+ ChimaraGlk *self = CHIMARA_GLK(object);
+ chimara_glk_free_private_data(self);
+
G_OBJECT_CLASS(chimara_glk_parent_class)->finalize(object);
}
+/**
+ * chimara_glk_reset:
+ * @self: The ChimaraGLK widget to reset
+ *
+ * Resets the widget back to it's origional state. IE: it resets all the private data.
+ */
+void
+chimara_glk_reset(ChimaraGlk *self)
+{
+ chimara_glk_free_private_data(self);
+ chimara_glk_init(self);
+}
+
+
/* Internal function: Recursively get the Glk window tree's size request */
static void
request_recurse(winid_t win, GtkRequisition *requisition, guint spacing)
chimara_glk_stopped(ChimaraGlk *self)
{
CHIMARA_GLK_USE_PRIVATE(self, priv);
+ printf("stopped signal received\n");
priv->running = FALSE;
/* Free the plugin */
chimara_glk_started(ChimaraGlk *self)
{
CHIMARA_GLK_USE_PRIVATE(self, priv);
+ printf("started signal received\n");
priv->running = TRUE;
}
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;
/* Run main function */
g_signal_emit_by_name(startup->glk_data->self, "started");
+ /* FIXME: hack. should be done by the signal above but for some reason
+ * this doesn't work */
+ chimara_glk_started(startup->glk_data->self);
+
(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;
}
{
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;
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 <filename
+ * class="headerfile">gdk/gdkkeysyms.h</filename>
+ *
+ * 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);
+}