X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/9338e46bb1d0e049aa37b65107862c9d8e85abbc..5ca921b28d5ca2964e19dad8f9b8614b2aebca4d:/src/gui/lbxgui.c diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c index 0cb929e..a3212a6 100644 --- a/src/gui/lbxgui.c +++ b/src/gui/lbxgui.c @@ -29,13 +29,15 @@ #include "bg.xbm" +extern char lbxgui_xml[]; + static GtkTreeStore *archives; static GtkBuilder *builder; static GtkWidget *canvas; static GdkGC *bg_gc; -static LBX_IMG *image; +static struct lbx_image *image; static GdkPixbuf *framebuf; @@ -61,7 +63,7 @@ void set_frame(GtkSpinButton *spin, gpointer data) { unsigned frame = gtk_spin_button_get_value_as_int(spin); - if (image) + if (image && framebuf) render_to_pixbuf(image, framebuf, frame); gdk_window_invalidate_rect(canvas->window, NULL, FALSE); } @@ -81,12 +83,12 @@ static void tick(void *p, double delta) struct lbx_imginfo info; GtkSpinButton *spin; GtkToggleButton *play; - unsigned frame; + unsigned frame, newframe; if (!image) return; - lbximg_getinfo(image, &info); + lbx_img_getinfo(image, &info); spin = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "framespin")); play = GTK_TOGGLE_BUTTON(gtk_builder_get_object(builder, "playbutton")); @@ -95,20 +97,22 @@ static void tick(void *p, double delta) return; elapsed += delta; + newframe = frame; while (elapsed > seconds_per_frame) { elapsed -= seconds_per_frame; - if (++frame >= info.nframes) { + if (++newframe >= info.nframes) { if (!info.looping) { gtk_toggle_button_set_active(play, FALSE); break; } - frame = info.loopstart; + newframe = info.loopstart; } - - gtk_spin_button_set_value(spin, frame); } + + if (frame != newframe) + gtk_spin_button_set_value(spin, newframe); } static gboolean timeout(gpointer data) @@ -148,7 +152,7 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data) return TRUE; } -static int alloc_framebuffer(LBX_IMG *image) +static int alloc_framebuffer(struct lbx_image *image) { struct lbx_imginfo info; GtkSpinButton *spin; @@ -156,7 +160,7 @@ static int alloc_framebuffer(LBX_IMG *image) if (framebuf) g_object_unref(framebuf); - lbximg_getinfo(image, &info); + lbx_img_getinfo(image, &info); framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, info.width, info.height); g_return_val_if_fail(framebuf, -1); @@ -175,16 +179,15 @@ static int close_image(void *handle) return 0; } -static LBX_IMG * -load_lbx_image(LBX *archive, unsigned index) +static struct lbx_image *load_lbx_image(struct lbx *archive, unsigned index) { LBXfile *file; - LBX_IMG *image; + struct lbx_image *image; file = lbx_file_open(archive, index); g_return_val_if_fail(file, NULL); - image = lbximg_open(file, &lbx_arch_fops, close_image); + image = lbx_img_open(file, &lbx_arch_fops, close_image); if (!image) lbx_file_close(file); return image; @@ -195,7 +198,7 @@ void set_override(GtkComboBox *combo) GtkTreeIter iter; gpointer lbx; guint index; - LBX_IMG *img; + struct lbx_image *img; memset(palette_override, 0, sizeof palette_override); if (!gtk_combo_box_get_active_iter(combo, &iter)) @@ -208,8 +211,8 @@ void set_override(GtkComboBox *combo) img = load_lbx_image(lbx, index); if (img) { - lbximg_getpalette(img, palette_override); - lbximg_close(img); + lbx_img_getpalette(img, palette_override); + lbx_img_close(img); redraw_image(); } } @@ -232,7 +235,7 @@ void set_palette(GtkComboBox *combo) f = lbx_file_open(lbx, index); if (f) { - if (lbximg_loadpalette(f, &lbx_arch_fops, palette_external)) + if (lbx_img_loadpalette(f, &lbx_arch_fops, palette_external)) memset(palette_external, 0, sizeof palette_external); lbx_file_close(f); } @@ -245,10 +248,10 @@ void set_image(GtkComboBox *combo) GtkTreeIter iter; gpointer lbx; guint index; - LBX_IMG *img; + struct lbx_image *img; if (image) { - lbximg_close(image); + lbx_img_close(image); image = NULL; } @@ -264,14 +267,14 @@ void set_image(GtkComboBox *combo) img = load_lbx_image(lbx, index); if (img) { - if (lbximg_getpalette(img, palette_internal) == -1) { + if (lbx_img_getpalette(img, palette_internal) == -1) { puts("crap"); - lbximg_close(img); + lbx_img_close(img); } if (alloc_framebuffer(img) == -1) { puts("crap"); - lbximg_close(img); + lbx_img_close(img); } } @@ -314,7 +317,7 @@ static int load_archive(const char *path) gchar *basename; GtkTreeIter iter1, iter2; unsigned nfiles; - LBX *lbx; + struct lbx *lbx; lbx = lbx_fopen(path); if (!lbx) @@ -328,11 +331,10 @@ static int load_archive(const char *path) -1); g_free(basename); - nfiles = lbx_numfiles(lbx); - for (unsigned i = 0; i < nfiles; i++) { + for (unsigned i = 0; i < lbx->nfiles; i++) { struct lbx_statbuf stat; - lbx_stat(lbx, i, &stat); + lbx_file_stat(lbx, i, &stat); gtk_tree_store_append(archives, &iter2, &iter1); gtk_tree_store_set(archives, &iter2, 0, stat.name, @@ -453,7 +455,7 @@ static void init_background(GdkDrawable *drawable) bg_gc = gdk_gc_new(canvas->window); - bitmap = gdk_bitmap_create_from_data(drawable, bg_bits, + bitmap = gdk_bitmap_create_from_data(drawable, (gchar *)bg_bits, bg_width, bg_height); gdk_gc_set_stipple(bg_gc, bitmap); @@ -480,7 +482,7 @@ int main(int argc, char **argv) load_archive(*argv++); builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, "src/gui/lbxgui.glade", &err)) { + if (!gtk_builder_add_from_string(builder, lbxgui_xml, -1, &err)) { fprintf(stderr, "%s\n", err->message); return EXIT_FAILURE; } @@ -491,7 +493,7 @@ int main(int argc, char **argv) init_interface(); gtk_builder_connect_signals(builder, window); - g_timeout_add(10, timeout, NULL); + g_timeout_add_full(G_PRIORITY_DEFAULT_IDLE, 10, timeout, NULL, NULL); gtk_widget_show_all(window); init_background(canvas->window);