output: Make it possible to push and pop output engines.

This makes it possible to temporarily push a different set of output
drivers, which in turn makes it possible to do output as a pane within a
dialog or other window.

diff --git a/src/output/driver-provider.h b/src/output/driver-provider.h
index 012a304e36ac46cf58dfcb66fc5533cbb8b81af3..754b0d0b5677adaa54b7f37c550dfe643fe22a20 100644 (file)
--- a/src/output/driver-provider.h
+++ b/src/output/driver-provider.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2012, 2014 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

diff --git a/src/output/driver.c b/src/output/driver.c
index 0a6afba98a5d7eeec20b1060217a1ea65e643296..3178878036a167587943077e8d0a184a4dba7722 100644 (file)
--- a/src/output/driver.c
+++ b/src/output/driver.c
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2011, 2012, 2014 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
@@ -44,22 +44,52 @@
 #include "gettext.h"
 #define _(msgid) gettext (msgid)
 
+struct output_engine
+  {
+    struct llx_list drivers;       /* Contains "struct output_driver"s. */
+    struct string deferred_syntax; /* TEXT_ITEM_SYNTAX being accumulated. */
+  };
+
 static const struct output_driver_factory *factories[];
 
-/* Drivers currently registered with output_driver_register(). */
-static struct llx_list drivers = LLX_INITIALIZER (drivers);
+/* A stack of output engines.. */
+static struct output_engine *engine_stack;
+static size_t n_stack, allocated_stack;
+
+static struct output_engine *
+engine_stack_top (void)
+{
+  assert (n_stack > 0);
+  return &engine_stack[n_stack - 1];
+}
+
+void
+output_engine_push (void)
+{
+  struct output_engine *e;
+
+  if (n_stack >= allocated_stack)
+    engine_stack = x2nrealloc (engine_stack, &allocated_stack,
+                               sizeof *engine_stack);
 
-/* TEXT_ITEM_SYNTAX being accumulated until another kind of output arrives. */
-static struct string deferred_syntax = DS_EMPTY_INITIALIZER;
+  e = &engine_stack[n_stack++];
+  llx_init (&e->drivers);
+  ds_init_empty (&e->deferred_syntax);
+}
 
 void
-output_close (void)
+output_engine_pop (void)
 {
-  while (!llx_is_empty (&drivers))
+  struct output_engine *e;
+
+  assert (n_stack > 0);
+  e = &engine_stack[--n_stack];
+  while (!llx_is_empty (&e->drivers))
     {
-      struct output_driver *d = llx_pop_head (&drivers, &llx_malloc_mgr);
+      struct output_driver *d = llx_pop_head (&e->drivers, &llx_malloc_mgr);
       output_driver_destroy (d);
     }
+  ds_destroy (&e->deferred_syntax);
 }
 
 void
@@ -72,11 +102,11 @@ output_get_supported_formats (struct string_set *formats)
 }
 
 static void
