X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fmain.c;h=9bd278d3397965ef1c0b5d8b52d141decc930bdf;hb=a8c96cbb1f8cf84047595f15b47dd407e292325e;hp=1e59f8431fc5fa8783ca3c910180001b69e08a08;hpb=ab97e700f033db654e2f44919c73973d13b0c522;p=pspp

diff --git a/src/ui/gui/main.c b/src/ui/gui/main.c
index 1e59f8431f..9bd278d339 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, 2011, 2012, 2013, 2014  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
@@ -42,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 */
 
@@ -153,42 +159,8 @@ startup_option_callback (int id, void *show_splash_)
       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)
-{
-  GtkWidget *splash = data;
-  gtk_widget_destroy (splash);
-  gtk_window_set_auto_startup_notification (TRUE);
-  return FALSE;
-}
-
-static gboolean
+static gboolean UNUSED
 print_startup_time (gpointer data)
 {
   g_timer_stop (startup);
@@ -199,57 +171,6 @@ print_startup_time (gpointer data)
   return FALSE;
 }
 
-/*
-static gboolean
-quit_one_loop (gpointer data)
-{
-  gtk_main_quit ();
-  return FALSE;
-}
-*/
-
-struct initialisation_parameters
-{
-  const char *data_file;
-  GtkWidget *splash_window;
-};
-
-
-static gboolean
-run_inner_loop (gpointer data)
-{
-  struct initialisation_parameters *ip = data;
-  initialize (ip->data_file);
-
-  g_timeout_add (500, hide_splash_window, ip->splash_window);
-
-  if (measure_startup)
-    {
-      GSource *source = g_idle_source_new ();
-      g_source_set_priority (source, G_PRIORITY_LOW);
-      g_source_set_callback (source, print_startup_time, NULL, NULL);
-      g_source_attach (source, NULL);
-      g_source_unref (source);
-    }
-
-  gtk_main ();
-
-  de_initialize ();
-
-  return FALSE;
-}
-
-
-static GMemVTable vtable =
-  {
-    xmalloc,
-    xrealloc,
-    free,
-    xcalloc,
-    malloc,
-    realloc
-  };
-
 #ifdef __APPLE__
 static const bool apple = true;
 #else
@@ -278,18 +199,54 @@ remove_psn (int argc, char **argv)
   return argc;
 }
 
+
+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)
+{
+  struct init_source *is = (struct init_source *)ss;
+
+  bool finished = initialize (is);
+  is->state++;
+  
+  if (finished)
+    {
+      g_main_loop_quit (is->loop);
+      return FALSE;
+    }
+
+  return TRUE;
+}
+
+static GSourceFuncs init_funcs = {init_prepare, init_check, init_dispatch, NULL};
+
+
+
 int
 main (int argc, char *argv[])
 {
-  struct initialisation_parameters init_p;
   gboolean show_splash = TRUE;
   struct argv_parser *parser;
   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. */
@@ -301,12 +258,6 @@ main (int argc, char *argv[])
   startup = g_timer_new ();
   g_timer_start (startup);
 
-  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)) )
@@ -328,22 +279,176 @@ main (int argc, char *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.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);
+
+  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);
 
-  //  if ( show_splash )
-  //    gtk_widget_show (init_p.splash_window);
+  ((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_idle_add (quit_one_loop, 0);
+  g_main_loop_run (loop);
 
-  //  gtk_quit_add (0, run_inner_loop, &init_p);
-  run_inner_loop (&init_p);
-  //  gtk_main ();
+  g_main_loop_unref (loop);
+  g_main_context_unref (context);
+
+  if (win)
+    g_timeout_add (500, destroy_splash_window, win);
+
+  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;
+}
+
+