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

diff --git a/libchimara/window.c b/libchimara/window.c
index 1f28770..5740690 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);
 }
@@ -471,25 +475,27 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			gtk_widget_show(textview);
 		    		
 			/* Set the window's font */
-			gtk_widget_modify_font(textview, glk_data->monospace_font_desc);
+			gtk_widget_modify_font( textview, get_current_font(wintype) );
 		    
 		    win->widget = textview;
 		    win->frame = textview;
 			
 			/* Determine the size of a "0" character in pixels */
 			PangoLayout *zero = gtk_widget_create_pango_layout(textview, "0");
-			pango_layout_set_font_description(zero, glk_data->monospace_font_desc);
+			pango_layout_set_font_description( zero, get_current_font(wintype) );
 			pango_layout_get_pixel_size(zero, &(win->unit_width), &(win->unit_height));
 			g_object_unref(zero);
 			/* 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);
@@ -514,28 +520,29 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			gtk_widget_show_all(scrolledwindow);
 
 			/* Set the window's font */
-			gtk_widget_modify_font(textview, glk_data->default_font_desc);
+			gtk_widget_modify_font( textview, get_current_font(wintype) );
 			
 			win->widget = textview;
 			win->frame = scrolledwindow;
 			
 			/* Determine the size of a "0" character in pixels */
 			PangoLayout *zero = gtk_widget_create_pango_layout(textview, "0");
-			pango_layout_set_font_description(zero, glk_data->default_font_desc);
+			pango_layout_set_font_description( zero, get_current_font(wintype) );
 			pango_layout_get_pixel_size(zero, &(win->unit_width), &(win->unit_height));
 			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) */
@@ -1145,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);