X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=src%2Fstream.h;h=b5a1e6092edf7bed4c74eea92bbe2163cf09396c;hb=1d98f490554273292d4ce29e4ea42e843c2f0c20;hp=3fd4fcba07717fee0ec1b74f890d4cb0a31811a2;hpb=d723ff5bb5fbb4d93723e8814a44179ef75e20e7;p=projects%2Fchimara%2Fchimara.git

diff --git a/src/stream.h b/src/stream.h
index 3fd4fcb..b5a1e60 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -9,9 +9,7 @@ enum StreamType
 {
 	STREAM_TYPE_WINDOW,
 	STREAM_TYPE_MEMORY,
-	STREAM_TYPE_FILE,
-	STREAM_TYPE_UNICODE_MEMORY,
-	STREAM_TYPE_UNICODE_FILE
+	STREAM_TYPE_FILE
 };
 
 struct glk_stream_struct
@@ -27,12 +25,19 @@ struct glk_stream_struct
 	enum StreamType stream_type;
 	/* Specific to window stream: the window this stream is connected to */
 	winid_t window;
+	/* For memory and file streams */
+	gboolean unicode;
 	/* Specific to memory streams */
-	gchar *memory_buffer;
-	glui32 *memory_buffer_unicode;
-	glui32 buffer_len;
+	gchar *buffer;
+	glui32 *ubuffer;
+	glui32 mark;
+	glui32 buflen;
+	/* Specific to file streams */
+	FILE *file_pointer;
+	gboolean binary;
+	gchar *filename; /* Displayable filename in UTF-8 for error handling */
 };
 
 strid_t window_stream_new(winid_t window);
-
+void stream_close_common(strid_t str, stream_result_t *result);
 #endif