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

diff --git a/libchimara/abort.c b/libchimara/abort.c
index aa8ed73..517dec5 100644
--- a/libchimara/abort.c
+++ b/libchimara/abort.c
@@ -11,21 +11,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 +52,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 +65,50 @@ 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);
+
+	chimara_glk_reset(glk_data->self);
 }