X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=737b965c116b35d5ac7c214ca465d341c00e3463;hb=f1a02381223dd6d652c590e2a5514967b9448905;hp=bc49a3cb2f054fcddb4b104135c4a922a12fe270;hpb=6dcb918fa1ddc5c8cb512f81166d3407b16c673f;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index bc49a3cb..737b965c 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.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, 2009  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,16 +21,18 @@
 #include <libintl.h>
 #include <gsl/gsl_errno.h>
 
+#include <argp.h>
+#include <ui/command-line.h>
 #include "relocatable.h"
 
-#include "data-editor.h"
+#include "psppire-data-window.h"
 #include "psppire.h"
 
+#include <libpspp/getl.h>
 #include <unistd.h>
 #include <data/casereader.h>
 #include <data/datasheet.h>
 #include <data/file-handle-def.h>
-#include <data/format.h>
 #include <data/settings.h>
 #include <data/file-name.h>
 #include <data/procedure.h>
@@ -39,6 +41,7 @@
 #include <libpspp/version.h>
 #include <output/output.h>
 #include <output/journal.h>
+#include <language/syntax-string-source.h>
 
 #include <gtk/gtk.h>
 #include <glade/glade.h>
@@ -46,11 +49,16 @@
 #include "psppire-var-store.h"
 #include "psppire-data-store.h"
 #include "helper.h"
-#include "data-sheet.h"
-#include "var-sheet.h"
 #include "message-dialog.h"
+#include <ui/syntax-gen.h>
+
+
+#include "psppire-output-window.h"
 
-#include "output-viewer.h"
+#include <data/sys-file-reader.h>
+#include <data/por-file-reader.h>
+
+#include <ui/source-init-opts.h>
 
 PsppireDataStore *the_data_store = 0;
 PsppireVarStore *the_var_store = 0;
@@ -60,21 +68,23 @@ static void create_icon_factory (void);
 struct source_stream *the_source_stream ;
 struct dataset * the_dataset = NULL;
 
+static GtkWidget *the_data_window;
 
 static void
 replace_casereader (struct casereader *s)
 {
-  PsppireCaseFile *pcf = psppire_case_file_new (s);
-
-  psppire_data_store_set_case_file (the_data_store, pcf);
+  psppire_data_store_set_reader (the_data_store, s);
 }
 
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
 
+const char * output_file_name (void);
+
+
 void
-initialize (void)
+initialize (struct command_line_processor *clp, int argc, char **argv)
 {
   PsppireDict *dictionary = 0;
 
@@ -88,7 +98,6 @@ initialize (void)
   glade_init ();
 
   gsl_set_error_handler_off ();
-  fmt_init ();
   fn_init ();
   outp_init ();
   settings_init (&viewer_width, &viewer_length);
@@ -115,18 +124,39 @@ initialize (void)
 
   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"));
+  {
+    const char *filename = output_file_name ();
+
+    struct string config_string;
 
-  unlink (OUTPUT_FILE_NAME);
+    ds_init_empty (&config_string);
+
+    ds_put_format (&config_string,
+		   "gui:ascii:screen:squeeze=on headers=off top-margin=0 "
+		   "bottom-margin=0 paginate=off length=auto width=auto "
+		   "emphasis=none "
+		   "output-file=\"%s\" append=yes", filename);
+
+    outp_configure_driver_line (ds_ss (&config_string));
+
+    unlink (filename);
+
+    ds_destroy (&config_string);
+  }
 
   journal_enable ();
   textdomain (PACKAGE);
 
-  new_data_window (NULL, NULL);
+  the_data_window = psppire_data_window_new ();
+
+  command_line_processor_replace_aux (clp, &post_init_argp, the_source_stream);
+  command_line_processor_replace_aux (clp, &non_option_argp, the_source_stream);
+
+  command_line_processor_parse (clp, argc, argv);
+
+  execute_syntax (create_syntax_string_source (""));
+
+  gtk_widget_show (the_data_window);
 }
 
 
@@ -190,7 +220,6 @@ create_icon_factory (void)
 	}
     }
 
-
   {
     /* Create our own "pspp-stock-reset" item, using the
        GTK_STOCK_REFRESH icon set */
@@ -202,11 +231,11 @@ create_icon_factory (void)
 
 
     gtk_stock_add (items, 2);
-    gtk_icon_factory_add (factory, "pspp-stock-reset", 
+    gtk_icon_factory_add (factory, "pspp-stock-reset",
 			  gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH)
 			  );
 
-    gtk_icon_factory_add (factory, "pspp-stock-select", 
+    gtk_icon_factory_add (factory, "pspp-stock-select",
 			  gtk_icon_factory_lookup_default (GTK_STOCK_INDEX)
 			  );
   }
@@ -214,3 +243,43 @@ create_icon_factory (void)
   gtk_icon_factory_add_default (factory);
 }
 
+
+
+static error_t
+parse_non_options (int key, char *arg, struct argp_state *state)
+{
+  struct source_stream *ss = state->input;
+
+  if ( NULL == ss )
+    return 0;
+
+  switch (key)
+    {
+    case ARGP_KEY_ARG:
+      {
+	psppire_data_window_load_file (PSPPIRE_DATA_WINDOW (the_data_window),
+				       arg);
+	break;
+      }
+    default:
+      return ARGP_ERR_UNKNOWN;
+    }
+  return 0;
+}
+
+
+const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0};
+
+
+const char *
+output_file_name (void)
+{
+  const char *dir = default_output_path ();
+  static char *filename = NULL;
+
+  if ( NULL == filename )
+    filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME);
+
+
+  return filename;
+}