projects
/
projects
/
chimara
/
chimara.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:wmvanvliet/Chimara
[projects/chimara/chimara.git]
/
libchimara
/
strio.c
diff --git
a/libchimara/strio.c
b/libchimara/strio.c
index bc645b9a6c6bfb926d08dbffaa276f10cbbadc11..d440832b69f9739c372cfc7794a66d34d87c94d2 100644
(file)
--- a/
libchimara/strio.c
+++ b/
libchimara/strio.c
@@
-31,6
+31,9
@@
write_utf8_to_window_buffer(winid_t win, gchar *s)
void
flush_window_buffer(winid_t win)
{
void
flush_window_buffer(winid_t win)
{
+#ifdef DEBUG_STYLES
+ g_printf("%s\n", win->buffer->str);
+#endif
if(win->type != wintype_TextBuffer && win->type != wintype_TextGrid)
return;
if(win->type != wintype_TextBuffer && win->type != wintype_TextGrid)
return;
@@
-76,8
+79,14
@@
flush_window_buffer(winid_t win)
}
// GLK Program's style overrides using garglk_set_zcolors()
}
// GLK Program's style overrides using garglk_set_zcolors()
- if(win->zcolor != NULL)
+ if(win->zcolor != NULL)
{
gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &end);
gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &end);
+ }
+
+ // GLK Program's style overrides using garglk_set_reversevideo()
+ if(win->zcolor_reversed != NULL) {
+ gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, &start, &end);
+ }
ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK));
g_assert(glk);
ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK));
g_assert(glk);
@@
-107,9
+116,9
@@
flush_window_buffer(winid_t win)
GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->glk_style);
GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink");
GtkTextTag *glk_style_tag = gtk_text_tag_table_lookup(tags, win->window_stream->glk_style);
GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink");
- while(chars_left > available_space && !gtk_text_iter_is_end(&
sta
rt))
+ while(chars_left > available_space && !gtk_text_iter_is_end(&
inse
rt))
{
{
- GtkTextIter end =
sta
rt;
+ GtkTextIter end =
inse
rt;
gtk_text_iter_forward_to_line_end(&end);
gtk_text_buffer_delete(buffer, &insert, &end);
gtk_text_iter_forward_to_line_end(&end);
gtk_text_buffer_delete(buffer, &insert, &end);
@@
-134,11
+143,13
@@
flush_window_buffer(winid_t win)
}
// GLK Program's style overrides using garglk_set_zcolors()
}
// GLK Program's style overrides using garglk_set_zcolors()
- /*
if(win->zcolor != NULL)
gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert);
if(win->zcolor != NULL)
gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert);
- */
+ // GLK Program's style overrides using garglk_set_reversevideo()
+ if(win->zcolor_reversed != NULL) {
+ gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, &start, &insert);
+ }
chars_left -= available_space;
gtk_text_iter_forward_line(&insert);
chars_left -= available_space;
gtk_text_iter_forward_line(&insert);
@@
-171,10
+182,13
@@
flush_window_buffer(winid_t win)
}
// GLK Program's style overrides using garglk_set_zcolors()
}
// GLK Program's style overrides using garglk_set_zcolors()
- /*
if(win->zcolor != NULL)
gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert);
if(win->zcolor != NULL)
gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &insert);
- */
+
+ // GLK Program's style overrides using garglk_set_reversevideo()
+ if(win->zcolor_reversed != NULL) {
+ gtk_text_buffer_apply_tag(buffer, win->zcolor_reversed, &start, &insert);
+ }
}
gtk_text_buffer_move_mark(buffer, cursor, &start);
}
gtk_text_buffer_move_mark(buffer, cursor, &start);