X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fstream.c;h=a6913e2f06ebde4e6a90c53f995f4d0f9f524cbd;hb=be258466a9f733fda535554f9a5f24c5bf00d784;hp=e32fb6f47a628c7747206abfe3eb1816b5e998d0;hpb=d723ff5bb5fbb4d93723e8814a44179ef75e20e7;p=projects%2Fchimara%2Fchimara.git

diff --git a/src/stream.c b/src/stream.c
index e32fb6f..a6913e2 100644
--- a/src/stream.c
+++ b/src/stream.c
@@ -1,4 +1,5 @@
 #include "stream.h"
+#include <string.h>
 
 /* Global current stream */
 static strid_t current_stream = NULL;
@@ -21,6 +22,54 @@ window_stream_new(winid_t window)
 	return s;
 }
 
+/**
+ * glk_stream_iterate:
+ * @str: A stream, or #NULL.
+ * @rockptr: Return location for the next window's rock, or #NULL.
+ *
+ * Iterates over the list of streams; if @str is #NULL, it returns the first
+ * stream, otherwise the next stream after @str. If there are no more, it
+ * returns #NULL. The stream's rock is stored in @rockptr. If you don't want
+ * the rocks to be returned, you may set @rockptr to #NULL.
+ *
+ * The order in which streams are returned is arbitrary. The order may change
+ * every time you create or destroy a stream, invalidating the iteration.
+ *
+ * Returns: the next stream, or #NULL if there are no more.
+ */
+strid_t
+glk_stream_iterate(strid_t str, glui32 *rockptr)
+{
+	GList *retnode;
+	
+	if(str == NULL)
+		retnode = stream_list;
+	else
+		retnode = str->stream_list->next;
+	strid_t retval = retnode? (strid_t)retnode->data : NULL;
+		
+	/* Store the stream's rock in rockptr */
+	if(retval && rockptr)
+		*rockptr = glk_stream_get_rock(retval);
+		
+	return retval;
+}
+
+/**
+ * glk_stream_get_rock:
+ * @str: A stream.
+ * 
+ * Returns the stream @str's rock value.
+ *
+ * Returns: A rock value.
+ */
+glui32
+glk_stream_get_rock(strid_t str)
+{
+	g_return_val_if_fail(str != NULL, 0);
+	return str->rock;
+}
+
 /**
  * glk_stream_set_current:
  * @str: An output stream, or NULL.
@@ -40,6 +89,33 @@ glk_stream_set_current(strid_t str)
 	current_stream = str;
 }
 
+/**
+ * glk_stream_get_current:
+ * 
+ * Returns the current stream, or #NULL if there is none.
+ *
+ * Returns: A stream.
+ */
+strid_t
+glk_stream_get_current()
+{
+	return current_stream;
+}
+
+/**
+ * glk_put_char:
+ * @ch: A character in Latin-1 encoding.
+ *
+ * Prints one character @ch to the current stream.
+ */
+void
+glk_put_char(unsigned char ch)
+{
+	/* Illegal to print to the current stream if it is NULL */
+	g_return_if_fail(current_stream != NULL);
+	glk_put_char_stream(current_stream, ch);
+}
+
 /**
  * glk_put_string:
  * @s: A null-terminated string in Latin-1 encoding.
@@ -48,36 +124,164 @@ glk_stream_set_current(strid_t str)
  */
 void
 glk_put_string(char *s)
