lbxgui: Clean up function names and linkage.

[liblbx.git] / src / gui / lbxgui.c

diff --git a/src/gui/lbxgui.c b/src/gui/lbxgui.c
index ebb92abd52545428c17f76d8c3e15192bc5be67c..f32eee56f6cce29f60fe46346ccc1434f423c4f3 100644 (file)
--- a/src/gui/lbxgui.c
+++ b/src/gui/lbxgui.c
@@ -22,7 +22,7 @@ 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)
 {
@@ -203,11 +203,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;
@@ -215,6 +222,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;
 
@@ -239,13 +247,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;
 
@@ -264,13 +273,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;
 
@@ -283,7 +297,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);
@@ -314,7 +327,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;
@@ -349,7 +362,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;
 
@@ -405,11 +418,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();
@@ -421,20 +459,12 @@ 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);
-
-       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);
+       init_combobox(builder, "palettechooser");
+       init_combobox(builder, "imagechooser");
+       init_combobox(builder, "overchooser");
 }
 
-GdkBitmap *init_bg(GdkDrawable *drawable, GdkGC *gc)
+static GdkBitmap *init_background(GdkDrawable *drawable, GdkGC *gc)
 {
        GdkColor fg = { .red = 0x6666, .green = 0x6666, .blue = 0x6666 };
        GdkColor bg = { .red = 0x9999, .green = 0x9999, .blue = 0x9999 };
@@ -475,13 +505,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_bg(canvas->window, bg_gc);
+       init_background(canvas->window, bg_gc);
        gtk_main();
 }