From e078ae64754d8ffd5e1005c9ee3c69d0e6f930ed Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Tue, 9 Feb 2010 22:01:08 -0500
Subject: [PATCH] lbxgui: Simplify image loading.

This also fixes an oversight whereby the framebuffer was re-allocated
every time the image is re-rendered.
---
 src/gui/lbxgui.c | 111 ++++++++++++++++++++++++-----------------------
 1 file changed, 56 insertions(+), 55 deletions(-)

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 965268b..4bc8157 100644
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -43,10 +43,19 @@ void set_frame(GtkSpinButton *spin, gpointer data)
 {
 	unsigned frame = gtk_spin_button_get_value_as_int(spin);
 
-	render_to_pixbuf(image, framebuf, frame);
+	if (image)
+		render_to_pixbuf(image, framebuf, frame);
 	gdk_window_invalidate_rect(canvas->window, NULL, FALSE);
 }
 
+static void redraw_image(void)
+{
+	GtkSpinButton *spin;
+
+	spin = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "framespin"));
+	set_frame(spin, NULL);
+}
+
 static void tick(void *p, double delta)
 {
 	static double elapsed = 0;
@@ -107,7 +116,7 @@ static gboolean timeout(gpointer data)
 gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
 {
 	if (!framebuf)
-		return TRUE;
+		return FALSE;
 
 	gdk_draw_rectangle(canvas->window, bg_gc, TRUE,
 		event->area.x, event->area.y,
@@ -121,51 +130,54 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
 	return TRUE;
 }
 
-static int init_framedata(int reset)
+static int alloc_framebuffer(LBX_IMG *image)
 {
 	struct lbx_imginfo info;
 	GtkSpinButton *spin;
 
-	if (!image)
-		return 0;
+	if (framebuf)
+		g_object_unref(framebuf);
 
 	lbximg_getinfo(image, &info);
 	framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
 		info.width, info.height);
-	if (!framebuf) {
-		printf("failed to allocate pixbuf\n");
-		return -1;
-	}
-
-	gtk_widget_set_size_request(canvas, info.width, info.height);
+	g_return_val_if_fail(framebuf, -1);
 
 	spin = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "framespin"));
 	gtk_spin_button_set_range(spin, 0, info.nframes-1);
 	gtk_spin_button_set_value(spin, 0);
-	set_frame(spin, NULL);
+
+	gtk_widget_set_size_request(canvas, info.width, info.height);
 	return 0;
 }
 
-static int img_close(void *handle)
+static int close_image(void *handle)
 {
-	if (framebuf) {
-		gtk_widget_set_size_request(canvas, -1, -1);
-		g_object_unref(framebuf);
-		framebuf = NULL;
-	}
-
-	memset(palette_internal, 0, sizeof palette_internal);
 	lbx_file_close(handle);
 	return 0;
 }
 
+static LBX_IMG *
+load_lbx_image(LBX *archive, unsigned index)
+{
+	LBXfile *file;
+	LBX_IMG *image;
+
+	file = lbx_file_open(archive, index);
+	g_return_val_if_fail(file, NULL);
+
+	image = lbximg_open(file, &lbx_arch_fops, close_image);
+	if (!image)
+		lbx_file_close(file);
+	return image;
+}
+
 void set_override(GtkComboBox *combo)
 {
 	GtkTreeIter iter;
 	gpointer lbx;
 	guint    index;
-	LBXfile  *f;
-	LBX_IMG  *img;
+	LBX_IMG *img;
 
 	memset(palette_override, 0, sizeof palette_override);
 	if (!gtk_combo_box_get_active_iter(combo, &iter))
@@ -176,19 +188,11 @@ void set_override(GtkComboBox *combo)
 		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");
+	img = load_lbx_image(lbx, index);
+	if (img) {
+		lbximg_getpalette(img, palette_override);
+		lbximg_close(img);
+		redraw_image();
 	}
 }
 
@@ -215,7 +219,7 @@ void set_palette(GtkComboBox *combo)
 		lbx_file_close(f);
 	}
 
-	init_framedata(0);
+	redraw_image();
 }
 
 void set_image(GtkComboBox *combo)
@@ -223,13 +227,15 @@ void set_image(GtkComboBox *combo)
 	GtkTreeIter iter;
 	gpointer lbx;
 	guint    index;
-	LBXfile  *f;
+	LBX_IMG *img;
 
 	if (image) {
 		lbximg_close(image);
 		image = NULL;
 	}
 
+	gtk_widget_set_size_request(canvas, -1, -1);
+	memset(palette_internal, 0, sizeof palette_internal);
 	if (!gtk_combo_box_get_active_iter(combo, &iter))
 		return;
 
@@ -238,26 +244,21 @@ void set_image(GtkComboBox *combo)
 		2, &index,
 		-1);
 
-	f = lbx_file_open(lbx, index);
-	if (f) {
-		image = lbximg_open(f, &lbx_arch_fops, img_close);
-		if (image) {
-			if (lbximg_getpalette(image, palette_internal) == -1) {
-				puts("crap");
-				lbximg_close(image);
-			}
+	img = load_lbx_image(lbx, index);
+	if (img) {
+		if (lbximg_getpalette(img, palette_internal) == -1) {
+			puts("crap");
+			lbximg_close(img);
+		}
 
-			if (init_framedata(1) == -1) {
-				puts("crap");
-				lbximg_close(image);
-			}
-		} else {
-			puts("fuck");
-			lbx_file_close(f);
+		if (alloc_framebuffer(img) == -1) {
+			puts("crap");
+			lbximg_close(img);
 		}
-	} else {
-		puts("damn");
 	}
+
+	image = img;
+	redraw_image();
 }
 
 void show_about(GtkWidget *widget)
@@ -370,7 +371,7 @@ static void clear_combobox(GtkEntry *entry, GtkEntryIconPosition pos,
 
 	gtk_entry_set_text(entry, "");
 	gtk_combo_box_set_active(combo, -1);
-	init_framedata(0);
+	redraw_image();
 }
 
 static void init_combobox(GtkBuilder *builder, const char *name)
-- 
2.43.2