X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;ds=sidebyside;f=libchimara%2Fgarglk.c;h=27ddd07e2b459b8b39cdb53caaf9d97791a8283a;hb=1e0dc5378f314f555e3b923c6d95f5017abd528b;hp=aacd1d54a72b9d0dcc18278fde5738f1171b4987;hpb=daf0bacb2f258c3f77a5f8567b0713cb9635fdbb;p=projects%2Fchimara%2Fchimara.git diff --git a/libchimara/garglk.c b/libchimara/garglk.c index aacd1d5..27ddd07 100644 --- a/libchimara/garglk.c +++ b/libchimara/garglk.c @@ -1,4 +1,6 @@ +#include #include +#include #include #include "chimara-glk-private.h" #include "stream.h" @@ -6,7 +8,7 @@ #include "style.h" #include "garglk.h" -extern GPrivate *glk_data_key; +extern GPrivate glk_data_key; /** * garglk_fileref_get_name: @@ -38,7 +40,7 @@ garglk_fileref_get_name(frefid_t fref) void garglk_set_program_name(const char *name) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); glk_data->program_name = g_strdup(name); g_object_notify(G_OBJECT(glk_data->self), "program-name"); } @@ -62,7 +64,7 @@ garglk_set_program_name(const char *name) void garglk_set_program_info(const char *info) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); glk_data->program_info = g_strdup(info); g_object_notify(G_OBJECT(glk_data->self), "program-info"); } @@ -81,46 +83,25 @@ garglk_set_program_info(const char *info) void garglk_set_story_name(const char *name) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); glk_data->story_name = g_strdup(name); g_object_notify(G_OBJECT(glk_data->self), "story-name"); } /** - * garglk_set_line_terminators: - * @win: A window. - * @keycodes: An array of keycode_ constants. - * @numkeycodes: The length of @keycodes. + * garglk_set_story_title: + * @title: Title bar text for the currently running story. * - * Amends the current line input request of @win to include terminating key - * codes. Any of the specified key codes will terminate the line input request - * (without printing a newline). - * - * Usually, in the event structure returned from a line input request, @val2 is - * zero, but if garglk_set_line_terminators() has been called during that input - * request, @val2 will be filled in with the key code that terminated the input - * request. - * - * This function only applies to one input request; any subsequent line input - * requests on that window are treated normally. - * - * If @numkeycodes is zero, then any previous call to - * garglk_set_line_terminators() is cancelled and the input request is treated - * normally. + * This function is a hint to the library to put @title in the title bar of the + * window that the Glk program is running in. It overrides + * garglk_set_program_name() and garglk_set_story_name(), if they were displayed + * in the title bar, although they may still be displayed somewhere else. * * This function is not currently implemented. */ -void -garglk_set_line_terminators(winid_t win, const glui32 *keycodes, glui32 numkeycodes) +void +garglk_set_story_title(const char *title) { - VALID_WINDOW(win, return); - g_return_if_fail(win->type != wintype_TextBuffer || win->type != wintype_TextGrid); - - if(win->input_request_type != INPUT_REQUEST_LINE && win->input_request_type != INPUT_REQUEST_LINE_UNICODE) { - ILLEGAL(_("Tried to set the line terminators on a window without a line input request.")); - return; - } - WARNING(_("Not implemented")); } @@ -137,7 +118,7 @@ garglk_set_line_terminators(winid_t win, const glui32 *keycodes, glui32 numkeyco void garglk_unput_string(char *str) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); g_return_if_fail(glk_data->current_stream != NULL); WARNING(_("Not implemented")); @@ -154,21 +135,36 @@ garglk_unput_string(char *str) void garglk_unput_string_uni(glui32 *str) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); g_return_if_fail(glk_data->current_stream != NULL); WARNING(_("Not implemented")); } -/* TODO document */ +/** + * garglk_set_zcolors_stream: + * @str: a stream. + * @fg: a 24-bit foreground color. + * @bg: a 24-bit background color. + * + * This function changes the foreground color of @str to @fg and the background + * color to @bg. @fg and @bg are encoded the same way as described in + * %stylehint_TextColor. See garglk_set_zcolors() for more information. + */ void garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) { +#ifdef DEBUG_STYLES + g_printf("garglk_set_zcolors_stream(str->rock=%d, fg=%08X, bg=%08X)\n", str->rock, fg, bg); +#endif + VALID_STREAM(str, return); g_return_if_fail(str->window != NULL); winid_t window = str->window; + gdk_threads_enter(); + GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(window->widget) ); GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); GdkColor fore, back; @@ -183,7 +179,7 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) WARNING(_("zcolor_Transparent, zcolor_Cursor not implemented")); // Fallthrough to default case zcolor_Default: - fore_name = "default"; + fore_name = g_strdup("default"); break; case zcolor_Current: { @@ -191,7 +187,7 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) // Get the current foreground color GdkColor *current_color; g_object_get(window->zcolor, "foreground-gdk", ¤t_color, NULL); - fore_name = g_strdup_printf("%02X%02X%02X", current_color->red, current_color->green, current_color->blue); + fore_name = gdkcolor_to_hex(current_color); // Copy the color and use it fore.red = current_color->red; @@ -199,18 +195,14 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) fore.blue = current_color->blue; fore_pointer = &fore; } else { - fore_name = "default"; + fore_name = g_strdup("default"); } break; } default: glkcolor_to_gdkcolor(fg, &fore); fore_pointer = &fore; - fore_name = g_strdup_printf("%02X%02X%02X", - ((fg & 0xff0000) >> 16), - ((fg & 0x00ff00) >> 8), - (fg & 0x0000ff) - ); + fore_name = glkcolor_to_hex(fg); } switch(bg) { @@ -219,7 +211,7 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) WARNING(_("zcolor_Transparent, zcolor_Cursor not implemented")); // Fallthrough to default case zcolor_Default: - back_name = "default"; + back_name = g_strdup("default"); break; case zcolor_Current: { @@ -227,7 +219,7 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) // Get the current background color GdkColor *current_color; g_object_get(window->zcolor, "background-gdk", ¤t_color, NULL); - back_name = g_strdup_printf("%02X%02X%02X", current_color->red, current_color->green, current_color->blue); + back_name = gdkcolor_to_hex(current_color); // Copy the color and use it back.red = current_color->red; @@ -235,26 +227,24 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) back.blue = current_color->blue; back_pointer = &back; } else { - back_name = "default"; + back_name = g_strdup("default"); } break; } default: glkcolor_to_gdkcolor(bg, &back); back_pointer = &back; - back_name = g_strdup_printf("%02X%02X%02X", - ((bg & 0xff0000) >> 16), - ((bg & 0x00ff00) >> 8), - (bg & 0x0000ff) - ); + back_name = glkcolor_to_hex(bg); } - char *name = g_strdup_printf("zcolor:#%s/#%s", fore_name, back_name); - if(fore_pointer == NULL && back_pointer == NULL) { // NULL value means to ignore the zcolor property altogether window->zcolor = NULL; } else { + char *name = g_strdup_printf("zcolor:#%s/#%s", fore_name, back_name); + g_free(fore_name); + g_free(back_name); + // See if we have used this color combination before GtkTextTag *tag = gtk_text_tag_table_lookup(tags, name); @@ -273,50 +263,119 @@ garglk_set_zcolors_stream(strid_t str, glui32 fg, glui32 bg) // From now on, text will be drawn in the specified colors window->zcolor = tag; + + // Update the reversed version if necessary + if(str->window->zcolor_reversed) { + gint reversed = GPOINTER_TO_INT( g_object_get_data( G_OBJECT(str->window->zcolor_reversed), "reverse-color" ) ); + + gdk_threads_leave(); + garglk_set_reversevideo_stream(str, reversed != 0); + gdk_threads_enter(); + } + } + + gdk_threads_leave(); } /** * garglk_set_zcolors: - * @fg: one of the zcolor_ constants. - * @bg: one of the zcolor_ constants. + * @fg: a 24-bit foreground color. + * @bg: a 24-bit background color. * * Glk works with styles, not specific colors. This is not quite compatible with * the Z-machine, so this Glk extension implements Z-machine style colors. * * This function changes the foreground color of the current stream to @fg and - * the background color to @bg. - * - * This function is not currently implemented. + * the background color to @bg. @fg and @bg are encoded the same way as + * described in %stylehint_TextColor. */ void garglk_set_zcolors(glui32 fg, glui32 bg) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + ChimaraGlkPrivate *glk_data = g_private_get(&glk_data_key); g_return_if_fail(glk_data->current_stream != NULL); garglk_set_zcolors_stream(glk_data->current_stream, fg, bg); } -static void -apply_reverse_color(GtkTextTag *tag, gpointer data) -{ - const gchar *tag_name; - g_object_get(tag, "name", &tag_name, NULL); - - if( g_str_has_prefix(tag_name, "glk-") ) - g_object_set_data( G_OBJECT(tag), "reverse_color", data ); -} - -/* TODO document */ +/** + * garglk_set_reversevideo_stream: + * @str: a stream. + * @reverse: nonzero for reverse colors, zero for normal colors. + * + * If @reverse is not zero, uses the foreground color of @str as its background + * and vice versa. If @reverse is zero, changes the colors of @str back to + * normal. + */ void garglk_set_reversevideo_stream(strid_t str, glui32 reverse) { +#ifdef DEBUG_STYLES + g_printf("garglk_set_reversevideo_stream(str->rock=%d, reverse=%d)\n", str->rock, reverse); +#endif + VALID_STREAM(str, return); + g_return_if_fail(str->window != NULL); + g_return_if_fail(str->window->type != wintype_TextBuffer || str->window->type != wintype_TextGrid); + + // Determine the current colors - GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(str->window->widget) ); + // If all fails, use black/white + // FIXME: Use system theme here + GdkColor foreground, background; + gdk_color_parse("black", &foreground); + gdk_color_parse("white", &background); + GdkColor *current_foreground = &foreground; + GdkColor *current_background = &background; + + gdk_threads_enter(); + + style_stream_colors(str, ¤t_foreground, ¤t_background); + + if(reverse) { + GdkColor *temp = current_foreground; + current_foreground = current_background; + current_background = temp; + } + + // Name the color + gchar *name = g_strdup_printf( + "zcolor:#%04X%04X%04X/#%04X%04X%04X", + current_foreground->red, + current_foreground->green, + current_foreground->blue, + current_background->red, + current_background->green, + current_background->blue + ); + + // Create a tag for the new colors if it doesn't exist yet + GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(str->window->widget) ); GtkTextTagTable *tags = gtk_text_buffer_get_tag_table(buffer); - gtk_text_tag_table_foreach( tags, apply_reverse_color, GINT_TO_POINTER(reverse) ); + GtkTextTag *tag = gtk_text_tag_table_lookup(tags, name); + if(tag == NULL) { + tag = gtk_text_buffer_create_tag( + buffer, + name, + "foreground-gdk", current_foreground, + "foreground-set", TRUE, + "background-gdk", current_background, + "background-set", TRUE, + NULL + ); + g_object_set_data( G_OBJECT(tag), "reverse-color", GINT_TO_POINTER(reverse) ); + } + + // From now on, text will be drawn in the specified colors + str->window->zcolor_reversed = tag; + + // Update the background of the gtktextview to correspond with the current background color + if(current_background != NULL) { + gtk_widget_modify_base(str->window->widget, GTK_STATE_NORMAL, current_background); + } + + gdk_threads_leave(); } /** @@ -330,7 +389,7 @@ garglk_set_reversevideo_stream(strid_t str, glui32 reverse) void garglk_set_reversevideo(glui32 reverse) { - ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key); + 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);