Kernel#show_console_window, Kernel#hide_console_window, Kernel#filecopy are implemented.

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/molby/trunk@359 a2be9bc6-48de-4e38-9406-05402d4bc13c

diff --git a/MolLib/Ruby_bind/ruby_bind.c b/MolLib/Ruby_bind/ruby_bind.c
index 0a18028..e2a80e6 100644 (file)
--- a/MolLib/Ruby_bind/ruby_bind.c
+++ b/MolLib/Ruby_bind/ruby_bind.c
@@ -229,6 +229,32 @@ s_Kernel_Ask(int argc, VALUE *argv, VALUE self)
 
 /*
  *  call-seq:
+ *     show_console_window
+ *
+ *  Show the console window and bring to the front.
+ */
+static VALUE
+s_Kernel_ShowConsoleWindow(VALUE self)
+{
+       MyAppCallback_showConsoleWindow();
+       return Qnil;
+}
+
+/*
+ *  call-seq:
+ *     hide_console_window
+ *
+ *  Hide the console window.
+ */
+static VALUE
+s_Kernel_HideConsoleWindow(VALUE self)
+{
+       MyAppCallback_hideConsoleWindow();
+       return Qnil;
+}
+
+/*
+ *  call-seq:
  *     stdout.write(str)
  *
  *  Put the message in the main text view in black color.
@@ -670,17 +696,39 @@ s_Kernel_DocumentHome(VALUE self)
        return retval;
 }
 
+/*  The callback functions for call_subprocess  */
+static VALUE
+s_Kernel_CallSubProcess_CallbackSub(VALUE val)
+{
+       return rb_funcall(val, rb_intern("call"), 0);
+}
+
+static int
+s_Kernel_CallSubProcess_Callback(void *data)
+{
+       int status;
+       VALUE retval = rb_protect(s_Kernel_CallSubProcess_CallbackSub, (VALUE)data, &status);
+       if (status != 0 || retval == Qnil || retval == Qfalse)
+               return 1;
+       else return 0;
+}
+
 /*
  *  call-seq:
- *     call_subprocess(cmd, process_name)
+ *     call_subprocess(cmd, process_name [, callback_proc])
  *
  *  Call subprocess. A progress dialog window is displayed, with a message
  *  "Running #{process_name}...".
+ *  A callback proc can be given, which is called periodically during execution. If the proc returns
+ *  nil or false, then the execution will be interrupted.
  */
 static VALUE
-s_Kernel_CallSubProcess(VALUE self, VALUE cmd, VALUE procname)
+s_Kernel_CallSubProcess(int argc, VALUE *argv, VALUE self)
 {
-       int n = MyAppCallback_callSubProcess(StringValuePtr(cmd), StringValuePtr(procname));
+       VALUE cmd, procname, cproc;
+       int n;
+       rb_scan_args(argc, argv, "21", &cmd, &procname, &cproc);
+       n = MyAppCallback_callSubProcess(StringValuePtr(cmd), StringValuePtr(procname), (cproc == Qnil ? NULL : s_Kernel_CallSubProcess_Callback), (cproc == Qnil ? NULL : (void *)cproc));
        return INT2NUM(n);
 }
 
@@ -10243,10 +10291,12 @@ Init_Molby(void)
        rb_define_method(rb_mKernel, "set_global_settings", s_Kernel_SetGlobalSettings, 2);
        rb_define_method(rb_mKernel, "execute_script", s_Kernel_ExecuteScript, 1);
        rb_define_method(rb_mKernel, "document_home", s_Kernel_DocumentHome, 0);
-       rb_define_method(rb_mKernel, "call_subprocess", s_Kernel_CallSubProcess, 2);
+       rb_define_method(rb_mKernel, "call_subprocess", s_Kernel_CallSubProcess, -1);
        rb_define_method(rb_mKernel, "message_box", s_Kernel_MessageBox, -1);
        rb_define_method(rb_mKernel, "error_message_box", s_Kernel_ErrorMessageBox, 1);
-
+       rb_define_method(rb_mKernel, "show_console_window", s_Kernel_ShowConsoleWindow, 0);
+       rb_define_method(rb_mKernel, "hide_console_window", s_Kernel_HideConsoleWindow, 0);
+       
        s_ID_equal = rb_intern("==");
 }
 

diff --git a/Scripts/startup.rb b/Scripts/startup.rb
index f8e7ed9..9de72e2 100755 (executable)
--- a/Scripts/startup.rb
+++ b/Scripts/startup.rb
@@ -53,6 +53,25 @@ module Enumerable
   end
 end
 
+module Kernel
+  def filecopy(src, dst)
+    fpin = File.open(src, "rb")
+    return nil if fpin == nil
+    fpout = File.open(dst, "wb")
+    if fpout == nil
+      fpin.close
+      return nil
+    end
+    a = ""
+    while fpin.read(4096, a)
+      fpout.write(a)
+    end
+    fpin.close
+    fpout.close
+    return true
+  end
+end
+
 load "transform.rb"
 load "molecule.rb"
 load "loadsave.rb"