X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fabort.c;h=aa8ed732bddfe4eab579d2be9847196e0e907364;hb=4a1188d59e0c9958df56cf5fb61d04ee8fb1e37c;hp=18b2725da810fbb143fc44dd173dd54a35ad35db;hpb=6702e46cbf0d5980a7386038d019c03fb12d3b52;p=rodin%2Fchimara.git

diff --git a/libchimara/abort.c b/libchimara/abort.c
index 18b2725..aa8ed73 100644
--- a/libchimara/abort.c
+++ b/libchimara/abort.c
@@ -1,3 +1,4 @@
+#include "abort.h"
 #include "event.h"
 #include <glib.h>
 #include <gtk/gtk.h>
@@ -36,18 +37,18 @@ glk_set_interrupt_handler(void (*func)(void))
 /* Internal function: abort this Glk program, freeing resources and calling the
 user's interrupt handler. */
 static void
-abort_glk()
+abort_glk(void)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 	if(glk_data->interrupt_handler)
 		(*(glk_data->interrupt_handler))();
-	g_signal_emit_by_name(glk_data->self, "stopped");
+	shutdown_glk();
 	g_thread_exit(NULL);
 }
 
 /* Internal function: check if the Glk program has been interrupted. */
 void
-check_for_abort()
+check_for_abort(void)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 	g_mutex_lock(glk_data->abort_lock);
@@ -58,3 +59,26 @@ check_for_abort()
 	}
 	g_mutex_unlock(glk_data->abort_lock);
 }
+
+/* Internal function: do any cleanup for shutting down the Glk library. */
+void
+shutdown_glk(void)
+{
+	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+		
+	if(!glk_data->in_startup)
+		g_signal_emit_by_name(glk_data->self, "stopped");
+
+	/* Stop any timers */
+	glk_request_timer_events(0);
+
+	/* Close any open resource files */
+	if(glk_data->resource_map != NULL) {
+		giblorb_destroy_map(glk_data->resource_map);
+		glk_stream_close(glk_data->resource_file, NULL);
+	}
+	
+	/* Unref the input queues */
+	g_async_queue_unref(glk_data->char_input_queue);
+	g_async_queue_unref(glk_data->line_input_queue);
+}