X-Git-Url: http://git.draconx.ca/gitweb/liblbx.git/blobdiff_plain/25cd06fa0b938a5f00a7c31f9380341cac55454b..f9f3a47a274221c512a23a76dceb6b2b1ee1d6a6:/src/gui/lbxgui.c diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c index 965268b..e9726a6 100644 --- a/src/gui/lbxgui.c +++ b/src/gui/lbxgui.c @@ -1,13 +1,33 @@ +/* + * 2ooM: The Master of Orion II Reverse Engineering Project + * Graphical tool for inspecting LBX archives. + * Copyright © 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 #include +#include #include #include #include "lbx.h" #include "image.h" -#include "render.h" +#include "lbxgui.h" #include "bg.xbm" @@ -15,11 +35,28 @@ static GtkTreeStore *archives; static GtkBuilder *builder; static GtkWidget *canvas; -static GdkGC *bg_gc; -static LBX_IMG *image; +static cairo_surface_t *framebuf; +static cairo_pattern_t *bg_pattern; +static bool bg_stipple; -static GdkPixbuf *framebuf; +static struct lbx_image *image; +static struct lbx_colour palette[256]; + +/* We support stacking 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]; + +static void refresh_palette(void) +{ + memcpy(palette, palette_external, sizeof palette); + lbxgui_stack_palette(palette, palette_internal); + lbxgui_stack_palette(palette, palette_override); + + if (framebuf) + lbxgui_render_restart(framebuf); +} void play_toggled(GtkToggleButton *button, gpointer data) { @@ -43,10 +80,21 @@ void set_frame(GtkSpinButton *spin, gpointer data) { unsigned frame = gtk_spin_button_get_value_as_int(spin); - render_to_pixbuf(image, framebuf, frame); + if (image) + lbxgui_render_argb(framebuf, image, frame, palette); gdk_window_invalidate_rect(canvas->window, NULL, FALSE); } +static void redraw_image(void) +{ + GtkSpinButton *spin; + + refresh_palette(); + + spin = GTK_SPIN_BUTTON(gtk_builder_get_object(builder, "framespin")); + set_frame(spin, NULL); +} + static void tick(void *p, double delta) { static double elapsed = 0; @@ -54,12 +102,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")); @@ -68,20 +116,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) @@ -106,66 +156,75 @@ static gboolean timeout(gpointer data) gboolean canvas_expose(GtkWidget *canvas, GdkEventExpose *event, gpointer data) { - if (!framebuf) - return TRUE; + cairo_t *cr; - gdk_draw_rectangle(canvas->window, bg_gc, TRUE, - event->area.x, event->area.y, - event->area.width, event->area.height); + cr = gdk_cairo_create(canvas->window); + + if (bg_stipple) { + cairo_set_source_rgb(cr, 0.6, 0.6, 0.6); + gdk_cairo_rectangle(cr, &event->area); + cairo_fill(cr); + + cairo_set_source_rgb(cr, 0.3, 0.3, 0.3); + gdk_cairo_rectangle(cr, &event->area); + cairo_mask(cr, bg_pattern); + } else { + cairo_set_source_rgb(cr, 0, 0, 0); + gdk_cairo_rectangle(cr, &event->area); + cairo_fill(cr); + } - 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); + cairo_set_source_surface(cr, framebuf, 0, 0); + gdk_cairo_rectangle(cr, &event->area); + cairo_fill(cr); + + cairo_destroy(cr); return TRUE; } -static int init_framedata(int reset) +static int alloc_framebuffer(struct lbx_image *img) { - struct lbx_imginfo info; GtkSpinButton *spin; - if (!image) - return 0; - - 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); + cairo_surface_destroy(framebuf); + framebuf = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, + img->width, img->height); 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, img->frames-1); gtk_spin_button_set_value(spin, 0); - set_frame(spin, NULL); + + gtk_widget_set_size_request(canvas, img->width, img->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; } +static struct lbx_image *load_lbx_image(struct lbx *archive, unsigned index) +{ + LBXfile *file; + struct lbx_image *image; + + file = lbx_file_open(archive, index); + g_return_val_if_fail(file, NULL); + + image = lbx_img_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; + struct lbx_image *img; memset(palette_override, 0, sizeof palette_override); if (!gtk_combo_box_get_active_iter(combo, &iter)) @@ -176,19 +235,11 @@ void set_override(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) { + lbx_img_getpalette(img, palette_override); + lbx_img_close(img); + redraw_image(); } } @@ -210,12 +261,12 @@ 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); } - init_framedata(0); + redraw_image(); } void set_image(GtkComboBox *combo) @@ -223,13 +274,15 @@ void set_image(GtkComboBox *combo) GtkTreeIter iter; gpointer lbx; guint index; - LBXfile *f; + struct lbx_image *img; if (image) { - lbximg_close(image); + lbx_img_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; @@ -238,26 +291,24 @@ void set_image(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); - } - - if (init_framedata(1) == -1) { - puts("crap"); - lbximg_close(image); - } - } else { - puts("fuck"); - lbx_file_close(f); + img = load_lbx_image(lbx, index); + if (img) { + if (lbx_img_getpalette(img, palette_internal) == -1) { + puts("crap"); + lbx_img_close(img); } - } else { - puts("damn"); + + alloc_framebuffer(img); } + + image = img; + redraw_image(); +} + +void set_background(GtkCheckMenuItem *item, gpointer data) +{ + bg_stipple = gtk_check_menu_item_get_active(item); + redraw_image(); } void show_about(GtkWidget *widget) @@ -277,7 +328,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) @@ -291,11 +342,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, @@ -370,7 +420,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) @@ -409,25 +459,81 @@ static void init_interface(void) init_combobox(builder, "overchooser"); } -static GdkBitmap *init_background(GdkDrawable *drawable, GdkGC *gc) +/* + * Reverse the bits in each byte of a 32-bit word. + */ +static guint32 reverse4b(guint32 v) +{ + v = ((v >> 1) & 0x55555555) | ((v & 0x55555555) << 1); + v = ((v >> 2) & 0x33333333) | ((v & 0x33333333) << 2); + v = ((v >> 4) & 0x0f0f0f0f) | ((v & 0x0f0f0f0f) << 4); + return v; +} + +static cairo_surface_t * +xbm_to_cairo(const void *xbmdata, int width, int height) +{ + const unsigned char *data = xbmdata; + unsigned char *sdata; + cairo_surface_t *s; + int stride; + + s = cairo_image_surface_create(CAIRO_FORMAT_A1, width, height); + if (cairo_surface_status(s) != CAIRO_STATUS_SUCCESS) + return s; + + sdata = cairo_image_surface_get_data(s); + stride = cairo_image_surface_get_stride(s); + assert(stride % 4 == 0); + width = (width + 7) / 8; + + cairo_surface_flush(s); + for (int y = 0; y < height; y++) { + /* + * Cairo is nuts. The mapping of bits to pixels in the A1 + * format actually depends on the host *byte* ordering, so + * we actually need these two separate cases. + */ + if (G_BYTE_ORDER == G_LITTLE_ENDIAN) { + /* Easy, XBM and Cairo match in this case */ + memcpy(sdata, data, width); + } else { + /* No such luck, we have to convert manually */ + for (int x = 0; x < width; x += 4) { + guint32 word = 0; + + memcpy(&word, data+x, MIN(4, width-x)); + word = reverse4b(word); + memcpy(sdata+x, &word, 4); + } + } + + sdata += stride; + data += width; + } + cairo_surface_mark_dirty(s); + + return s; +} + +static void init_background(GdkDrawable *drawable) { - 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; + cairo_surface_t *bg; + GtkWidget *check; + + bg = xbm_to_cairo(bg_bits, bg_width, bg_height); + bg_pattern = cairo_pattern_create_for_surface(bg); + cairo_pattern_set_extend(bg_pattern, CAIRO_EXTEND_REPEAT); + cairo_surface_destroy(bg); + + 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) { + extern char lbxgui_glade[]; GtkWidget *window; GError *err = NULL; @@ -442,7 +548,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; } @@ -453,10 +559,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(); }