extern GPrivate *glk_data_key;
void on_size_prepared(GdkPixbufLoader *loader, gint width, gint height, struct image_info *info);
void on_pixbuf_closed(GdkPixbufLoader *loader, gpointer data);
+glui32 draw_image_common(winid_t win, GdkPixbuf *pixbuf, glsi32 val1, glsi32 val2);
static gboolean image_loaded;
static gboolean size_determined;
static struct image_info*
-load_image_in_cache(glui32 image, gint width, gint height)
+load_image_from_blorb(giblorb_result_t resource, glui32 image, gint width, gint height)
{
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
- giblorb_err_t blorb_error = 0;
- giblorb_result_t resource;
GError *pixbuf_error = NULL;
guchar *buffer;
- /* Lookup the proper resource */
- blorb_error = giblorb_load_resource(glk_data->resource_map, giblorb_method_FilePos, &resource, giblorb_ID_Pict, image);
- if(blorb_error != giblorb_err_None) {
- WARNING_S( "Error loading resource", giblorb_get_error_message(blorb_error) );
- return NULL;
- }
-
struct image_info *info = g_new0(struct image_info, 1);
info->resource_number = image;
}
g_mutex_unlock(glk_data->resource_lock);
+ info->pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
+ g_object_ref(info->pixbuf);
+
+ g_object_unref(loader);
+ return info;
+}
+
+static struct image_info *
+load_image_from_file(const gchar *filename, glui32 image, gint width, gint height)
+{
+ GError *err = NULL;
+
+ struct image_info *info = g_new0(struct image_info, 1);
+ info->resource_number = image;
+
+ if(width > 0 && height > 0) {
+ info->scaled = TRUE;
+ info->pixbuf = gdk_pixbuf_new_from_file_at_size(filename, width, height, &err);
+ } else {
+ info->pixbuf = gdk_pixbuf_new_from_file(filename, &err);
+ }
+ if(!info->pixbuf) {
+ IO_WARNING("Error loading resource from alternative location", filename, err->message);
+ g_error_free(err);
+ g_free(info);
+ return NULL;
+ }
+ g_object_ref(info->pixbuf);
+
+ return info;
+}
+
+static struct image_info*
+load_image_in_cache(glui32 image, gint width, gint height)
+{
+ ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
+ struct image_info *info = NULL;
+
+ /* Lookup the proper resource */
+ if(!glk_data->resource_map) {
+ if(!glk_data->resource_load_callback) {
+ WARNING("No resource map has been loaded yet.");
+ return NULL;
+ }
+ gchar *filename = glk_data->resource_load_callback(CHIMARA_RESOURCE_IMAGE, image, glk_data->resource_load_callback_data);
+ if(!filename) {
+ WARNING("Error loading resource from alternative location");
+ return NULL;
+ }
+ info = load_image_from_file(filename, image, width, height);
+ g_free(filename);
+ } else {
+ giblorb_result_t resource;
+ giblorb_err_t blorb_error = giblorb_load_resource(glk_data->resource_map, giblorb_method_FilePos, &resource, giblorb_ID_Pict, image);
+ if(blorb_error != giblorb_err_None) {
+ WARNING_S( "Error loading resource", giblorb_get_error_message(blorb_error) );
+ return NULL;
+ }
+ info = load_image_from_blorb(resource, image, width, height);
+ }
+
+ if(info == NULL)
+ return NULL;
+
/* Store the image in the cache */
gdk_threads_enter();
if( g_slist_length(glk_data->image_cache) >= IMAGE_CACHE_MAX_NUM ) {
struct image_info *head = (struct image_info*) glk_data->image_cache->data;
- gdk_pixbuf_unref(head->pixbuf);
+ g_object_unref(head->pixbuf);
g_free(head);
glk_data->image_cache = g_slist_remove_link(glk_data->image_cache, glk_data->image_cache);
}
- info->pixbuf = gdk_pixbuf_loader_get_pixbuf(loader);
- gdk_pixbuf_ref(info->pixbuf);
info->width = gdk_pixbuf_get_width(info->pixbuf);
info->height = gdk_pixbuf_get_height(info->pixbuf);
glk_data->image_cache = g_slist_prepend(glk_data->image_cache, info);
gdk_threads_leave();
-
- g_object_unref(loader);
return info;
}
void
clear_image_cache(struct image_info *data, gpointer user_data)
{
- gdk_pixbuf_unref(data->pixbuf);
+ g_object_unref(data->pixbuf);
g_free(data);
}
/* Empty cache */
if(link == NULL) {
gdk_threads_leave();
- printf("Cache miss for image %d\n", to_find->resource_number);
return NULL;
}
/* Iterate over the cache to find the correct image and size */
+ struct image_info *match = NULL;
do {
struct image_info *info = (struct image_info*) link->data;
if(info->resource_number == to_find->resource_number) {
/* Check size: are we looking for a scaled version or the original one? */
if(to_find->scaled) {
- if(info->width >= to_find->width && info->height >= to_find->height) {
+
+ if(info->width == to_find->width && info->height == to_find->height) {
+ /* Prescaled image found */
+ gdk_threads_leave();
+ return info;
+ }
+ else if(info->width >= to_find->width && info->height >= to_find->height) {
+ /* Larger image found, needs to be scaled down in order to work */
gdk_threads_leave();
- printf("Cache hit for image %d\n", to_find->resource_number);
- return info; /* Found a good enough match */
+ match = info;
}
} else {
if(!info->scaled) {
gdk_threads_leave();
- printf("Cache hit for image %d\n", to_find->resource_number);
return info; /* Found a match */
}
}
gdk_threads_leave();
- printf("Cache miss for image %d\n", to_find->resource_number);
- return NULL; /* No match found */
+ return match;
}
/**
* @height: Pointer to a location at which to store the image's height.
*
* This gets information about the image resource with the given identifier. It
- * returns %TRUE if there is such an image, and %FALSE if not. You can also pass
- * pointers to width and height variables; if the image exists, the variables
- * will be filled in with the width and height of the image, in pixels. (You can
- * pass %NULL for either width or height if you don't care about that
- * information.)
+ * returns %TRUE (1) if there is such an image, and %FALSE (0) if not. You can
+ * also pass pointers to width and height variables; if the image exists, the
+ * variables will be filled in with the width and height of the image, in
+ * pixels. (You can pass %NULL for either width or height if you don't care
+ * about that information.)
*
* <note><para>
* You should always use this function to measure the size of images when you
if(width != NULL)
*width = found->width;
- if(width != NULL)
+ if(height != NULL)
*height = found->height;
return TRUE;
}
glk_image_draw(winid_t win, glui32 image, glsi32 val1, glsi32 val2)
{
VALID_WINDOW(win, return FALSE);
- g_return_val_if_fail(win->type == wintype_Graphics, FALSE);
+ g_return_val_if_fail(win->type == wintype_Graphics || win->type == wintype_TextBuffer, FALSE);
struct image_info *to_find = g_new0(struct image_info, 1);
struct image_info *info;
- GdkPixmap *canvas;
/* Lookup the proper resource */
to_find->resource_number = image;
return FALSE;
}
- gdk_threads_enter();
-
- gtk_image_get_pixmap( GTK_IMAGE(win->widget), &canvas, NULL );
- if(canvas == NULL) {
- WARNING("Could not get pixmap");
- return FALSE;
- }
-
- gdk_draw_pixbuf( GDK_DRAWABLE(canvas), NULL, GDK_PIXBUF((GdkPixbuf*)info->pixbuf), 0, 0, val1, val2, -1, -1, GDK_RGB_DITHER_NONE, 0, 0 );
-
- /* Update the screen */
- gtk_widget_queue_draw(win->widget);
-
- gdk_threads_leave();
-
- return TRUE;
+ return draw_image_common(win, info->pixbuf, val1, val2);
}
/**
glk_image_draw_scaled(winid_t win, glui32 image, glsi32 val1, glsi32 val2, glui32 width, glui32 height)
{
VALID_WINDOW(win, return FALSE);
- g_return_val_if_fail(win->type == wintype_Graphics, FALSE);
+ g_return_val_if_fail(win->type == wintype_Graphics || win->type == wintype_TextBuffer, FALSE);
ChimaraGlkPrivate *glk_data = g_private_get(glk_data_key);
struct image_info *to_find = g_new0(struct image_info, 1);
struct image_info *info;
struct image_info *scaled_info;
- GdkPixmap *canvas;
/* Lookup the proper resource */
to_find->resource_number = image;
return FALSE;
}
- gdk_threads_enter();
-
- gtk_image_get_pixmap( GTK_IMAGE(win->widget), &canvas, NULL );
- if(canvas == NULL) {
- WARNING("Could not get pixmap");
- return FALSE;
- }
-
/* Scale the image if necessary */
if(info->width != width || info->height != height) {
GdkPixbuf *scaled = gdk_pixbuf_scale_simple(info->pixbuf, width, height, GDK_INTERP_BILINEAR);
info = scaled_info;
}
- gdk_draw_pixbuf( GDK_DRAWABLE(canvas), NULL, info->pixbuf, 0, 0, val1, val2, -1, -1, GDK_RGB_DITHER_NONE, 0, 0 );
+ return draw_image_common(win, info->pixbuf, val1, val2);
+}
- /* Update the screen */
- gtk_widget_queue_draw(win->widget);
+/* Internal function: draws a pixbuf to a graphics window of text buffer */
+glui32
+draw_image_common(winid_t win, GdkPixbuf *pixbuf, glsi32 val1, glsi32 val2)
+{
+ switch(win->type) {
+ case wintype_Graphics:
+ {
+ GdkPixmap *canvas;
- gdk_threads_leave();
+ gdk_threads_enter();
+
+ gtk_image_get_pixmap( GTK_IMAGE(win->widget), &canvas, NULL );
+ if(canvas == NULL) {
+ WARNING("Could not get pixmap");
+ return FALSE;
+ }
+
+ gdk_draw_pixbuf( GDK_DRAWABLE(canvas), NULL, pixbuf, 0, 0, val1, val2, -1, -1, GDK_RGB_DITHER_NONE, 0, 0 );
+ /* Update the screen */
+ gtk_widget_queue_draw(win->widget);
+
+ gdk_threads_leave();
+ }
+ break;
+
+ case wintype_TextBuffer:
+ {
+ flush_window_buffer(win);
+
+ gdk_threads_enter();
+
+ GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
+ GtkTextIter end, start;
+ gtk_text_buffer_get_end_iter(buffer, &end);
+
+ gtk_text_buffer_insert_pixbuf(buffer, &end, pixbuf);
+ start = end;
+ gtk_text_iter_forward_char(&end);
+
+ gint height = 0;
+ switch(val1) {
+ case imagealign_InlineDown:
+ height -= win->unit_height;
+ break;
+ case imagealign_InlineCenter:
+ height = -win->unit_height / 2;
+ break;
+ case imagealign_InlineUp:
+ default:
+ height = 0;
+ }
+
+ if(height != 0) {
+ GtkTextTag *tag = gtk_text_buffer_create_tag(buffer, NULL, "rise", PANGO_SCALE * (-height), NULL);
+ gtk_text_buffer_apply_tag(buffer, tag, &start, &end);
+ }
+
+ gdk_threads_leave();
+ }
+ break;
+ }
return TRUE;
}
* <note><para>
* This function may only be used with graphics windows. To set background
* colors in a text window, use text styles with color hints; see <link
- * linkend="Styles">Styles</link>.
+ * linkend="chimara-Styles">Styles</link>.
* </para></note>
*/
void
VALID_WINDOW(win, return);
g_return_if_fail(win->type == wintype_Graphics);
-
gdk_threads_enter();
GdkPixmap *map;
gtk_image_get_pixmap( GTK_IMAGE(win->widget), &map, NULL );
- gdk_draw_rectangle( GDK_DRAWABLE(map), win->widget->style->white_gc, TRUE, left, top, width, height);
+
+ GdkGC *gc = gdk_gc_new(map);
+ GdkColor gdkcolor;
+ glkcolor_to_gdkcolor(color, &gdkcolor);
+ gdk_gc_set_rgb_fg_color(gc, &gdkcolor);
+ gdk_draw_rectangle( GDK_DRAWABLE(map), gc, TRUE, left, top, width, height);
gtk_widget_queue_draw(win->widget);
+ g_object_unref(gc);
gdk_threads_leave();
}
glk_window_fill_rect(win, win->background_color, left, top, width, height);
}
+/**
+ * glk_window_flow_break:
+ * @win: A window.
+ *
+ * You may wish to <quote>break</quote> the stream of text down below the
+ * current margin image. Since lines of text can be in any font and size, you
+ * cannot do this by counting newlines. Instead, use this function.
+ *
+ * If the current point in the text is indented around a margin-aligned image,
+ * this acts like the correct number of newlines to start a new line below the
+ * image. (If there are several margin-aligned images, it goes below all of
+ * them.) If the current point is not beside a margin-aligned image, this call
+ * has no effect.
+ *
+ * When a text buffer window is resized, a flow-break behaves cleverly; it may
+ * become active or inactive as necessary. You can consider this function to
+ * insert an invisible mark in the text stream. The mark works out how many
+ * newlines it needs to be whenever the text is formatted for display.
+ *
+ * An example of the use of glk_window_flow_break(): If you display a
+ * left-margin image at the start of every line, they can stack up in a strange
+ * diagonal way that eventually squeezes all the text off the screen.
+ * <note><para>
+ * If you can't picture this, draw some diagrams. Make the margin images more
+ * than one line tall, so that each line starts already indented around the
+ * last image.
+ * </para></note>
+ * To avoid this problem, call glk_window_flow_break() immediately before
+ * glk_image_draw() for every margin-aligned image.
+ *
+ * In all windows other than text buffers, glk_window_flow_break() has no
+ * effect.
+ *
+ * <warning><para>
+ * This function is not implemented yet.
+ * </para></warning>
+ */
void glk_window_flow_break(winid_t win)
{
+ VALID_WINDOW(win, return);
}
/*** Called when the graphics window is resized. Resize the backing pixmap if necessary ***/
projects / projects / chimara / chimara.git / blobdiff