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=7fa660df84349806386d4c6c3e424ba7e18d4b82;hpb=fd4b99dc5367c6cd8f4ef2d9a151d001676eef7f;p=pspp diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 7fa660df84..4ed38b3f35 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -1,5 +1,6 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014, 2015, 2016 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 @@ -16,6 +17,8 @@ #include +#include "pre-initialisation.h" + #include "ui/gui/psppire.h" #include @@ -27,6 +30,7 @@ #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" @@ -48,7 +52,7 @@ 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); @@ -60,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; @@ -90,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 * @@ -161,7 +163,7 @@ on_local_options (GApplication * application, start_time = g_get_monotonic_time (); } - + return -1; } @@ -235,27 +237,136 @@ 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); } +static GtkWindow * +find_empty_data_window (GApplication *app) +{ + GList *wl = gtk_application_get_windows (GTK_APPLICATION (app)); + while (wl) + { + if (wl->data && PSPPIRE_IS_DATA_WINDOW (GTK_WINDOW (wl->data)) && + psppire_data_window_is_empty (PSPPIRE_DATA_WINDOW (wl->data))) + return GTK_WINDOW (wl->data); + wl = wl->next; + } + return NULL; +} + +static GtkWindow * +find_psppire_window (GApplication *app) +{ + GList *wl = gtk_application_get_windows (GTK_APPLICATION (app)); + while (wl) + { + if (wl->data && PSPPIRE_IS_WINDOW (GTK_WINDOW (wl->data))) + return GTK_WINDOW (wl->data); + wl = wl->next; + } + return NULL; +} static void on_open (GApplication *app, GFile **files, gint n_files, gchar * hint, gpointer ud) { - post_initialise (app); + /* If the application is already open and we open another file + via xdg-open on GNU/Linux or via the file manager, then open is + called. Check if we already have a psppire window. */ + if (find_psppire_window (app) == NULL) + post_initialise (app); + + /* When a new data file is opened, then try to find an empty + data window which will then be replaced as in the open file + dialog */ + GtkWindow *victim = find_empty_data_window (app); gchar *file = g_file_get_parse_name (files[0]); - GtkWindow *x = psppire_preload_file (file); + GtkWindow *x = psppire_preload_file (file, victim); g_free (file); wait_for_splash (app, x); @@ -269,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 (""); @@ -277,12 +388,17 @@ process_pre_start_arguments (int *argc, char ***argv) g_option_context_set_ignore_unknown_options (oc, FALSE); g_option_context_add_main_entries (oc, oe, NULL); g_option_context_parse (oc, argc, argv, NULL); + g_option_context_free (oc); } - int main (int argc, char *argv[]) { + /* Some operating systems need to munge the arguments. */ + pre_initialisation (&argc, argv); + + set_program_name (argv[0]); + GtkApplication *app = gtk_application_new ("gnu.pspp", G_APPLICATION_HANDLES_OPEN); @@ -318,5 +434,6 @@ main (int argc, char *argv[]) g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_new_data)); } + g_object_set (G_OBJECT (app), "register-session", TRUE, NULL); return g_application_run (G_APPLICATION (app), argc, argv); }