]> git.draconx.ca Git - liblbx.git/blobdiff - src/gui/lbxgui.c
lbxgui: Fix an error handling regression.
[liblbx.git] / src / gui / lbxgui.c
index 4bc815740abbffc2f69ce546fe418d83f3df3981..9e462e65dd5c7df7eecc021111b267b4f7d9c86f 100644 (file)
@@ -1,3 +1,21 @@
+/*
+ *  2ooM: The Master of Orion II Reverse Engineering Project
+ *  Graphical tool for inspecting LBX archives.
+ *  Copyright (C) 2010 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 <http://www.gnu.org/licenses/>.
+ */
 #include <config.h>
 #include <stdlib.h>
 #include <string.h>
 
 #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 LBXimg *image;
 
 static GdkPixbuf *framebuf;
 
@@ -43,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);
 }
@@ -63,7 +83,7 @@ static void tick(void *p, double delta)
        struct lbx_imginfo info;
        GtkSpinButton   *spin;
        GtkToggleButton *play;
-       unsigned frame;
+       unsigned frame, newframe;
 
        if (!image)
                return;
@@ -77,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)
@@ -130,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(LBXimg *image)
 {
        struct lbx_imginfo info;
        GtkSpinButton *spin;
@@ -157,11 +179,10 @@ static int close_image(void *handle)
        return 0;
 }
 
-static LBX_IMG *
-load_lbx_image(LBX *archive, unsigned index)
+static LBXimg *load_lbx_image(LBX *archive, unsigned index)
 {
        LBXfile *file;
-       LBX_IMG *image;
+       LBXimg *image;
 
        file = lbx_file_open(archive, index);
        g_return_val_if_fail(file, NULL);
@@ -177,7 +198,7 @@ void set_override(GtkComboBox *combo)
        GtkTreeIter iter;
        gpointer lbx;
        guint    index;
-       LBX_IMG *img;
+       LBXimg *img;
 
        memset(palette_override, 0, sizeof palette_override);
        if (!gtk_combo_box_get_active_iter(combo, &iter))
@@ -227,7 +248,7 @@ void set_image(GtkComboBox *combo)
        GtkTreeIter iter;
        gpointer lbx;
        guint    index;
-       LBX_IMG *img;
+       LBXimg *img;
 
        if (image) {
                lbximg_close(image);
@@ -261,6 +282,24 @@ void set_image(GtkComboBox *combo)
        redraw_image();
 }
 
+void set_background(GtkCheckMenuItem *item, gpointer data)
+{
+       GdkColor black = { .red = 0,      .green = 0,      .blue = 0      };
+       GdkColor dark  = { .red = 0x6666, .green = 0x6666, .blue = 0x6666 };
+       GdkColor light = { .red = 0x9999, .green = 0x9999, .blue = 0x9999 };
+
+       if (gtk_check_menu_item_get_active(item)) {
+               /* Enable stippled background. */
+               gdk_gc_set_rgb_fg_color(bg_gc, &dark);
+               gdk_gc_set_rgb_bg_color(bg_gc, &light);
+               gdk_gc_set_fill(bg_gc, GDK_OPAQUE_STIPPLED);
+       } else {
+               gdk_gc_set_rgb_fg_color(bg_gc, &black);
+               gdk_gc_set_fill(bg_gc, GDK_SOLID);
+       }
+       redraw_image();
+}
+
 void show_about(GtkWidget *widget)
 {
        GtkWindow *parent = GTK_WINDOW(gtk_widget_get_toplevel(widget));
@@ -296,7 +335,7 @@ static int load_archive(const char *path)
        for (unsigned i = 0; i < 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,
@@ -410,21 +449,22 @@ static void init_interface(void)
        init_combobox(builder, "overchooser");
 }
 
-static GdkBitmap *init_background(GdkDrawable *drawable, GdkGC *gc)
+static void init_background(GdkDrawable *drawable)
 {
-       GdkColor fg = { .red = 0x6666, .green = 0x6666, .blue = 0x6666 };
-       GdkColor bg = { .red = 0x9999, .green = 0x9999, .blue = 0x9999 };
+       GtkWidget *check;
        GdkBitmap *bitmap;
 
-       bitmap = gdk_bitmap_create_from_data(drawable, bg_bits,
+       bg_gc = gdk_gc_new(canvas->window);
+
+       bitmap = gdk_bitmap_create_from_data(drawable, (gchar *)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;
+       gdk_gc_set_stipple(bg_gc, bitmap);
+       gdk_gc_set_ts_origin(bg_gc, 0, 0);
+
+       check = GTK_WIDGET(gtk_builder_get_object(builder, "menu-background"));
+       gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(check), TRUE);
+       set_background(GTK_CHECK_MENU_ITEM(check), NULL);
 }
 
 int main(int argc, char **argv)
@@ -443,7 +483,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;
        }
@@ -454,10 +494,9 @@ 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);
 
-       bg_gc = gdk_gc_new(canvas->window);
-       init_background(canvas->window, bg_gc);
+       init_background(canvas->window);
        gtk_main();
 }