/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2004, 2005, 2006 Free Software Foundation
+ Copyright (C) 2004, 2005, 2006, 2010 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
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
+#include "ui/gui/psppire.h"
+
#include <gtk/gtk.h>
-#include "psppire.h"
-#include "progname.h"
#include <stdlib.h>
-#include <argp.h>
-#include <gl/relocatable.h>
-#include <ui/command-line.h>
-#include <ui/source-init-opts.h>
-#include <libpspp/version.h>
-#include <libpspp/copyleft.h>
+#include "libpspp/argv-parser.h"
+#include "libpspp/assertion.h"
+#include "libpspp/getl.h"
+#include "libpspp/version.h"
+#include "libpspp/copyleft.h"
+#include "libpspp/str.h"
+#include "ui/source-init-opts.h"
+
+#include "gl/configmake.h"
+#include "gl/progname.h"
+#include "gl/relocatable.h"
+#include "gl/version-etc.h"
+#include "gl/xalloc.h"
#include "gettext.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
-const char *argp_program_version = version;
-const char *argp_program_bug_address = PACKAGE_BUGREPORT;
-
\f
/* Arguments to be interpreted before the X server gets initialised */
-static const struct argp_option startup_options [] =
+enum
{
- {"no-splash", 'q', 0, 0, N_("Don't show the splash screen"), 0 },
- { 0, 0, 0, 0, 0, 0 }
+ OPT_HELP,
+ OPT_VERSION,
+ OPT_NO_SPLASH,
+ N_STARTUP_OPTIONS
};
-static error_t
-parse_startup_opts (int key, char *arg, struct argp_state *state)
+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}
+ };
+
+static char *
+get_default_include_path (void)
{
- gboolean *showsplash = state->input;
+ 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);
+}
- switch (key)
+static void
+usage (void)
+{
+ char *default_include_path = get_default_include_path ();
+ 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, default_include_path);
+
+ free (default_include_path);
+ g_free (gtk_help_base);
+
+ emit_bug_reporting_address ();
+ exit (EXIT_SUCCESS);
+}
+
+static void
+startup_option_callback (int id, void *show_splash_)
+{
+ gboolean *show_splash = show_splash_;
+
+ switch (id)
{
- case 'q':
- *showsplash = FALSE;
+ case OPT_HELP:
+ usage ();
break;
+
+ case OPT_VERSION:
+ version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION,
+ "Ben Pfaff", "John Darrington", "Jason Stover",
+ (char *) NULL);
+ exit (EXIT_SUCCESS);
+
+ case OPT_NO_SPLASH:
+ *show_splash = FALSE;
+ break;
+
default:
- return ARGP_ERR_UNKNOWN;
+ NOT_REACHED ();
}
- return 0;
}
-
-static const struct argp startup_argp = {startup_options, parse_startup_opts, 0, 0, 0, 0, 0};
-
\f
-
static GtkWidget *
create_splash_window (void)
{
struct initialisation_parameters
{
- int argc;
- char **argv;
+ struct source_stream *ss;
+ const char *data_file;
GtkWidget *splash_window;
- struct command_line_processor *clp;
};
run_inner_loop (gpointer data)
{
struct initialisation_parameters *ip = data;
- initialize (ip->clp, ip->argc, ip->argv);
+ initialize (ip->ss, ip->data_file);
g_timeout_add (500, hide_splash_window, ip->splash_window);
}
+static GMemVTable vtable =
+ {
+ xmalloc,
+ xrealloc,
+ free,
+ xcalloc,
+ malloc,
+ realloc
+ };
int
main (int argc, char *argv[])
{
- struct command_line_processor *clp ;
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);
+
+ gtk_disable_setlocale ();
+
+
if ( ! gtk_parse_args (&argc, &argv) )
{
perror ("Error parsing arguments");
GTK_MINOR_VERSION,
GTK_MICRO_VERSION)) )
{
- g_warning (vers);
+ g_warning ("%s", vers);
}
- clp = command_line_processor_create (_("PSPPIRE --- A user interface for PSPP"), "[ DATA-FILE ]", 0);
-
- command_line_processor_add_options (clp, &startup_argp, _("Miscellaneous options:"), &show_splash);
- command_line_processor_add_options (clp, &post_init_argp,
- _("Options affecting syntax and behavior:"), NULL);
- command_line_processor_add_options (clp, &non_option_argp, NULL, NULL);
-
- command_line_processor_parse (clp, argc, argv);
+ 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);
+ 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.argc = argc;
- init_p.argv = argv;
- init_p.clp = clp;
+ init_p.ss = ss;
+ init_p.data_file = optind < argc ? argv[optind] : NULL;
if ( show_splash )
gtk_widget_show (init_p.splash_window);