Fix #982: random crash (SIGSEGV) while running two instances of geeqie

[geeqie.git] / src / advanced_exif.c

diff --git a/src/advanced_exif.c b/src/advanced_exif.c
index 2a8715c..a6851ad 100644 (file)
--- a/src/advanced_exif.c
+++ b/src/advanced_exif.c
@@ -26,12 +26,13 @@
 #include "metadata.h"
 #include "filedata.h"
 #include "history_list.h"
+#include "layout_util.h"
 #include "misc.h"
 #include "ui_misc.h"
 #include "window.h"
 #include "dnd.h"
 
-/* FIXME: not needed when bar_exif.c is improved */
+/** @FIXME not needed when bar_exif.c is improved */
 #include "bar_exif.h"
 
 #include <math.h>
@@ -248,7 +249,9 @@ static void advanced_exif_add_column(GtkWidget *listview, const gchar *title, gi
                gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_AUTOSIZE);
                }
 
+#if GTK_CHECK_VERSION(3,0,0)
        gtk_tree_view_column_set_resizable(column, TRUE);
+#endif
        gtk_tree_view_column_set_sort_column_id(column, n);
 
        renderer = gtk_cell_renderer_text_new();
@@ -257,18 +260,45 @@ static void advanced_exif_add_column(GtkWidget *listview, const gchar *title, gi
        gtk_tree_view_append_column(GTK_TREE_VIEW(listview), column);
 }
 
+static void advanced_exif_window_get_geometry(ExifWin *ew)
+{
+       GdkWindow *window;
+       LayoutWindow *lw = NULL;
+
+       layout_valid(&lw);
+
+       if (!ew || !lw) return;
+
+       window = gtk_widget_get_window(ew->window);
+       gdk_window_get_position(window, &lw->options.advanced_exif_window.x, &lw->options.advanced_exif_window.y);
+       lw->options.advanced_exif_window.w = gdk_window_get_width(window);
+       lw->options.advanced_exif_window.h = gdk_window_get_height(window);
+}
+
 void advanced_exif_close(ExifWin *ew)
 {
        if (!ew) return;
 
+       advanced_exif_window_get_geometry(ew);
+       file_data_unref(ew->fd);
+
        gtk_widget_destroy(ew->window);
+
+       g_free(ew);
 }
 
-static void advanced_exif_destroy(GtkWidget *widget, gpointer data)
+static gboolean advanced_exif_delete_cb(GtkWidget *widget, GdkEvent *event, gpointer data)
 {
        ExifWin *ew = data;
+
+       if (!ew) return FALSE;
+
+       advanced_exif_window_get_geometry(ew);
        file_data_unref(ew->fd);
+
        g_free(ew);
+
+       return FALSE;
 }
 
 static gint advanced_exif_sort_cb(GtkTreeModel *model, GtkTreeIter *a, GtkTreeIter *b, gpointer data)
@@ -340,6 +370,8 @@ static gboolean advanced_exif_mouseclick(GtkWidget *widget,
 
                g_list_free(cols);
                g_free(value);
+
+               gtk_tree_view_set_search_column(GTK_TREE_VIEW(ew->listview), gtk_tree_view_column_get_sort_column_id(column));
                }
 
        return TRUE;
@@ -360,11 +392,40 @@ static gboolean advanced_exif_keypress(GtkWidget *widget, GdkEventKey *event, gp
                                break;
                        }
                } // if (event->state & GDK_CONTROL...
+       if (!stop_signal && is_help_key(event))
+               {
+               help_window_show("GuideOtherWindowsExif.html");
+               stop_signal = TRUE;
+               }
 
        return stop_signal;
 } // static gboolean advanced_exif_...
 
