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=0c88204ae1469347daf7b25347cb4873883f8eec;hpb=a258e53c63a08b0ec48aea8f03808eb651729424;p=pspp diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c index 0c88204ae1..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, 2010 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 @@ -21,13 +21,15 @@ #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/getl.h" -#include "libpspp/version.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" @@ -40,6 +42,12 @@ #define _(msgid) gettext (msgid) #define N_(msgid) msgid + +GdkWindow *create_splash_window (GMainContext *context); +gboolean destroy_splash_window (gpointer ud); + + + /* Arguments to be interpreted before the X server gets initialised */ @@ -48,6 +56,7 @@ enum OPT_HELP, OPT_VERSION, OPT_NO_SPLASH, + OPT_MEASURE_STARTUP, N_STARTUP_OPTIONS }; @@ -55,31 +64,19 @@ 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} + {"no-splash", 'q', no_argument, OPT_NO_SPLASH}, + {"measure-startup", 0, no_argument, OPT_MEASURE_STARTUP}, }; -static char * -get_default_include_path (void) -{ - 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); -} +/* --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 void usage (void) { - char *default_include_path = get_default_include_path (); + char *inc_path = string_array_join (include_path_default (), " "); GOptionGroup *gtk_options; GOptionContext *ctx; gchar *gtk_help_base, *gtk_help; @@ -97,7 +94,7 @@ usage (void) 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\ +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\ @@ -116,16 +113,17 @@ Language options:\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\ +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); +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 (default_include_path); + free (inc_path); g_free (gtk_help_base); emit_bug_reporting_address (); @@ -153,108 +151,124 @@ startup_option_callback (int id, void *show_splash_) *show_splash = FALSE; break; + case OPT_MEASURE_STARTUP: + measure_startup = TRUE; + break; + default: NOT_REACHED (); } } - -static GtkWidget * -create_splash_window (void) -{ - GtkWidget *splash ; - GtkWidget *image; - - gtk_window_set_auto_startup_notification (FALSE); - - splash = gtk_window_new (GTK_WINDOW_POPUP); - gtk_window_set_position (GTK_WINDOW (splash), - GTK_WIN_POS_CENTER_ALWAYS); - - gtk_window_set_type_hint (GTK_WINDOW (splash), - GDK_WINDOW_TYPE_HINT_SPLASHSCREEN); - - image = gtk_image_new_from_file (relocate (PKGDATADIR "/splash.png")); - - gtk_container_add (GTK_CONTAINER (splash), image); - - gtk_widget_show (image); - - return splash; -} - -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_) { - struct source_stream *ss; - const char *data_file; - GtkWidget *splash_window; -}; + return TRUE; +} -static gboolean -run_inner_loop (gpointer data) + +gboolean +init_check (GSource *source) { - struct initialisation_parameters *ip = data; - initialize (ip->ss, ip->data_file); + 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}; -static GMemVTable vtable = - { - xmalloc, - xrealloc, - free, - xcalloc, - malloc, - realloc - }; + int 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]); 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 (); - - if ( ! gtk_parse_args (&argc, &argv) ) - { - perror ("Error parsing arguments"); - exit (1); - } + startup = g_timer_new (); + g_timer_start (startup); if ( (vers = gtk_check_version (GTK_MAJOR_VERSION, GTK_MINOR_VERSION, @@ -263,8 +277,8 @@ main (int argc, char *argv[]) g_warning ("%s", vers); } + argc = remove_psn (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. @@ -272,27 +286,181 @@ main (int argc, char *argv[]) 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. */ + /* Initialise GDK. GTK gets initialized later. */ gdk_init (&argc, &argv); - init_p.splash_window = create_splash_window (); - init_p.ss = ss; - init_p.data_file = optind < argc ? argv[optind] : NULL; + GMainContext *context = g_main_context_new (); + + GdkWindow *win = show_splash ? create_splash_window (context) : NULL; + + GMainLoop *loop = g_main_loop_new (context, FALSE); - if ( show_splash ) - gtk_widget_show (init_p.splash_window); + 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); - g_idle_add (quit_one_loop, 0); + ((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); + + g_main_loop_run (loop); + + g_main_loop_unref (loop); + g_main_context_unref (context); + + 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; +} + +