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=6d5f50e1bf0df744b1d14722776cfab4ad4eff6e;hpb=5f8dc7ca9962b212d623566e287b0f1d365f6398;p=pspp-builds.git
diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index 6d5f50e1..7e9d4ee5 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 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
@@ -15,20 +15,132 @@
along with this program. If not, see . */
#include
-#include
-#include "psppire.h"
-#include "progname.h"
-#include
-#include
-#include
-#include
+#include "ui/gui/psppire.h"
-static gboolean parse_command_line (int *argc, char ***argv, gchar **filename,
- gboolean *show_splash, GError **err);
+#include
+#include
+#include "language/lexer/include-path.h"
+#include "libpspp/argv-parser.h"
+#include "libpspp/assertion.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"
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+
+/* 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}
+ };
+
+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_)
+{
+ gboolean *show_splash = 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;
+
+ default:
+ NOT_REACHED ();
+ }
+}
+
static GtkWidget *
create_splash_window (void)
{
@@ -45,7 +157,7 @@ create_splash_window (void)
gtk_window_set_type_hint (GTK_WINDOW (splash),
GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
- image = gtk_image_new_from_file (PKGDATADIR "/splash.png");
+ image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png"));
gtk_container_add (GTK_CONTAINER (splash), image);
@@ -71,13 +183,20 @@ quit_one_loop (gpointer data)
return FALSE;
}
+struct initialisation_parameters
+{
+ const char *data_file;
+ GtkWidget *splash_window;
+};
+
static gboolean
run_inner_loop (gpointer data)
{
- initialize ();
+ struct initialisation_parameters *ip = data;
+ initialize (ip->data_file);
- g_timeout_add (500, hide_splash_window, data);
+ g_timeout_add (500, hide_splash_window, ip->splash_window);
gtk_main ();
@@ -87,18 +206,31 @@ run_inner_loop (gpointer data)
}
+static GMemVTable vtable =
+ {
+ xmalloc,
+ xrealloc,
+ free,
+ xcalloc,
+ malloc,
+ realloc
+ };
int
main (int argc, char *argv[])
{
- GtkWidget *splash_window;
- gchar *filename = 0;
+ struct initialisation_parameters init_p;
gboolean show_splash = TRUE;
- GError *err = 0;
+ 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");
@@ -109,78 +241,37 @@ main (int argc, char *argv[])
GTK_MINOR_VERSION,
GTK_MICRO_VERSION)) )
{
- g_warning (vers);
+ g_warning ("%s", vers);
}
- /* Deal with options like --version, --help etc */
- if ( ! parse_command_line (&argc, &argv, &filename, &show_splash, &err) )
- {
- g_clear_error (&err);
- return 0;
- }
+ /* 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);
- splash_window = create_splash_window ();
+ init_p.splash_window = create_splash_window ();
+ init_p.data_file = optind < argc ? argv[optind] : NULL;
+
if ( show_splash )
- gtk_widget_show (splash_window);
+ gtk_widget_show (init_p.splash_window);
g_idle_add (quit_one_loop, 0);
- gtk_quit_add (0, run_inner_loop, splash_window);
+ gtk_quit_add (0, run_inner_loop, &init_p);
gtk_main ();
-
return 0;
}
-
-
-/* Parses the command line specified by ARGC and ARGV as received by
- main (). Returns true if normal execution should proceed,
- false if the command-line indicates that PSPP should exit. */
-static gboolean
-parse_command_line (int *argc, char ***argv, gchar **filename,
- gboolean *show_splash, GError **err)
-{
-
- static struct option long_options[] =
- {
- {"help", no_argument, NULL, 'h'},
- {"version", no_argument, NULL, 'V'},
- {"no-splash", no_argument, NULL, 'q'},
- {0, 0, 0, 0},
- };
-
- int c;
-
- for (;;)
- {
- c = getopt_long (*argc, *argv, "hVq", long_options, NULL);
- if (c == -1)
- break;
-
- switch (c)
- {
- case 'h':
- g_print ("Usage: psppire {|--help|--version|--no-splash}\n");
- return FALSE;
- case 'V':
- g_print (version);
- g_print ("\n");
- g_print (legal);
- return FALSE;
- case 'q':
- *show_splash = FALSE;
- break;
- default:
- return FALSE;
- }
- }
-
- if ( optind < *argc)
- {
- *filename = (*argv)[optind];
- }
-
- return TRUE;
-}