This also fixes an oversight whereby the framebuffer was re-allocated
every time the image is re-rendered.
{
unsigned frame = gtk_spin_button_get_value_as_int(spin);
{
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);
}
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;
static void tick(void *p, double delta)
{
static double elapsed = 0;
gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
{
if (!framebuf)
gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
{
if (!framebuf)
gdk_draw_rectangle(canvas->window, bg_gc, TRUE,
event->area.x, event->area.y,
gdk_draw_rectangle(canvas->window, bg_gc, TRUE,
event->area.x, event->area.y,
-static int init_framedata(int reset)
+static int alloc_framebuffer(LBX_IMG *image)
{
struct lbx_imginfo info;
GtkSpinButton *spin;
{
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);
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);
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);
+
+ gtk_widget_set_size_request(canvas, info.width, info.height);
-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;
}
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;
void set_override(GtkComboBox *combo)
{
GtkTreeIter iter;
gpointer lbx;
guint index;
- LBXfile *f;
- LBX_IMG *img;
memset(palette_override, 0, sizeof palette_override);
if (!gtk_combo_box_get_active_iter(combo, &iter))
memset(palette_override, 0, sizeof palette_override);
if (!gtk_combo_box_get_active_iter(combo, &iter))
- 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();
}
void set_image(GtkComboBox *combo)
}
void set_image(GtkComboBox *combo)
GtkTreeIter iter;
gpointer lbx;
guint index;
GtkTreeIter iter;
gpointer lbx;
guint index;
if (image) {
lbximg_close(image);
image = NULL;
}
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;
if (!gtk_combo_box_get_active_iter(combo, &iter))
return;
- 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)
}
void show_about(GtkWidget *widget)
gtk_entry_set_text(entry, "");
gtk_combo_box_set_active(combo, -1);
gtk_entry_set_text(entry, "");
gtk_combo_box_set_active(combo, -1);
}
static void init_combobox(GtkBuilder *builder, const char *name)
}
static void init_combobox(GtkBuilder *builder, const char *name)