X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=d1a4798fd11574b3933f09f0e59b54b616abd818;hb=dad7c7dcd682f51141da4dc13ee6f75ff3f304c6;hp=a36e9410a345557f6c7e9a8ece90b0a15b5aec3d;hpb=8af88c0b7ea2fe75df7e45497988ed0371006a86;p=pspp
diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index a36e9410a3..d1a4798fd1 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, 2011, 2012, 2013, 2014, 2015 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,169 +15,452 @@
along with this program. If not, see . */
#include
+
+#include "ui/gui/psppire.h"
+
#include
-#include "psppire.h"
-#include "progname.h"
#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include "language/lexer/include-path.h"
+#include "libpspp/argv-parser.h"
+#include "libpspp/array.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
-const char *argp_program_version = version;
-const char *argp_program_bug_address = PACKAGE_BUGREPORT;
+
+GdkWindow *create_splash_window (GMainContext *context);
+gboolean destroy_splash_window (gpointer ud);
+
+
/* 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,
+ OPT_MEASURE_STARTUP,
+ N_STARTUP_OPTIONS
};
-static error_t
-parse_startup_opts (int key, char *arg, struct argp_state *state)
-{
- gboolean *showsplash = state->input;
-
- switch (key)
- {
- case 'q':
- *showsplash = FALSE;
- break;
- default:
- return ARGP_ERR_UNKNOWN;
- }
- return 0;
-}
-
-static const struct argp startup_argp = {startup_options, parse_startup_opts, 0, 0, 0, 0, 0};
+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},
+ {"measure-startup", 0, no_argument, OPT_MEASURE_STARTUP},
+ };
-
+/* --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 GtkWidget *
-create_splash_window (void)
+static void
+usage (void)
{
- GtkWidget *splash ;
- GtkWidget *image;
-
- gtk_window_set_auto_startup_notification (FALSE);
-
- splash = gtk_window_new (GTK_WINDOW_POPUP);
+ 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 sampled 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 data file in .sav or .zsav or .por\n\
+format or a syntax 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);
+}
- gtk_window_set_position (GTK_WINDOW (splash),
- GTK_WIN_POS_CENTER_ALWAYS);
+static void
+startup_option_callback (int id, void *show_splash_)
+{
+ gboolean *show_splash = show_splash_;
- gtk_window_set_type_hint (GTK_WINDOW (splash),
- GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
+ switch (id)
+ {
+ case OPT_HELP:
+ usage ();
+ break;
- image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png"));
+ case OPT_VERSION:
+ version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION,
+ "Ben Pfaff", "John Darrington", "Jason Stover",
+ NULL_SENTINEL);
+ exit (EXIT_SUCCESS);
- gtk_container_add (GTK_CONTAINER (splash), image);
+ case OPT_NO_SPLASH:
+ *show_splash = FALSE;
+ break;
- gtk_widget_show (image);
+ case OPT_MEASURE_STARTUP:
+ measure_startup = TRUE;
+ break;
- return splash;
+ default:
+ NOT_REACHED ();
+ }
}
-static gboolean
-hide_splash_window (gpointer data)
+static gboolean UNUSED
+print_startup_time (gpointer data)
{
- GtkWidget *splash = data;
- gtk_widget_destroy (splash);
- gtk_window_set_auto_startup_notification (TRUE);
+ g_timer_stop (startup);
+ printf ("%.3f seconds elapsed\n", g_timer_elapsed (startup, NULL));
+ g_timer_destroy (startup);
+ startup = NULL;
+
return FALSE;
}
+static GMemVTable vtable =
+ {
+ xmalloc,
+ xrealloc,
+ free,
+ xcalloc,
+ malloc,
+ realloc
+ };
-static gboolean
-quit_one_loop (gpointer data)
+#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)
{
- gtk_main_quit ();
- return FALSE;
+ 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;
}
-struct initialisation_parameters
+
+gboolean
+init_prepare (GSource *source, gint *timeout_)
{
- int argc;
- char **argv;
- GtkWidget *splash_window;
- struct command_line_processor *clp;
-};
+ return TRUE;
+}
-static gboolean
-run_inner_loop (gpointer data)
+
+gboolean
+init_check (GSource *source)
{
- struct initialisation_parameters *ip = data;
- initialize (ip->clp, ip->argc, ip->argv);
+ return TRUE;
+}
- g_timeout_add (500, hide_splash_window, ip->splash_window);
- gtk_main ();
+gboolean
+init_dispatch (GSource *ss,
+ GSourceFunc callback,
+ gpointer user_data)
+{
+ struct init_source *is = (struct init_source *)ss;
- de_initialize ();
+ bool finished = initialize (is);
+ is->state++;
+
+ if (finished)
+ {
+ g_main_loop_quit (is->loop);
+ return FALSE;
+ }
- return FALSE;
+ return TRUE;
}
+static GSourceFuncs init_funcs = {init_prepare, init_check, init_dispatch, NULL};
+
int
main (int argc, char *argv[])
{
- struct command_line_processor *clp ;
- struct initialisation_parameters init_p;
gboolean show_splash = TRUE;
-
+ struct argv_parser *parser;
const gchar *vers;
set_program_name (argv[0]);
- if ( ! gtk_parse_args (&argc, &argv) )
- {
- perror ("Error parsing arguments");
- exit (1);
- }
+ 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 ( (vers = gtk_check_version (GTK_MAJOR_VERSION,
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);
+ argc = remove_psn (argc, argv);
+
+ /* 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. GTK gets initialized later. */
+ gdk_init (&argc, &argv);
- 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);
+ GMainContext *context = g_main_context_new ();
+
+ GdkWindow *win = show_splash ? create_splash_window (context) : NULL;
- command_line_processor_parse (clp, argc, argv);
+ GMainLoop *loop = g_main_loop_new (context, FALSE);
- gdk_init (&argc, &argv);
+ GSource *ss = g_source_new (&init_funcs,
+ sizeof (struct init_source));
+
+ ((struct init_source *) ss)->state = 0;
+
+ g_source_set_priority (ss, G_PRIORITY_DEFAULT);
+
+ g_source_attach (ss, context);
+
+ ((struct init_source *) ss)->argc = &argc;
+ ((struct init_source *) ss)->argv = &argv;
+ ((struct init_source *) ss)->loop = loop;
+ ((struct init_source *) ss)->file = optind < argc ? argv[optind] : NULL;
+
+ g_source_unref (ss);
- init_p.splash_window = create_splash_window ();
- init_p.argc = argc;
- init_p.argv = argv;
- init_p.clp = clp;
+ g_main_loop_run (loop);
- if ( show_splash )
- gtk_widget_show (init_p.splash_window);
+ g_main_loop_unref (loop);
+ g_main_context_unref (context);
- g_idle_add (quit_one_loop, 0);
+ if (win)
+ g_timeout_add (500, destroy_splash_window, win);
- gtk_quit_add (0, run_inner_loop, &init_p);
gtk_main ();
+ /* Not much point in this except to check for memory leaks */
+ de_initialize ();
+
return 0;
}
+
+
+
+
+
+struct splash_source
+{
+ GSource parent;
+ cairo_surface_t *sfc;
+};
+
+void
+fill_splash_window (GdkWindow *win, cairo_surface_t *sfce)
+{
+ cairo_t *cr = gdk_cairo_create (win);
+
+ cairo_set_source_surface (cr, sfce, 0, 0);
+
+ cairo_paint (cr);
+ cairo_destroy (cr);
+}
+
+gboolean
+splash_prepare (GSource *source,
+ gint *timeout_)
+{
+ GdkEvent *e = gdk_event_peek ();
+ if (!e)
+ return FALSE;
+
+ gdk_event_free (e);
+ return TRUE;
+}
+
+gboolean
+splash_check (GSource *source)
+{
+ GdkEvent *e = gdk_event_peek ();
+ if (!e)
+ return FALSE;
+
+ gdk_event_free (e);
+ return TRUE;
+}
+
+
+gboolean
+splash_dispatch (GSource *ss,
+ GSourceFunc callback,
+ gpointer user_data)
+{
+ struct splash_source *source = (struct splash_source *) ss;
+ GdkEvent *e = gdk_event_get ();
+ if (!e)
+ return TRUE;
+
+ GdkWindow *w = ((GdkEventAny *)e)->window;
+
+ if (!w)
+ {
+ gdk_event_free (e);
+ return TRUE;
+ }
+
+ fill_splash_window (w, source->sfc);
+ gdk_display_flush (gdk_window_get_display (w));
+
+ gdk_event_free (e);
+
+ return TRUE;
+}
+
+
+gboolean
+destroy_splash_window (gpointer ud)
+{
+ GdkWindow *win = GDK_WINDOW (ud);
+ gdk_window_withdraw (win);
+ gdk_display_flush (gdk_window_get_display (win));
+ gdk_window_destroy (win);
+
+ return FALSE;
+}
+
+GSourceFuncs splash_funcs = {splash_prepare, splash_check, splash_dispatch, NULL};
+
+
+GdkWindow *
+create_splash_window (GMainContext *context)
+{
+ const gchar *filename = PKGDATADIR "/splash.png";
+
+ const char *relocated_filename = relocate (filename);
+ cairo_surface_t *the_surface =
+ cairo_image_surface_create_from_png (relocated_filename);
+
+ if (filename != relocated_filename)
+ free (CONST_CAST (char *, relocated_filename));
+
+
+ g_return_val_if_fail (the_surface, NULL);
+
+ int attr_mask = GDK_WA_TYPE_HINT;
+ GdkWindowAttr attr;
+
+ attr.width = cairo_image_surface_get_width (the_surface);
+ attr.height = cairo_image_surface_get_height (the_surface);
+ attr.wclass = GDK_INPUT_OUTPUT;
+ attr.window_type = GDK_WINDOW_TOPLEVEL;
+
+ attr.type_hint = GDK_WINDOW_TYPE_HINT_SPLASHSCREEN;
+
+ GdkWindow *win = gdk_window_new (NULL, &attr, attr_mask);
+
+ gdk_window_set_events (win, GDK_EXPOSURE_MASK);
+ gdk_window_set_keep_above (win, TRUE);
+ gdk_window_show (win);
+
+
+ GSource *ss = g_source_new (&splash_funcs,
+ sizeof (struct splash_source));
+
+ ((struct splash_source *) ss)->sfc = the_surface;
+ g_source_set_priority (ss, G_PRIORITY_HIGH);
+
+ g_source_attach (ss, context);
+
+ g_source_unref (ss);
+
+ return win;
+}
+
+