X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fwindow.c;h=49936677c23dfca5f5a001507106aa7e73d548ee;hb=fed235e548376a8a2763405c4623fdf23f5c6529;hp=c1a79eeb7d319da6aa4a5a40a5531108d4328f8f;hpb=9ea720a7472bac322f91d6f96a8a3db33bba9f8e;p=rodin%2Fchimara.git

diff --git a/src/window.c b/src/window.c
index c1a79ee..4993667 100644
--- a/src/window.c
+++ b/src/window.c
@@ -510,51 +510,33 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 	gtk_widget_set_parent(win->frame, GTK_WIDGET(glk_data->self));
 	gtk_widget_queue_resize(GTK_WIDGET(glk_data->self));
 
+	gdk_threads_leave();
+	
     /* For text grid windows, wait until GTK draws the window (see note in glk_window_get_size() ), calculate the size and fill the buffer with blanks. */
     if(wintype == wintype_TextGrid)
     {
-        while(win->widget->allocation.width == 1 && win->widget->allocation.height == 1)
-        {
-            /* Release the GDK lock momentarily */
-            gdk_threads_leave();
-            gdk_threads_enter();
-            while(gtk_events_pending())
-                gtk_main_iteration();
-        }
-        win->width = (glui32)(win->widget->allocation.width / win->unit_width);
-        win->height = (glui32)(win->widget->allocation.height / win->unit_height);
+		/* Force the window to be drawn and cache its size */
+        glk_window_get_size(win, NULL, NULL);
 		
-        /* Mark the cursor position */
+        /* Create the cursor position mark */
+		gdk_threads_enter();
         GtkTextIter begin;
         GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
         gtk_text_buffer_get_start_iter(buffer, &begin);
         gtk_text_buffer_create_mark(buffer, "cursor_position", &begin, TRUE);
-        
-        /* Fill the buffer with blanks and move the cursor to the upper left */
         gdk_threads_leave();
+		
+        /* Fill the buffer with blanks and move the cursor to the upper left */
         glk_window_clear(win);
-        gdk_threads_enter();
     }
 
-	gdk_threads_leave();
-
 	return win;
 }
 
-/* Internal function: close the window streams of this window and all its children */
-static void
-close_window_streams_below(winid_t win, stream_result_t *result)
-{
-	if(win->type == wintype_Pair) {
-		close_window_streams_below(win->window_node->children->data, NULL);
-		close_window_streams_below(win->window_node->children->next->data, NULL);
-	}
-	stream_close_common(win->window_stream, result);
-}
-
-/* Internal function: destroy this window's GTK widgets and those of all its children */
+/* Internal function: destroy this window's GTK widgets, window streams, 
+ and those of all its children */
 static void
-destroy_widgets_below(winid_t win)
+destroy_windows_below(winid_t win, stream_result_t *result)
 {
 	switch(win->type)
 	{
@@ -573,14 +555,15 @@ destroy_widgets_below(winid_t win)
 			break;
 
 		case wintype_Pair:
-			destroy_widgets_below(win->window_node->children->data);
-			destroy_widgets_below(win->window_node->children->next->data);
+			destroy_windows_below(win->window_node->children->data, NULL);
+			destroy_windows_below(win->window_node->children->next->data, NULL);
 			break;
 
 		default:
 			ILLEGAL_PARAM("Unknown window type: %u", win->type);
 			return;
 	}
+	stream_close_common(win->window_stream, result);
 }
 
 /* Internal function: free the winid_t structure of this window and those of all its children */
@@ -644,11 +627,9 @@ glk_window_close(winid_t win, stream_result_t *result)
 {
 	VALID_WINDOW(win, return);
 	
-	/* First close all the window streams before trashing the window tree */
-	close_window_streams_below(win, result);
-	
-	/* Then destroy the widgets of this window and below */
-	destroy_widgets_below(win);
+	/* First close all the window streams and destroy the widgets of this window
+	 and below, before trashing the window tree */
+	destroy_windows_below(win, result);
 	
 	/* Then free the winid_t structures below this node, but not this one itself */
 	if(win->type == wintype_Pair) {
@@ -698,6 +679,7 @@ glk_window_close(winid_t win, stream_result_t *result)
 	g_free(win);
 
 	/* Schedule a redraw */
+	gdk_threads_enter();
 	gtk_widget_queue_resize( GTK_WIDGET(glk_data->self) );
 	gdk_threads_leave();
 }
@@ -914,7 +896,20 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
             break;
             
         case wintype_TextGrid:
-            /* The text grid caches its width and height */
+			gdk_threads_enter();
+			/* Wait for the window to be drawn, and then cache the width and height */
+			while(win->widget->allocation.width == 1 && win->widget->allocation.height == 1)
+		    {
+		        /* Release the GDK lock momentarily */
+		        gdk_threads_leave();
+		        gdk_threads_enter();
+		        while(gtk_events_pending())
+		            gtk_main_iteration();
+		    }
+		    win->width = (glui32)(win->widget->allocation.width / win->unit_width);
+		    win->height = (glui32)(win->widget->allocation.height / win->unit_height);
+            gdk_threads_leave();
+			
             if(widthptr != NULL)
                 *widthptr = win->width;
             if(heightptr != NULL)