+{
+ 	/* Illegal to print to the current stream if it is NULL */
+	g_return_if_fail(current_stream != NULL);
+	glk_put_string_stream(current_stream, s);
+}
+
+/**
+ * glk_put_buffer:
+ * @buf: An array of characters in Latin-1 encoding.
+ * @len: Length of @buf.
+ *
+ * Prints @buf to the current stream.
+ */
+void
+glk_put_buffer(char *buf, glui32 len)
+{
+	/* Illegal to print to the current stream if it is NULL */
+	g_return_if_fail(current_stream != NULL);
+	glk_put_buffer_stream(current_stream, buf, len);
+}
+
+/**
+ * glk_put_char_stream:
+ * @str: An output stream.
+ * @ch: A character in Latin-1 encoding.
+ *
+ * Prints one character @ch to the stream @str. It is illegal for @str to be
+ * #NULL, or an input-only stream.
+ */
+void
+glk_put_char_stream(strid_t str, unsigned char ch)
+{
+	g_return_if_fail(str != NULL);
+	g_return_if_fail(str->file_mode != filemode_Read);
+	
+	/* Convert ch to a null-terminated string, call glk_put_string_stream() */
+	gchar *s = g_strndup((gchar *)&ch, 1);
+	glk_put_string_stream(str, s);
+	g_free(s);
+}
+
+/* Internal function: change illegal (control) characters in a string to a
+placeholder character. Must free returned string afterwards. */
+static gchar *
+remove_latin1_control_characters(gchar *s)
+{
+	gchar *retval = g_strdup(s);
+	unsigned char *ptr;
+	for(ptr = (unsigned char *)retval; *ptr != '\0'; ptr++)
+		if( (*ptr < 32 && *ptr != 10) || (*ptr >= 127 && *ptr <= 159) )
+			*ptr = '?';
+			/* Our placeholder character is '?'; other options are possible,
+			like printing "0x7F" or something */
+	return retval;
+}
+
+/* Internal function: convert a Latin-1 string to a UTF-8 string, replacing
+Latin-1 control characters by a placeholder first. The UTF-8 string must be
+freed afterwards. Returns NULL on error. */
+static gchar *
+convert_latin1_to_utf8(gchar *s)
 {
 	GError *error = NULL;
 	gchar *utf8;
-
-	switch(current_stream->stream_type)
+	gchar *canonical = remove_latin1_control_characters(s);
+	utf8 = g_convert(canonical, -1, "UTF-8", "ISO-8859-1", NULL, NULL, &error);
+	g_free(canonical);
+	
+	if(utf8 == NULL)
 	{
-		case STREAM_TYPE_WINDOW:
-			utf8 = g_convert(s, -1, "UTF-8", "ISO-8859-1", NULL, NULL, &error);
-
-			if(utf8 == NULL)
-			{
-				g_warning("glk_put_string: "
-					"Error during latin1->utf8 conversion: %s", 
-					error->message);
-				g_error_free(error);
-				return;
-			}
+		error_dialog(NULL, error, "Error during latin1->utf8 conversion: ");
+		return NULL;
+	}
+	
+	return utf8;
+}
 
-			GtkTextBuffer *buffer = gtk_text_view_get_buffer( 
-				GTK_TEXT_VIEW(current_stream->window->widget) );
+/* Internal function: write a UTF-8 string to a window's text buffer. */
+static void
+write_utf8_to_window(winid_t win, gchar *s)
+{
+	GtkTextBuffer *buffer = 
+		gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
 
-			GtkTextIter iter;
-			gtk_text_buffer_get_end_iter(buffer, &iter);
+	GtkTextIter iter;
+	gtk_text_buffer_get_end_iter(buffer, &iter);
+	gtk_text_buffer_insert(buffer, &iter, s, -1);
+}
 
-			gtk_text_buffer_insert(buffer, &iter, utf8, -1);
+/**
+ * glk_put_string_stream:
+ * @str: An output stream.
+ * @s: A null-terminated string in Latin-1 encoding.
+ *
+ * Prints @s to the stream @str. It is illegal for @str to be #NULL, or an
+ * input-only stream.
+ */
+void
+glk_put_string_stream(strid_t str, char *s)
+{
+	g_return_if_fail(str != NULL);
+	g_return_if_fail(str->file_mode != filemode_Read);
 
-			g_free(utf8);
+	switch(str->stream_type)
+	{
+		case STREAM_TYPE_WINDOW:
+			/* Each window type has a different way of printing to it */
+			switch(str->window->window_type)
+			{
+				/* Printing to a these windows' streams does nothing */
+				case wintype_Blank:
+				case wintype_Pair:
+				case wintype_Graphics:
+					current_stream->write_count += strlen(s);
+					break;
+				/* Text buffer window */	
+				case wintype_TextBuffer:
+				{
+					gchar *utf8 = convert_latin1_to_utf8(s);
+					write_utf8_to_window(str->window, utf8);
+					g_free(utf8);
+				}	
+					str->write_count += strlen(s);
+					break;
+				default:
+					g_warning("glk_put_string: "
+						"Writing to this kind of window unsupported.");
+			}
+			
+			/* Now write the same buffer to the window's echo stream */
+			if(str->window->echo_stream != NULL)
+				glk_put_string_stream(str->window->echo_stream, s);
+			
 			break;
 		default:
 			g_warning("glk_put_string: "
 				"Writing to this kind of stream unsupported.");	
 	}
 }
+
+/**
+ * glk_put_buffer_stream:
+ * @str: An output stream.
+ * @buf: An array of characters in Latin-1 encoding.
+ * @len: Length of @buf.
+ *
+ * Prints @buf to the stream @str. It is illegal for @str to be #NULL, or an
+ * input-only stream.
+ */
+void
+glk_put_buffer_stream(strid_t str, char *buf, glui32 len)
+{
+	g_return_if_fail(str != NULL);
+	g_return_if_fail(str->file_mode != filemode_Read);
+	
+	/* Convert buf to a null-terminated string, call glk_put_string_stream() */
+	gchar *s = g_strndup(buf, len);
+	glk_put_string_stream(str, s);
+	g_free(s);
+}
+