lbxgui: Make an effort to not leak resources.

[liblbx.git] / src / gui / lbxgui.c

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 650f2630fe463927e6ccc861647d358a98b172c9..21256e4f0a6ccab2931a94116bb575160aea4433 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -8,10 +8,14 @@
 #include "lbx.h"
 #include "image.h"
 
+#include "bg.xbm"
+
 static GtkTreeStore *archives;
 static GtkBuilder *builder;
 
 static GtkWidget *canvas;
+static GdkGC     *bg_gc;
+
 static LBX_IMG *image;
 /* LBX images can have up to three palettes, with each superseding the last. */
 static struct lbx_colour palette_external[256];
@@ -75,15 +79,14 @@ static int render_frame(LBX_IMG *img, GdkPixbuf *buf, unsigned frame)
        stride = gdk_pixbuf_get_rowstride(buf);
 
        for (unsigned i = 0; i < info.height; i++) {
-               unsigned char (*p)[3] = (void *)(data + i*stride);
+               unsigned char (*p)[4] = (void *)(data + i*stride);
 
                for (unsigned j = 0; j < info.width; j++) {
                        if (imgmask[i][j]) {
                                get_colour(imgdata[i][j], p[j]);
+                               p[j][3] = -1;
                        } else {
-                               p[j][0] = 0;
-                               p[j][1] = 0;
-                               p[j][2] = 0;
+                               p[j][3] = 0;
                        }
                }
        }
@@ -161,6 +164,10 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
        if (!framebuf)
                return TRUE;
 
+       gdk_draw_rectangle(canvas->window, bg_gc, TRUE,
+               event->area.x, event->area.y,
+               event->area.width, event->area.height);
+
        gdk_draw_pixbuf(canvas->window, NULL, framebuf,
                event->area.x, event->area.y, event->area.x, event->area.y,
                event->area.width, event->area.height,
@@ -174,8 +181,11 @@ static int init_framedata(int reset)
        struct lbx_imginfo info;
        GtkSpinButton *spin;
 
+       if (!image)
+               return 0;
+
        lbximg_getinfo(image, &info);
-       framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
+       framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
                info.width, info.height);
        if (!framebuf) {
                printf("failed to allocate pixbuf\n");
@@ -193,10 +203,47 @@ static int init_framedata(int reset)
 
 static int img_close(void *handle)
 {
+       if (framebuf) {
+               g_object_unref(framebuf);
+               framebuf = NULL;
+       }
+
        lbx_file_close(handle);
        return 0;
 }
 
+void set_override_data(GtkComboBox *combo)
+{
+       GtkTreeIter iter;
+       gpointer lbx;
+       guint    index;
+       LBXfile  *f;
+       LBX_IMG  *img;
+
+       if (!gtk_combo_box_get_active_iter(combo, &iter))
+               return;
+
+       gtk_tree_model_get(GTK_TREE_MODEL(archives), &iter,
+               1, &lbx,
+               2, &index,
+               -1);
+
+       f = lbx_file_open(lbx, index);
+       if (f) {
+               img = lbximg_open(f, &lbx_arch_fops, NULL);
+               if (img) {
+                       memset(palette_override, 0, sizeof palette_override);
+                       lbximg_getpalette(img, palette_override);
+                       lbximg_close(img);
+                       init_framedata(0);
+               }
+
+               lbx_file_close(f);
+       } else {
+               puts("damn");
+       }
+}
+
 void set_palette_data(GtkComboBox *combo)
 {
        GtkTreeIter iter;
@@ -239,7 +286,10 @@ void set_image_data(GtkComboBox *combo)
 
        f = lbx_file_open(lbx, index);
        if (f) {
-               struct lbx_imginfo info;
+               if (image) {
+                       lbximg_close(image);
+                       image = NULL;
+               }
 
                image = lbximg_open(f, &lbx_arch_fops, img_close);
                if (image) {
@@ -388,6 +438,27 @@ static void interface_init(void)
        combo = GTK_COMBO_BOX(gtk_builder_get_object(builder, "imagechooser"));
        gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives));
        gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
+
+       combo = GTK_COMBO_BOX(gtk_builder_get_object(builder, "overchooser"));
+       gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives));
+       gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
+}
+
+GdkBitmap *init_bg(GdkDrawable *drawable, GdkGC *gc)
+{
+       GdkColor fg = { .red = 0x6666, .green = 0x6666, .blue = 0x6666 };
+       GdkColor bg = { .red = 0x9999, .green = 0x9999, .blue = 0x9999 };
+       GdkBitmap *bitmap;
+
+       bitmap = gdk_bitmap_create_from_data(drawable, bg_bits,
+               bg_width, bg_height);
+
+       gdk_gc_set_rgb_fg_color(gc, &fg);
+       gdk_gc_set_rgb_bg_color(gc, &bg);
+       gdk_gc_set_fill(gc, GDK_OPAQUE_STIPPLED);
+       gdk_gc_set_stipple(gc, bitmap);
+       gdk_gc_set_ts_origin(gc, 0, 0);
+       return bitmap;
 }
 
 int main(int argc, char **argv)
@@ -419,5 +490,8 @@ int main(int argc, char **argv)
 
        g_timeout_add(10, timeout, NULL);
        gtk_widget_show_all(window);
+
+       bg_gc = gdk_gc_new(canvas->window);
+       init_bg(canvas->window, bg_gc);
        gtk_main();
 }