projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make interactive output go to the terminal (bug #17213), by
[pspp-builds.git]
/
src
/
data
/
settings.c
diff --git
a/src/data/settings.c
b/src/data/settings.c
index 3e95b6b5bfd3bf64eec1dd8d17471c9d29ea0d84..b14fb618f3a235addab2a140270dae0a7149f0aa 100644
(file)
--- a/
src/data/settings.c
+++ b/
src/data/settings.c
@@
-1,5
+1,5
@@
/* PSPP - a program for statistical analysis.
/* 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
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
@@
-24,13
+24,23
@@
#include "xalloc.h"
#include <libpspp/i18n.h>
#include "xalloc.h"
#include <libpspp/i18n.h>
+#include "error.h"
+
+#ifdef HAVE_LIBNCURSES
+#include <curses.h>
+#include <term.h>
+#endif
+
+#include "gettext.h"
+#define _(msgid) gettext (msgid)
+
static int viewlength = 24;
static int viewwidth = 79;
static bool long_view = false;
static bool safer_mode = false;
static int viewlength = 24;
static int viewwidth = 79;
static bool long_view = false;
static bool safer_mode = false;
-static bool echo = false;
+static bool
do_
echo = false;
static bool include = true;
static int epoch = -1;
static bool include = true;
static int epoch = -1;
@@
-121,7
+131,7
@@
set_viewwidth (int viewwidth_)
viewwidth = viewwidth_;
}
viewwidth = viewwidth_;
}
-#if HAVE_LIB
TERMCAP
+#if HAVE_LIB
NCURSES
static void
get_termcap_viewport (void)
{
static void
get_termcap_viewport (void)
{
@@
-130,7
+140,8
@@
get_termcap_viewport (void)
return;
else if (tgetent (term_buffer, getenv ("TERM")) <= 0)
{
return;
else if (tgetent (term_buffer, getenv ("TERM")) <= 0)
{
- msg (IE, _("Could not access definition for terminal `%s'."), termtype);
+ error (0,0, _("could not access definition for terminal `%s'"),
+ getenv ("TERM"));
return;
}
return;
}
@@
-140,7
+151,7
@@
get_termcap_viewport (void)
if (tgetnum ("co") > 1)
viewwidth = tgetnum ("co") - 1;
}
if (tgetnum ("co") > 1)
viewwidth = tgetnum ("co") - 1;
}
-#endif /* HAVE_LIB
TERMCAP
*/
+#endif /* HAVE_LIB
NCURSES
*/
static void
init_viewport (void)
static void
init_viewport (void)
@@
-150,9
+161,9
@@
init_viewport (void)
viewwidth = viewlength = -1;
viewwidth = viewlength = -1;
-#if HAVE_LIB
TERMCAP
+#if HAVE_LIB
NCURSES
get_termcap_viewport ();
get_termcap_viewport ();
-#endif /* HAVE_LIB
TERMCAP
*/
+#endif /* HAVE_LIB
NCURSES
*/
if (viewwidth < 0 && getenv ("COLUMNS") != NULL)
viewwidth = atoi (getenv ("COLUMNS"));
if (viewwidth < 0 && getenv ("COLUMNS") != NULL)
viewwidth = atoi (getenv ("COLUMNS"));
@@
-183,14
+194,14
@@
set_safer_mode (void)
bool
get_echo (void)
{
bool
get_echo (void)
{
- return echo;
+ return
do_
echo;
}
/* Set echo. */
void
set_echo (bool echo_)
{
}
/* Set echo. */
void
set_echo (bool echo_)
{
- echo = echo_;
+
do_
echo = echo_;
}
/* If echo is on, whether commands from include files are echoed. */
}
/* If echo is on, whether commands from include files are echoed. */