X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=93f95c73cb400a3d57d68b3e137b561a104ad664;hb=5d29fc8d5b231c0390f8a4cbebec97c7a51b8f69;hp=907c1214c0bafe87466f5b25422b33b9a9f97570;hpb=ed25f6521c1715c564d945cf5edc236eca65b27f;p=rodin%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index 907c121..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
@@ -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);
@@ -109,6 +111,7 @@ chimara_glk_init(ChimaraGlk *self)
     priv->stream_list = NULL;
 	priv->timer_id = 0;
 	priv->style_initialized = FALSE;
+	priv->needs_reset = FALSE;
 	priv->in_startup = FALSE;
 	priv->current_dir = NULL;
 }
@@ -167,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);
@@ -190,26 +190,78 @@ chimara_glk_finalize(GObject *object)
 	g_mutex_free(priv->abort_lock);
 	priv->abort_lock = NULL;
 
-	/* 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;
-	
 	/* 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->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);
 }
 
@@ -551,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 */
@@ -562,6 +615,7 @@ static void
 chimara_glk_started(ChimaraGlk *self)
 {
 	CHIMARA_GLK_USE_PRIVATE(self, priv);
+	printf("started signal received\n");
 	priv->running = TRUE;
 }
 
@@ -625,7 +679,7 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
      * 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);
@@ -636,7 +690,7 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
 	 * 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);
 	/**
@@ -1074,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;
 }
@@ -1106,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);
@@ -1158,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;