-output_submit__ (struct output_item *item)
+output_submit__ (struct output_engine *e, struct output_item *item)
 {
   struct llx *llx, *next;
 
-  for (llx = llx_head (&drivers); llx != llx_null (&drivers); llx = next)
+  for (llx = llx_head (&e->drivers); llx != llx_null (&e->drivers); llx = next)
     {
       struct output_driver *d = llx_data (llx);
       enum settings_output_type type;
@@ -105,12 +135,12 @@ output_submit__ (struct output_item *item)
 }
 
 static void
-flush_deferred_syntax (void)
+flush_deferred_syntax (struct output_engine *e)
 {
-  if (!ds_is_empty (&deferred_syntax))
+  if (!ds_is_empty (&e->deferred_syntax))
     {
-      char *syntax = ds_steal_cstr (&deferred_syntax);
-      output_submit__ (text_item_super (
+      char *syntax = ds_steal_cstr (&e->deferred_syntax);
+      output_submit__ (e, text_item_super (
                          text_item_create_nocopy (TEXT_ITEM_SYNTAX, syntax)));
     }
 }
@@ -127,15 +157,17 @@ is_syntax_item (const struct output_item *item)
 void
 output_submit (struct output_item *item)
 {
+  struct output_engine *e = engine_stack_top ();
+
   if (is_syntax_item (item))
     {
-      ds_put_cstr (&deferred_syntax, text_item_get_text (to_text_item (item)));
+      ds_put_cstr (&e->deferred_syntax, text_item_get_text (to_text_item (item)));
       output_item_unref (item);
       return;
     }
 
-  flush_deferred_syntax ();
-  output_submit__ (item);
+  flush_deferred_syntax (e);
+  output_submit__ (e, item);
 }
 
 /* Flushes output to screen devices, so that the user can see
@@ -143,10 +175,11 @@ output_submit (struct output_item *item)
 void
 output_flush (void)
 {
+  struct output_engine *e = engine_stack_top ();
   struct llx *llx;
 
-  flush_deferred_syntax ();
-  for (llx = llx_head (&drivers); llx != llx_null (&drivers);
+  flush_deferred_syntax (e);
+  for (llx = llx_head (&e->drivers); llx != llx_null (&e->drivers);
        llx = llx_next (llx))
     {
       struct output_driver *d = llx_data (llx);
@@ -185,24 +218,41 @@ output_driver_get_name (const struct output_driver *driver)
   return driver->name;
 }
 \f
+static struct output_engine *
+output_driver_get_engine (const struct output_driver *driver)
+{
+  struct output_engine *e;
+
+  for (e = engine_stack; e < &engine_stack[n_stack]; e++)
+    if (llx_find (llx_head (&e->drivers), llx_null (&e->drivers), driver))
+      return e;
+
+  return NULL;
+}
+
 void
 output_driver_register (struct output_driver *driver)
 {
+  struct output_engine *e = engine_stack_top ();
+
   assert (!output_driver_is_registered (driver));
-  llx_push_tail (&drivers, driver, &llx_malloc_mgr);
+  llx_push_tail (&e->drivers, driver, &llx_malloc_mgr);
 }
 
 void
 output_driver_unregister (struct output_driver *driver)
 {
-  llx_remove (llx_find (llx_head (&drivers), llx_null (&drivers), driver),
+  struct output_engine *e = output_driver_get_engine (driver);
+
+  assert (e != NULL);
+  llx_remove (llx_find (llx_head (&e->drivers), llx_null (&e->drivers), driver),
               &llx_malloc_mgr);
 }
 
 bool
 output_driver_is_registered (const struct output_driver *driver)
 {
-  return llx_find (llx_head (&drivers), llx_null (&drivers), driver) != NULL;
+  return output_driver_get_engine (driver) != NULL;
 }
 \f
 /* Useful functions for output driver implementation. */

diff --git a/src/output/driver.h b/src/output/driver.h
index 93802078a43cb5fcabb2922bf0abf077205d4a90..bc2b52183f2328f66c62dc80768cf2e9454d21bd 100644 (file)
--- a/src/output/driver.h
+++ b/src/output/driver.h
@@ -1,5 +1,5 @@
 /* PSPP - a program for statistical analysis.
-   Copyright (C) 1997-9, 2000, 2007, 2009, 2010 Free Software Foundation, Inc.
+   Copyright (C) 1997-9, 2000, 2007, 2009, 2010, 2014 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
@@ -23,16 +23,18 @@ struct output_item;
 struct string_set;
 struct string_map;
 
-void output_submit (struct output_item *);
+void output_get_supported_formats (struct string_set *);
 
-void output_flush (void);
+void output_engine_push (void);
+void output_engine_pop (void);
 
-void output_close (void);
-void output_get_supported_formats (struct string_set *);
+void output_submit (struct output_item *);
+void output_flush (void);
 
 struct output_driver *output_driver_create (struct string_map *options);
+bool output_driver_is_registered (const struct output_driver *);
+
 void output_driver_register (struct output_driver *);
 void output_driver_unregister (struct output_driver *);
-bool output_driver_is_registered (const struct output_driver *);
 
 #endif /* output/driver.h */

diff --git a/src/ui/gui/psppire.c b/src/ui/gui/psppire.c
index 9fe010525a36f1bd775a0f9657607fcc3e173e43..eb8fddbe98d486631284f972801aa735cfb4f070 100644 (file)
--- a/src/ui/gui/psppire.c
+++ b/src/ui/gui/psppire.c
@@ -82,6 +82,7 @@ initialize (const char *data_file)
   preregister_widgets ();
 
   gsl_set_error_handler_off ();
+  output_engine_push ();
   settings_init ();
   fh_init ();
 
@@ -129,7 +130,7 @@ void
 de_initialize (void)
 {
   settings_done ();
-  output_close ();
+  output_engine_pop ();
   i18n_done ();
 }
 

diff --git a/src/ui/terminal/main.c b/src/ui/terminal/main.c
index c30b5f85bc02bd82259ce8aeadb6e7910ea6af02..fdbca25a2f61f76fbb407e02cc5cf8bd069b0512 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-2000, 2006-2007, 2009-2013 Free Software Foundation, Inc.
+   Copyright (C) 1997-2000, 2006-2007, 2009-2014 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
@@ -90,6 +90,7 @@ main (int argc, char **argv)
   fpu_init ();
   gsl_set_error_handler_off ();
 
+  output_engine_push ();
   fh_init ();
   settings_init ();
   terminal_check_size ();
@@ -166,7 +167,7 @@ main (int argc, char **argv)
   settings_done ();
   fh_done ();
   lex_destroy (lexer);
-  output_close ();
+  output_engine_pop ();
   i18n_done ();
 
   return msg_ui_any_errors ();

diff --git a/tests/output/render-test.c b/tests/output/render-test.c
index fbc0f208484d973f4170b053abd694d8761fca68..a8c912835fa942adf046222c9e0fcc31643cd4a0 100644 (file)
--- a/tests/output/render-test.c
+++ b/tests/output/render-test.c
@@ -74,6 +74,7 @@ main (int argc, char **argv)
   FILE *input;
 
   set_program_name (argv[0]);
+  output_engine_push ();
   input_file_name = parse_options (argc, argv);
 
   if (!strcmp (input_file_name, "-"))
@@ -119,7 +120,7 @@ main (int argc, char **argv)
   if (input != stdin)
     fclose (input);
 
-  output_close ();
+  output_engine_pop ();
 
   return 0;
 }