X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/7db3d5624cfb59506bc01339ac682c456266ac56..ba19b133bf87936dc606dd994f56f433a278b768:/src/gui/lbxgui.c
diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index be629fd..bb9e5e5 100644
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -1,3 +1,21 @@
+/*
+ * 2ooM: The Master of Orion II Reverse Engineering Project
+ * Graphical tool for inspecting LBX archives.
+ * Copyright (C) 2010, 2014 Nick Bowler
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
#include
#include
#include
@@ -17,7 +35,7 @@ static GtkBuilder *builder;
static GtkWidget *canvas;
static GdkGC *bg_gc;
-static LBX_IMG *image;
+static struct lbx_image *image;
static GdkPixbuf *framebuf;
@@ -43,7 +61,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);
}
@@ -63,12 +81,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"));
@@ -77,20 +95,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 (!info.looping) {
+ if (++newframe >= image->frames) {
+ if (image->leadin == image->frames - 1) {
gtk_toggle_button_set_active(play, FALSE);
break;
}
- frame = info.loopstart;
+ newframe = image->leadin;
}
-
- gtk_spin_button_set_value(spin, frame);
}
+
+ if (frame != newframe)
+ gtk_spin_button_set_value(spin, newframe);
}
static gboolean timeout(gpointer data)
@@ -130,24 +150,22 @@ 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;
if (framebuf)
g_object_unref(framebuf);
- lbximg_getinfo(image, &info);
framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8,
- info.width, info.height);
+ image->width, image->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_range(spin, 0, image->frames-1);
gtk_spin_button_set_value(spin, 0);
- gtk_widget_set_size_request(canvas, info.width, info.height);
+ gtk_widget_set_size_request(canvas, image->width, image->height);
return 0;
}
@@ -157,16 +175,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;
@@ -177,7 +194,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))
@@ -190,8 +207,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();
}
}
@@ -214,7 +231,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);
}
@@ -227,10 +244,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;
}
@@ -246,14 +263,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);
}
}
@@ -296,7 +313,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)
@@ -310,11 +327,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,
@@ -435,7 +451,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);
@@ -448,6 +464,7 @@ static void init_background(GdkDrawable *drawable)
int main(int argc, char **argv)
{
+ extern char lbxgui_glade[];
GtkWidget *window;
GError *err = NULL;
@@ -462,7 +479,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_glade, -1, &err)) {
fprintf(stderr, "%s\n", err->message);
return EXIT_FAILURE;
}
@@ -473,7 +490,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);