X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=ecc8e96a253e3a9561249784b60dbbf0615052d2;hb=c3a39d7832a862e2fd6c3ed291121f0d791c7e52;hp=edb241f88a4c34fdf34369409c3da24ecccbae3d;hpb=0c75df5f3c9b9dce26f54dfceaefd71a48a8a392;p=rodin%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index edb241f..ecc8e96 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -35,28 +35,36 @@ window_new_common(glui32 rock)
 	/* Initialise the buffer */
 	win->buffer = g_string_sized_new(1024);
 
+	/* Initialise hyperlink table */
+	win->hyperlinks = g_hash_table_new_full(g_int_hash, g_direct_equal, g_free, g_object_unref);
+	
 	return win;
 }
 
+/* Internal function: do all the stuff necessary to close a window. Call only
+ from Glk thread. */
 static void
 window_close_common(winid_t win, gboolean destroy_node)
 {
 	ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
-	
+
 	if(glk_data->unregister_obj) 
 	{
         (*glk_data->unregister_obj)(win, gidisp_Class_Window, win->disprock);
         win->disprock.ptr = NULL;
     }
-
+	
 	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_hash_table_destroy(win->hyperlinks);
+	g_free(win->current_hyperlink);
 	g_free(win);
 }
 
@@ -493,10 +501,10 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			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 );
+			win->shutdown_keypress_handler = g_signal_connect(textview, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win);
+			g_signal_handler_block(textview, win->shutdown_keypress_handler);
+			win->button_press_event_handler = g_signal_connect( textview, "button-press-event", G_CALLBACK(on_window_button_press), win );
+			g_signal_handler_block(textview, win->button_press_event_handler);
 		}
 		    break;
 		
@@ -535,13 +543,12 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			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->shutdown_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_shutdown_key_press_event), win );
+			g_signal_handler_block(textview, win->shutdown_keypress_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 );
+			g_signal_handler_block(textbuffer, win->insert_text_handler);
+			win->button_press_event_handler = g_signal_connect( textview, "button-press-event", G_CALLBACK(on_window_button_press), win );
+			g_signal_handler_block(textview, win->button_press_event_handler);
 
 			/* Create an editable tag to indicate uneditable parts of the window
 			(for line input) */