Reworked settings so as to use one large struct instead of lots of static

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

diff --git a/src/ui/terminal/read-line.c b/src/ui/terminal/read-line.c
index f28fb6fe3912a989a1df8ef74d234ffc402474c4..e72f11458ac4112ede5e78c701dfb8cb9b153960 100644 (file)
--- a/src/ui/terminal/read-line.c
+++ b/src/ui/terminal/read-line.c
@@ -1,20 +1,18 @@
-/* PSPP - computes sample statistics.
-   Copyright (C) 1997-9, 2000 Free Software Foundation, Inc.
+/* PSPP - a program for statistical analysis.
+   Copyright (C) 1997-9, 2000, 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 the Free Software Foundation; either version 2 of the
-   License, or (at your option) any later version.
+   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 3 of the License, or
+   (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   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>
 
@@ -34,6 +32,9 @@
 #include <libpspp/str.h>
 #include <libpspp/version.h>
 #include <language/prompt.h>
+#include <output/journal.h>
+#include <output/manager.h>
+#include <ui/terminal/terminal.h>
 
 #include "xalloc.h"
 
@@ -51,7 +52,7 @@ static char **dont_complete (const char *, int, int);
 #endif /* HAVE_READLINE */
 
 
-struct readln_source 
+struct readln_source
 {
   struct getl_interface parent ;
 
@@ -75,10 +76,10 @@ readln_initialize (void)
   if (history_file == NULL)
     {
       const char *home_dir = getenv ("HOME");
-      if (home_dir != NULL) 
+      if (home_dir != NULL)
         {
           history_file = xasprintf ("%s/.pspp_history", home_dir);
-          read_history (history_file); 
+          read_history (history_file);
         }
     }
 #endif
@@ -91,7 +92,7 @@ readln_uninitialize (void)
   initialised = false;
 
 #if HAVE_READLINE
-  if (history_file != NULL && false == get_testing_mode() )
+  if (history_file != NULL && false == settings_get_testing_mode () )
     write_history (history_file);
   clear_history ();
   free (history_file);
@@ -101,12 +102,11 @@ readln_uninitialize (void)
 
 static bool
 read_interactive (struct getl_interface *s,
-                  struct string *line, enum getl_syntax *syntax)
+                  struct string *line)
 {
   struct readln_source *is  =
     (struct readln_source *) s ;
 
-  *syntax = GETL_INTERACTIVE;
   return is->interactive_func (line, prompt_get_style ());
 }
 
@@ -130,6 +130,7 @@ welcome (void)
         "warranty.\" for details.\n", stdout);
   puts (stat_version);
   readln_initialize ();
+  journal_enable ();
 }
 
 /* Gets a line from the user and stores it into LINE.
@@ -143,41 +144,55 @@ readln_read (struct string *line, enum prompt_style style)
 #if HAVE_READLINE
   char *string;
 #endif
-  
+  bool eof;
+
   assert (initialised);
 
   reset_msg_count ();
 
   welcome ();
 
+  if (style == PROMPT_FIRST)
+    som_flush ();
+
 #if HAVE_READLINE
   rl_attempted_completion_function = (style == PROMPT_FIRST
                                       ? complete_command_name
                                       : dont_complete);
   string = readline (prompt);
   if (string == NULL)
-    return false;
-  else 
+    eof = true;
+  else
     {
       if (string[0])
         add_history (string);
       ds_assign_cstr (line, string);
       free (string);
-      return true; 
+      eof = false;
     }
 #else
   fputs (prompt, stdout);
   fflush (stdout);
-  if (ds_read_line (line, stdin)) 
+  if (ds_read_line (line, stdin))
     {
       ds_chomp (line, '\n');
-      return true;
+      eof = false;
     }
   else
-    return false;
+    eof = true;
 #endif
-}
 
+  /* Check whether the size of the window has changed, so that
+     the output drivers can adjust their settings as needed.  We
+     only do this for the first line of a command, as it's
+     possible that the output drivers are actually in use
+     afterward, and we don't want to confuse them in the middle
+     of output. */
+  if (style == PROMPT_FIRST)
+    terminal_check_size ();
+
+  return !eof;
+}
 
 static void
 readln_close (struct getl_interface *i)
@@ -210,16 +225,16 @@ static char *command_generator (const char *text, int state);
 static char **
 complete_command_name (const char *text, int start, int end UNUSED)
 {
-  if (start == 0) 
+  if (start == 0)
     {
       /* Complete command name at start of line. */
-      return rl_completion_matches (text, command_generator); 
+      return rl_completion_matches (text, command_generator);
     }
-  else 
+  else
     {
       /* Otherwise don't do any completion. */
       rl_attempted_completion_over = 1;
-      return NULL; 
+      return NULL;
     }
 }
 
@@ -228,15 +243,15 @@ static char **
 dont_complete (const char *text UNUSED, int start UNUSED, int end UNUSED)
 {
   rl_attempted_completion_over = 1;
-  return NULL; 
+  return NULL;
 }
 
 /* If STATE is 0, returns the first command name matching TEXT.
    Otherwise, returns the next command name matching TEXT.
    Returns a null pointer when no matches are left. */
 static char *
-command_generator (const char *text, int state) 
-{ 
+command_generator (const char *text, int state)
+{
   static const struct command *cmd;
   const char *name;