X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=4ed38b3f357fb165c112f78d5da3f651fc588796;hb=65d602ed236d685ffec00ad1552a193cf47b2e4d;hp=ecb07f83ff378fb6c2c725220396642a68b551f5;hpb=002a30f274ced97769ebc3373c493a8e5329c2bc;p=pspp diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index ecb07f83ff..4ed38b3f35 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -1,6 +1,6 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014, 2015, 2016, - 2020 Free Software Foundation + Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014, 2015, + 2016, 2020 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,17 +17,12 @@ #include +#include "pre-initialisation.h" + #include "ui/gui/psppire.h" #include #include -#include -#include -#if ENABLE_RELOCATABLE && defined(__APPLE__) -static const bool apple_relocatable = true; -#else -static const bool apple_relocatable = false; -#endif #include "language/lexer/include-path.h" #include "libpspp/argv-parser.h" @@ -35,6 +30,7 @@ static const bool apple_relocatable = false; #include "libpspp/assertion.h" #include "libpspp/cast.h" #include "libpspp/copyleft.h" +#include "libpspp/message.h" #include "libpspp/str.h" #include "libpspp/string-array.h" #include "libpspp/version.h" @@ -56,7 +52,7 @@ static const bool apple_relocatable = false; static gboolean -show_version_and_exit () +show_version_and_exit (void) { version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION, "Ben Pfaff", "John Darrington", "Jason Stover", NULL_SENTINEL); @@ -68,19 +64,19 @@ show_version_and_exit () -gboolean +static gboolean init_prepare (GSource * source, gint * timeout_) { return TRUE; } -gboolean +static gboolean init_check (GSource * source) { return TRUE; } -gboolean +static gboolean init_dispatch (GSource * ss, GSourceFunc callback, gpointer user_data) { struct init_source *is = (struct init_source *) ss; @@ -98,12 +94,10 @@ init_dispatch (GSource * ss, GSourceFunc callback, gpointer user_data) } static GSourceFuncs init_funcs = - { init_prepare, init_check, init_dispatch, NULL }; - + { init_prepare, init_check, init_dispatch, NULL, NULL, NULL }; - -GtkWidget *wsplash = 0; -gint64 start_time = 0; +static GtkWidget *wsplash = 0; +static gint64 start_time = 0; static GtkWidget * @@ -243,18 +237,93 @@ wait_for_splash (GApplication *app, GtkWindow *x) } } +static GtkWidget *fatal_error_dialog = NULL; +static GtkWidget *fatal_error_label; +static const char *diagnostic_info; + +static void +fatal_error_handler (int sig) +{ + /* Reset SIG to its default handling so that if it happens again we won't + recurse. */ + signal (sig, SIG_DFL); + + static char message [1024]; + strcpy (message, "proximate cause: "); + switch (sig) + { + case SIGABRT: + strcat (message, "Assertion Failure/Abort"); + break; + case SIGFPE: + strcat (message, "Floating Point Exception"); + break; + case SIGSEGV: + strcat (message, "Segmentation Violation"); + break; + default: + strcat (message, "Unknown"); + break; + } + strcat (message, "\n"); + strcat (message, diagnostic_info); + + g_object_set (fatal_error_label, + "label", message, + NULL); + + gtk_dialog_run (GTK_DIALOG (fatal_error_dialog)); + + /* Re-raise the signal so that we terminate with the correct status. */ + raise (sig); +} + static void on_activate (GApplication * app, gpointer ud) { + struct sigaction fatal_error_action; + sigset_t sigset; + g_return_if_fail (0 == sigemptyset (&sigset)); + fatal_error_dialog = + gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, + _("Psppire: Fatal Error")); + + diagnostic_info = prepare_diagnostic_information (); + + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (fatal_error_dialog), + _("You have discovered a bug in PSPP. " + "Please report this to %s including all of the following information, " + "and a description of what you were doing when this happened."), + PACKAGE_BUGREPORT); + + g_return_if_fail (fatal_error_dialog != NULL); + + GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (fatal_error_dialog)); + fatal_error_label = gtk_label_new (""); + g_object_set (fatal_error_label, + "selectable", TRUE, + "wrap", TRUE, + NULL); + gtk_container_add (GTK_CONTAINER (content_area), fatal_error_label); + + gtk_widget_show_all (content_area); + + fatal_error_action.sa_handler = fatal_error_handler; + fatal_error_action.sa_mask = sigset; + fatal_error_action.sa_flags = 0; + post_initialise (app); GtkWindow *x = create_data_window (); gtk_application_add_window (GTK_APPLICATION (app), x); wait_for_splash (app, x); + sigaction (SIGABRT, &fatal_error_action, NULL); + sigaction (SIGSEGV, &fatal_error_action, NULL); + sigaction (SIGFPE, &fatal_error_action, NULL); } -GtkWindow * +static GtkWindow * find_empty_data_window (GApplication *app) { GList *wl = gtk_application_get_windows (GTK_APPLICATION (app)); @@ -268,7 +337,7 @@ find_empty_data_window (GApplication *app) return NULL; } -GtkWindow * +static GtkWindow * find_psppire_window (GApplication *app) { GList *wl = gtk_application_get_windows (GTK_APPLICATION (app)); @@ -311,7 +380,7 @@ process_pre_start_arguments (int *argc, char ***argv) GOptionEntry oe[] = { {"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK, show_version_and_exit, N_("Show version information and exit"), 0}, - {NULL} + {NULL, 0, 0, 0, NULL, "", 0} }; GOptionContext *oc = g_option_context_new (""); @@ -322,85 +391,11 @@ process_pre_start_arguments (int *argc, char ***argv) g_option_context_free (oc); } -static void -pspp_macos_setenv (const char * progname) -{ - /* helper to set environment variables for pspp to be relocatable. - * Due to the latest changes it is not recommended to set it in the shell - * wrapper anymore. - */ - gchar resolved_path[PATH_MAX]; - /* on some OSX installations open file limit is 256 and GIMP needs more */ - struct rlimit limit; - limit.rlim_cur = 10000; - limit.rlim_max = 10000; - setrlimit (RLIMIT_NOFILE, &limit); - if (realpath (progname, resolved_path)) - { - gchar tmp[PATH_MAX]; - gchar *app_dir; - gchar res_dir[PATH_MAX]; - struct stat sb; - - app_dir = g_path_get_dirname (resolved_path); - g_snprintf (tmp, sizeof(tmp), "%s/../../Resources", app_dir); - if (realpath (tmp, res_dir) && !stat (res_dir,&sb) && S_ISDIR (sb.st_mode)) - g_print ("pspp is started as MacOS application\n"); - else - return; - g_free (app_dir); - - g_snprintf (tmp, sizeof(tmp), "%s/lib/gtk-3.0/3.0.0", res_dir); - g_setenv ("GTK_PATH", tmp, TRUE); - g_snprintf (tmp, sizeof(tmp), "%s/etc/gtk-3.0/gtk.immodules", res_dir); - g_setenv ("GTK_IM_MODULE_FILE", tmp, TRUE); - g_snprintf (tmp, sizeof(tmp), "%s/lib/gegl-0.4", res_dir); - g_setenv ("GEGL_PATH", tmp, TRUE); - g_snprintf (tmp, sizeof(tmp), "%s/lib/babl-0.1", res_dir); - g_setenv ("BABL_PATH", tmp, TRUE); - g_snprintf (tmp, sizeof(tmp), "%s/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache", res_dir); - g_setenv ("GDK_PIXBUF_MODULE_FILE", tmp, TRUE); - g_snprintf (tmp, sizeof(tmp), "%s/etc/fonts", res_dir); - g_setenv ("FONTCONFIG_PATH", tmp, TRUE); - g_snprintf (tmp, sizeof(tmp), "%s/lib/gio/modules", res_dir); - g_setenv ("GIO_MODULE_DIR", tmp, TRUE); - g_snprintf (tmp, sizeof(tmp), "%s/etc/xdg", res_dir); - g_setenv ("XDG_CONFIG_DIRS", tmp, TRUE); - g_snprintf (tmp, sizeof(tmp), "%s/share", res_dir); - g_setenv ("XDG_DATA_DIRS", tmp, TRUE); - - if (g_getenv ("HOME")!=NULL) - { - g_snprintf (tmp, sizeof(tmp), - "%s/Library/Application Support/pspp/1.3/cache", - g_getenv("HOME")); - g_setenv ("XDG_CACHE_HOME", tmp, TRUE); - } - } -} - int main (int argc, char *argv[]) { - if (apple_relocatable) - { - /* remove MacOS session identifier from the command line args */ - gint newargc = 0; - for (gint i = 0; i < argc; i++) - { - if (!g_str_has_prefix (argv[i], "-psn_")) - { - argv[newargc] = argv[i]; - newargc++; - } - } - if (argc > newargc) - { - argv[newargc] = NULL; /* glib expects NULL terminated array */ - argc = newargc; - } - pspp_macos_setenv (argv[0]); - } + /* Some operating systems need to munge the arguments. */ + pre_initialisation (&argc, argv); set_program_name (argv[0]);