X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=libchimara%2Fwindow.c;h=5b970f5be4bedd4d2e2990189b7ba434cd131bb4;hb=490f0a12cc09054e98d99ddc195859099223e597;hp=e8bcf3724a9a947fc86998d34231189121cd6ac1;hpb=a2e82e317a6000511953c2dbc0eb1026c7b245a7;p=rodin%2Fchimara.git

diff --git a/libchimara/window.c b/libchimara/window.c
index e8bcf37..5b970f5 100644
--- a/libchimara/window.c
+++ b/libchimara/window.c
@@ -26,7 +26,8 @@ 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;
 	win->line_input_buffer = NULL;
@@ -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;
 }
 
@@ -282,11 +287,11 @@ glk_window_get_root()
  * 
  * So to create a text buffer window which takes the top 40% of the original
  * window's space, you would execute
- * |[ newwin = #glk_window_open(win, #winmethod_Above | #winmethod_Proportional, 40, #wintype_TextBuffer, 0); ]|
+ * |[ newwin = glk_window_open(win, winmethod_Above | winmethod_Proportional, 40, wintype_TextBuffer, 0); ]|
  *
  * To create a text grid which is always five lines high, at the bottom of the
  * original window, you would do
- * |[ newwin = #glk_window_open(win, #winmethod_Below | #winmethod_Fixed, 5, #wintype_TextGrid, 0); ]|
+ * |[ newwin = glk_window_open(win, winmethod_Below | winmethod_Fixed, 5, wintype_TextGrid, 0); ]|
  * 
  * Note that the meaning of the @size argument depends on the @method argument.
  * If the method is %winmethod_Fixed, it also depends on the @wintype argument.
@@ -331,7 +336,8 @@ glk_window_get_root()
  * <quote>O</quote>. C gets two rows; A gets the rest. All done.
  * 
  * Then the user maliciously starts squeezing the window down, in stages:
- * <informaltable frame="none"><tgroup cols="5"><tbody><row valign="top">
+ * <informaltable xml:id="chimara-Figure-Squeezing-Window" frame="none">
+ * <tgroup cols="5"><tbody><row valign="top">
  * <entry><mediaobject><imageobject><imagedata fileref="fig5-7a.png"/>
  * </imageobject></mediaobject></entry>
  * <entry><mediaobject><imageobject><imagedata fileref="fig7b.png"/>
@@ -547,13 +553,13 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			/* Connect signal handlers */
 			
 			/* Pager */
-			win->pager_expose_handler = g_signal_connect( textview, "expose-event", G_CALLBACK(pager_on_expose), 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 );
@@ -571,10 +577,11 @@ glk_window_open(winid_t split, glui32 method, glui32 size, glui32 wintype,
 			(for line input) */
 			gtk_text_buffer_create_tag(textbuffer, "uneditable", "editable", FALSE, "editable-set", TRUE, NULL);
 
-			/* Mark the position where the user will input text */
+			/* Mark the position where the user will input text and the end mark */
 			GtkTextIter end;
 			gtk_text_buffer_get_end_iter(textbuffer, &end);
 			gtk_text_buffer_create_mark(textbuffer, "input_position", &end, TRUE);
+			gtk_text_buffer_create_mark(textbuffer, "end_position", &end, FALSE);
 
 			/* Create the pager position mark; it stands for the last character in the buffer
 			 that has been on-screen */
@@ -823,7 +830,12 @@ glk_window_close(winid_t win, stream_result_t *result)
 	if(pair_node != NULL)
 	{
 		gboolean new_child_on_left = ( pair_node == g_node_first_sibling(pair_node) );
-		GNode *sibling_node = pair_node->children; /* only one child left */
+
+		/* Lookup our sibling */
+		GNode *sibling_node = pair_node->children;
+		if(sibling_node == win->window_node)
+			sibling_node = sibling_node->next;
+
 		GNode *new_parent_node = pair_node->parent;
 		g_node_unlink(pair_node);
 		g_node_unlink(sibling_node);
@@ -841,6 +853,7 @@ glk_window_close(winid_t win, stream_result_t *result)
 				g_node_append(new_parent_node, sibling_node);
 		}
 
+		stream_close_common( ((winid_t) pair_node->data)->window_stream, NULL );
 		window_close_common( (winid_t) pair_node->data, TRUE);
 	} 
 	else /* it was the root window */
@@ -885,7 +898,8 @@ glk_window_close(winid_t win, stream_result_t *result)
  *  <term>Graphics</term>
  *  <listitem><para>
  *   Clears the entire window to its current background color. See <link
- *   linkend="chimara-Graphics-Windows">Graphics Windows</link>.
+ *   linkend="chimara-The-Types-of-Windows&num;wintype-Graphics">Graphics 
+ *   Windows</link>.
  *  </para></listitem>
  * </varlistentry>
  * <varlistentry>
@@ -981,7 +995,7 @@ glk_window_clear(winid_t win)
  * @win: A window, or %NULL.
  *
  * Sets the current stream to @win's window stream. It is exactly equivalent to
- * |[ #glk_stream_set_current(#glk_window_get_stream(@win)) ]| 
+ * |[ glk_stream_set_current(glk_window_get_stream(win)) ]| 
  * See <link linkend="chimara-Streams">Streams</link>.
  *
  * <note><title>Chimara</title>
@@ -1175,15 +1189,15 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
  * Consider the example above, where D has collapsed to zero height. Say D was a
  * text buffer window. You could make a more useful layout by doing
  * |[
- * #winid_t o2;
- * o2 = #glk_window_get_parent(d);
- * glk_window_set_arrangement(o2, #winmethod_Above | #winmethod_Fixed, 3, d);
+ * winid_t o2;
+ * o2 = glk_window_get_parent(d);
+ * glk_window_set_arrangement(o2, winmethod_Above | winmethod_Fixed, 3, d);
  * ]|
  * That would set D (the upper child of O2) to be O2's key window, and give it a
  * fixed size of 3 rows.
  * 
  * If you later wanted to expand D, you could do
- * |[ glk_window_set_arrangement(o2, #winmethod_Above | #winmethod_Fixed, 5, NULL); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Above | winmethod_Fixed, 5, NULL); ]|
  * That expands D to five rows. Note that, since O2's key window is already set 
  * to D, it is not necessary to provide the @keywin argument; you can pass %NULL
  * to mean <quote>leave the key window unchanged.</quote>
@@ -1193,18 +1207,18 @@ glk_window_get_size(winid_t win, glui32 *widthptr, glui32 *heightptr)
  * example, you could change O2's key window to be A, but not B. The key window
  * also cannot be a pair window itself.
  * 
- * |[ glk_window_set_arrangement(o2, #winmethod_Below | #winmethod_Fixed, 3, NULL); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Below | winmethod_Fixed, 3, NULL); ]|
  * This changes the constraint to be on the <emphasis>lower</emphasis> child of 
  * O2, which is A. The key window is still D; so A would then be three rows high
  * as measured in D's font, and D would get the rest of O2's space. That may not
  * be what you want. To set A to be three rows high as measured in A's font, you
  * would do
- * |[ glk_window_set_arrangement(o2, #winmethod_Below | #winmethod_Fixed, 3, a); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Below | winmethod_Fixed, 3, a); ]|
  * 
  * Or you could change O2 to a proportional split:
- * |[ glk_window_set_arrangement(o2, #winmethod_Below | #winmethod_Proportional, 30, NULL); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Below | winmethod_Proportional, 30, NULL); ]|
  * or
- * |[ glk_window_set_arrangement(o2, #winmethod_Above | #winmethod_Proportional, 70, NULL); ]|
+ * |[ glk_window_set_arrangement(o2, winmethod_Above | winmethod_Proportional, 70, NULL); ]|
  * These do exactly the same thing, since 30&percnt; above is the same as 
  * 70&percnt; below. You don't need to specify a key window with a proportional
  * split, so the @keywin argument is %NULL. (You could actually specify either A