Mercurial > octave-nkf

changeset 7409:73036cdd855d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2008-01-22 20:31:59 by jwe]
author jwe
date Tue, 22 Jan 2008 20:32:00 +0000
parents 246f905cb984
children 8a3b2ccc4e11
files src/ChangeLog src/graphics.cc src/input.cc src/input.h src/toplev.cc src/toplev.h
diffstat 6 files changed, 150 insertions(+), 102 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Tue Jan 22 19:42:48 2008 +0000
+++ b/src/ChangeLog	Tue Jan 22 20:32:00 2008 +0000
@@ -1,3 +1,21 @@
+2008-01-22  John W. Eaton  <jwe@octave.org>
+
+	* graphics.cc (clear_drawnow_request): New function.
+	(Fdrawnow): Add it to the unwind_protect stack.
+
+	* input.cc (Vdrawnow_requested): No longer static.
+	* input.h: Provide decl.
+	* graphics.cc (Fdrawnow, Fset, make_graphics_object):
+	Use Vdrawnow_requested directly.
+
+	* toplev.cc (octave_add_atexit_function,
+	octave_remove_atexit_function): New functions.
+	(Fatexit): Use them.
+	* graphics.cc (Fdrawnow): Call octave_add_atexit_function instead
+	of using eval.
+	* toplev.h (octave_add_atexit_function,
+	octave_remove_atexit_function): Provide decls.
+
 2008-01-22  Michael Goffioul  <michael.goffioul@gmail.com>
 
 	* graphics.h.in (base_properties::is_visible,
--- a/src/graphics.cc	Tue Jan 22 19:42:48 2008 +0000
+++ b/src/graphics.cc	Tue Jan 22 20:32:00 2008 +0000
@@ -34,17 +34,20 @@
 #include <set>
 #include <string>
 
+#include "file-ops.h"
+#include "file-stat.h"
+
 #include "defun.h"
 #include "error.h"
 #include "graphics.h"
+#include "input.h"
 #include "ov.h"
 #include "oct-obj.h"
 #include "oct-map.h"
 #include "ov-fcn-handle.h"
 #include "parse.h"
+#include "toplev.h"
 #include "unwind-prot.h"
-#include "file-ops.h"
-#include "file-stat.h"
 
 static void
 gripe_set_invalid (const std::string& pname)
@@ -1184,17 +1187,16 @@
 		     const std::string& debug_file) const
     {
       octave_value_list args;
-      args.resize (4);
-      args(0) = fh.as_octave_value ();
-      args(1) = term;
-      args(2) = file;
-      args(3) = mono;
       if (! debug_file.empty ())
 	args(4) = debug_file;
+      args(3) = mono;
+      args(2) = file;
+      args(1) = term;
+      args(0) = fh.as_octave_value ();
       feval ("gnuplot_drawnow", args);
     }
 
-  Matrix get_canvas_size (const graphics_handle& fh) const
+  Matrix get_canvas_size (const graphics_handle&) const
     { return Matrix (1, 2, 0.0); }
 };
 
@@ -1955,7 +1957,7 @@
             }
 
 	  if (! error_state && request_drawnow)
-	    feval ("__request_drawnow__");
+	    Vdrawnow_requested = true;
         }
       else
         error ("set: expecting graphics handle as first argument");
@@ -2119,7 +2121,7 @@
 	      retval = h.value ();
 
 	      if (! error_state)
-		feval ("__request_drawnow__");
+		Vdrawnow_requested = true;
 	    }
 	  else
 	    error ("__go%s__: unable to create graphics handle",
@@ -2365,6 +2367,12 @@
   return octave_value (gh_manager::figure_handle_list ());
 }
 
