lbxgui: Add initial support for decoding and displaying images.

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index 6705d72bff3cef0810118b298f61d0e36855cc3d..2d60e6ed503efea0dc632e3b729ec9e7cae3af14 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -1,11 +1,157 @@
+#include <config.h>
 #include <stdlib.h>
+#include <string.h>
 #include <gtk/gtk.h>
 
 #include "lbx.h"
+#include "image.h"
 
 static GtkTreeStore *archives;
 static GtkBuilder *builder;
 
+static GtkWidget *canvas;
+static LBX_IMG *image;
+
+/* LBX images can have up to three palettes, with each superseding the last. */
+static struct lbx_colour palette_external[256];
+static struct lbx_colour palette_internal[256];
+static struct lbx_colour palette_override[256];
+
+GdkPixbuf *framebuf;
+
+gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data)
+{
+       if (!framebuf)
+               return TRUE;
+
+       gdk_draw_pixbuf(canvas->window, NULL, framebuf,
+               event->area.x, event->area.y, event->area.x, event->area.y,
+               event->area.width, event->area.height,
+               GDK_RGB_DITHER_NORMAL, 0, 0);
+
+       return TRUE;
+}
+
+void get_colour(unsigned char index, unsigned char out[static 3])
+{
+       struct lbx_colour *colour;
+
+       if (palette_override[index].active)
+               colour = palette_override + index;
+       else if (palette_internal[index].active)
+               colour = palette_internal + index;
+       else if (palette_external[index].active)
+               colour = palette_external + index;
+       else
+               colour = &(struct lbx_colour) { .red = 0xff, .blue = 0xff };
+
+       out[0] = colour->red;
+       out[1] = colour->green;
+       out[2] = colour->blue;
+}
+
+static int init_framedata(void)
+{
+       struct lbx_imginfo info;
+       unsigned char **imgdata, **imgmask;
+       unsigned char *data;
+       unsigned stride;
+
+       lbximg_getinfo(image, &info);
+       imgdata = lbximg_getframe(image, 0);
+       if (!imgdata) {
+               printf("failed to decode frame 0\n");
+               return -1;
+       }
+       imgmask = lbximg_getmask(image);
+
+       framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8,
+               info.width, info.height);
+       if (!framebuf) {
+               printf("failed to allocate pixbuf\n");
+               return -1;
+       }
+
+       data   = gdk_pixbuf_get_pixels(framebuf);
+       stride = gdk_pixbuf_get_rowstride(framebuf);
+
+       for (unsigned i = 0; i < info.height; i++) {
+               unsigned char (*p)[3] = (void *)(data + i*stride);
+
+               for (unsigned j = 0; j < info.width; j++) {
+                       if (imgmask[i][j]) {
+                               get_colour(imgdata[i][j], p[j]);
+                       } else {
+                               p[j][0] = 0;
+                               p[j][1] = 0;
+                               p[j][2] = 0;
+                       }
+               }
+       }
+
+       gtk_widget_set_size_request(canvas, info.width, info.height);
+       gdk_window_invalidate_rect(canvas->window, NULL, FALSE);
+       return 0;
+}
+
+static int img_close(void *handle)
+{
+       lbx_file_close(handle);
+       return 0;
+}
+
+void set_image_data(GtkComboBox *combo)
+{
+       GtkTreeIter iter;
+       gpointer lbx;
+       guint    index;
+       LBXfile  *f;
+
+       if (!gtk_combo_box_get_active_iter(combo, &iter))
+               return;
+
+       gtk_tree_model_get(GTK_TREE_MODEL(archives), &iter,
+               1, &lbx,
+               2, &index,
+               -1);
+
+       f = lbx_file_open(lbx, index);
+       if (f) {
+               struct lbx_imginfo info;
+
+               image = lbximg_open(f, &lbx_arch_fops, img_close);
+               if (image) {
+                       memset(palette_internal, 0, sizeof palette_internal);
+                       if (lbximg_getpalette(image, palette_internal) == -1) {
+                               puts("crap");
+                               lbximg_close(image);
+                       }
+
+                       if (init_framedata() == -1) {
+                               puts("crap");
+                               lbximg_close(image);
+                       }
+               } else {
+                       puts("fuck");
+                       lbx_file_close(f);
+               }
+       } else {
+               puts("damn");
+       }
+}
+
+void show_about(GtkWidget *widget)
+{
+       GtkWindow *parent = GTK_WINDOW(gtk_widget_get_toplevel(widget));
+
+       gtk_show_about_dialog(parent,
+               "name", g_get_application_name(),
+               "version", PACKAGE_VERSION,
+               "copyright", "Copyright \xc2\xa9 2010 Nick Bowler",
+               "website", "http://toom.sourceforge.net/",
+               NULL);
+}
+
 int load_archive(const char *path)
 {
        gchar *basename;
@@ -19,7 +165,10 @@ int load_archive(const char *path)
 
        basename = g_path_get_basename(path);
        gtk_tree_store_append(archives, &iter1, NULL);
-       gtk_tree_store_set(archives, &iter1, 0, basename, -1);
+       gtk_tree_store_set(archives, &iter1,
+               0, basename,
+               1, (gpointer)lbx,
+               -1);
        g_free(basename);
 
        nfiles = lbx_numfiles(lbx);
@@ -28,22 +177,40 @@ int load_archive(const char *path)
 
                lbx_stat(lbx, i, &stat);
                gtk_tree_store_append(archives, &iter2, &iter1);
-               gtk_tree_store_set(archives, &iter2, 0, stat.name, -1);
+               gtk_tree_store_set(archives, &iter2,
+                       0, stat.name,
+                       1, (gpointer)lbx,
+                       2, (guint)i,
+                       -1);
        }
 
