/* 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, 2016 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 <gl/xalloc.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 "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 "ui/gui/psppire-syntax-window.h"
+#include "ui/gui/psppire-data-window.h"
+#include "ui/gui/psppire-output-window.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;
+
+static gboolean
+show_version_and_exit ()
+{
+ version_etc (stdout, "psppire", PACKAGE_NAME, PACKAGE_VERSION,
+ "Ben Pfaff", "John Darrington", "Jason Stover", NULL_SENTINEL);
+
+ exit (0);
+
+ return TRUE;
+}
\f
-/* Arguments to be interpreted before the X server gets initialised */
-static const struct argp_option startup_options [] =
- {
- {"no-splash", 'q', 0, 0, N_("Don't show the splash screen"), 0 },
- { 0, 0, 0, 0, 0, 0 }
- };
-static error_t
-parse_startup_opts (int key, char *arg, struct argp_state *state)
+gboolean
+init_prepare (GSource * source, gint * timeout_)
+{
+ return TRUE;
+}
+
+gboolean
+init_check (GSource * source)
+{
+ return TRUE;
+}
+
+gboolean
+init_dispatch (GSource * ss, GSourceFunc callback, gpointer user_data)
{
- gboolean *showsplash = state->input;
+ struct init_source *is = (struct init_source *) ss;
- switch (key)
+ bool finished = initialize (is);
+ is->state++;
+
+ if (finished)
{
- case 'q':
- *showsplash = FALSE;
- break;
- default:
- return ARGP_ERR_UNKNOWN;
+ g_main_loop_quit (is->loop);
+ return FALSE;
}
- return 0;
-}
-static const struct argp startup_argp = {startup_options, parse_startup_opts, 0, 0, 0, 0, 0};
+ return TRUE;
+}
+static GSourceFuncs init_funcs =
+ { init_prepare, init_check, init_dispatch, NULL };
\f
+
+GtkWidget *wsplash;
+gint64 start_time = 0;
+
+
static GtkWidget *
create_splash_window (void)
{
- GtkWidget *splash ;
- GtkWidget *image;
+ GtkWidget *sp = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+
+ const gchar *filename = PKGDATADIR "/splash.png";
+ const char *relocated_filename = relocate (filename);
+ GtkWidget *l = gtk_image_new_from_file (relocated_filename);
+ if (filename != relocated_filename)
+ free (CONST_CAST (char *, relocated_filename));
+
+ gtk_container_add (GTK_CONTAINER (sp), l);
+ gtk_window_set_type_hint (GTK_WINDOW (sp),
+ GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
+ gtk_window_set_position (GTK_WINDOW (sp), GTK_WIN_POS_CENTER);
+ gtk_window_set_skip_pager_hint (GTK_WINDOW (sp), TRUE);
+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW (sp), TRUE);
+ gtk_window_set_focus_on_map (GTK_WINDOW (sp), FALSE);
+ gtk_window_set_accept_focus (GTK_WINDOW (sp), FALSE);
+
+ GdkGeometry hints;
+ hints.max_height = 100;
+ hints.max_width = 200;
+ gtk_window_set_geometry_hints (GTK_WINDOW (sp),
+ NULL, &hints, GDK_HINT_MAX_SIZE);
+
+
+ gtk_window_set_gravity (GTK_WINDOW (sp), GDK_GRAVITY_CENTER);
+
+ gtk_window_set_modal (GTK_WINDOW (sp), TRUE);
+ gtk_window_set_decorated (GTK_WINDOW (sp), FALSE);
+ gtk_window_set_keep_above (GTK_WINDOW (sp), TRUE);
+ gtk_widget_show_all (sp);
+ return sp;
+}
+
+
+static gint
+on_local_options (GApplication * application,
+ GVariantDict * options, gpointer user_data)
+{
+ GVariant *b;
+
+ b =
+ g_variant_dict_lookup_value (options, "no-splash",
+ G_VARIANT_TYPE_BOOLEAN);
+ if (b)
+ {
+ g_variant_unref (b);
+ }
+ else
+ {
+ start_time = g_get_monotonic_time ();
+ }
+
+ return -1;
+}
- gtk_window_set_auto_startup_notification (FALSE);
- splash = gtk_window_new (GTK_WINDOW_POPUP);
+static void
+on_startup (GApplication * app, gpointer ud)
+{
+ GMainContext *context = g_main_context_new ();
- gtk_window_set_position (GTK_WINDOW (splash),
- GTK_WIN_POS_CENTER_ALWAYS);
+ if (start_time != 0)
+ {
+ wsplash = create_splash_window ();
+ gtk_application_add_window (GTK_APPLICATION (app),
+ GTK_WINDOW (wsplash));
+ }
- gtk_window_set_type_hint (GTK_WINDOW (splash),
- GDK_WINDOW_TYPE_HINT_SPLASHSCREEN);
+ GMainLoop *loop = g_main_loop_new (context, FALSE);
- image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png"));
+ GSource *ss = g_source_new (&init_funcs, sizeof (struct init_source));
- gtk_container_add (GTK_CONTAINER (splash), image);
+ ((struct init_source *) ss)->loop = loop;
+ ((struct init_source *) ss)->state = 0;
- gtk_widget_show (image);
+ g_source_set_priority (ss, G_PRIORITY_DEFAULT);
- return splash;
+ g_source_attach (ss, context);
+ g_main_loop_run (loop);
}
-static gboolean
-hide_splash_window (gpointer data)
+
+static void
+post_initialise (GApplication * app)
{
- GtkWidget *splash = data;
- gtk_widget_destroy (splash);
- gtk_window_set_auto_startup_notification (TRUE);
- return FALSE;
+ register_selection_functions ();
+ psppire_output_window_setup ();
+
+ GSimpleAction *quit = g_simple_action_new ("quit", NULL);
+ g_signal_connect_swapped (quit, "activate", G_CALLBACK (psppire_quit), app);
+ g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (quit));
}
+#define SPLASH_DURATION 1000
+
static gboolean
-quit_one_loop (gpointer data)
+destroy_splash (gpointer ud)
{
- gtk_main_quit ();
- return FALSE;
+ GtkWidget *sp = GTK_WIDGET (ud);
+ gtk_widget_destroy (sp);
+ return G_SOURCE_REMOVE;
}
-struct initialisation_parameters
+static void
+on_activate (GApplication * app, gpointer ud)
{
- int argc;
- char **argv;
- GtkWidget *splash_window;
- struct command_line_processor *clp;
-};
+ post_initialise (app);
+
+ GtkWindow *x = create_data_window ();
+ gtk_window_set_transient_for (GTK_WINDOW (wsplash), GTK_WINDOW (x));
+ gtk_application_add_window (GTK_APPLICATION (app), x);
+ gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (wsplash));
+ gtk_window_set_keep_above (GTK_WINDOW (wsplash), TRUE);
+ gtk_window_present (GTK_WINDOW (wsplash));
+
+ /* Remove the splash screen after SPLASH_DURATION milliseconds */
+ gint64 elapsed_time = (g_get_monotonic_time () - start_time) / 1000;
+ if (SPLASH_DURATION - elapsed_time <= 0)
+ destroy_splash (wsplash);
+ else
+ g_timeout_add (SPLASH_DURATION - elapsed_time, destroy_splash, wsplash);
+}
-static gboolean
-run_inner_loop (gpointer data)
+static void
+on_open (GApplication * app, GFile ** files, gint n_files, gchar * hint,
+ gpointer ud)
{
- struct initialisation_parameters *ip = data;
- initialize (ip->clp, ip->argc, ip->argv);
+ post_initialise (app);
- g_timeout_add (500, hide_splash_window, ip->splash_window);
+ gchar *file = g_file_get_parse_name (files[0]);
+ psppire_preload_file (file);
+ g_free (file);
+}
- gtk_main ();
- de_initialize ();
+/* These are arguments which must be processed BEFORE the X server has been initialised */
+static void
+process_pre_start_arguments (int *argc, char ***argv)
+{
+ GOptionEntry oe[] = {
+ {"version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
+ show_version_and_exit, "Show version information and exit", 0},
+ {NULL}
+ };
- return FALSE;
+ GOptionContext *oc = g_option_context_new ("");
+ g_option_context_set_help_enabled (oc, FALSE);
+ g_option_context_set_ignore_unknown_options (oc, FALSE);
+ g_option_context_add_main_entries (oc, oe, NULL);
+ g_option_context_parse (oc, argc, argv, NULL);
}
-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;
+ GtkApplication *app =
+ gtk_application_new ("gnu.pspp", G_APPLICATION_HANDLES_OPEN);
- const gchar *vers;
+ process_pre_start_arguments (&argc, &argv);
- set_program_name (argv[0]);
-
- g_mem_set_vtable (&vtable);
-
- gtk_disable_setlocale ();
-
-
- if ( ! gtk_parse_args (&argc, &argv) )
- {
- perror ("Error parsing arguments");
- exit (1);
- }
-
- if ( (vers = gtk_check_version (GTK_MAJOR_VERSION,
- GTK_MINOR_VERSION,
- GTK_MICRO_VERSION)) )
- {
- g_warning (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);
-
- gdk_init (&argc, &argv);
+ GOptionEntry oe[] = {
+ {"no-splash", 'q', G_OPTION_FLAG_NONE, G_OPTION_ARG_NONE, NULL,
+ "Do not display the splash screen", 0},
+ {NULL}
+ };
- init_p.splash_window = create_splash_window ();
- init_p.argc = argc;
- init_p.argv = argv;
- init_p.clp = clp;
+ g_application_add_main_option_entries (G_APPLICATION (app), oe);
- if ( show_splash )
- gtk_widget_show (init_p.splash_window);
+ g_signal_connect (app, "startup", G_CALLBACK (on_startup), NULL);
+ g_signal_connect (app, "activate", G_CALLBACK (on_activate), NULL);
+ g_signal_connect (app, "handle-local-options",
+ G_CALLBACK (on_local_options), NULL);
+ g_signal_connect (app, "open", G_CALLBACK (on_open), NULL);
- g_idle_add (quit_one_loop, 0);
+ {
+ GSimpleAction *act_new_syntax = g_simple_action_new ("new-syntax", NULL);
+ g_signal_connect_swapped (act_new_syntax, "activate",
+ G_CALLBACK (create_syntax_window), NULL);
+ g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_new_syntax));
+ }
- gtk_quit_add (0, run_inner_loop, &init_p);
- gtk_main ();
+ {
+ GSimpleAction *act_new_data = g_simple_action_new ("new-data", NULL);
+ g_signal_connect_swapped (act_new_data, "activate",
+ G_CALLBACK (create_data_window), NULL);
+ g_action_map_add_action (G_ACTION_MAP (app), G_ACTION (act_new_data));
+ }
- return 0;
+ return g_application_run (G_APPLICATION (app), argc, argv);
}
projects / pspp / blobdiff