+static void
+clear_drawnow_request (void *)
+{
+  Vdrawnow_requested = false;
+}
+
 DEFUN (drawnow, args, ,
    "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} __go_drawnow__ ()\n\
@@ -2377,114 +2385,112 @@
 
   octave_value retval;
 
-  if (drawnow_executing >= 1)
-    return retval;
-
-  if (! __go_close_all_registered__)
+  unwind_protect::begin_frame ("Fdrawnow");
+  unwind_protect::add (clear_drawnow_request);
+
+  unwind_protect_int (drawnow_executing);
+
+  if (++drawnow_executing <= 1)
     {
-      // FIXME: is there a C++ way to do this?
-      int parse_status;
-      eval_string ("atexit (\"__go_close_all__\")", true, parse_status);
-      __go_close_all_registered__ = true;
-    }
-
-  ++drawnow_executing;
-
-  if (args.length () == 0)
-    {
-      Matrix hlist = gh_manager::figure_handle_list ();
-
-      for (int i = 0; ! error_state && i < hlist.length (); i++)
+      if (! __go_close_all_registered__)
+	{
+	  octave_add_atexit_function ("__go_close_all__");
+
+	  __go_close_all_registered__ = true;
+	}
+
+      if (args.length () == 0)
 	{
-	  graphics_handle h = gh_manager::lookup (hlist(i));
-
-	  if (h.ok () && h != 0)
+	  Matrix hlist = gh_manager::figure_handle_list ();
+
+	  for (int i = 0; ! error_state && i < hlist.length (); i++)
 	    {
-	      graphics_object go = gh_manager::get_object (h);
-	      figure::properties& fprops = dynamic_cast <figure::properties&> (go.get_properties ());
-
-	      if (fprops.is_modified ())
+	      graphics_handle h = gh_manager::lookup (hlist(i));
+
+	      if (h.ok () && h != 0)
 		{
-		  if (fprops.is_visible ())
-		    fprops.get_backend ().redraw_figure (h);
-		  else if (! fprops.get___plot_stream__ ().is_empty ())
+		  graphics_object go = gh_manager::get_object (h);
+		  figure::properties& fprops = dynamic_cast <figure::properties&> (go.get_properties ());
+
+		  if (fprops.is_modified ())
 		    {
-		      fprops.close (false);
-		      fprops.set___plot_stream__ (Matrix ());
-		      fprops.set___enhanced__ (false);
+		      if (fprops.is_visible ())
+			fprops.get_backend ().redraw_figure (h);
+		      else if (! fprops.get___plot_stream__ ().is_empty ())
+			{
+			  fprops.close (false);
+			  fprops.set___plot_stream__ (Matrix ());
+			  fprops.set___enhanced__ (false);
+			}
+		      fprops.set_modified (false);
 		    }
-		  fprops.set_modified (false);
 		}
 	    }
 	}
-    }
-  else if (args.length () >= 2 && args.length () <= 4)
-    {
-      std::string term, file, debug_file;
-      bool mono;
-
-      term = args(0).string_value ();
-
-      if (! error_state)
+      else if (args.length () >= 2 && args.length () <= 4)
 	{
-	  file = args(1).string_value ();
+	  std::string term, file, debug_file;
+	  bool mono;
+
+	  term = args(0).string_value ();
 
 	  if (! error_state)
 	    {
-	      int pos = file.find_last_of (file_ops::dir_sep_chars);
-
-	      if (pos != NPOS)
-		{
-		  file_stat fs (file.substr (0, pos));
-
-		  if (! (fs && fs.is_dir ()))
-		    error ("drawnow: nonexistent directory `%s'",
-			   file.substr (0, pos).c_str ());
-		}
-
-	      mono = (args.length () >= 3 ? args(2).bool_value () : false);
+	      file = args(1).string_value ();
 
 	      if (! error_state)
 		{
-		  debug_file = (args.length () > 3 ? args(3).string_value ()
-				: "");
+		  size_t pos = file.find_last_of (file_ops::dir_sep_chars);
+
+		  if (pos != NPOS)
+		    {
+		      file_stat fs (file.substr (0, pos));
+
+		      if (! (fs && fs.is_dir ()))
+			error ("drawnow: nonexistent directory `%s'",
+			       file.substr (0, pos).c_str ());
+		    }
+
+		  mono = (args.length () >= 3 ? args(2).bool_value () : false);
 
 		  if (! error_state)
 		    {
-		      graphics_handle h = gcf ();
-
-		      if (h.ok ())
+		      debug_file = (args.length () > 3 ? args(3).string_value ()
+				    : "");
+
+		      if (! error_state)
 			{
-			  graphics_object go = gh_manager::get_object (h);
-			  figure::properties& fprops = dynamic_cast<figure::properties&> (go.get_properties ());
-
-			  fprops.get_backend ()
-			      .print_figure (h, term, file, mono, debug_file);
+			  graphics_handle h = gcf ();
+
+			  if (h.ok ())
+			    {
+			      graphics_object go = gh_manager::get_object (h);
+
+			      figure::properties& fprops = dynamic_cast<figure::properties&> (go.get_properties ());
+
+			      fprops.get_backend ()
+				.print_figure (h, term, file, mono, debug_file);
+			    }
+			  else
+			    error ("drawnow: nothing to draw");
 			}
 		      else
-			error ("drawnow: nothing to draw");
+			error ("drawnow: invalid debug_file, expected a string value");
 		    }
 		  else
-		    error ("drawnow: invalid debug_file, expected a string value");
+		    error ("drawnow: invalid colormode, expected a boolean value");
 		}
 	      else
-		error ("drawnow: invalid colormode, expected a boolean value");
+		error ("drawnow: invalid file, expected a string value");
 	    }
 	  else
-	    error ("drawnow: invalid file, expected a string value");
+	    error ("drawnow: invalid terminal, expected a string value");
 	}
       else
-	error ("drawnow: invalid terminal, expected a string value");
+	print_usage ();
     }
-  else
-    print_usage ();
-
-  // FIXME: is there a C++ way to do this?
-  octave_value_list fargs;
-  fargs(0) = false;
-  feval ("__request_drawnow__", fargs);
-
-  --drawnow_executing;
+
+  unwind_protect::run_frame ("Fdrawnow");
 
   return retval;
 }
