X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=cbfc9862e8911f37f2e2c27ca2f3dfb4adafc7e3;hb=64d6d61f49c8400e61c3db0b3e31705776d63232;hp=1f287700a8ce8a51dfc11355ed28dd6bf2a3481c;hpb=f463bc32aa6199dcd0d253bd42862ef67c32c784;p=rodin%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index 1f28770..cbfc986 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -30,6 +30,7 @@ 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);
@@ -52,6 +53,9 @@ window_close_common(winid_t win, gboolean destroy_node)
 		g_node_destroy(win->window_node);
 	win->magic = MAGIC_FREE;
 
+	g_list_foreach(win->history, (GFunc)g_free, NULL);
+	g_list_free(win->history);
+
 	g_string_free(win->buffer, TRUE);
 	g_free(win);
 }
@@ -484,8 +488,8 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			/* width and height are set later */
 			
 			/* Connect signal handlers */
-			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 );
+			win->char_input_keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );
+			g_signal_handler_block( G_OBJECT(textview), win->char_input_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 );
@@ -526,9 +530,10 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			g_object_unref(zero);
 
 			/* Connect signal handlers */
-			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 );
-
+			win->char_input_keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );
+			g_signal_handler_block( G_OBJECT(textview), win->char_input_keypress_handler );
+			win->line_input_keypress_handler = g_signal_connect( G_OBJECT(textview), "key-press-event", G_CALLBACK(on_line_input_key_press_event), win );
+			
 			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 );
@@ -1145,7 +1150,6 @@ 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);