Patch #6210: implement ability to resize output device parameters to

[pspp-builds.git] / src / ui / terminal / main.c

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index 9375ffc62960317cb7825fcfa0189a82e1a3ccb5..e3d3dbd7df5d7aaf92daa164ef566eea5dc8abd9 100644 (file)
--- a/src/ui/terminal/main.c
+++ b/src/ui/terminal/main.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2006, 2007 Free Software Foundation, Inc.
 
    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
@@ -16,14 +16,19 @@
 
 #include <config.h>
 
+#include <locale.h>
 #include <signal.h>
 #include <stdio.h>
-
-#include <ui/debugger.h>
-#include "command-line.h"
-#include "msg-ui.h"
-#include "progname.h"
-#include "read-line.h"
+#include <stdlib.h>
+#if HAVE_FPU_CONTROL_H
+#include <fpu_control.h>
+#endif
+#if HAVE_FENV_H
+#include <fenv.h>
+#endif
+#if HAVE_IEEEFP_H
+#include <ieeefp.h>
+#endif
 
 #include <data/dictionary.h>
 #include <data/file-handle-def.h>
@@ -42,27 +47,17 @@
 #include <libpspp/version.h>
 #include <math/random.h>
 #include <output/output.h>
+#include <ui/debugger.h>
+#include <ui/terminal/command-line.h>
+#include <ui/terminal/msg-ui.h>
+#include <ui/terminal/read-line.h>
+#include <ui/terminal/terminal.h>
 
-#if HAVE_FPU_CONTROL_H
-#include <fpu_control.h>
-#endif
-
-#if HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
-#if HAVE_FENV_H
-#include <fenv.h>
-#endif
-
-#if HAVE_IEEEFP_H
-#include <ieeefp.h>
-#endif
+#include "progname.h"
 
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
-#include <stdlib.h>
 
 static void i18n_init (void);
 static void fpu_init (void);
@@ -78,18 +73,19 @@ static struct dataset * the_dataset = NULL;
 static struct lexer *the_lexer;
 static struct source_stream *the_source_stream ;
 
-
 /* Program entry point. */
 int
 main (int argc, char **argv)
 {
+  int *view_width_p, *view_length_p;
+
+  set_program_name (argv[0]);
+
   signal (SIGABRT, bug_handler);
   signal (SIGSEGV, bug_handler);
   signal (SIGFPE, bug_handler);
   signal (SIGINT, interrupt_handler);
 
-  set_program_name (argv[0]);
-
   i18n_init ();
   fpu_init ();
   gsl_set_error_handler_off ();
@@ -104,10 +100,11 @@ main (int argc, char **argv)
                          );
   prompt_init ();
   readln_initialize ();
-  settings_init ();
+  terminal_init (&view_width_p, &view_length_p);
+  settings_init (view_width_p, view_length_p);
   random_init ();
 
-  the_dataset = create_dataset (NULL, NULL);
+  the_dataset = create_dataset ();
 
   if (parse_command_line (argc, argv, the_source_stream))
     {
@@ -150,7 +147,9 @@ i18n_init (void)
 #if HAVE_LC_MESSAGES
   setlocale (LC_MESSAGES, "");
 #endif
-  setlocale (LC_MONETARY, "");
+#if HAVE_LC_PAPER
+  setlocale (LC_PAPER, "");
+#endif
   bindtextdomain (PACKAGE, locale_dir);
   textdomain (PACKAGE);
 #endif /* ENABLE_NLS */