X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=2d90ce8fd257648527c26850d1809e8a9b1c6a4c;hb=7293c1a383d325c371bd708401e5a1d7586a4d90;hp=7e9d4ee51a8960f2d52cb365076888e2eeca715e;hpb=fe8dc2171009e90d2335f159d05f7e6660e24780;p=pspp diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 7e9d4ee51a..2d90ce8fd2 100644 --- a/src/ui/gui/main.c +++ b/src/ui/gui/main.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2004, 2005, 2006, 2010 Free Software Foundation + Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012, 2013, 2014, 2015, 2016 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 @@ -23,6 +23,7 @@ #include "language/lexer/include-path.h" #include "libpspp/argv-parser.h" +#include "libpspp/array.h" #include "libpspp/assertion.h" #include "libpspp/cast.h" #include "libpspp/copyleft.h" @@ -30,6 +31,9 @@ #include "libpspp/string-array.h" #include "libpspp/version.h" #include "ui/source-init-opts.h" +#include "ui/gui/psppire-syntax-window.h" +#include "ui/gui/psppire-data-window.h" +#include "ui/gui/psppire-output-window.h" #include "gl/configmake.h" #include "gl/progname.h" @@ -41,237 +45,252 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid + + +static gboolean +show_version_and_exit () +{ + version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION, + "Ben Pfaff", "John Darrington", "Jason Stover", NULL_SENTINEL); + + exit (0); + + return TRUE; +} -/* Arguments to be interpreted before the X server gets initialised */ -enum - { - OPT_HELP, - OPT_VERSION, - OPT_NO_SPLASH, - N_STARTUP_OPTIONS - }; -static const struct argv_option startup_options[N_STARTUP_OPTIONS] = - { - {"help", 'h', no_argument, OPT_HELP}, - {"version", 'V', no_argument, OPT_VERSION}, - {"no-splash", 'q', no_argument, OPT_NO_SPLASH} - }; +gboolean +init_prepare (GSource * source, gint * timeout_) +{ + return TRUE; +} -static void -usage (void) +gboolean +init_check (GSource * source) { - char *inc_path = string_array_join (include_path_default (), " "); - GOptionGroup *gtk_options; - GOptionContext *ctx; - gchar *gtk_help_base, *gtk_help; - - /* Get help text for GTK+ options. */ - ctx = g_option_context_new ("psppire"); - gtk_options = gtk_get_option_group (FALSE); - gtk_help_base = g_option_context_get_help (ctx, FALSE, gtk_options); - g_option_context_free (ctx); - - /* The GTK+ help text starts with usage instructions that we don't want, - followed by a blank line. Trim off everything up to and including the - first blank line. */ - gtk_help = strstr (gtk_help_base, "\n\n"); - gtk_help = gtk_help != NULL ? gtk_help + 2 : gtk_help_base; - - printf (_("\ -PSPPIRE, a GUI for PSPP, a program for statistical analysis of sample data.\n\ -Usage: %s [OPTION]... FILE\n\ -\n\ -Arguments to long options also apply to equivalent short options.\n\ -\n\ -GUI options:\n\ - -q, --no-splash don't show splash screen during startup\n\ -\n\ -%s\ -Language options:\n\ - -I, --include=DIR append DIR to search path\n\ - -I-, --no-include clear search path\n\ - -a, --algorithm={compatible|enhanced}\n\ - set to `compatible' if you want output\n\ - calculated from broken algorithms\n\ - -x, --syntax={compatible|enhanced}\n\ - set to `compatible' to disable PSPP extensions\n\ - -i, --interactive interpret syntax in interactive mode\n\ - -s, --safer don't allow some unsafe operations\n\ -Default search path: %s\n\ -\n\ -Informative output:\n\ - -h, --help display this help and exit\n\ - -V, --version output version information and exit\n\ -\n\ -A non-option argument is interpreted as a .sav or .por file to load.\n"), - program_name, gtk_help, inc_path); - - free (inc_path); - g_free (gtk_help_base); - - emit_bug_reporting_address (); - exit (EXIT_SUCCESS); + return TRUE; } -static void -startup_option_callback (int id, void *show_splash_) +gboolean +init_dispatch (GSource * ss, GSourceFunc callback, gpointer user_data) { - gboolean *show_splash = show_splash_; + struct init_source *is = (struct init_source *) ss; - switch (id) + bool finished = initialize (is); + is->state++; + + if (finished) { - case OPT_HELP: - usage (); - break; - - case OPT_VERSION: - version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION, - "Ben Pfaff", "John Darrington", "Jason Stover", - NULL_SENTINEL); - exit (EXIT_SUCCESS); - - case OPT_NO_SPLASH: - *show_splash = FALSE; - break; - - default: - NOT_REACHED (); + g_main_loop_quit (is->loop); + return FALSE; } + + return TRUE; } + +static GSourceFuncs init_funcs = + { init_prepare, init_check, init_dispatch, NULL }; + + +GtkWidget *wsplash; +gint64 start_time = 0; + + static GtkWidget * create_splash_window (void) { - GtkWidget *splash ; - GtkWidget *image; + GtkWidget *sp = gtk_window_new (GTK_WINDOW_TOPLEVEL); + + const gchar *filename = PKGDATADIR "/splash.png"; + const char *relocated_filename = relocate (filename); + GtkWidget *l = gtk_image_new_from_file (relocated_filename); + if (filename != relocated_filename) + free (CONST_CAST (char *, relocated_filename)); + + gtk_container_add (GTK_CONTAINER (sp), l); + gtk_window_set_type_hint (GTK_WINDOW (sp), + GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); + gtk_window_set_position (GTK_WINDOW (sp), GTK_WIN_POS_CENTER); + gtk_window_set_skip_pager_hint (GTK_WINDOW (sp), TRUE); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (sp), TRUE); + gtk_window_set_focus_on_map (GTK_WINDOW (sp), FALSE); + gtk_window_set_accept_focus (GTK_WINDOW (sp), FALSE); + + GdkGeometry hints; + hints.max_height = 100; + hints.max_width = 200; + gtk_window_set_geometry_hints (GTK_WINDOW (sp), + NULL, &hints, GDK_HINT_MAX_SIZE); + + + gtk_window_set_gravity (GTK_WINDOW (sp), GDK_GRAVITY_CENTER); + + gtk_window_set_modal (GTK_WINDOW (sp), TRUE); + gtk_window_set_decorated (GTK_WINDOW (sp), FALSE); + gtk_window_set_keep_above (GTK_WINDOW (sp), TRUE); + gtk_widget_show_all (sp); + return sp; +} - gtk_window_set_auto_startup_notification (FALSE); - splash = gtk_window_new (GTK_WINDOW_POPUP); +static gint +on_local_options (GApplication * application, + GVariantDict * options, gpointer user_data) +{ + GVariant *b; - gtk_window_set_position (GTK_WINDOW (splash), - GTK_WIN_POS_CENTER_ALWAYS); + b = + g_variant_dict_lookup_value (options, "no-splash", + G_VARIANT_TYPE_BOOLEAN); + if (b) + { + g_variant_unref (b); + } + else + { + start_time = g_get_monotonic_time (); + } + + return -1; +} - gtk_window_set_type_hint (GTK_WINDOW (splash), - GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); - image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png")); +static void +on_startup (GApplication * app, gpointer ud) +{ + GMainContext *context = g_main_context_new (); - gtk_container_add (GTK_CONTAINER (splash), image); + if (start_time != 0) + { + wsplash = create_splash_window (); + gtk_application_add_window (GTK_APPLICATION (app), + GTK_WINDOW (wsplash)); + } - gtk_widget_show (image); + GMainLoop *loop = g_main_loop_new (context, FALSE); - return splash; + GSource *ss = g_source_new (&init_funcs, sizeof (struct init_source)); + + ((struct init_source *) ss)->loop = loop; + ((struct init_source *) ss)->state = 0; + + g_source_set_priority (ss, G_PRIORITY_DEFAULT); + + g_source_attach (ss, context); + g_main_loop_run (loop); } -static gboolean -hide_splash_window (gpointer data) + +static void +post_initialise (GApplication * app) { - GtkWidget *splash = data; - gtk_widget_destroy (splash); - gtk_window_set_auto_startup_notification (TRUE); - return FALSE; + register_selection_functions (); + psppire_output_window_setup (); + + GSimpleAction *quit = g_simple_action_new ("quit", NULL); + g_signal_connect_swapped (quit, "activate", G_CALLBACK (psppire_quit), app); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (quit)); } +#define SPLASH_DURATION 1000 + static gboolean -quit_one_loop (gpointer data) +destroy_splash (gpointer ud) { - gtk_main_quit (); - return FALSE; + GtkWidget *sp = GTK_WIDGET (ud); + gtk_widget_destroy (sp); + return G_SOURCE_REMOVE; } -struct initialisation_parameters +static void +on_activate (GApplication * app, gpointer ud) { - const char *data_file; - GtkWidget *splash_window; -}; + post_initialise (app); + + GtkWindow *x = create_data_window (); + gtk_window_set_transient_for (GTK_WINDOW (wsplash), GTK_WINDOW (x)); + gtk_application_add_window (GTK_APPLICATION (app), x); + gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (wsplash)); + gtk_window_set_keep_above (GTK_WINDOW (wsplash), TRUE); + gtk_window_present (GTK_WINDOW (wsplash)); + + /* Remove the splash screen after SPLASH_DURATION milliseconds */ + gint64 elapsed_time = (g_get_monotonic_time () - start_time) / 1000; + if (SPLASH_DURATION - elapsed_time <= 0) + destroy_splash (wsplash); + else + g_timeout_add (SPLASH_DURATION - elapsed_time, destroy_splash, wsplash); +} -static gboolean -run_inner_loop (gpointer data) +static void +on_open (GApplication * app, GFile ** files, gint n_files, gchar * hint, + gpointer ud) { - struct initialisation_parameters *ip = data; - initialize (ip->data_file); + post_initialise (app); - g_timeout_add (500, hide_splash_window, ip->splash_window); + gchar *file = g_file_get_parse_name (files[0]); + psppire_preload_file (file); + g_free (file); +} - gtk_main (); - de_initialize (); +/* These are arguments which must be processed BEFORE the X server has been initialised */ +static void +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, "Show version information and exit", 0}, + {NULL} + }; - return FALSE; + GOptionContext *oc = g_option_context_new (""); + g_option_context_set_help_enabled (oc, FALSE); + 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); } -static GMemVTable vtable = - { - xmalloc, - xrealloc, - free, - xcalloc, - malloc, - realloc - }; - int main (int argc, char *argv[]) { - struct initialisation_parameters init_p; - gboolean show_splash = TRUE; - struct argv_parser *parser; - const gchar *vers; - - set_program_name (argv[0]); - - g_mem_set_vtable (&vtable); - - gtk_disable_setlocale (); - - - if ( ! gtk_parse_args (&argc, &argv) ) - { - perror ("Error parsing arguments"); - exit (1); - } - - if ( (vers = gtk_check_version (GTK_MAJOR_VERSION, - GTK_MINOR_VERSION, - GTK_MICRO_VERSION)) ) - { - g_warning ("%s", vers); - } + GtkApplication *app = + gtk_application_new ("gnu.pspp", G_APPLICATION_HANDLES_OPEN); + process_pre_start_arguments (&argc, &argv); - /* Parse our own options. - This must come BEFORE gdk_init otherwise options such as - --help --version which ought to work without an X server, won't. - */ - parser = argv_parser_create (); - argv_parser_add_options (parser, startup_options, N_STARTUP_OPTIONS, - startup_option_callback, &show_splash); - source_init_register_argv_parser (parser); - if (!argv_parser_run (parser, argc, argv)) - exit (EXIT_FAILURE); - argv_parser_destroy (parser); - - /* Initialise GDK. Theoretically this call can remove options from argc,argv if - it thinks they are gdk options. - However there shouldn't be any here because of the gtk_parse_args call above. */ - gdk_init (&argc, &argv); + GOptionEntry oe[] = { + {"no-splash", 'q', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, NULL, + "Do not display the splash screen", 0}, + {NULL} + }; - init_p.splash_window = create_splash_window (); - init_p.data_file = optind < argc ? argv[optind] : NULL; + g_application_add_main_option_entries (G_APPLICATION (app), oe); - if ( show_splash ) - gtk_widget_show (init_p.splash_window); + g_signal_connect (app, "startup", G_CALLBACK (on_startup), NULL); + g_signal_connect (app, "activate", G_CALLBACK (on_activate), NULL); + g_signal_connect (app, "handle-local-options", + G_CALLBACK (on_local_options), NULL); + g_signal_connect (app, "open", G_CALLBACK (on_open), NULL); - g_idle_add (quit_one_loop, 0); + { + GSimpleAction *act_new_syntax = g_simple_action_new ("new-syntax", NULL); + g_signal_connect_swapped (act_new_syntax, "activate", + G_CALLBACK (create_syntax_window), NULL); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_new_syntax)); + } - gtk_quit_add (0, run_inner_loop, &init_p); - gtk_main (); + { + GSimpleAction *act_new_data = g_simple_action_new ("new-data", NULL); + g_signal_connect_swapped (act_new_data, "activate", + G_CALLBACK (create_data_window), NULL); + g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_new_data)); + } - return 0; + return g_application_run (G_APPLICATION (app), argc, argv); }