X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=1e59f8431fc5fa8783ca3c910180001b69e08a08;hb=9682fa965a7d96dbfbc89324ebfc41a0c73f4fb6;hp=eddf3fe3347b750844442d3e8ccbcb8a1065d4f8;hpb=547aa92b0d16ea0f5accb25ef8d72eaf95769c04;p=pspp diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index eddf3fe334..1e59f8431f 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 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 @@ -21,12 +21,15 @@ #include #include +#include "language/lexer/include-path.h" #include "libpspp/argv-parser.h" +#include "libpspp/array.h" #include "libpspp/assertion.h" -#include "libpspp/getl.h" -#include "libpspp/version.h" +#include "libpspp/cast.h" #include "libpspp/copyleft.h" #include "libpspp/str.h" +#include "libpspp/string-array.h" +#include "libpspp/version.h" #include "ui/source-init-opts.h" #include "gl/configmake.h" @@ -47,6 +50,7 @@ enum OPT_HELP, OPT_VERSION, OPT_NO_SPLASH, + OPT_MEASURE_STARTUP, N_STARTUP_OPTIONS }; @@ -54,31 +58,19 @@ 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} + {"no-splash", 'q', no_argument, OPT_NO_SPLASH}, + {"measure-startup", 0, no_argument, OPT_MEASURE_STARTUP}, }; -static char * -get_default_include_path (void) -{ - struct source_stream *ss; - struct string dst; - char **path; - size_t i; - - ss = create_source_stream (); - path = getl_include_path (ss); - ds_init_empty (&dst); - for (i = 0; path[i] != NULL; i++) - ds_put_format (&dst, " %s", path[i]); - destroy_source_stream (ss); - - return ds_steal_cstr (&dst); -} +/* --measure-startup: Prints the elapsed time to start up and load any file + specified on the command line. */ +static gboolean measure_startup; +static GTimer *startup; static void usage (void) { - char *default_include_path = get_default_include_path (); + char *inc_path = string_array_join (include_path_default (), " "); GOptionGroup *gtk_options; GOptionContext *ctx; gchar *gtk_help_base, *gtk_help; @@ -96,7 +88,7 @@ usage (void) 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\ +PSPPIRE, a GUI for PSPP, a program for statistical analysis of sampled data.\n\ Usage: %s [OPTION]... FILE\n\ \n\ Arguments to long options also apply to equivalent short options.\n\ @@ -115,16 +107,17 @@ Language options:\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\ +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, default_include_path); +A non-option argument is interpreted as a data file in .sav or .zsav or .por\n\ +format or a syntax file to load.\n"), + program_name, gtk_help, inc_path); - free (default_include_path); + free (inc_path); g_free (gtk_help_base); emit_bug_reporting_address (); @@ -145,13 +138,17 @@ startup_option_callback (int id, void *show_splash_) case OPT_VERSION: version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION, "Ben Pfaff", "John Darrington", "Jason Stover", - (char *) NULL); + NULL_SENTINEL); exit (EXIT_SUCCESS); case OPT_NO_SPLASH: *show_splash = FALSE; break; + case OPT_MEASURE_STARTUP: + measure_startup = TRUE; + break; + default: NOT_REACHED (); } @@ -191,17 +188,28 @@ hide_splash_window (gpointer data) return FALSE; } +static gboolean +print_startup_time (gpointer data) +{ + g_timer_stop (startup); + printf ("%.3f seconds elapsed\n", g_timer_elapsed (startup, NULL)); + g_timer_destroy (startup); + startup = NULL; + + return FALSE; +} +/* static gboolean quit_one_loop (gpointer data) { gtk_main_quit (); return FALSE; } +*/ struct initialisation_parameters { - struct source_stream *ss; const char *data_file; GtkWidget *splash_window; }; @@ -211,10 +219,19 @@ static gboolean run_inner_loop (gpointer data) { struct initialisation_parameters *ip = data; - initialize (ip->ss, ip->data_file); + initialize (ip->data_file); g_timeout_add (500, hide_splash_window, ip->splash_window); + if (measure_startup) + { + GSource *source = g_idle_source_new (); + g_source_set_priority (source, G_PRIORITY_LOW); + g_source_set_callback (source, print_startup_time, NULL, NULL); + g_source_attach (source, NULL); + g_source_unref (source); + } + gtk_main (); de_initialize (); @@ -233,21 +250,56 @@ static GMemVTable vtable = realloc }; +#ifdef __APPLE__ +static const bool apple = true; +#else +static const bool apple = false; +#endif + +/* Searches ARGV for the -psn_xxxx option that the desktop application + launcher passes in, and removes it if it finds it. Returns the new value + of ARGC. */ +static inline int +remove_psn (int argc, char **argv) +{ + if (apple) + { + int i; + + for (i = 0; i < argc; i++) + { + if (!strncmp (argv[i], "-psn", 4)) + { + remove_element (argv, argc + 1, sizeof *argv, i); + return argc - 1; + } + } + } + return argc; +} + int main (int argc, char *argv[]) { struct initialisation_parameters init_p; gboolean show_splash = TRUE; struct argv_parser *parser; - struct source_stream *ss; const gchar *vers; set_program_name (argv[0]); g_mem_set_vtable (&vtable); +#if !GLIB_CHECK_VERSION(2,32,0) + /* g_thread_init() was required before glib 2.32, but it is deprecated since + then and calling it yields a compile-time warning. */ + g_thread_init (NULL); +#endif + gtk_disable_setlocale (); + startup = g_timer_new (); + g_timer_start (startup); if ( ! gtk_parse_args (&argc, &argv) ) { @@ -262,30 +314,36 @@ main (int argc, char *argv[]) g_warning ("%s", vers); } - /* Let GDK remove any options that it owns. */ - gdk_init (&argc, &argv); + argc = remove_psn (argc, argv); - /* Parse our own options. */ - ss = create_source_stream (); + /* 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, ss); + 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); + init_p.splash_window = create_splash_window (); - init_p.ss = ss; init_p.data_file = optind < argc ? argv[optind] : NULL; - if ( show_splash ) - gtk_widget_show (init_p.splash_window); + // if ( show_splash ) + // gtk_widget_show (init_p.splash_window); - g_idle_add (quit_one_loop, 0); + // g_idle_add (quit_one_loop, 0); - gtk_quit_add (0, run_inner_loop, &init_p); - gtk_main (); + // gtk_quit_add (0, run_inner_loop, &init_p); + run_inner_loop (&init_p); + // gtk_main (); return 0; }