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 aa8ed732bddfe4eab579d2be9847196e0e907364..8399f054901376b1d1790bc2639d5c4a27c330cc 100644 (file)
--- a/libchimara/abort.c
+++ b/libchimara/abort.c
@@ -4,6 +4,7 @@
 #include <gtk/gtk.h>
 
 #include "chimara-glk-private.h"
+#include "window.h"
 
 extern GPrivate *glk_data_key;
 
@@ -11,21 +12,21 @@ 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))
@@ -52,7 +53,7 @@ check_for_abort(void)
 {
        ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
        g_mutex_lock(glk_data->abort_lock);
-       if(glk_data->abort_signalled) 
+       if(glk_data->abort_signalled)
        {
                g_mutex_unlock(glk_data->abort_lock);
                abort_glk();
@@ -65,20 +66,53 @@ 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);
 
+       /* 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))
+       {
+               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);
+       }
+
        /* 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;
 }