X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=a31bed1b251f7b749d82a325a2b058c599bd4b93;hb=f5361c37bf7265628802787ea90164bab8108d3a;hp=7dd14c7b3d53d6e22e7538d2eadea855469c0e92;hpb=e814f969f41041687a5e1cfce558b64432130279;p=rodin%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index 7dd14c7..a31bed1 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -31,11 +31,14 @@ window_new_common(glui32 rock)
 	win->line_input_buffer = NULL;
 	win->line_input_buffer_unicode = 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 +48,11 @@ 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_string_free(win->buffer, TRUE);
 	g_free(win);
 }
 
@@ -458,6 +464,7 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 		case wintype_TextGrid:
 		{
 		    GtkWidget *textview = gtk_text_view_new();
+			GtkTextBuffer *textbuffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(textview) );
 
 		    gtk_text_view_set_wrap_mode( GTK_TEXT_VIEW(textview), GTK_WRAP_NONE );
 		    gtk_text_view_set_editable( GTK_TEXT_VIEW(textview), FALSE );
@@ -479,6 +486,13 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			/* 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 );
+
+			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);
 		}
 		    break;
 		
@@ -515,14 +529,19 @@ 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);
 
-			/* Create the default styles available to the window stream */
+			/* Create the styles available to the window stream */
 			style_init_textbuffer(textbuffer);
 
 			/* Mark the position where the user will input text */
@@ -656,7 +675,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);
 }
 
 /**
@@ -770,14 +789,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);