X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=15f8f4b1337059e2d4452a1c338ca019a0f5c8a4;hb=cccf5a5fb76599e4c5dffaae34ec6bda6229f554;hp=e8bcf3724a9a947fc86998d34231189121cd6ac1;hpb=a2e82e317a6000511953c2dbc0eb1026c7b245a7;p=rodin%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index e8bcf37..15f8f4b 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -26,7 +26,7 @@ window_new_common(glui32 rock)
 	win->window_stream->type = STREAM_TYPE_WINDOW;
 	win->window_stream->window = win;
 	win->window_stream->style = "normal";
-	
+
 	win->echo_stream = NULL;
 	win->input_request_type = INPUT_REQUEST_NONE;
 	win->line_input_buffer = NULL;
@@ -547,11 +547,13 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			/* Connect signal handlers */
 			
 			/* Pager */
-			win->pager_expose_handler = g_signal_connect( textview, "expose-event", G_CALLBACK(pager_on_expose), win );
+			/* "size-allocate"? Really? WTF, GTK? */
+			g_signal_connect_after( textview, "size-allocate", G_CALLBACK(pager_after_size_allocate), win );
+			win->pager_expose_handler = g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_on_expose), win );
 			g_signal_handler_block(textview, win->pager_expose_handler);
 			win->pager_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(pager_on_key_press_event), win );
 			g_signal_handler_block(textview, win->pager_keypress_handler);
-			g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(pager_after_insert_text), win );
+			//g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(pager_after_insert_text), win );
 			GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwindow));
 			g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
 
@@ -571,10 +573,11 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			(for line input) */
 			gtk_text_buffer_create_tag(textbuffer, "uneditable", "editable", FALSE, "editable-set", TRUE, NULL);
 
-			/* Mark the position where the user will input text */
+			/* Mark the position where the user will input text and the end mark */
 			GtkTextIter end;
 			gtk_text_buffer_get_end_iter(textbuffer, &end);
 			gtk_text_buffer_create_mark(textbuffer, "input_position", &end, TRUE);
+			gtk_text_buffer_create_mark(textbuffer, "end_position", &end, FALSE);
 
 			/* Create the pager position mark; it stands for the last character in the buffer
 			 that has been on-screen */
@@ -823,7 +826,12 @@ glk_window_close(winid_t win, stream_result_t *result)
 	if(pair_node != NULL)
 	{
 		gboolean new_child_on_left = ( pair_node == g_node_first_sibling(pair_node) );
-		GNode *sibling_node = pair_node->children; /* only one child left */
+
+		/* Lookup our sibling */
+		GNode *sibling_node = pair_node->children;
+		if(sibling_node == win->window_node)
+			sibling_node = sibling_node->next;
+
 		GNode *new_parent_node = pair_node->parent;
 		g_node_unlink(pair_node);
 		g_node_unlink(sibling_node);
@@ -841,6 +849,7 @@ glk_window_close(winid_t win, stream_result_t *result)
 				g_node_append(new_parent_node, sibling_node);
 		}
 
+		stream_close_common( ((winid_t) pair_node->data)->window_stream, NULL );
 		window_close_common( (winid_t) pair_node->data, TRUE);
 	} 
 	else /* it was the root window */