X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=2f209a08953539f25a38ac74a3aa0d07e491bcab;hb=9378edb08cecf21474a2ecec769117f362840866;hp=529f9880caa46ceff8d071a5fb3b1ce949939fce;hpb=8f157150f5fe225224e407161fb7f899d34b8b18;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 529f9880..2f209a08 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -1,10 +1,9 @@
-/*
-   PSPPIRE --- A Graphical User Interface for PSPP
+/* PSPPIRE - a graphical user interface for PSPP.
    Copyright (C) 2004, 2005, 2006  Free Software Foundation
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -13,32 +12,33 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA. */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
 
 #include <config.h>
 
 #include <assert.h>
 #include <libintl.h>
+#include <gsl/gsl_errno.h>
 
+#include "relocatable.h"
 
 #include "data-editor.h"
-#include <libpspp/version.h>
-#include <libpspp/copyleft.h>
+#include "psppire.h"
+
+#include <unistd.h>
+#include <data/casereader.h>
+#include <data/datasheet.h>
 #include <data/file-handle-def.h>
 #include <data/format.h>
-#include <data/storage-stream.h>
-#include <data/case-source.h>
 #include <data/settings.h>
 #include <data/file-name.h>
 #include <data/procedure.h>
 #include <libpspp/getl.h>
 #include <language/lexer/lexer.h>
-#include <ui/flexifile.h>
+#include <libpspp/version.h>
+#include <output/output.h>
+#include <output/journal.h>
 
-#include <getopt.h>
-#include <gtk/gtk.h>
 #include <gtk/gtk.h>
 #include <glade/glade.h>
 #include "psppire-dict.h"
@@ -48,68 +48,31 @@
 #include "data-sheet.h"
 #include "var-sheet.h"
 #include "message-dialog.h"
-#include "flexifile-factory.h"
-
-PsppireDataStore *the_data_store = 0;
-
-
-static bool parse_command_line (int *argc, char ***argv,
-				gchar **filename, GError **err);
 
+#include "output-viewer.h"
 
+PsppireDataStore *the_data_store = 0;
 PsppireVarStore *the_var_store = 0;
 
-void create_icon_factory (void);
+static void create_icon_factory (void);
 
 struct source_stream *the_source_stream ;
 struct dataset * the_dataset = NULL;
 
-static void
-replace_dictionary (struct dictionary *d)
-{
-  psppire_dict_replace_dictionary (the_data_store->dict,
-				   d);
-}
-
 
 static void
-replace_flexifile (struct case_source *s)
+replace_casereader (struct casereader *s)
 {
-  if ( NULL == s )
-    psppire_case_file_replace_flexifile (the_data_store->case_file,
-					 (struct flexifile *) flexifile_create (0));
-  else
-    {
-      if ( ! case_source_is_class (s, &storage_source_class))
-	return ;
+  PsppireCaseFile *pcf = psppire_case_file_new (s);
 
-      psppire_case_file_replace_flexifile (the_data_store->case_file,
-					   (struct flexifile *)
-					   storage_source_get_casefile (s));
-    }
+  psppire_data_store_set_case_file (the_data_store, pcf);
 }
 
