[QA] Limit scope of includes of vikutils header.

[andy/viking.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index e22b43aa2b28f9c03c9d7d0a85f9fe80377e6b43..f20fdcf8c67b693ebfa6e21248ccb362315ff9cb 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -31,8 +31,11 @@
 #include "babel.h"
 #include "curl_download.h"
 #include "preferences.h"
+#include "viklayer_defaults.h"
 #include "globals.h"
 #include "vikmapslayer.h"
+#include "vikrouting.h"
+#include "vikutils.h"
 
 #ifdef VIK_CONFIG_GEOCACHES
 void a_datasource_gc_init();
@@ -58,6 +61,10 @@ void a_datasource_gc_init();
 #define LOCALEDIR "locale"
 #endif
 
+#ifdef HAVE_X11_XLIB_H
+#include "X11/Xlib.h"
+#endif
+
 #if GLIB_CHECK_VERSION (2, 32, 0)
 /* Callback to log message */
 static void log_debug(const gchar *log_domain,
@@ -78,6 +85,20 @@ static void mute_log(const gchar *log_domain,
 }
 #endif
 
+#if HAVE_X11_XLIB_H
+static int myXErrorHandler(Display *display, XErrorEvent *theEvent)
+{
+  g_fprintf (stderr,
+             _("Ignoring Xlib error: error code %d request code %d\n"),
+             theEvent->error_code,
+             theEvent->request_code);
+  // No exit on X errors!
+  //  mainly to handle out of memory error when requesting large pixbuf from user request
+  //  see vikwindow.c::save_image_file ()
+  return 0;
+}
+#endif
+
 /* Options */
 static GOptionEntry entries[] = 
 {
@@ -100,7 +121,9 @@ int main( int argc, char *argv[] )
   bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
   textdomain (GETTEXT_PACKAGE);
 
+#if ! GLIB_CHECK_VERSION (2, 32, 0)
   g_thread_init ( NULL );
+#endif
   gdk_threads_init ();
 
   gui_initialized = gtk_init_with_args (&argc, &argv, "files+", entries, NULL, &error);
@@ -137,10 +160,20 @@ int main( int argc, char *argv[] )
     g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, mute_log, NULL);
 #endif
 
+#if HAVE_X11_XLIB_H
+  XSetErrorHandler(myXErrorHandler);
+#endif
+
+  // Discover if this is the very first run
+  a_vik_very_first_run ();
+
+  a_settings_init ();
   a_preferences_init ();
 
   a_vik_preferences_init ();
 
+  a_layer_defaults_init ();
+
   a_download_init();
   curl_download_init();
 
@@ -157,21 +190,41 @@ int main( int argc, char *argv[] )
   a_datasource_gc_init();
 #endif
 
+  vik_routing_prefs_init();
+
   /* Set the icon */
   main_icon = gdk_pixbuf_from_pixdata(&viking_pixbuf, FALSE, NULL);
   gtk_window_set_default_icon(main_icon);
 
+  gdk_threads_enter ();
+
+  // Ask for confirmation of default settings on first run
+  vu_set_auto_features_on_first_run ();
+
   /* Create the first window */
   first_window = vik_window_new_window();
 
-  gdk_threads_enter ();
+  vu_check_latest_version ( GTK_WINDOW(first_window) );
+
   while ( ++i < argc ) {
     if ( strcmp(argv[i],"--") == 0 && !dashdash_already )
       dashdash_already = TRUE; /* hack to open '-' */
-    else
-      vik_window_open_file ( first_window, argv[i], argc == 2 );
+    else {
+      VikWindow *newvw = first_window;
+      gboolean change_filename = (i == 1);
+
+      // Open any subsequent .vik files in their own window
+      if ( i > 1 && check_file_magic_vik ( argv[i] ) ) {
+        newvw = vik_window_new_window ();
+        change_filename = TRUE;
+      }
+
+      vik_window_open_file ( newvw, argv[i], change_filename );
+    }
   }
 
+  vik_window_new_window_finish ( first_window );
+
   gtk_main ();
   gdk_threads_leave ();
 
@@ -180,7 +233,9 @@ int main( int argc, char *argv[] )
   a_background_uninit ();
   a_mapcache_uninit ();
   a_dems_uninit ();
+  a_layer_defaults_uninit ();
   a_preferences_uninit ();
+  a_settings_uninit ();
 
   curl_download_uninit();