X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fchimara-glk.c;h=ae39f168c892e49639e39af559b9ebaf5cb0c3c8;hb=68f719dde04e370ecf2356db4b40563b4d0c827d;hp=b9e0437e3249a48eda74b6016eb2ace27a020e71;hpb=4cfbef613ec760188fc1c06c840c2bf568d1dc85;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/chimara-glk.c b/libchimara/chimara-glk.c
index b9e0437..ae39f16 100644
--- a/libchimara/chimara-glk.c
+++ b/libchimara/chimara-glk.c
@@ -2,7 +2,8 @@
 
 #include <math.h>
 #include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <config.h>
+#include <glib/gi18n-lib.h>
 #include <gmodule.h>
 #include <pango/pango.h>
 #include "chimara-glk.h"
@@ -12,6 +13,7 @@
 #include "window.h"
 #include "glkstart.h"
 #include "glkunix.h"
+#include "init.h"
 
 #define CHIMARA_GLK_MIN_WIDTH 0
 #define CHIMARA_GLK_MIN_HEIGHT 0
@@ -484,7 +486,7 @@ chimara_glk_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 		if(!priv->ignore_next_arrange_event)
 		{
 			if(arrange)
-				event_throw(evtype_Arrange, arrange == priv->root_window->data? NULL : arrange, 0, 0);
+				event_throw(CHIMARA_GLK(widget), evtype_Arrange, arrange == priv->root_window->data? NULL : arrange, 0, 0);
 		}
 		else
 			priv->ignore_next_arrange_event = FALSE;
@@ -673,6 +675,9 @@ chimara_glk_class_init(ChimaraGlkClass *klass)
 GtkWidget *
 chimara_glk_new(void)
 {
+	/* This is a library entry point; initialize the library */
+	chimara_init();
+
     ChimaraGlk *self = CHIMARA_GLK(g_object_new(CHIMARA_TYPE_GLK, NULL));
     ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(self);
     
@@ -929,19 +934,21 @@ struct StartupData {
 	glk_main_t glk_main;
 	glkunix_startup_code_t glkunix_startup_code;
 	glkunix_startup_t args;
+	ChimaraGlkPrivate *glk_data;
 };
 
 /* glk_enter() is the actual function called in the new thread in which glk_main() runs.  */
 static gpointer
 glk_enter(struct StartupData *startup)
 {
-    extern ChimaraGlkPrivate *glk_data;
+	extern GPrivate *glk_data_key;
+	g_private_set(glk_data_key, startup->glk_data);
 	
 	/* Run startup function */
 	if(startup->glkunix_startup_code) {
-		glk_data->in_startup = TRUE;
+		startup->glk_data->in_startup = TRUE;
 		int result = startup->glkunix_startup_code(&startup->args);
-		glk_data->in_startup = FALSE;
+		startup->glk_data->in_startup = FALSE;
 		
 		int i = 0;
 		while(i < startup->args.argc)
@@ -953,10 +960,10 @@ glk_enter(struct StartupData *startup)
 	}
 	
 	/* Run main function */
-    g_signal_emit_by_name(glk_data->self, "started");
+    g_signal_emit_by_name(startup->glk_data->self, "started");
 	(startup->glk_main)();
-	g_slice_free(struct StartupData, startup);	
-	g_signal_emit_by_name(glk_data->self, "stopped");
+	g_signal_emit_by_name(startup->glk_data->self, "stopped");
+	g_slice_free(struct StartupData, startup);
 	return NULL;
 }
 
@@ -1019,11 +1026,7 @@ chimara_glk_run(ChimaraGlk *glk, gchar *plugin, int argc, char *argv[], GError *
 		/* Set the program name */
 		startup->args.argv[0] = g_strdup(plugin);
     }
-
-	extern ChimaraGlkPrivate *glk_data;
-    /* Set the thread's private data */
-    /* TODO: Do this with a GPrivate */
-    glk_data = priv;
+	startup->glk_data = priv;
 	
     /* Run in a separate thread */
 	priv->thread = g_thread_create((GThreadFunc)glk_enter, startup, TRUE, error);
@@ -1044,7 +1047,14 @@ chimara_glk_stop(ChimaraGlk *glk)
 {
     g_return_if_fail(glk || CHIMARA_IS_GLK(glk));
     /* TODO: check if glk is actually running a program */
-	signal_abort();
+	ChimaraGlkPrivate *priv = CHIMARA_GLK_PRIVATE(glk);
+	if(priv->abort_lock) {
+		g_mutex_lock(priv->abort_lock);
+		priv->abort_signalled = TRUE;
+		g_mutex_unlock(priv->abort_lock);
+		/* Stop blocking on the event queue condition */
+		event_throw(glk, evtype_Abort, NULL, 0, 0);
+	}
 }
 
 /**