-
-int
-main (int argc, char *argv[])
+void
+initialize (void)
 {
-  struct casefile_factory *factory;
   PsppireDict *dictionary = 0;
 
-
-  gchar *filename=0;
-  GError *err = 0;
-  gchar *vers;
-
-  gtk_init (&argc, &argv);
-  if ( (vers = gtk_check_version (GTK_MAJOR_VERSION,
-				 GTK_MINOR_VERSION,
-				 GTK_MICRO_VERSION)) )
-    {
-      g_critical (vers);
-    }
-
-
   /* gtk_init messes with the locale.
      So unset the bits we want to control ourselves */
   setlocale (LC_NUMERIC, "C");
@@ -118,150 +81,109 @@ main (int argc, char *argv[])
 
   textdomain (PACKAGE);
 
-  if ( ! parse_command_line (&argc, &argv, &filename, &err) )
-    {
-      g_clear_error (&err);
-      return 0;
-    }
-
   glade_init ();
 
+  gsl_set_error_handler_off ();
   fmt_init ();
-  settings_init ();
+  fn_init ();
+  outp_init ();
+  settings_init (&viewer_width, &viewer_length);
   fh_init ();
-  factory = flexifile_factory_create ();
-  the_source_stream = create_source_stream (
+  the_source_stream =
+    create_source_stream (
 			  fn_getenv_default ("STAT_INCLUDE_PATH", include_path)
 			  );
 
-  the_dataset = create_dataset (factory,
-				replace_flexifile,
-				replace_dictionary);
+  the_dataset = create_dataset ();
+
 
   message_dialog_init (the_source_stream);
 
-  dictionary = psppire_dict_new_from_dict (
-					   dataset_dict (the_dataset)
-					   );
+  dictionary = psppire_dict_new_from_dict (dataset_dict (the_dataset));
 
   bind_textdomain_codeset (PACKAGE, "UTF-8");
 
   /* Create the model for the var_sheet */
   the_var_store = psppire_var_store_new (dictionary);
 
-
   the_data_store = psppire_data_store_new (dictionary);
-
-  proc_set_source (the_dataset,
-		   storage_source_create (the_data_store->case_file->flexifile)
-		   );
+  replace_casereader (NULL);
 
   create_icon_factory ();
 
+  outp_configure_driver_line (
+    ss_cstr ("gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+             "bottom-margin=0 paginate=off length=auto width=auto "
+	     "emphasis=none "
+             "output-file=\"" OUTPUT_FILE_NAME "\" append=yes"));
+
+  unlink (OUTPUT_FILE_NAME);
+
+  journal_enable ();
+
   new_data_window (NULL, NULL);
+}
 
-  /* start the event loop */
-  gtk_main ();
 
+void
+de_initialize (void)
+{
   destroy_source_stream (the_source_stream);
   message_dialog_done ();
-
   settings_done ();
-
-  return 0;
+  outp_done ();
 }
 
 
-/* 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 bool
-parse_command_line (int *argc, char ***argv, gchar **filename, GError **err)
+struct icon_info
 {
-  static struct option long_options[] =
-    {
-      {"help", no_argument, NULL, 'h'},
-      {"version", no_argument, NULL, 'V'},
-      {0, 0, 0, 0},
-    };
+  const char *file_name;
+  const gchar *id;
+};
+
+
+static const struct icon_info icons[] =
+  {
+    {PKGDATADIR "/value-labels.png",    "pspp-value-labels"},
+    {PKGDATADIR "/weight-cases.png",    "pspp-weight-cases"},
+    {PKGDATADIR "/goto-variable.png",   "pspp-goto-variable"},
+    {PKGDATADIR "/insert-variable.png", "pspp-insert-variable"},
+    {PKGDATADIR "/insert-case.png",     "pspp-insert-case"},
+    {PKGDATADIR "/split-file.png",      "pspp-split-file"},
+    {PKGDATADIR "/select-cases.png",    "pspp-select-cases"},
+    {PKGDATADIR "/recent-dialogs.png",  "pspp-recent-dialogs"},
+    {PKGDATADIR "/nominal.png",         "var-nominal"},
+    {PKGDATADIR "/ordinal.png",         "var-ordinal"},
+    {PKGDATADIR "/scale.png",           "var-scale"},
+    {PKGDATADIR "/string.png",          "var-string"},
+    {PKGDATADIR "/date-scale.png",      "var-date-scale"}
+  };
 
-  int c;
+static void
+create_icon_factory (void)
+{
+  gint i;
+  GtkIconFactory *factory = gtk_icon_factory_new ();
 
-  for (;;)
+  for (i = 0 ; i < sizeof (icons) / sizeof(icons[0]); ++i)
     {
-      c = getopt_long (*argc, *argv, "hV", long_options, NULL);
-      if (c == -1)
-	break;
+      GError *err = NULL;
+      GdkPixbuf *pixbuf =
+	gdk_pixbuf_new_from_file (relocate (icons[i].file_name), &err);
 
-      switch (c)
+      if ( pixbuf )
 	{
-	case 'h':
-	  g_print ("Usage: psppire {|--help|--version}\n");
-          return false;
-	case 'V':
-	  g_print (version);
-	  g_print ("\n");
-	  g_print (legal);
-	  return false;
-	default:
-	  return false;
+	  GtkIconSet *icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
+	  g_object_unref (pixbuf);
+	  gtk_icon_factory_add ( factory, icons[i].id, icon_set);
+	}
+      else
+	{
+	  g_warning ("Cannot create icon: %s", err->message);
+	  g_clear_error (&err);
 	}
     }
 
-  if ( optind < *argc)
-    {
-      *filename = (*argv)[optind];
-    }
-
-  return true;
-}
-
-
-
-void
-create_icon_factory (void)
-{
-  GtkIconFactory *factory = gtk_icon_factory_new ();
-
-  GtkIconSet *icon_set;
-
-  GdkPixbuf *pixbuf;
-
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/value-labels.png", 0);
-  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-  g_object_unref (pixbuf);
-  gtk_icon_factory_add ( factory, "pspp-value-labels", icon_set);
-
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/weight-cases.png", 0);
-  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-  g_object_unref (pixbuf);
-  gtk_icon_factory_add ( factory, "pspp-weight-cases", icon_set);
-
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/goto-variable.png", 0);
-  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-  g_object_unref (pixbuf);
-  gtk_icon_factory_add ( factory, "pspp-goto-variable", icon_set);
-
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-variable.png", 0);
-  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-  g_object_unref (pixbuf);
-  gtk_icon_factory_add ( factory, "pspp-insert-variable", icon_set);
-
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/insert-case.png", 0);
-  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-  g_object_unref (pixbuf);
-  gtk_icon_factory_add ( factory, "pspp-insert-case", icon_set);
-
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/split-file.png", 0);
-  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-  g_object_unref (pixbuf);
-  gtk_icon_factory_add ( factory, "pspp-split-file", icon_set);
-
-  pixbuf = gdk_pixbuf_new_from_file (PKGDATADIR "/select-cases.png", 0);
-  icon_set = gtk_icon_set_new_from_pixbuf (pixbuf);
-  g_object_unref (pixbuf);
-  gtk_icon_factory_add ( factory, "pspp-select-cases", icon_set);
-
   gtk_icon_factory_add_default (factory);
 }