When splitting a window W, the new pair window was always inserted back into the...

as the right-hand child of W's former parent. So if you split a window vertically into A and
B and then split A (the top half) again into C and D, then C and D would end up below B.
Fixed.

diff --git a/src/chimara-glk.c b/src/chimara-glk.c
index 889b4f265e041387f5931c7b889e954592a3f397..b7629240b7cc4422b7e8b774003399c2cd2d48be 100644 (file)
--- a/src/chimara-glk.c
+++ b/src/chimara-glk.c
@@ -346,7 +346,8 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
                for(line = 0; line < win->height; line++)
                {
                        gtk_text_buffer_get_iter_at_line(textbuffer, &start, line);
-                       if(line > newheight)
+                       /* If this line is going to fall off the bottom, delete it */
+                       if(line >= newheight)
                        {
                                end = start;
                                gtk_text_iter_forward_to_line_end(&end);
@@ -354,6 +355,7 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
                                gtk_text_buffer_delete(textbuffer, &start, &end);
                                break;
                        }
+                       /* If this line is not long enough, add spaces on the end */
                        if(newwidth > win->width)
                        {
                                gchar *spaces = g_strnfill(newwidth - win->width, ' ');
@@ -361,6 +363,7 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
                                gtk_text_buffer_insert(textbuffer, &start, spaces, -1);
                                g_free(spaces);
                        }
+                       /* But if it's too long, delete characters from the end */
                        else if(newwidth < win->width)
                        {
                                end = start;
@@ -368,7 +371,9 @@ allocate_recurse(winid_t win, GtkAllocation *allocation, guint spacing)
                                gtk_text_iter_forward_to_line_end(&end);
                                gtk_text_buffer_delete(textbuffer, &start, &end);
                        }
+                       /* Note: if the widths are equal, do nothing */
                }
+               /* Add blank lines if there aren't enough lines to fit the new size */
                if(newheight > win->height)
                {
                        gchar *blanks = g_strnfill(win->width, ' ');

diff --git a/src/window.c b/src/window.c
index 49936677c23dfca5f5a001507106aa7e73d548ee..ea490c93db88d7a2e484a45a8c2b6a0adbce819a 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -480,10 +480,13 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
                
                /* Insert the new window into the window tree */
                if(split->window_node->parent == NULL)
-               {
                        glk_data->root_window = pair->window_node;
-               } else {
-                       g_node_append(split->window_node->parent, pair->window_node);
+               else 
+               {
+                       if( split->window_node == g_node_first_sibling(split->window_node) )
+                               g_node_prepend(split->window_node->parent, pair->window_node);
+                       else
+                               g_node_append(split->window_node->parent, pair->window_node);
                        g_node_unlink(split->window_node);
                }
                /* Place the windows in the correct order */