X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=7e9d4ee51a8960f2d52cb365076888e2eeca715e;hb=9ade26c8349b4434008c46cf09bc7473ec743972;hp=e0e680f30b5e621b6b21b320b652918519f17f88;hpb=c1fb8a1c11cbebbf805b03d43068ead9ec60327d;p=pspp-builds.git

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index e0e680f3..7e9d4ee5 100644
--- a/src/ui/gui/main.c
+++ b/src/ui/gui/main.c
@@ -21,15 +21,20 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 
+#include "language/lexer/include-path.h"
 #include "libpspp/argv-parser.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"
 #include "gl/progname.h"
 #include "gl/relocatable.h"
+#include "gl/version-etc.h"
 #include "gl/xalloc.h"
 
 #include "gettext.h"
@@ -41,15 +46,75 @@
 
 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}
   };
 
+static void
+usage (void)
+{
+  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);
+}
+
 static void
 startup_option_callback (int id, void *show_splash_)
 {
@@ -57,6 +122,16 @@ startup_option_callback (int id, void *show_splash_)
 
   switch (id)
     {
+    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;
@@ -110,7 +185,6 @@ quit_one_loop (gpointer data)
 
 struct initialisation_parameters
 {
-  struct source_stream *ss;
   const char *data_file;
   GtkWidget *splash_window;
 };
@@ -120,7 +194,7 @@ 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);
 
@@ -148,7 +222,6 @@ 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]);
@@ -171,21 +244,25 @@ main (int argc, char *argv[])
       g_warning ("%s", vers);
     }
 
-  /* Let GDK remove any options that it owns. */
-  gdk_init (&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 )