X-Git-Url: https://git.stderr.nl/gitweb?p=rodin%2Fchimara.git;a=blobdiff_plain;f=libchimara%2Fhyperlink.c;h=a2795bdc83fb0861e598a3adaa626d1fcb04c884;hp=e58f9818f8d58c8310ff2b000cd533ea630e76d0;hb=96eba2611d3efe92e3cb22745cb2eca26fafc6c6;hpb=3d231460ccf8a570d0ad99152a0181af50f5786f

diff --git a/libchimara/hyperlink.c b/libchimara/hyperlink.c
index e58f981..a2795bd 100644
--- a/libchimara/hyperlink.c
+++ b/libchimara/hyperlink.c
@@ -8,13 +8,8 @@ extern GPrivate *glk_data_key;
  * glk_set_hyperlink:
  * @linkval: Set to nonzero to initiate hyperlink mode. Set to zero to disengage.
  *
- * Use this function to create hyperlinks in a textbuffer. It sets the current stream
- * to hyperlink mode, after which text will become a hyperlink until hyperlink mode
- * is turned off. If the current stream does not write to a textbuffer window, this function
- * does nothing.
- *
- * You can request hyperlink events with glk_request_hyperlink_event() to react
- * to clicks on the link.
+ * This call sets the current link value in the current output stream. See
+ * glk_set_hyperlink_stream().
  */
 void 
 glk_set_hyperlink(glui32 linkval)
@@ -27,20 +22,39 @@ glk_set_hyperlink(glui32 linkval)
 /**
  * glk_set_hyperlink_stream:
  * @str: The stream to set the hyperlink mode on.
- * @linkval: Set to nonzero to initiate hyperlink mode. Set to zero to disengage.
+ * @linkval: Set to non-zero to initiate hyperlink mode. Set to zero to 
+ * disengage.
+ *
+ * This call sets the current link value on the specified output stream. A link
+ * value is any non-zero integer; zero indicates no link. Subsequent text output
+ * is considered to make up the body of the link, which continues until the link
+ * value is changed (or set to zero).
  *
- * Use this function to create hyperlinks in a textbuffer. It sets a stream to a textbuffer
- * window to hyperlink mode, after which text will become a hyperlink until hyperlink mode
- * is turned off. Calling this function on a stream that does not write to a textbuffer does
- * nothing.
+ * Note that it is almost certainly useless to change the link value of a stream
+ * twice with no intervening text. The result will be a zero-length link, which 
+ * the player probably cannot see or select; the library may optimize it out 
+ * entirely.
  *
- * You can request hyperlink events with glk_request_hyperlink_event() to react
- * to clicks on the link.
+ * Setting the link value of a stream to the value it already has, has no 
+ * effect.
+ *
+ * If the library supports images, they take on the current link value as they 
+ * are output, just as text does. The player can select an image in a link just 
+ * as he does text. (This includes margin-aligned images, which can lead to some 
+ * peculiar situations, since a right-margin image may not appear directly 
+ * adjacent to the text it was output with.)
+ * 
+ * The library will attempt to display links in some distinctive way (and it 
+ * will do this whether or not hyperlink input has actually been requested for 
+ * the window). Naturally, blue underlined text is most likely. Link images may 
+ * not be distinguished from non-link images, so it is best not to use a 
+ * particular image both ways. 
  */
 void 
 glk_set_hyperlink_stream(strid_t str, glui32 linkval)
 {
 	g_return_if_fail(str != NULL);
+	g_return_if_fail(str->type == STREAM_TYPE_WINDOW);
 	g_return_if_fail(str->window != NULL);
 	g_return_if_fail(str->window->type == wintype_TextBuffer);
 
@@ -97,6 +111,28 @@ hyperlink_block_event_handler(gpointer key, gpointer value, gpointer user_data)
 	g_signal_handler_block(link->tag, link->event_handler);
 }
 
+/**
+ * glk_request_hyperlink_event:
+ * @win: The window to request a hyperlink event on.
+ *
+ * This call works like glk_request_char_event(), glk_request_line_event() and
+ * glk_request_mouse_event(). A pending request on a window remains pending 
+ * until the player selects a link, or the request is cancelled.
+ *
+ * A window can have hyperlink input and mouse, character, or line input pending
+ * at the same time. However, if hyperlink and mouse input are requested at the
+ * same time, the library may not provide an intuitive way for the player to 
+ * distingish which a mouse click represents. Therefore, this combination should
+ * be avoided.
+ *
+ * When a link is selected in a window with a pending request, glk_select() will
+ * return an event of type %evtype_Hyperlink. In the event structure, @win tells
+ * what window the event came from, and @val1 gives the (non-zero) link value.
+ * 
+ * If no hyperlink request is pending in a window, the library will ignore 
+ * attempts to select a link. No %evtype_Hyperlink event will be generated 
+ * unless it has been requested. 
+ */
 void 
 glk_request_hyperlink_event(winid_t win)
 {
@@ -108,6 +144,13 @@ glk_request_hyperlink_event(winid_t win)
 
 }
 
+/**
+ * glk_cancel_hyperlink_event:
+ * @win: The window in which to cancel the hyperlink event request.
+ *
+ * This call works like glk_cancel_char_event(), glk_cancel_line_event(), and
+ * glk_cancel_mouse_event(). See glk_request_hyperlink_event().
+ */
 void 
 glk_cancel_hyperlink_event(winid_t win)
 {