From: Marijn van Vliet Date: Sat, 29 Jan 2011 16:04:08 +0000 (+0100) Subject: Merge branch 'master' of https://github.com/wmvanvliet/Chimara X-Git-Tag: v0.9~153^2~4 X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=f945dd447b55c34d88683ff48d7ffb0b7c3c2ad8;hp=393b7a2b777d06754da16ffa5998d3eb9bf128ad;p=projects%2Fchimara%2Fchimara.git Merge branch 'master' of https://github.com/wmvanvliet/Chimara Conflicts: libchimara/garglk.c --- diff --git a/libchimara/garglk.c b/libchimara/garglk.c index 19be504..02f032c 100644 --- a/libchimara/garglk.c +++ b/libchimara/garglk.c @@ -3,6 +3,7 @@ #include "chimara-glk-private.h" #include "stream.h" #include "fileref.h" +#include "style.h" extern GPrivate *glk_data_key; @@ -185,8 +186,28 @@ garglk_set_zcolors(glui32 fg, glui32 bg) ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); g_return_if_fail(glk_data->current_stream != NULL); g_return_if_fail(glk_data->current_stream->window != NULL); + + winid_t window = glk_data->current_stream->window; + GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(window->widget) ); + //GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); + GdkColor fore, back; + glkcolor_to_gdkcolor(fg, &fore); + glkcolor_to_gdkcolor(bg, &back); + + gchar *id = g_strdup_printf("%d", ++window->last_zcolor_id); + printf("id = %s\nfg = %08X\nbg = %08X\n\n", id, fg, bg); - garglk_set_zcolors_stream(glk_data->current_stream, fg, bg); + GtkTextTag *tag = gtk_text_buffer_create_tag( + buffer, + g_strdup_printf("%d", ++window->last_zcolor_id), + "foreground-gdk", &fore, + "foreground-set", TRUE, + "background-gdk", &back, + "background-set", TRUE, + NULL + ); + + window->zcolor = tag; } static void diff --git a/libchimara/strio.c b/libchimara/strio.c index b1df8ae..6d54e82 100644 --- a/libchimara/strio.c +++ b/libchimara/strio.c @@ -44,22 +44,39 @@ flush_window_buffer(winid_t win) switch(win->type) { case wintype_TextBuffer: { - GtkTextIter iter; - gtk_text_buffer_get_end_iter(buffer, &iter); + GtkTextIter start, end; + gtk_text_buffer_get_end_iter(buffer, &start); 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); + gtk_text_buffer_insert(buffer, &start, win->buffer->str, -1); + gtk_text_buffer_get_end_iter(buffer, &end); + + // 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); + + // Link style overrides if(win->window_stream->hyperlink_mode) { GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink"); GtkTextTag *link_tag = win->current_hyperlink->tag; - gtk_text_buffer_insert_with_tags(buffer, &iter, win->buffer->str, -1, default_tag, style_tag, glk_style_tag, link_style_tag, link_tag, NULL); - } else { - gtk_text_buffer_insert_with_tags(buffer, &iter, win->buffer->str, -1, default_tag, style_tag, glk_style_tag, NULL); + gtk_text_buffer_apply_tag(buffer, link_style_tag, &start, &end); + gtk_text_buffer_apply_tag(buffer, link_tag, &start, &end); } + // GLK Program's style overrides using garglk_set_zcolors() + if(win->zcolor != NULL) + gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &end); + ChimaraGlk *glk = CHIMARA_GLK(gtk_widget_get_ancestor(win->widget, CHIMARA_TYPE_GLK)); g_assert(glk); g_signal_emit_by_name(glk, "text-buffer-output", win->rock, win->buffer->str); @@ -80,25 +97,40 @@ flush_window_buffer(winid_t win) /* Spaces available on this line */ gint available_space = win->width - gtk_text_iter_get_line_offset(&start); + 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); + GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink"); + while(chars_left > available_space && !gtk_text_iter_is_end(&start)) { GtkTextIter end = start; gtk_text_iter_forward_to_line_end(&end); gtk_text_buffer_delete(buffer, &start, &end); - 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); + gtk_text_buffer_insert(buffer, &start, win->buffer->str + (length - chars_left), available_space); + + // 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); + + // Link style overrides if(win->window_stream->hyperlink_mode) { - GtkTextTag *link_style_tag = gtk_text_tag_table_lookup(tags, "hyperlink"); GtkTextTag *link_tag = win->current_hyperlink->tag; - gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, default_tag, style_tag, glk_style_tag, link_style_tag, link_tag, NULL); - } else { - gtk_text_buffer_insert_with_tags(buffer, &start, win->buffer->str + (length - chars_left), available_space, default_tag, style_tag, glk_style_tag, NULL); + gtk_text_buffer_apply_tag(buffer, link_style_tag, &start, &end); + gtk_text_buffer_apply_tag(buffer, link_tag, &start, &end); } + // GLK Program's style overrides using garglk_set_zcolors() + if(win->zcolor != NULL) + gtk_text_buffer_apply_tag(buffer, win->zcolor, &start, &end); + chars_left -= available_space; gtk_text_iter_forward_line(&start); available_space = win->width; diff --git a/libchimara/style.c b/libchimara/style.c index e9bfd88..48883a9 100644 --- a/libchimara/style.c +++ b/libchimara/style.c @@ -749,7 +749,6 @@ apply_stylehint_to_tag(GtkTextTag *tag, GtkTextTag *default_tag, glui32 wintype, step be a scaling of 1.2 */ scale = pow(1.2, (double)val); } - g_printerr("Setting tag to %f\n", scale); g_object_set(tag_object, "scale", scale, "scale-set", TRUE, NULL); } break; diff --git a/libchimara/window.h b/libchimara/window.h index bb9a2f6..7ba3112 100644 --- a/libchimara/window.h +++ b/libchimara/window.h @@ -82,6 +82,9 @@ struct glk_window_struct gulong pager_adjustment_handler; /* Window buffer */ GString *buffer; + /* Styles */ + GtkTextTag *zcolor; + glui32 last_zcolor_id; /* Hyperlinks */ GHashTable *hyperlinks; struct hyperlink *current_hyperlink; diff --git a/player/chimara.menus b/player/chimara.menus index ec43fb9..927bc82 100644 --- a/player/chimara.menus +++ b/player/chimara.menus @@ -3,7 +3,7 @@ - + diff --git a/player/main.c b/player/main.c index 860cdfb..7eef7f7 100644 --- a/player/main.c +++ b/player/main.c @@ -155,6 +155,7 @@ create_window(void) const gchar *patterns[] = { "*.z[1-8]", "*.[zg]lb", "*.[zg]blorb", "*.ulx", "*.blb", "*.blorb", NULL }; + for(ptr = patterns; *ptr; ptr++) gtk_recent_filter_add_pattern(filter, *ptr); GtkRecentChooser *recent = GTK_RECENT_CHOOSER(load_object("recent")); @@ -214,7 +215,7 @@ create_window(void) g_signal_connect(glk, "notify::story-name", G_CALLBACK(change_window_title), window); /* Create preferences window */ - preferences_create(CHIMARA_GLK(glk)); + //preferences_create(CHIMARA_GLK(glk)); } int diff --git a/player/style.css b/player/style.css index b012c76..023e0aa 100644 --- a/player/style.css +++ b/player/style.css @@ -26,11 +26,14 @@ * text-align (left/right/center) */ grid { - font-size: 14; + font-size: 11; + font-family: "Liberation Mono"; } buffer { - font-size: 14; + color: #303030; + font-size: 11; + margin-bottom: 5; } grid.user1 { @@ -38,6 +41,10 @@ grid.user1 { background-color: #ffffff; } +buffer.emphasized { + font-size: 14; +} + buffer.header { font-weight: bold; text-align: center; diff --git a/tests/plugin-loader.c b/tests/plugin-loader.c index 766305d..1c560ac 100644 --- a/tests/plugin-loader.c +++ b/tests/plugin-loader.c @@ -17,7 +17,7 @@ * contributor may be used to endorse or promote products derived * from this software without specific prior written permission. * - * main.c IS PROVIDED BY Philip en Marijn ``AS IS'' AND ANY EXPRESS + * plugin-loader.c IS PROVIDED BY Philip en Marijn ``AS IS'' AND ANY EXPRESS * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL Philip en Marijn OR ANY OTHER CONTRIBUTORS diff --git a/tests/style.css b/tests/style.css deleted file mode 100644 index 2504e9f..0000000 --- a/tests/style.css +++ /dev/null @@ -1,80 +0,0 @@ -/* Possible windows: - * grid - * buffer - * - * Possible selectors: - * normal - * emphasized - * preformatted - * header - * subheader - * alert - * note - * block-quote - * input - * user1 - * user2 - * hyperlink - * - * Possible style hints: - * font-family (string) - * font-size (float) - * font-weight (normal/bold) - * font-style (normal/italic) - * color (#hex-value) - * background-color (#hex-value) - * text-align (left/right/center) - */ -grid.normal { - font-size: 10; -} - -grid.user1 { - color: #303030; - background-color: #ffffff; -} - -buffer.normal { - font-size: 10; -} - -buffer.header { - font-size: 14; - font-weight: bold; - text-align: center; -} - -buffer.subheader { - font-size: 12; - font-weight: bold; -} - -buffer.alert { - color: #aa0000; - font-weight: bold; -} - -buffer.note { - color: #aaaa00; - font-weight: bold; -} - -buffer.block-quote { - text-align: center; - font-style: italic; -} - -buffer.input { - color: #0000aa; - font-style: italic; -} - -buffer.user1 { -} - -buffer.user2 { -} - -buffer.hyperlink { - color: #ff0000; -}