X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=224db4808cf789c5b4f72b9f4e35c8bb2db982b0;hb=b80c7c9358f022e5e99f7fcd0ccb048b0ce7b7d3;hp=84b6fd9431b4987b73e7832811d3b664e8418a3f;hpb=c6e78c57fc1b323ec055bfe48c7430515be27d1c;p=rodin%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index 84b6fd9..224db48 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -26,6 +26,7 @@ window_new_common(glui32 rock)
 	win->window_stream->type = STREAM_TYPE_WINDOW;
 	win->window_stream->window = win;
 	win->window_stream->style = "normal";
+	win->window_stream->glk_style = "normal";
 
 	win->echo_stream = NULL;
 	win->input_request_type = INPUT_REQUEST_NONE;
@@ -37,7 +38,7 @@ window_new_common(glui32 rock)
 	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);
+	win->hyperlinks = g_hash_table_new_full(g_int_hash, g_int_equal, g_free, g_free);
 	
 	return win;
 }
@@ -170,7 +171,11 @@ winid_t
 glk_window_get_parent(winid_t win)
 {
 	VALID_WINDOW(win, return NULL);
+
 	/* Value will also be NULL if win is the root window */
+	if(win->window_node->parent == NULL)
+		return NULL;
+
 	return (winid_t)win->window_node->parent->data;
 }
 
@@ -548,15 +553,14 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			/* Connect signal handlers */
 			
 			/* Pager */
-			/* "size-allocate"? Really? WTF, GTK? */
-			g_signal_connect_after( textview, "size-allocate", G_CALLBACK(pager_after_size_allocate), win );
+			//g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_after_expose_event), win );
+			g_signal_connect_after( textview, "size-request", G_CALLBACK(pager_after_size_request), win );
 			win->pager_expose_handler = g_signal_connect_after( textview, "expose-event", G_CALLBACK(pager_on_expose), win );
 			g_signal_handler_block(textview, win->pager_expose_handler);
 			win->pager_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(pager_on_key_press_event), win );
 			g_signal_handler_block(textview, win->pager_keypress_handler);
-			//g_signal_connect_after( textbuffer, "insert-text", G_CALLBACK(pager_after_insert_text), win );
 			GtkAdjustment *adj = gtk_scrolled_window_get_vadjustment(GTK_SCROLLED_WINDOW(scrolledwindow));
-			g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
+			win->pager_adjustment_handler = g_signal_connect_after(adj, "value-changed", G_CALLBACK(pager_after_adjustment_changed), win);
 
 			/* Char and line input */
 			win->char_input_keypress_handler = g_signal_connect( textview, "key-press-event", G_CALLBACK(on_char_input_key_press_event), win );