#include <libpspp/getl.h>
#include <language/lexer/lexer.h>
#include <libpspp/version.h>
-#include <output/output.h>
+#include <output/driver.h>
#include <output/journal.h>
#include <language/syntax-string-source.h>
gsl_set_error_handler_off ();
fn_init ();
- outp_init ();
settings_init (&viewer_width, &viewer_length);
fh_init ();
the_source_stream =
create_icon_factory ();
- {
- const char *filename = output_file_name ();
-
- struct string config_string;
-
- ds_init_empty (&config_string);
-
- ds_put_format (&config_string,
- "gui:ascii:screen:squeeze=on headers=off top-margin=0 "
- "bottom-margin=0 paginate=off length=auto width=auto "
- "emphasis=none "
- "output-file=\"%s\" append=yes", filename);
-
- outp_configure_driver_line (ds_ss (&config_string));
-
- unlink (filename);
-
- ds_destroy (&config_string);
- }
+ psppire_output_window_setup ();
journal_enable ();
textdomain (PACKAGE);
destroy_source_stream (the_source_stream);
message_dialog_done ();
settings_done ();
- outp_done ();
+ output_close ();
i18n_done ();
}
const struct argp non_option_argp = {NULL, parse_non_options, 0, 0, 0, 0, 0};
-
-
-const char *
-output_file_name (void)
-{
- const char *dir = default_output_path ();
- static char *filename = NULL;
-
- if ( NULL == filename )
- filename = xasprintf ("%s%s", dir, OUTPUT_FILE_NAME);
-
- return filename;
-}