Simplify use-existing-window logic

3 files changed, 25 insertions, 15 deletions

diff --git a/siv.c b/siv.c
index 01a4adc..aa4c4dc 100644
--- a/siv.c
+++ b/siv.c
@@ -376,22 +376,17 @@ open_file (App *app, const char *filename, GPtrArray *err_files)
 
     for (i = 0; i < app->windows->len; ++i)
     {
-	const char *f;
-	SivWindow *w;
+	SivWindow *w = app->windows->pdata[i];
 
-	w = app->windows->pdata[i];
-	f = window_get_filename (w);
-
-	if (!f)
+	if (window_is_blank (w))
 	{
-	    /* empty window */
 	    window = w;
 	    break;
 	}
-	
-	if (strcmp (f, filename) == 0)
+
+	if (window_matches_file (w, filename))
 	{
-	    window_show (window, GDK_CURRENT_TIME);
+	    window_show (w, GDK_CURRENT_TIME);
 	    return TRUE;
 	}
     }
diff --git a/siv.h b/siv.h
index cfbafea..abc4461 100644
--- a/siv.h
+++ b/siv.h
@@ -72,8 +72,9 @@ gboolean    window_load_file    (SivWindow   *window,
 void        window_show         (SivWindow   *window,
 				 guint32      time);
 void        window_present      (SivWindow   *window);
-const char *window_get_filename (SivWindow   *window);
+gboolean    window_matches_file (SivWindow   *window,
+				 const char  *filename);
+gboolean    window_is_blank     (SivWindow   *window);
 void        window_free         (SivWindow   *window);
 
-
 #endif
diff --git a/window.c b/window.c
index 05ba209..6a1cb72 100644
--- a/window.c
+++ b/window.c
@@ -1225,8 +1225,22 @@ window_show (SivWindow *window, guint32 time)
     gtk_window_present_with_time (get_widget (window, "main_window"), time);
 }
 
-const char *
-window_get_filename  (SivWindow *window)
+gboolean
+window_matches_file (SivWindow *window,
+		     const char *filename)
+{
+    char *canon = canonicalize_filename (filename);
+    gboolean match;
+
+    match = window->filename && strcmp (canon, window->filename) == 0;
+
+    g_free (canon);
+
+    return match;
+}
+
+gboolean
+window_is_blank (SivWindow *window)
 {
-    return window->filename;
+    return !window->filename;
 }