X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/80d0ff2bdf827e903afebf0bf2c687c485e0a743..80471a6a905e00bf80ad04fa2061f88ea81f15cb:/src/main.c?ds=inline

diff --git a/src/main.c b/src/main.c
index 243a8fce..0c9e0324 100644
--- a/src/main.c
+++ b/src/main.c
@@ -19,17 +19,41 @@
  *
  */
 
+#ifdef HAVE_CONFIG
+#include "config.h"
+#endif /* HAVE_CONFIG */
+
 #include "viking.h"
-#include "icons/viking_18.png_h"
+#include "icons/icons.h"
 #include "mapcache.h"
 #include "background.h"
+#include "dems.h"
+#include "curl_download.h"
+#include "preferences.h"
+#include "globals.h"
+
+#ifdef VIK_CONFIG_GEOCACHES
+void a_datasource_gc_init();
+#endif
 
+#include <stdlib.h>
 #include <string.h>
 
+#include <glib/gprintf.h>
+#include <glib/gi18n.h>
+
 #include "modules.h"
 
 #define MAX_WINDOWS 1024
 
+/* FIXME LOCALEDIR must be configured by ./configure --localedir */
+/* But something does not work actually. */
+/* So, we need to redefine this variable on windows. */
+#ifdef WINDOWS
+#undef LOCALEDIR
+#define LOCALEDIR "locale"
+#endif
+
 static guint window_count = 0;
 
 static VikWindow *new_window ();
@@ -37,6 +61,14 @@ static void open_window ( VikWindow *vw, const gchar **files );
 static void destroy( GtkWidget *widget,
                      gpointer   data );
 
+/* Callback to mute log message */
+static void mute_log(const gchar *log_domain,
+                     GLogLevelFlags log_level,
+                     const gchar *message,
+                     gpointer user_data)
+{
+  /* Nothing to do, we just want to mute */
+}
 
 /* Another callback */
 static void destroy( GtkWidget *widget,
@@ -78,21 +110,65 @@ static void open_window ( VikWindow *vw, const gchar **files )
     }
 }
 
+/* Options */
+static GOptionEntry entries[] = 
+{
+  { "debug", 'd', 0, G_OPTION_ARG_NONE, &vik_debug, N_("Enable debug output"), NULL },
+  { "verbose", 'V', 0, G_OPTION_ARG_NONE, &vik_verbose, N_("Enable verbose output"), NULL },
+  { "version", 'v', 0, G_OPTION_ARG_NONE, &vik_version, N_("Show version"), NULL },
+  { NULL }
+};
+
 int main( int argc, char *argv[] )
 {
   VikWindow *first_window;
   GdkPixbuf *main_icon;
   gboolean dashdash_already = FALSE;
   int i = 0;
+  GError *error = NULL;
+  gboolean gui_initialized;
+	
+  bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR);  
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  textdomain (GETTEXT_PACKAGE);
 
   g_thread_init ( NULL );
   gdk_threads_init ();
 
-  gtk_init (&argc, &argv);
+  gui_initialized = gtk_init_with_args (&argc, &argv, "files+", entries, NULL, &error);
+  if (!gui_initialized)
+  {
+    /* check if we have an error message */
+    if (error == NULL)
+    {
+      /* no error message, the GUI initialization failed */
+      const gchar *display_name = gdk_get_display_arg_name ();
+      g_fprintf (stderr, "Failed to open display: %s\n", (display_name != NULL) ? display_name : " ");
+    }
+    else
+    {
+      /* yep, there's an error, so print it */
+      g_fprintf (stderr, "Parsing command line options failed: %s\n", error->message);
+      g_error_free (error);
+      g_fprintf (stderr, "Run \"%s --help\" to see the list of recognized options.\n",argv[0]);
+    }
+    return EXIT_FAILURE;
+  }
+   
+  if (vik_version)
+  {
+    g_printf ("%s %s, Copyright (c) 2003-2007 Evan Battaglia\n", PACKAGE_NAME, PACKAGE_VERSION);
+    return EXIT_SUCCESS;
+  }
+
+  if (!vik_debug)
+    g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, mute_log, NULL);
 
-#ifdef HAVE_LIBCURL
   curl_download_init();
-#endif
+
+  a_preferences_init ();
+
+  a_vik_preferences_init ();
 
   /* Init modules/plugins */
   modules_init();
@@ -100,8 +176,12 @@ int main( int argc, char *argv[] )
   a_mapcache_init ();
   a_background_init ();
 
+#ifdef VIK_CONFIG_GEOCACHES
+  a_datasource_gc_init();
+#endif
+
   /* Set the icon */
-  main_icon = gdk_pixbuf_from_pixdata(&viking_18, FALSE, NULL);
+  main_icon = gdk_pixbuf_from_pixdata(&viking_icon_pixbuf, FALSE, NULL);
   gtk_window_set_default_icon(main_icon);
 
   /* Create the first window */
@@ -119,6 +199,8 @@ int main( int argc, char *argv[] )
   gdk_threads_leave ();
 
   a_mapcache_uninit ();
+  a_dems_uninit ();
+  a_preferences_uninit ();
 
   return 0;
 }