X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire.c;h=d36a802cb0e828a9a9d7c46c81aa312d8e5958d2;hb=62215e63f11b18112899541b29b3151e25f7eb6e;hp=6910ddd1f403e46cae869b93cc08d12af2f9e36c;hpb=97a777315ec2f2000ac67da1f405323a5e2294e2;p=pspp-builds.git

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 6910ddd1..d36a802c 100644
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -16,20 +16,24 @@
 
 #include <config.h>
 
+#include <locale.h>
 #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.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>
@@ -38,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>
@@ -45,12 +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 "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;
 
@@ -71,9 +80,8 @@ replace_casereader (struct casereader *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;
 
@@ -87,7 +95,6 @@ initialize (void)
   glade_init ();
 
   gsl_set_error_handler_off ();
-  fmt_init ();
   fn_init ();
   outp_init ();
   settings_init (&viewer_width, &viewer_length);
@@ -112,6 +119,8 @@ initialize (void)
   the_data_store = psppire_data_store_new (dictionary);
   replace_casereader (NULL);
 
+
+
   create_icon_factory ();
 
   outp_configure_driver_line (
@@ -125,7 +134,17 @@ initialize (void)
   journal_enable ();
   textdomain (PACKAGE);
 
+  /* Ignore alarm clock signals */
+  signal (SIGALRM, SIG_IGN);
+
+  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);
+
   new_data_window (NULL, NULL);
+
+  execute_syntax (create_syntax_string_source (""));
 }
 
 
@@ -189,19 +208,87 @@ create_icon_factory (void)
 	}
     }
 
-
   {
     /* Create our own "pspp-stock-reset" item, using the
        GTK_STOCK_REFRESH icon set */
 
-    GtkStockItem item = {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE};
-    GtkIconSet *icon_set =
-      gtk_icon_factory_lookup_default (GTK_STOCK_REFRESH);
+    GtkStockItem items[] = {
+      {"pspp-stock-reset", N_("_Reset"), 0, 0, PACKAGE},
+      {"pspp-stock-select", N_("_Select"), 0, 0, PACKAGE}
+    };
+
 
-    gtk_stock_add (&item, 1);
-    gtk_icon_factory_add (factory, "pspp-stock-reset", icon_set);
+    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_lookup_default (GTK_STOCK_INDEX)
+			  );
   }
 
   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);
+	break;
+      }
+    default:
+      return ARGP_ERR_UNKNOWN;
+    }
+  return 0;
+}
+
+
+const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0};