X-Git-Url: https://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/e41adc19e0d43c41e0ccf416e09eaae418af6549..7db3d5624cfb59506bc01339ac682c456266ac56:/src/gui/lbxgui.c diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c index 2cceca3..be629fd 100644 --- a/src/gui/lbxgui.c +++ b/src/gui/lbxgui.c @@ -7,6 +7,7 @@ #include "lbx.h" #include "image.h" +#include "render.h" #include "bg.xbm" @@ -17,12 +18,8 @@ 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) { @@ -42,64 +39,21 @@ 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) +void set_frame(GtkSpinButton *spin, gpointer data) { - 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)[4] = (void *)(data + i*stride); - - for (unsigned j = 0; j < info.width; j++) { - if (imgmask[i][j]) { - get_colour(imgdata[i][j], p[j]); - p[j][3] = -1; - } else { - p[j][3] = 0; - } - } - } + unsigned frame = gtk_spin_button_get_value_as_int(spin); - return 0; + if (image) + render_to_pixbuf(image, framebuf, frame); + gdk_window_invalidate_rect(canvas->window, NULL, FALSE); } -void set_frame(GtkSpinButton *spin, gpointer data) +static void redraw_image(void) { - unsigned frame = gtk_spin_button_get_value_as_int(spin); + GtkSpinButton *spin; - render_frame(image, framebuf, frame); - gdk_window_invalidate_rect(canvas->window, NULL, FALSE); + spin = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "framespin")); + set_frame(spin, NULL); } static void tick(void *p, double delta) @@ -162,7 +116,7 @@ static gboolean timeout(gpointer data) gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data) { if (!framebuf) - return TRUE; + return FALSE; gdk_draw_rectangle(canvas->window, bg_gc, TRUE, event->area.x, event->area.y, @@ -176,51 +130,54 @@ gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data) return TRUE; } -static int init_framedata(int reset) +static int alloc_framebuffer(LBX_IMG *image) { struct lbx_imginfo info; GtkSpinButton *spin; - if (!image) - return 0; + if (framebuf) + g_object_unref(framebuf); lbximg_getinfo(image, &info); framebuf = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, info.width, info.height); - if (!framebuf) { - printf("failed to allocate pixbuf\n"); - return -1; - } - - gtk_widget_set_size_request(canvas, info.width, info.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_value(spin, 0); - set_frame(spin, NULL); + + gtk_widget_set_size_request(canvas, info.width, info.height); return 0; } -static int img_close(void *handle) +static int close_image(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) +static LBX_IMG * +load_lbx_image(LBX *archive, unsigned index) +{ + LBXfile *file; + LBX_IMG *image; + + file = lbx_file_open(archive, index); + g_return_val_if_fail(file, NULL); + + image = lbximg_open(file, &lbx_arch_fops, close_image); + if (!image) + lbx_file_close(file); + return image; +} + +void set_override(GtkComboBox *combo) { GtkTreeIter iter; gpointer lbx; guint index; - LBXfile *f; - LBX_IMG *img; + LBX_IMG *img; memset(palette_override, 0, sizeof palette_override); if (!gtk_combo_box_get_active_iter(combo, &iter)) @@ -231,23 +188,15 @@ void set_override_data(GtkComboBox *combo) 2, &index, -1); - f = lbx_file_open(lbx, index); - if (f) { - img = lbximg_open(f, &lbx_arch_fops, NULL); - if (img) { - memset(palette_override, 0, sizeof palette_override); - lbximg_getpalette(img, palette_override); - lbximg_close(img); - init_framedata(0); - } - - lbx_file_close(f); - } else { - puts("damn"); + img = load_lbx_image(lbx, index); + if (img) { + lbximg_getpalette(img, palette_override); + lbximg_close(img); + redraw_image(); } } -void set_palette_data(GtkComboBox *combo) +void set_palette(GtkComboBox *combo) { GtkTreeIter iter; gpointer lbx; @@ -270,21 +219,23 @@ void set_palette_data(GtkComboBox *combo) lbx_file_close(f); } - init_framedata(0); + redraw_image(); } -void set_image_data(GtkComboBox *combo) +void set_image(GtkComboBox *combo) { GtkTreeIter iter; gpointer lbx; guint index; - LBXfile *f; + LBX_IMG *img; if (image) { lbximg_close(image); image = NULL; } + gtk_widget_set_size_request(canvas, -1, -1); + memset(palette_internal, 0, sizeof palette_internal); if (!gtk_combo_box_get_active_iter(combo, &iter)) return; @@ -293,26 +244,39 @@ void set_image_data(GtkComboBox *combo) 2, &index, -1); - f = lbx_file_open(lbx, index); - if (f) { - image = lbximg_open(f, &lbx_arch_fops, img_close); - if (image) { - if (lbximg_getpalette(image, palette_internal) == -1) { - puts("crap"); - lbximg_close(image); - } + img = load_lbx_image(lbx, index); + if (img) { + if (lbximg_getpalette(img, palette_internal) == -1) { + puts("crap"); + lbximg_close(img); + } - if (init_framedata(1) == -1) { - puts("crap"); - lbximg_close(image); - } - } else { - puts("fuck"); - lbx_file_close(f); + if (alloc_framebuffer(img) == -1) { + puts("crap"); + lbximg_close(img); } + } + + image = img; + 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 { - puts("damn"); + gdk_gc_set_rgb_fg_color(bg_gc, &black); + gdk_gc_set_fill(bg_gc, GDK_SOLID); } + redraw_image(); } void show_about(GtkWidget *widget) @@ -327,7 +291,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; @@ -362,7 +326,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; @@ -425,7 +389,7 @@ static void clear_combobox(GtkEntry *entry, GtkEntryIconPosition pos, gtk_entry_set_text(entry, ""); gtk_combo_box_set_active(combo, -1); - init_framedata(0); + redraw_image(); } static void init_combobox(GtkBuilder *builder, const char *name) @@ -444,7 +408,7 @@ static void init_combobox(GtkBuilder *builder, const char *name) GTK_STOCK_CLEAR); } -static void interface_init(void) +static void init_interface(void) { GtkTreeViewColumn *column; GtkCellRenderer *renderer; @@ -464,21 +428,22 @@ static void interface_init(void) init_combobox(builder, "overchooser"); } -GdkBitmap *init_bg(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; + bg_gc = gdk_gc_new(canvas->window); + 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; + 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) @@ -505,13 +470,12 @@ 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_bg(canvas->window, bg_gc); + init_background(canvas->window); gtk_main(); }