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

diff --git a/libchimara/window.c b/libchimara/window.c
index c835ccb..87264c1 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -30,12 +30,16 @@ 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;
 }
 
 static void
-window_close_common(winid_t win)
+window_close_common(winid_t win, gboolean destroy_node)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
 	
@@ -45,8 +49,14 @@ window_close_common(winid_t win)
         win->disprock.ptr = NULL;
     }
 
-	g_node_destroy(win->window_node);
+	if(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);
 }
 
@@ -478,8 +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( 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( textview, win->mouse_click_handler );
 
 			/* Create the styles available to the window stream */
 			style_init_textgrid(textbuffer);
@@ -516,11 +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( 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( G_OBJECT(textbuffer), "insert-text", G_CALLBACK(after_window_insert_text), win );
-			g_signal_handler_block( G_OBJECT(textbuffer), win->insert_text_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) */
@@ -660,7 +682,7 @@ free_winids_below(winid_t win)
 		free_winids_below(win->window_node->children->data);
 		free_winids_below(win->window_node->children->next->data);
 	}
-	window_close_common(win);
+	window_close_common(win, FALSE);
 }
 
 /**
@@ -774,14 +796,14 @@ glk_window_close(winid_t win, stream_result_t *result)
 				g_node_append(new_parent_node, sibling_node);
 		}
 
-		window_close_common( (winid_t) pair_node->data );
+		window_close_common( (winid_t) pair_node->data, TRUE);
 	} 
 	else /* it was the root window */
 	{
 		glk_data->root_window = NULL;
 	}
 
-	window_close_common(win);
+	window_close_common(win, FALSE);
 
 	/* Schedule a redraw */
 	g_mutex_lock(glk_data->arrange_lock);
@@ -1217,6 +1239,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 */
@@ -1235,6 +1259,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)
 	{