Fixed freeing data at stop & start. Previously the root window was set to NULL when...

[rodin/chimara.git] / libchimara / abort.c

diff --git a/libchimara/abort.c b/libchimara/abort.c
index 61234a06f5743747687e6fbf397763dae528598c..8399f054901376b1d1790bc2639d5c4a27c330cc 100644 (file)
--- a/libchimara/abort.c
+++ b/libchimara/abort.c
@@ -1,71 +1,118 @@
+#include "abort.h"
 #include "event.h"
 #include <glib.h>
 #include <gtk/gtk.h>
 
 #include "chimara-glk-private.h"
+#include "window.h"
 
-extern ChimaraGlkPrivate *glk_data;
+extern GPrivate *glk_data_key;
 
 /**
  * glk_set_interrupt_handler:
  * @func: A pointer to an interrupt handler function.
  *
- * Sets @func to be the interrupt handler. @func should be a pointer to a 
+ * Sets @func to be the interrupt handler. @func should be a pointer to a
  * function which takes no argument and returns no result. If Glk receives an
- * interrupt, and you have set an interrupt handler, your handler will be 
+ * interrupt, and you have set an interrupt handler, your handler will be
  * called, before the process is shut down.
- * 
+ *
  * Initially there is no interrupt handler. You can reset to not having any by
  * calling <code>#glk_set_interrupt_handler(%NULL)</code>.
- * 
+ *
  * If you call glk_set_interrupt_handler() with a new handler function while an
  * older one is set, the new one replaces the old one. Glk does not try to queue
  * interrupt handlers.
  *
  * You should not try to interact with the player in your interrupt handler. Do
  * not call glk_select() or glk_select_poll(). Anything you print to a window
- * may not be visible to the player. 
+ * may not be visible to the player.
  */
 void
 glk_set_interrupt_handler(void (*func)(void))
 {
+       ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
        glk_data->interrupt_handler = func;
 }
 
 /* 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: Signal this Glk thread to abort. Does nothing if the abort
-mutex has already been freed. (That means the thread already ended.) */
+/* Internal function: check if the Glk program has been interrupted. */
 void
-signal_abort()
+check_for_abort(void)
 {
-       if(glk_data && glk_data->abort_lock) {
-               g_mutex_lock(glk_data->abort_lock);
-               glk_data->abort_signalled = TRUE;
+       ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+       g_mutex_lock(glk_data->abort_lock);
+       if(glk_data->abort_signalled)
+       {
                g_mutex_unlock(glk_data->abort_lock);
-               /* Stop blocking on the event queue condition */
-               event_throw(evtype_Abort, NULL, 0, 0);
+               abort_glk();
        }
+       g_mutex_unlock(glk_data->abort_lock);
 }
 
-/* Internal function: check if the Glk program has been interrupted. */
+/* Internal function: do any cleanup for shutting down the Glk library. */
 void
-check_for_abort()
+shutdown_glk(void)
 {
-       g_mutex_lock(glk_data->abort_lock);
-       if(glk_data->abort_signalled) 
+       ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+
+       /* Stop any timers */
+       glk_request_timer_events(0);
+
+       /* Cancel any pending input requests and flush all window buffers */
+       winid_t win;
+       for(win = glk_window_iterate(NULL, NULL); win; win = glk_window_iterate(win, NULL))
        {
-               g_mutex_unlock(glk_data->abort_lock);
-               abort_glk();
+               switch(win->input_request_type)
+               {
+                       case INPUT_REQUEST_CHARACTER:
+                       case INPUT_REQUEST_CHARACTER_UNICODE:
+                               glk_cancel_char_event(win);
+                               break;
+                       case INPUT_REQUEST_LINE:
+                       case INPUT_REQUEST_LINE_UNICODE:
+                               glk_cancel_line_event(win, NULL);
+                               break;
+                       case INPUT_REQUEST_NONE:
+                       default:
+                               ; /* Handle mouse and hyperlink requests */
+               }
+
+               flush_window_buffer(win);
        }
-       g_mutex_unlock(glk_data->abort_lock);
+
+       /* 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);
+
+       /* Wait for any pending window rearrange */
+       g_mutex_lock(glk_data->arrange_lock);
+       if(glk_data->needs_rearrange)
+               g_cond_wait(glk_data->rearranged, glk_data->arrange_lock);
+       g_mutex_unlock(glk_data->arrange_lock);
+
+       /* Default handler for 'stopped' unloads the plugin, so be absolutely sure
+        we're not calling any dispatch callbacks after this point */
+       if(!glk_data->in_startup)
+               g_signal_emit_by_name(glk_data->self, "stopped");
+       
+       _chimara_glk_free_nonwindow_private_data(glk_data);
+       glk_data->needs_reset = TRUE;
 }