X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fwindow.c;h=876db66933867406084ab9dfa75081c5b46e2cd1;hb=890e2ad862eb2132ddae3458d590e2fe2f3b7496;hp=45054e0765fba3d537b4cb6f7643ea0a5829e341;hpb=27bed8aa9bf21a0c42defacee957ab513807c726;p=rodin%2Fchimara.git

diff --git a/src/window.c b/src/window.c
index 45054e0..876db66 100644
--- a/src/window.c
+++ b/src/window.c
@@ -458,6 +458,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 	/* Set the minimum size to "as small as possible" so it doesn't depend on
 	 the size of the window contents */
 	gtk_widget_set_size_request(win->widget, 0, 0);
+	gtk_widget_set_size_request(win->frame, 0, 0);
 	
 	if(split)
 	{
@@ -514,12 +515,15 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 
 	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. */
+	/* For blank or pair windows, this is almost a no-op. For text grid and
+	 text buffer windows, this will wait for GTK to draw the window. Otherwise,
+	 opening a window and getting its size immediately will give you the wrong
+	 size. */
+	glk_window_get_size(win, NULL, NULL);
+	
+    /* For text grid windows, fill the buffer with blanks. */
     if(wintype == wintype_TextGrid)
     {
-		/* Force the window to be drawn and cache its size */
-        glk_window_get_size(win, NULL, NULL);
-		
         /* Create the cursor position mark */
 		gdk_threads_enter();
         GtkTextIter begin;
@@ -535,6 +539,17 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 	return win;
 }
 
+/* Internal function: if node's key window is closing_win or one of its
+ children, set node's key window to NULL. */
+static gboolean 
+remove_key_windows(GNode *node, winid_t closing_win)
+{
+	winid_t win = (winid_t)node->data;
+	if(win->key_window && (win->key_window == closing_win || g_node_is_ancestor(closing_win->window_node, win->key_window->window_node)))
+		win->key_window = NULL;
+	return FALSE; /* Don't stop the traversal */
+}
+
 /* Internal function: destroy this window's GTK widgets, window streams, 
  and those of all its children */
 static void
@@ -629,7 +644,11 @@ glk_window_close(winid_t win, stream_result_t *result)
 {
 	VALID_WINDOW(win, return);
 	
-	/* First close all the window streams and destroy the widgets of this window
+	/* If any pair windows have this window or its children as a key window,
+	 set their key window to NULL */
+	g_node_traverse(glk_data->root_window, G_IN_ORDER, G_TRAVERSE_NON_LEAVES, -1, (GNodeTraverseFunc)remove_key_windows, win);
+	
+	/* Close all the window streams and destroy the widgets of this window
 	 and below, before trashing the window tree */
 	destroy_windows_below(win, result);