X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fabort.c;h=b2d2b67ab2122e3d840de23c425199352fe96401;hb=46974bb948c0a7ca82b476a578b6199e438bab41;hp=63ef3bd1c15a7dfa2e453b70b85a7036a0c76777;hpb=5292406311d31682a850baf059cab01a6f0262b2;p=rodin%2Fchimara.git

diff --git a/src/abort.c b/src/abort.c
index 63ef3bd..b2d2b67 100644
--- a/src/abort.c
+++ b/src/abort.c
@@ -2,27 +2,9 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 
-static GMutex *abort_lock = NULL;
-static gboolean abort_signalled = FALSE;
-static void (*interrupt_handler)(void) = NULL;
+#include "chimara-glk-private.h"
 
-/* Internal function: initialize the interrupt handling system. */
-void
-interrupt_init()
-{
-	abort_lock = g_mutex_new();
-}
-
-/* Internal function: free the resources allocated in interrupt_init(). */
-void
-interrupt_free()
-{
-	g_mutex_lock(abort_lock);
-	/* Make sure no other thread is busy with this */
-	g_mutex_unlock(abort_lock);
-	g_mutex_free(abort_lock);
-	abort_lock = NULL;
-}
+extern ChimaraGlkPrivate *glk_data;
 
 /**
  * glk_set_interrupt_handler:
@@ -46,15 +28,7 @@ interrupt_free()
 void
 glk_set_interrupt_handler(void (*func)(void))
 {
-	interrupt_handler = func;
-}
-
-/* Internal function: Free all Glk resources. */
-void
-cleanup()
-{
-	events_free();
-	interrupt_free();
+	glk_data->interrupt_handler = func;
 }
 
 /* Internal function: abort this Glk program, freeing resources and calling the
@@ -62,9 +36,8 @@ user's interrupt handler. */
 void
 abort_glk()
 {
-	if(interrupt_handler)
-		(*interrupt_handler)();
-	cleanup();
+	if(glk_data->interrupt_handler)
+		(*(glk_data->interrupt_handler))();
 	g_thread_exit(NULL);
 }
 
@@ -73,10 +46,10 @@ mutex has already been freed. (That means the thread already ended.) */
 void
 signal_abort()
 {
-	if(abort_lock) {
-		g_mutex_lock(abort_lock);
-		abort_signalled = TRUE;
-		g_mutex_unlock(abort_lock);
+	if(glk_data->abort_lock) {
+		g_mutex_lock(glk_data->abort_lock);
+		glk_data->abort_signalled = TRUE;
+		g_mutex_unlock(glk_data->abort_lock);
 		/* Stop blocking on the event queue condition */
 		event_throw(evtype_Abort, NULL, 0, 0);
 	}
@@ -86,13 +59,13 @@ signal_abort()
 void
 check_for_abort()
 {
-	g_mutex_lock(abort_lock);
-	if(abort_signalled) 
+	g_mutex_lock(glk_data->abort_lock);
+	if(glk_data->abort_signalled) 
 	{
-		g_mutex_unlock(abort_lock);
+		g_mutex_unlock(glk_data->abort_lock);
 		abort_glk();
 	}
-	g_mutex_unlock(abort_lock);
+	g_mutex_unlock(glk_data->abort_lock);
 }