X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/c6bde872a51bea0beb105d5b9fde0f4aad36ca1d..25cd06fa0b938a5f00a7c31f9380341cac55454b:/src/gui/lbxgui.c diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c index 21dee9a..965268b 100644 --- a/src/gui/lbxgui.c +++ b/src/gui/lbxgui.c @@ -7,18 +7,19 @@ #include "lbx.h" #include "image.h" +#include "render.h" + +#include "bg.xbm" static GtkTreeStore *archives; static GtkBuilder *builder; static GtkWidget *canvas; +static GdkGC *bg_gc; + 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; +static GdkPixbuf *framebuf; void play_toggled(GtkToggleButton *button, gpointer data) { @@ -38,64 +39,11 @@ void play_toggled(GtkToggleButton *button, gpointer data) } } -static 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 render_frame(LBX_IMG *img, GdkPixbuf *buf, unsigned frame) -{ - unsigned char **imgdata, **imgmask; - struct lbx_imginfo info; - unsigned char *data; - unsigned stride; - - lbximg_getinfo(image, &info); - imgdata = lbximg_getframe(image, frame); - if (!imgdata) { - printf("failed to decode frame %u\n", frame); - return -1; - } - imgmask = lbximg_getmask(image); - - data = gdk_pixbuf_get_pixels(buf); - stride = gdk_pixbuf_get_rowstride(buf); - - 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; - } - } - } - - return 0; -} - void set_frame(GtkSpinButton *spin, gpointer data) { unsigned frame = gtk_spin_button_get_value_as_int(spin); - render_frame(image, framebuf, frame); + render_to_pixbuf(image, framebuf, frame); gdk_window_invalidate_rect(canvas->window, NULL, FALSE); } @@ -161,6 +109,10 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data) if (!framebuf) return TRUE; + gdk_draw_rectangle(canvas->window, bg_gc, TRUE, + event->area.x, event->area.y, + event->area.width, event->area.height); + 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, @@ -178,7 +130,7 @@ static int init_framedata(int reset) return 0; lbximg_getinfo(image, &info); - framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, + framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, info.width, info.height); if (!framebuf) { printf("failed to allocate pixbuf\n"); @@ -196,11 +148,18 @@ static int init_framedata(int reset) static int img_close(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; } -void set_override_data(GtkComboBox *combo) +void set_override(GtkComboBox *combo) { GtkTreeIter iter; gpointer lbx; @@ -208,6 +167,7 @@ void set_override_data(GtkComboBox *combo) LBXfile *f; LBX_IMG *img; + memset(palette_override, 0, sizeof palette_override); if (!gtk_combo_box_get_active_iter(combo, &iter)) return; @@ -232,13 +192,14 @@ void set_override_data(GtkComboBox *combo) } } -void set_palette_data(GtkComboBox *combo) +void set_palette(GtkComboBox *combo) { GtkTreeIter iter; gpointer lbx; guint index; LBXfile *f; + memset(palette_external, 0, sizeof palette_external); if (!gtk_combo_box_get_active_iter(combo, &iter)) return; @@ -257,13 +218,18 @@ void set_palette_data(GtkComboBox *combo) init_framedata(0); } -void set_image_data(GtkComboBox *combo) +void set_image(GtkComboBox *combo) { GtkTreeIter iter; gpointer lbx; guint index; LBXfile *f; + if (image) { + lbximg_close(image); + image = NULL; + } + if (!gtk_combo_box_get_active_iter(combo, &iter)) return; @@ -276,7 +242,6 @@ void set_image_data(GtkComboBox *combo) if (f) { 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); @@ -307,7 +272,7 @@ void show_about(GtkWidget *widget) NULL); } -int load_archive(const char *path) +static int load_archive(const char *path) { gchar *basename; GtkTreeIter iter1, iter2; @@ -342,7 +307,7 @@ int load_archive(const char *path) return 0; } -void load_error(const char *name, GtkWindow *window) +static void load_error(const char *name, GtkWindow *window) { GtkWidget *dialog; @@ -398,11 +363,36 @@ void open_archive(GtkWidget *widget) gtk_widget_destroy(GTK_WIDGET(chooser)); } -static void interface_init(void) +static void clear_combobox(GtkEntry *entry, GtkEntryIconPosition pos, + GdkEvent *event, gpointer data) +{ + GtkComboBox *combo = data; + + gtk_entry_set_text(entry, ""); + gtk_combo_box_set_active(combo, -1); + init_framedata(0); +} + +static void init_combobox(GtkBuilder *builder, const char *name) +{ + GtkComboBox *combo; + GtkEntry *entry; + + combo = GTK_COMBO_BOX(gtk_builder_get_object(builder, name)); + gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives)); + gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0); + + entry = GTK_ENTRY(gtk_bin_get_child(GTK_BIN(combo))); + g_signal_connect(G_OBJECT(entry), "icon-press", + G_CALLBACK(clear_combobox), combo); + gtk_entry_set_icon_from_stock(entry, GTK_ENTRY_ICON_SECONDARY, + GTK_STOCK_CLEAR); +} + +static void init_interface(void) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; - GtkComboBox *combo; GtkTreeView *tree; renderer = gtk_cell_renderer_text_new(); @@ -414,17 +404,26 @@ static void interface_init(void) 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, "palettechooser")); - gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives)); - gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0); - - 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); + init_combobox(builder, "palettechooser"); + init_combobox(builder, "imagechooser"); + init_combobox(builder, "overchooser"); +} - combo = GTK_COMBO_BOX(gtk_builder_get_object(builder, "overchooser")); - gtk_combo_box_set_model(combo, GTK_TREE_MODEL(archives)); - gtk_combo_box_entry_set_text_column(GTK_COMBO_BOX_ENTRY(combo), 0); +static GdkBitmap *init_background(GdkDrawable *drawable, GdkGC *gc) +{ + GdkColor fg = { .red = 0x6666, .green = 0x6666, .blue = 0x6666 }; + GdkColor bg = { .red = 0x9999, .green = 0x9999, .blue = 0x9999 }; + GdkBitmap *bitmap; + + bitmap = gdk_bitmap_create_from_data(drawable, 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; } int main(int argc, char **argv) @@ -451,10 +450,13 @@ 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(); + init_interface(); gtk_builder_connect_signals(builder, window); g_timeout_add(10, timeout, NULL); gtk_widget_show_all(window); + + bg_gc = gdk_gc_new(canvas->window); + init_background(canvas->window, bg_gc); gtk_main(); }