X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Foutput%2Foutput.c;h=58750724ccda57f332f48c79bead89c465158927;hb=12219168a9ece27a11d652ae82c8e7d65e1be98f;hp=e5736b02bedbde68af53a56ab42618e794d93398;hpb=f5c108becd49d78f4898cab11352291f5689d24e;p=pspp-builds.git
diff --git a/src/output/output.c b/src/output/output.c
index e5736b02..58750724 100644
--- a/src/output/output.c
+++ b/src/output/output.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 . */
#include
#include "output.h"
@@ -152,8 +150,8 @@ add_name (char *bp, char *ep, int source)
outp_configure_vec = n;
}
-/* Checks that outp_configure_vec is empty, bitches & clears it if it
- isn't. */
+/* Checks that outp_configure_vec is empty, complains and clears
+ it if it isn't. */
static void
check_configure_vec (void)
{
@@ -564,7 +562,7 @@ get_option_token (struct substring *s, const char *driver_name,
case '7':
out = c - '0';
while (ss_first (*s) >= '0' && ss_first (*s) <= '7')
- out = c * 8 + (ss_get_char (s) - '0');
+ out = out * 8 + (ss_get_char (s) - '0');
break;
case 'x':
case 'X':
@@ -703,7 +701,7 @@ configure_driver (struct substring driver_name, struct substring class_name,
d->class = c->class;
d->name = ss_xstrdup (driver_name);
d->page_open = false;
- d->device = OUTP_DEV_NONE;
+ d->device = device;
d->cp_x = d->cp_y = 0;
d->ext = NULL;
d->prc = NULL;
@@ -1098,10 +1096,10 @@ outp_drivers (struct outp_driver *d)
return d;
}
-/* Enables (if ENABLE is nonzero) or disables (if ENABLE is zero) the
+/* Enables (if ENABLE is true) or disables (if ENABLE is false) the
device(s) given in mask DEVICE. */
void
-outp_enable_device (int enable, int device)
+outp_enable_device (bool enable, int device)
{
if (enable)
disabled_devices &= ~device;
@@ -1145,6 +1143,18 @@ outp_eject_page (struct outp_driver *d)
outp_open_page (d);
}
+/* Flushes output to screen devices, so that the user can see
+ output that doesn't fill up an entire page. */
+void
+outp_flush (struct outp_driver *d)
+{
+ if (d->device & OUTP_DEV_SCREEN && d->class->flush != NULL)
+ {
+ outp_close_page (d);
+ d->class->flush (d);
+ }
+}
+
/* Returns the width of string S, in device units, when output on
device D. */
int