-GtkWidget *advanced_exif_new(void)
+static gboolean search_function_cb(GtkTreeModel *model, gint column, const gchar *key, GtkTreeIter *iter, gpointer data)
+{
+       gboolean ret = TRUE;
+       gchar *field_contents;
+       gchar *field_contents_nocase;
+       gchar *key_nocase;
+
+       gtk_tree_model_get(model, iter, column, &field_contents, -1);
+
+       field_contents_nocase = g_utf8_casefold(field_contents, -1);
+       key_nocase = g_utf8_casefold(key, -1);
+
+       if (g_strstr_len(field_contents_nocase, -1, key_nocase))
+               {
+               ret = FALSE;
+               }
+
+       g_free(field_contents);
+       g_free(field_contents_nocase);
+       g_free(key_nocase);
+
+       return ret;
+}
+
+GtkWidget *advanced_exif_new(LayoutWindow *lw)
 {
        ExifWin *ew;
        GtkListStore *store;
@@ -376,6 +437,7 @@ GtkWidget *advanced_exif_new(void)
        ew = g_new0(ExifWin, 1);
 
        ew->window = window_new(GTK_WINDOW_TOPLEVEL, "view", NULL, NULL, _("Metadata"));
+       DEBUG_NAME(ew->window);
 
        geometry.min_width = 900;
        geometry.min_height = 600;
@@ -383,9 +445,14 @@ GtkWidget *advanced_exif_new(void)
 
        gtk_window_set_resizable(GTK_WINDOW(ew->window), TRUE);
 
+       gtk_window_resize(GTK_WINDOW(ew->window), lw->options.advanced_exif_window.w, lw->options.advanced_exif_window.h);
+       if (lw->options.advanced_exif_window.x != 0 && lw->options.advanced_exif_window.y != 0)
+               {
+               gtk_window_move(GTK_WINDOW(ew->window), lw->options.advanced_exif_window.x, lw->options.advanced_exif_window.y);
+               }
+
        g_object_set_data(G_OBJECT(ew->window), "advanced_exif_data", ew);
-       g_signal_connect_after(G_OBJECT(ew->window), "destroy",
-                              G_CALLBACK(advanced_exif_destroy), ew);
+       g_signal_connect(G_OBJECT(ew->window), "delete_event", G_CALLBACK(advanced_exif_delete_cb), ew);
 
        ew->vbox = gtk_vbox_new(FALSE, PREF_PAD_GAP);
        gtk_container_add(GTK_CONTAINER(ew->window), ew->vbox);
@@ -396,7 +463,12 @@ GtkWidget *advanced_exif_new(void)
        ew->label_file_name = gtk_label_new("");
        gtk_label_set_ellipsize(GTK_LABEL(ew->label_file_name), PANGO_ELLIPSIZE_START);
        gtk_label_set_selectable(GTK_LABEL(ew->label_file_name), TRUE);
+#if GTK_CHECK_VERSION(3,16,0)
+       gtk_label_set_xalign(GTK_LABEL(ew->label_file_name), 0.5);
+       gtk_label_set_yalign(GTK_LABEL(ew->label_file_name), 0.5);
+#else
        gtk_misc_set_alignment(GTK_MISC(ew->label_file_name), 0.5, 0.5);
+#endif
        gtk_box_pack_start(GTK_BOX(box), ew->label_file_name, TRUE, TRUE, 0);
        gtk_widget_show(ew->label_file_name);
 
@@ -430,6 +502,9 @@ GtkWidget *advanced_exif_new(void)
        advanced_exif_add_column(ew->listview, _("Format"), EXIF_ADVCOL_FORMAT, FALSE);
        advanced_exif_add_column(ew->listview, _("Elements"), EXIF_ADVCOL_ELEMENTS, FALSE);
 
+       gtk_tree_view_set_enable_search(GTK_TREE_VIEW(ew->listview), TRUE);
+       gtk_tree_view_set_search_column(GTK_TREE_VIEW(ew->listview), EXIF_ADVCOL_DESCRIPTION);
+       gtk_tree_view_set_search_equal_func(GTK_TREE_VIEW(ew->listview), search_function_cb, ew, NULL);
 
        gtk_drag_source_set(ew->listview,
                           GDK_BUTTON1_MASK | GDK_BUTTON2_MASK,