#include "mapcache.h"
#include "background.h"
#include "dems.h"
+#include "babel.h"
#include "curl_download.h"
#include "preferences.h"
+#include "viklayer_defaults.h"
#include "globals.h"
#include "vikmapslayer.h"
void a_datasource_gc_init();
#endif
+#ifdef HAVE_STDLIB_H
#include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
#include <string.h>
+#endif
#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. */
#define LOCALEDIR "locale"
#endif
-static guint window_count = 0;
-
-static VikWindow *new_window ();
-static void open_window ( VikWindow *vw, const gchar **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,
{
/* 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, const gchar **files )
+#if HAVE_X11_XLIB_H
+static int myXErrorHandler(Display *display, XErrorEvent *theEvent)
{
- VikWindow *newvw = new_window();
- gboolean change_fn = (!files[1]); /* only change fn if one file */
- if ( newvw )
- while ( *files ) {
- vik_window_open_file ( newvw, *(files++), change_fn );
- }
+ 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[] =
if (vik_version)
{
- g_printf ("%s %s, Copyright (c) 2003-2008 Evan Battaglia\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
a_preferences_init ();
a_vik_preferences_init ();
+ a_layer_defaults_init ();
+
a_download_init();
curl_download_init();
+ a_babel_init ();
+
/* Init modules/plugins */
modules_init();
gtk_window_set_default_icon(main_icon);
/* Create the first window */
- first_window = new_window();
+ first_window = vik_window_new_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 );
+ }
}
gtk_main ();
gdk_threads_leave ();
+ a_babel_uninit ();
+
a_background_uninit ();
a_mapcache_uninit ();
a_dems_uninit ();
+ a_layer_defaults_uninit ();
a_preferences_uninit ();
+ curl_download_uninit();
+
return 0;
}