--- a/src/input.cc	Tue Jan 22 19:42:48 2008 +0000
+++ b/src/input.cc	Tue Jan 22 20:32:00 2008 +0000
@@ -141,7 +141,7 @@
 
 // TRUE if the plotting system has requested a call to drawnow at
 // the next user prompt.
-static bool Vdrawnow_requested = false;
+bool Vdrawnow_requested = false;
 
 // TRUE if we are running in the Emacs GUD mode.
 static bool Vgud_mode = false;
--- a/src/input.h	Tue Jan 22 19:42:48 2008 +0000
+++ b/src/input.h	Tue Jan 22 20:32:00 2008 +0000
@@ -84,6 +84,10 @@
 // TRUE after a call to completion_matches.
 extern bool octave_completion_matches_called;
 
+// TRUE if the plotting system has requested a call to drawnow at
+// the next user prompt.
+extern bool Vdrawnow_requested;
+
 extern std::string gnu_readline (const std::string& s, bool force_readline = false);
 
 extern void initialize_command_input (void);
--- a/src/toplev.cc	Tue Jan 22 19:42:48 2008 +0000
+++ b/src/toplev.cc	Tue Jan 22 20:32:00 2008 +0000
@@ -663,6 +663,32 @@
     }
 }
 
+void
+octave_add_atexit_function (const std::string& fname)
+{
+  octave_atexit_functions.push_front (fname);
+}
+
+bool
+octave_remove_atexit_function (const std::string& fname)
+{
+  bool found = false;
+
+  for (std::list<std::string>::iterator p = octave_atexit_functions.begin ();
+       p != octave_atexit_functions.end (); p++)
+    {
+      if (*p == fname)
+	{
+	  octave_atexit_functions.erase (p);
+	  found = true;
+	  break;
+	}
+    }
+
+  return found;
+}
+
+
 DEFUN (atexit, args, nargout,
   "-*- texinfo -*-\n\
 @deftypefn {Built-in Function} {} atexit (@var{fcn})\n\
@@ -723,22 +749,10 @@
           if (! error_state)
 	    {
 	      if (add_mode)
-		octave_atexit_functions.push_front (arg);
+		octave_add_atexit_function (arg);
 	      else
 		{
-		  bool found = false;
-		  std::list<std::string>::iterator it;
-
-		  for (std::list<std::string>::iterator p = octave_atexit_functions.begin ();
-		       p != octave_atexit_functions.end (); p++)
-		    {
-		      if (*p == arg)
-			{
-			  octave_atexit_functions.erase (p);
-			  found = true;
-			  break;
-			}
-		    }
+		  bool found = octave_remove_atexit_function (arg);
 
 		  if (nargout > 0)
 		    retval(0) = found;
--- a/src/toplev.h	Tue Jan 22 19:42:48 2008 +0000
+++ b/src/toplev.h	Tue Jan 22 20:32:00 2008 +0000
@@ -46,6 +46,12 @@
 extern OCTINTERP_API void
 do_octave_atexit (void);
 
+extern OCTINTERP_API void
+octave_add_atexit_function (const std::string& fname);
+
+extern OCTINTERP_API bool
+octave_remove_atexit_function (const std::string& fname);
+
 // Current command to execute.
 extern OCTINTERP_API tree_statement_list *global_command;