/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2004, 2005, 2006, 2010 Free Software Foundation
+ Copyright (C) 2004, 2005, 2006, 2010, 2011, 2012 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
#include <gtk/gtk.h>
#include <stdlib.h>
+#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"
OPT_HELP,
OPT_VERSION,
OPT_NO_SPLASH,
+ OPT_MEASURE_STARTUP,
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;
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 .sav file, a .por file or a syntax\n\
+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 ();
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 ();
}
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)
struct initialisation_parameters
{
- struct source_stream *ss;
const char *data_file;
GtkWidget *splash_window;
};
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 ();
realloc
};
+#ifdef __APPLE__
+/* 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 int
+remove_psn (int argc, char **argv)
+{
+ 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;
+}
+#endif /* __APPLE__ */
+
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);
+ g_thread_init (NULL);
gtk_disable_setlocale ();
+ startup = g_timer_new ();
+ g_timer_start (startup);
if ( ! gtk_parse_args (&argc, &argv) )
{
g_warning ("%s", vers);
}
+#ifdef __APPLE__
+ argc = remove_psn (argc, argv);
+#endif
- 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);
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 )
projects / pspp / blobdiff