X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=62117a01bc0bbfc779476da08d3117a0913d59ad;hb=76160320343cb402ed54024f8ea258e548c0b0c5;hp=edf17efe46df178197d370bfe7b66cac5ba62cd1;hpb=833944dfd2ecf9dc78f7e9575f4900260df70164;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index edf17efe..62117a01 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -20,17 +20,20 @@
 #include <assert.h>
 #include <libintl.h>
 #include <gsl/gsl_errno.h>
+#include <signal.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 +42,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 +50,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 +69,19 @@ 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
 
-
 void
-initialize (void)
+initialize (struct command_line_processor *clp, int argc, char **argv)
 {
   PsppireDict *dictionary = 0;
 
@@ -88,7 +95,6 @@ initialize (void)
   glade_init ();
 
   gsl_set_error_handler_off ();
-  fmt_init ();
   fn_init ();
   outp_init ();
   settings_init (&viewer_width, &viewer_length);
@@ -126,7 +132,19 @@ initialize (void)
   journal_enable ();
   textdomain (PACKAGE);
 
-  new_data_window (NULL, NULL);
+  /* Ignore alarm clock signals */
+  signal (SIGALRM, SIG_IGN);
+
+  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 +208,6 @@ create_icon_factory (void)
 	}
     }
 
-
   {
     /* Create our own "pspp-stock-reset" item, using the
        GTK_STOCK_REFRESH icon set */
@@ -201,12 +218,12 @@ create_icon_factory (void)
     };
 
 
-    gtk_stock_add (&items, 2);
-    gtk_icon_factory_add (factory, "pspp-stock-reset", 
+    gtk_stock_add (items, 2);
+    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 +231,67 @@ 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:
+      {
+	struct string syntax;
+	FILE *fp = fopen (arg, "r");
+	if (NULL == fp)
+	  {
+	    const int errnum = errno;
+	    fprintf (state->err_stream, _("Cannot open %s: %s.\n"),
+		     arg, strerror (errnum));
+	    return 0;
+	  }
+	if ( sfm_detect (fp))
+	  {
+	    ds_init_cstr (&syntax, "GET FILE=");
+	    goto close;
+	  }
+	rewind (fp);
+	if (pfm_detect (fp))
+	  {
+	    ds_init_cstr (&syntax, "IMPORT FILE=");
+	    goto close;
+	  }
+
+	fclose (fp);
+	msg (ME, _("%s is neither a system nor portable file"), arg);
+	break;
+
+      close:
+	fclose (fp);
+
+	syntax_gen_string (&syntax, ss_cstr (arg));
+	ds_put_cstr (&syntax, ".");
+
+	getl_append_source (ss,
+			    create_syntax_string_source (ds_cstr (&syntax)),
+			    GETL_BATCH,
+			    ERRMODE_CONTINUE);
+
+	ds_destroy (&syntax);
+
+	psppire_window_set_filename (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};