X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=8e83b9d194f92c080bcef3020bcd721785297f34;hb=f41fc44565ee60d1551de548c50cb35336322f1b;hp=b3995f09189b8234982a3df80977ef9114f487b8;hpb=ef9854e6a969e9d5c082fcd1b4cda78f74ba44dd;p=projects%2Fchimara%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index b3995f0..8e83b9d 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -30,6 +30,10 @@ window_new_common(glui32 rock)
 	win->input_request_type = INPUT_REQUEST_NONE;
 	win->line_input_buffer = NULL;
 	win->line_input_buffer_unicode = NULL;
+	win->history = NULL;
+
+	/* Initialise the buffer */
+	win->buffer = g_string_sized_new(1024);
 
 	return win;
 }
@@ -48,6 +52,11 @@ window_close_common(winid_t win, gboolean destroy_node)
 	if(destroy_node)
 		g_node_destroy(win->window_node);
 	win->magic = MAGIC_FREE;
+
+	g_list_foreach(win->history, g_free, NULL);
+	g_list_free(win->history);
+
+	g_string_free(win->buffer, TRUE);
 	g_free(win);
 }
 
@@ -482,6 +491,10 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			win->keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_window_key_press_event), win );
 			g_signal_handler_block( G_OBJECT(textview), win->keypress_handler );
 
+			gtk_widget_add_events( GTK_WIDGET(textview), GDK_BUTTON_RELEASE_MASK );
+			win->mouse_click_handler = g_signal_connect_after( G_OBJECT(textview), "button-release-event", G_CALLBACK(on_window_button_release_event), win );
+			g_signal_handler_block( G_OBJECT(textview), win->mouse_click_handler );
+
 			/* Create the styles available to the window stream */
 			style_init_textgrid(textbuffer);
 		}
@@ -520,9 +533,14 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			win->keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_window_key_press_event), win );
 			g_signal_handler_block( G_OBJECT(textview), win->keypress_handler );
 
+			gtk_widget_add_events( GTK_WIDGET(textview), GDK_BUTTON_RELEASE_MASK );
+			win->mouse_click_handler = g_signal_connect_after( G_OBJECT(textview), "button-release-event", G_CALLBACK(on_window_button_release_event), win );
+			g_signal_handler_block( G_OBJECT(textview), win->mouse_click_handler );
+
 			win->insert_text_handler = g_signal_connect_after( G_OBJECT(textbuffer), "insert-text", G_CALLBACK(after_window_insert_text), win );
 			g_signal_handler_block( G_OBJECT(textbuffer), win->insert_text_handler );
 
+
 			/* Create an editable tag to indicate uneditable parts of the window
 			(for line input) */
 			gtk_text_buffer_create_tag(textbuffer, "uneditable", "editable", FALSE, "editable-set", TRUE, NULL);
@@ -1131,6 +1149,7 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
 void
 glk_window_set_arrangement(winid_t win, glui32 method, glui32 size, winid_t keywin)
 {
+	printf("set_arrangement(%d)\n", size);
 	VALID_WINDOW(win, return);
 	VALID_WINDOW_OR_NULL(keywin, return);
 	g_return_if_fail(win->type == wintype_Pair);
@@ -1218,6 +1237,8 @@ glk_window_move_cursor(winid_t win, glui32 xpos, glui32 ypos)
 	VALID_WINDOW(win, return);
 	g_return_if_fail(win->type == wintype_TextGrid);
 
+	flush_window_buffer(win);
+
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 	
 	/* Wait until the window's size is current */
@@ -1236,6 +1257,7 @@ glk_window_move_cursor(winid_t win, glui32 xpos, glui32 ypos)
 	    ypos += xpos / win->width;
 	    xpos %= win->width;
 	}
+
 	/* Go to the end if the cursor is moved off the bottom edge */
 	if(ypos >= win->height)
 	{