Fixed setting of proportional font in textgrids. Fixed text tag priorities, ticket #32

[projects/chimara/chimara.git] / libchimara / strio.c

diff --git a/libchimara/strio.c b/libchimara/strio.c
index d440832b69f9739c372cfc7794a66d34d87c94d2..691773ded45265f3288e83f033f6ff41f3562112 100644 (file)
--- a/libchimara/strio.c
+++ b/libchimara/strio.c
@@ -61,15 +61,15 @@ flush_window_buffer(winid_t win)
                gtk_text_buffer_insert(buffer, &end, win->buffer->str, -1);
                gtk_text_buffer_get_iter_at_offset(buffer, &start, start_offset);
 
-               // Default style
-               gtk_text_buffer_apply_tag(buffer, default_tag, &start, &end);
-
                // Player's style overrides
                gtk_text_buffer_apply_tag(buffer, style_tag, &start, &end);
 
                // GLK Program's style overrides
                gtk_text_buffer_apply_tag(buffer, glk_style_tag, &start, &end);
 
+               // Default style
+               gtk_text_buffer_apply_tag(buffer, default_tag, &start, &end);
+
                // Link style overrides
                if(win->window_stream->hyperlink_mode) {
                        GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink");
@@ -111,6 +111,7 @@ flush_window_buffer(winid_t win)
                gint available_space = win->width - gtk_text_iter_get_line_offset(&insert);
                
                GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer);
+
                GtkTextTag *default_tag = gtk_text_tag_table_lookup(tags, "default");
                GtkTextTag *style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->style);
                GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->glk_style);
@@ -220,6 +221,44 @@ write_buffer_to_stream(strid_t str, gchar *buf, glui32 len)
                                        
                            /* Text grid/buffer windows */
                            case wintype_TextGrid:
+                               {
+                               gchar *utf8 = convert_latin1_to_utf8(buf, len);
+                               if(utf8 != NULL) {
+                                               /* Deal with newlines */
+                                               int i;
+                                               gchar *line = utf8;
+                                               for(i=0; i<len; i++) {
+                                                       if(utf8[i] == '\n') {
+                                                               utf8[i] = '\0';
+                                                               write_utf8_to_window_buffer(str->window, line);
+                                                               flush_window_buffer(str->window);
+
+                                                               /* Move cursor position forward to the next line */
+                                                               gdk_threads_enter();
+                                                               GtkTextIter cursor_pos;
+                                                               GtkTextView *textview = GTK_TEXT_VIEW(str->window->widget);
+                                                               GtkTextBuffer *buffer = gtk_text_view_get_buffer(textview);
+                                                               GtkTextMark *cursor_mark = gtk_text_buffer_get_mark(buffer, "cursor_position");
+
+                                                           gtk_text_buffer_get_iter_at_mark( buffer, &cursor_pos, cursor_mark);
+                                                               gtk_text_view_forward_display_line(textview, &cursor_pos);
+                                                               gtk_text_view_backward_display_line_start(textview, &cursor_pos);
+                                                               gtk_text_buffer_move_mark(buffer, cursor_mark, &cursor_pos);
+                                                               gdk_threads_leave();
+
+                                                               line = utf8 + (i < len-1 ? (i+1):(len-1));
+                                                       }
+                                               }
+                                                               
+                                               /* No more newlines left. */
+                                               write_utf8_to_window_buffer(str->window, line);
+                                               g_free(utf8);
+                                       }
+
+                                       str->write_count += len;
+                               }
+                                       break;
+
                                case wintype_TextBuffer:
                            {
                                gchar *utf8 = convert_latin1_to_utf8(buf, len);
@@ -676,8 +715,8 @@ glk_get_char_stream(strid_t str)
  * glk_get_char_stream_uni:
  * @str: An input stream.
  *
- * Reads one character from the stream @str. The result will be between 0 and 
- * 0x7FFFFFFF. If the end of the stream has been reached, the result will be -1.
+ * Reads one character from the stream @str. If the end of the stream has been
+ * reached, the result will be -1.
  *
  * Returns: A value between 0 and 0x7FFFFFFF, or -1 on end of stream.
  */
@@ -1198,6 +1237,14 @@ glk_get_line_stream_uni(strid_t str, glui32 *buf, glui32 len)
  *   good for much anyhow.
  * </para></note>
  *
+ * glk_stream_get_position() on a window stream will always return zero.
+ *
+ * <note><para>
+ *   It might make more sense to return the number of characters written to the
+ *   window, but existing libraries do not support this and it's not really
+ *   worth adding the feature.
+ * </para></note>
+ *
  * Returns: position of the read/write mark in @str.
  */
 glui32
@@ -1211,6 +1258,8 @@ glk_stream_get_position(strid_t str)
                        return str->mark;
                case STREAM_TYPE_FILE:
                        return ftell(str->file_pointer);
+               case STREAM_TYPE_WINDOW:
+                       return 0;
                default:
                        ILLEGAL_PARAM("Seeking illegal on stream type: %u", str->type);
                        return 0;
@@ -1242,6 +1291,9 @@ glk_stream_get_position(strid_t str)
  *
  * Again, in Latin-1 streams, characters are bytes. In Unicode streams,
  * characters are 32-bit words, or four bytes each.
+ *
+ * A window stream doesn't have a movable mark, so calling
+ * glk_stream_set_position() has no effect.
  */
 void
 glk_stream_set_position(strid_t str, glsi32 pos, glui32 seekmode)
@@ -1279,6 +1331,8 @@ glk_stream_set_position(strid_t str, glsi32 pos, glui32 seekmode)
                                WARNING("Seek failed on file stream");
                        break;
                }
+               case STREAM_TYPE_WINDOW:
+                       break; /* Quietly do nothing */
                default:
                        ILLEGAL_PARAM("Seeking illegal on stream type: %u", str->type);
                        return;