-       lbx_close(lbx);
        return 0;
 }
 
+void load_error(const char *name, GtkWindow *window)
+{
+       GtkWidget *dialog;
+
+       dialog = gtk_message_dialog_new(window,
+               GTK_DIALOG_MODAL,
+               GTK_MESSAGE_ERROR,
+               GTK_BUTTONS_OK,
+               "Failed to open %s.  Decent error messages coming eventually.",
+               name);
+       gtk_dialog_run(GTK_DIALOG(dialog));
+       gtk_widget_destroy(dialog);
+}
+
 void open_archive(GtkWidget *widget)
 {
+       GtkWindow *window = GTK_WINDOW(gtk_widget_get_toplevel(widget));
        GtkFileFilter *lbxfilter, *allfilter;
        GtkFileChooser *chooser;
        GtkTreeIter iter;
 
        chooser = GTK_FILE_CHOOSER(gtk_file_chooser_dialog_new(
                "Load Archive",
-               GTK_WINDOW(gtk_widget_get_toplevel(widget)),
+               window,
                GTK_FILE_CHOOSER_ACTION_OPEN,
                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
@@ -60,10 +227,15 @@ void open_archive(GtkWidget *widget)
        gtk_file_chooser_add_filter(chooser, lbxfilter);
        gtk_file_chooser_add_filter(chooser, allfilter);
 
-       if (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
+       while (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) {
                gchar *name = gtk_file_chooser_get_filename(chooser);
-               load_archive(name);
 
+               if (load_archive(name) == 0) {
+                       g_free(name);
+                       break;
+               }
+
+               load_error(name, GTK_WINDOW(chooser));
                g_free(name);
        }
 
@@ -74,16 +246,21 @@ static void interface_init(void)
 {
        GtkTreeViewColumn *column;
        GtkCellRenderer *renderer;
+       GtkComboBox *combo;
        GtkTreeView *tree;
 
-       tree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview"));
-       gtk_tree_view_set_model(tree, GTK_TREE_MODEL(archives));
-
        renderer = gtk_cell_renderer_text_new();
        column = gtk_tree_view_column_new();
        gtk_tree_view_column_pack_start(column, renderer, TRUE);
        gtk_tree_view_column_add_attribute(column, renderer, "text", 0);
+
+       tree = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview"));
+       gtk_tree_view_set_model(tree, GTK_TREE_MODEL(archives));
        gtk_tree_view_append_column(tree, column);
+
+       combo = GTK_COMBO_BOX(gtk_builder_get_object(builder, "imagechooser"));
+       gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives));
+       gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0);
 }
 
 int main(int argc, char **argv)
@@ -96,7 +273,8 @@ int main(int argc, char **argv)
                return EXIT_FAILURE;
        }
 
-       archives = gtk_tree_store_new(1, G_TYPE_STRING);
+       archives = gtk_tree_store_new(3,
+               G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_UINT);
        while (*argv)
                load_archive(*argv++);
 
@@ -107,6 +285,7 @@ int main(int argc, char **argv)
        }
 
        window = GTK_WIDGET(gtk_builder_get_object(builder, "mainwindow"));
+       canvas = GTK_WIDGET(gtk_builder_get_object(builder, "canvas"));
 
        interface_init();
        gtk_builder_connect_signals(builder, window);

diff --git a/src/gui/lbxgui.glade b/src/gui/lbxgui.glade
index b9f9e894476ef9e12325a9114b193eeb2bf04c0c..1896267dd4409153dbd79fb94366f406bf2312a2 100644 (file)
--- a/src/gui/lbxgui.glade
+++ b/src/gui/lbxgui.glade
@@ -45,6 +45,28 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="GtkMenuItem" id="helpmenu">
+                <property name="visible">True</property>
+                <property name="right_justified">True</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu2">
+                    <property name="visible">True</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menu-about">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="show_about"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -52,17 +74,64 @@
           </packing>
         </child>
         <child>
-          <object class="GtkScrolledWindow" id="scrolledwindow1">
+          <object class="GtkHPaned" id="hpaned1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">never</property>
-            <property name="vscrollbar_policy">automatic</property>
             <child>
-              <object class="GtkTreeView" id="treeview">
+              <object class="GtkScrolledWindow" id="scrolledwindow1">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="headers_visible">False</property>
+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <object class="GtkTreeView" id="treeview">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="headers_visible">False</property>
+                    <property name="enable_search">False</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="resize">False</property>
+                <property name="shrink">True</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkVBox" id="vbox2">
+                <property name="visible">True</property>
+                <property name="orientation">vertical</property>
+                <child>
+                  <object class="GtkComboBoxEntry" id="imagechooser">
+                    <property name="visible">True</property>
+                    <signal name="changed" handler="set_image_data"/>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkViewport" id="viewport">
+                    <property name="visible">True</property>
+                    <property name="resize_mode">queue</property>
+                    <property name="shadow_type">etched-in</property>
+                    <child>
+                      <object class="GtkDrawingArea" id="canvas">
+                        <property name="visible">True</property>
+                        <signal name="expose_event" handler="canvas_expose"/>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
+              <packing>
+                <property name="resize">True</property>
+                <property name="shrink">True</property>
+              </packing>
             </child>
           </object>
           <packing>