Een heleboel, relatief nutteloze dingen, zoals blank windows, en filerefs

[rodin/chimara.git] / src / stream.c

diff --git a/src/stream.c b/src/stream.c
index e32fb6f47a628c7747206abfe3eb1816b5e998d0..020443bcf6e491aed27b12350ddbfb007365ce58 100644 (file)
--- a/src/stream.c
+++ b/src/stream.c
@@ -1,10 +1,59 @@
 #include "stream.h"
+#include <string.h>
 
 /* Global current stream */
 static strid_t current_stream = NULL;
 /* List of streams currently in existence */
 static GList *stream_list = NULL;
 
+/**
+ * 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;
+}
+
 /* Internal function: create a window stream to go with window. */
 strid_t
 window_stream_new(winid_t window)
@@ -40,6 +89,21 @@ glk_stream_set_current(strid_t str)
        current_stream = str;
 }
 
+/* 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;
+}
+
 /**
  * glk_put_string:
  * @s: A null-terminated string in Latin-1 encoding.
@@ -49,14 +113,20 @@ 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);
+       
        GError *error = NULL;
-       gchar *utf8;
+       gchar *canonical, *utf8;
 
        switch(current_stream->stream_type)
        {
                case STREAM_TYPE_WINDOW:
-                       utf8 = g_convert(s, -1, "UTF-8", "ISO-8859-1", NULL, NULL, &error);
-
+                       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)
                        {
                                g_warning("glk_put_string: "
@@ -66,14 +136,33 @@ glk_put_string(char *s)
                                return;
                        }
 
-                       GtkTextBuffer *buffer = gtk_text_view_get_buffer( 
-                               GTK_TEXT_VIEW(current_stream->window->widget) );
-
-                       GtkTextIter iter;
-                       gtk_text_buffer_get_end_iter(buffer, &iter);
+                       /* Each window type has a different way of printing to it */
+                       switch(current_stream->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:
+                               {
+                                       GtkTextBuffer *buffer = gtk_text_view_get_buffer( 
+                                               GTK_TEXT_VIEW(current_stream->window->widget) );
 
-                       gtk_text_buffer_insert(buffer, &iter, utf8, -1);
+                                       GtkTextIter iter;
+                                       gtk_text_buffer_get_end_iter(buffer, &iter);
 
+                                       gtk_text_buffer_insert(buffer, &iter, utf8, -1);
+                               }
+                                       current_stream->write_count += strlen(s);
+                                       break;
+                               default:
+                                       g_warning("glk_put_string: "
+                                               "Writing to this kind of window unsupported.");
+                       }
+                       
                        g_free(utf8);
                        break;
                default: