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

diff --git a/libchimara/window.c b/libchimara/window.c
index 8e83b9d..87264c1 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -53,7 +53,7 @@ window_close_common(winid_t win, gboolean destroy_node)
 		g_node_destroy(win->window_node);
 	win->magic = MAGIC_FREE;
 
-	g_list_foreach(win->history, g_free, NULL);
+	g_list_foreach(win->history, (GFunc)g_free, NULL);
 	g_list_free(win->history);
 
 	g_string_free(win->buffer, TRUE);
@@ -488,12 +488,14 @@ 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(textview, "key-press-event", G_CALLBACK(on_char_input_key_press_event), win);
+			g_signal_handler_block(textview, win->char_input_keypress_handler);
+			win->line_input_keypress_handler = g_signal_connect(textview, "key-press-event", G_CALLBACK(on_line_input_key_press_event), win);
+			g_signal_handler_block(textview, win->line_input_keypress_handler);
 
-			gtk_widget_add_events( GTK_WIDGET(textview), GDK_BUTTON_RELEASE_MASK );
+			gtk_widget_add_events( 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 );
+			g_signal_handler_block( textview, win->mouse_click_handler );
 
 			/* Create the styles available to the window stream */
 			style_init_textgrid(textbuffer);
@@ -530,16 +532,17 @@ 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( textview, "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );
+			g_signal_handler_block(textview, win->char_input_keypress_handler);
+			win->line_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_line_input_key_press_event), win );
+			g_signal_handler_block(textview, win->line_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 );
-			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 );
+			win->mouse_click_handler = g_signal_connect_after( textview, "button-release-event", G_CALLBACK(on_window_button_release_event), win );
+			g_signal_handler_block( textview, win->mouse_click_handler );
 
+			win->insert_text_handler = g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(after_window_insert_text), win );
+			g_signal_handler_block( textbuffer, win->insert_text_handler );
 
 			/* Create an editable tag to indicate uneditable parts of the window
 			(for line input) */
@@ -1149,7 +1152,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);