X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/9a9c986e71c9e77b87a9585c6d3594cf2794c707..3f31bec4a6927651bc562e8b21aa0c7354328e1b:/src/main.c?ds=sidebyside diff --git a/src/main.c b/src/main.c index af9ea4c5..f20fdcf8 100644 --- 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(); @@ -50,8 +53,6 @@ void a_datasource_gc_init(); #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. */ @@ -60,13 +61,20 @@ void a_datasource_gc_init(); #define LOCALEDIR "locale" #endif -static guint window_count = 0; - -static VikWindow *new_window (); -static void open_window ( VikWindow *vw, GSList *files ); -static void destroy( GtkWidget *widget, - gpointer data ); +#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, + GLogLevelFlags log_level, + const gchar *message, + gpointer user_data) +{ + g_print("** (viking): DEBUG: %s\n", message); +} +#else /* Callback to mute log message */ static void mute_log(const gchar *log_domain, GLogLevelFlags log_level, @@ -75,57 +83,21 @@ static void mute_log(const gchar *log_domain, { /* Nothing to do, we just want to mute */ } +#endif -/* Another callback */ -static void destroy( GtkWidget *widget, - gpointer data ) -{ - if ( ! --window_count ) - gtk_main_quit (); -} - -static VikWindow *new_window () -{ - if ( window_count < MAX_WINDOWS ) - { - VikWindow *vw = vik_window_new (); - - g_signal_connect (G_OBJECT (vw), "destroy", - G_CALLBACK (destroy), NULL); - g_signal_connect (G_OBJECT (vw), "newwindow", - G_CALLBACK (new_window), NULL); - g_signal_connect (G_OBJECT (vw), "openwindow", - G_CALLBACK (open_window), NULL); - - gtk_widget_show_all ( GTK_WIDGET(vw) ); - - window_count++; - - return vw; - } - return NULL; -} - -static void open_window ( VikWindow *vw, GSList *files ) +#if HAVE_X11_XLIB_H +static int myXErrorHandler(Display *display, XErrorEvent *theEvent) { - gboolean change_fn = (g_slist_length(files) == 1); /* only change fn if one file */ - GSList *cur_file = files; - while ( cur_file ) { - // Only open a new window if a viking file - gchar *file_name = cur_file->data; - if (vw != NULL && check_file_magic_vik ( file_name ) ) { - VikWindow *newvw = new_window(); - if (newvw) - vik_window_open_file ( newvw, file_name, change_fn ); - } - else { - vik_window_open_file ( vw, file_name, change_fn ); - } - g_free (file_name); - cur_file = g_slist_next (cur_file); - } - g_slist_free (files); + 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[] = @@ -149,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); @@ -174,17 +148,32 @@ int main( int argc, char *argv[] ) if (vik_version) { - g_printf ("%s %s\nCopyright (c) 2003-2008 Evan Battaglia\nCopyright (c) 2008-2010 Viking's contributors\n", PACKAGE_NAME, PACKAGE_VERSION); + g_printf ("%s %s\nCopyright (c) 2003-2008 Evan Battaglia\nCopyright (c) 2008-2012 Viking's contributors\n", PACKAGE_NAME, PACKAGE_VERSION); return EXIT_SUCCESS; } +#if GLIB_CHECK_VERSION (2, 32, 0) + if (vik_debug) + g_log_set_handler (NULL, G_LOG_LEVEL_DEBUG, log_debug, NULL); +#else if (!vik_debug) 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(); @@ -201,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 = new_window(); + first_window = vik_window_new_window(); + + vu_check_latest_version ( GTK_WINDOW(first_window) ); - gdk_threads_enter (); 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 (); @@ -224,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();