Support for graphics in text buffers

git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@226 ddfedd41-794f-dd11-ae45-00112f111e67

diff --git a/libchimara/gestalt.c b/libchimara/gestalt.c
index a9128ac6fbd948c4540ac0ef75ff8a2b39b02ea4..e3529094233d4f88cf055abc7af0023b76562421 100644 (file)
--- a/libchimara/gestalt.c
+++ b/libchimara/gestalt.c
@@ -120,7 +120,7 @@ glk_gestalt_ext(glui32 sel, glui32 val, glui32 *arr, glui32 arrlen)
                        return 1;
 
                case gestalt_DrawImage:
-                       return val == wintype_Graphics;
+                       return val == wintype_Graphics || val == wintype_TextBuffer;
 
                case gestalt_GraphicsTransparency:
                        return 1;

diff --git a/libchimara/graphics.c b/libchimara/graphics.c
index 12a42b2e268fdb4684e84c4fe909baac5768fa15..21fcd09067937b6820d33069877f6d798758033b 100644 (file)
--- a/libchimara/graphics.c
+++ b/libchimara/graphics.c
@@ -7,6 +7,7 @@
 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;
@@ -143,20 +144,28 @@ image_cache_find(struct image_info* to_find)
        }
 
        /* 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();
+                                       printf("Exact cache hit for image %d\n", to_find->resource_number);
+                                       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);
+                                       printf("Exact cache hit for image %d\n", to_find->resource_number);
                                        return info; /* Found a match */
                                }
                        }
@@ -165,8 +174,12 @@ image_cache_find(struct image_info* to_find)
 
        gdk_threads_leave();
 
-       printf("Cache miss for image %d\n", to_find->resource_number);
-       return NULL; /* No match found */
+       if(match == NULL)
+               printf("Cache miss for image %d\n", to_find->resource_number);
+       else
+               printf("Approx cache hit for image %d\n", to_find->resource_number);
+
+       return match;
 }
 
 /**
@@ -248,11 +261,10 @@ glui32
 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;
@@ -264,22 +276,7 @@ glk_image_draw(winid_t win, glui32 image, glsi32 val1, glsi32 val2)
                        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);
 }
 
 /**
@@ -309,13 +306,12 @@ glui32
 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;
@@ -327,14 +323,6 @@ glk_image_draw_scaled(winid_t win, glui32 image, glsi32 val1, glsi32 val2, glui3
                        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);
@@ -352,13 +340,66 @@ glk_image_draw_scaled(winid_t win, glui32 image, glsi32 val1, glsi32 val2, glui3
                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)
+{
+       GdkPixmap *canvas;
+       gdk_threads_enter();
 
-       gdk_threads_leave();
+       switch(win->type) {
+       case wintype_Graphics:
+       {
+               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);
+       }
+               break;
+
+       case wintype_TextBuffer:
+       {
+               GtkTextBuffer *buffer = gtk_text_view_get_buffer( GTK_TEXT_VIEW(win->widget) );
+               GtkTextIter end, start;
+               gtk_text_buffer_get_end_iter(buffer, &end);
+               start = end;
+
+               flush_window_buffer(win);
+               gtk_text_buffer_insert_pixbuf(buffer, &end, pixbuf);
+               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);
+               }
+       }
+               break;
+
+       }
+
+       gdk_threads_leave();
        return TRUE;
 }
 
@@ -418,8 +459,12 @@ glk_window_fill_rect(winid_t win, glui32 color, glsi32 left, glsi32 top, glui32
 
        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);
+       gdk_gc_set_foreground( gc, glkcolor_to_gdkcolor(color) );
+       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();
 }

diff --git a/libchimara/graphics.h b/libchimara/graphics.h
index 183405ee68145654e48e9520ebe5e6e7a994708b..fe39694c3591205161e38d150168d7bf0a1c395d 100644 (file)
--- a/libchimara/graphics.h
+++ b/libchimara/graphics.h
@@ -8,6 +8,8 @@
 #include "gi_blorb.h"
 #include "resource.h"
 #include "window.h"
+#include "style.h"
+#include "strio.h"
 
 #define IMAGE_CACHE_MAX_NUM 10
 #define IMAGE_CACHE_MAX_SIZE 5242880

diff --git a/libchimara/style.c b/libchimara/style.c
index af371d1a52fbd0b1ebb5526507328751c336e829..8c6ca121bfc3d1756d30a4923b62708c45380881 100644 (file)
--- a/libchimara/style.c
+++ b/libchimara/style.c
@@ -513,7 +513,7 @@ style_accept_style_hint(GScanner *scanner, GtkTextTag *current_tag)
 
 /* Internal function: parses a glk color to a #hex-value */
 static void
-color_format(glui32 val, gchar *buffer)
+glkcolor_to_hex(glui32 val, gchar *buffer)
 {
        g_return_if_fail(buffer != NULL);
 
@@ -524,9 +524,21 @@ color_format(glui32 val, gchar *buffer)
        );
 }
 
+/* Internal function: parses a glk color to a GdkColor */
+GdkColor*
+glkcolor_to_gdkcolor(glui32 val)
+{
+       GdkColor* color = g_new0(GdkColor, 1);
+       color->red = (val & 0xff0000) >> 16;
+       color->green = (val & 0x00ff00) >> 8;
+       color->blue = val & 0x0000ff;
+
+       return color;
+}
+
 /* Internal function: parses a GdkColor to a glk color */
 static glui32
-color_parse_gdk(GdkColor *color)
+gdkcolor_to_glkcolor(GdkColor *color)
 {
        g_return_val_if_fail(color != NULL, 0);
        return (glui32) color->pixel;
@@ -591,7 +603,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val)
                break;
 
        case stylehint_TextColor:
-               color_format(val, color);
+               glkcolor_to_hex(val, color);
 
                if(!reverse_color)
                        g_object_set(tag_object, "foreground", color, "foreground-set", TRUE, NULL);
@@ -601,7 +613,7 @@ apply_stylehint_to_tag(GtkTextTag *tag, glui32 hint, glsi32 val)
                break;
 
        case stylehint_BackColor:
-               color_format(val, color);
+               glkcolor_to_hex(val, color);
 
                if(!reverse_color)
                        g_object_set(tag_object, "background", color, "background-set", TRUE, NULL);
@@ -704,12 +716,12 @@ query_tag(GtkTextTag *tag, glui32 hint)
 
        case stylehint_TextColor:
                g_object_get(tag, "foreground-gdk", &colval, NULL);
-               return color_parse_gdk(colval);
+               return gdkcolor_to_glkcolor(colval);
                break;
 
        case stylehint_BackColor:
                g_object_get(tag, "background-gdk", &colval, NULL);
-               return color_parse_gdk(colval);
+               return gdkcolor_to_glkcolor(colval);
                break;
 
        case stylehint_ReverseColor:

diff --git a/libchimara/style.h b/libchimara/style.h
index 2b8afe38a8947b9f03c822cb7dcfbf4991dfd691..6c74222551750fb3193c1ea56c427dadea413613 100644 (file)
--- a/libchimara/style.h
+++ b/libchimara/style.h
@@ -10,6 +10,8 @@ G_GNUC_INTERNAL void style_init();
 G_GNUC_INTERNAL PangoFontDescription* get_current_font(guint32 wintype);
 G_GNUC_INTERNAL GtkTextTag* gtk_text_tag_copy(GtkTextTag *tag);
 
+G_GNUC_INTERNAL GdkColor* glkcolor_to_gdkcolor(glui32 val);
+
 typedef struct StyleSet {
        GHashTable *text_grid;
        GHashTable *text_buffer;