X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-ruby.el;h=dbbecf8f493f09fc7846605493a85b6469aa02ef;hb=99c733d6c3830ec7aae806fe88b8911c4ff13f64;hp=8a3c66b4722ccd6e10043e9f5283cdb01c50dffa;hpb=a85a55953362f67f37b0253c804c2bca24144bc3;p=riece

diff --git a/lisp/riece-ruby.el b/lisp/riece-ruby.el
index 8a3c66b..dbbecf8 100644
--- a/lisp/riece-ruby.el
+++ b/lisp/riece-ruby.el
@@ -106,6 +106,8 @@ Local to the process buffer.")
   "Status from server.
 Local to the process buffer.")
 
+(defvar riece-ruby-output-queue-alist nil
+  "An alist mapping from program name to output data.")
 (defvar riece-ruby-output-handler-alist nil
   "An alist mapping from program name to output handler.
 Output handlers are called every time \"# output\" line arrives.
@@ -196,7 +198,7 @@ Use `riece-ruby-set-property' to set this variable.")
 	    (progn
 	      (setq riece-ruby-escaped-data nil
 		    riece-ruby-response
-		    (list 'ERR (string-to-number (match-string 2))
+		    (list 'ERR (string-to-number (match-string 1))
 			  (match-string 3))
 		    riece-ruby-lock nil))
 	  (if (looking-at "D \\(.*\\)\r")
@@ -212,11 +214,9 @@ Use `riece-ruby-set-property' to set this variable.")
 		      (riece-ruby-run-exit-handler
 		       (cdr (car riece-ruby-status-alist)))))
 	      (if (looking-at "# output \\([^ ]*\\) \\(.*\\)\r")
-		  (let ((entry (assoc (match-string 1)
-				      riece-ruby-output-handler-alist)))
-		    (if entry
-			(riece-debug-with-backtrace
-			  (funcall (cdr entry) (car entry) (match-string 2)))))
+		  (riece-ruby-run-output-handler (match-string 1)
+						 (match-string 2)
+						 (current-time))
 		(if (looking-at "# exit \\(.*\\)\r")
 		    (riece-ruby-run-exit-handler (match-string 1))))))))
       (forward-line))
@@ -224,13 +224,28 @@ Use `riece-ruby-set-property' to set this variable.")
 
 (defun riece-ruby-run-exit-handler (name)
   (let ((entry (assoc name riece-ruby-exit-handler-alist)))
-    (if entry
-	(progn
-	  (setq riece-ruby-exit-handler-alist
-		(delq entry riece-ruby-exit-handler-alist))
-	  (riece-debug-with-backtrace
-	    (funcall (cdr entry) (car entry)))
-	  (riece-ruby-clear name)))))
+    (when entry
+      (setq riece-ruby-exit-handler-alist
+	    (delq entry riece-ruby-exit-handler-alist))
+      (riece-funcall-ignore-errors (if (symbolp (cdr entry))
+				       (symbol-name (cdr entry))
+				     (format "%s-exit-handler" name))
+				   (cdr entry) (car entry))
+      (riece-ruby-clear name))))
+
+(defun riece-ruby-run-output-handler (name output time)
+  (let ((handler-entry (assoc name riece-ruby-output-handler-alist))
+	(entry (assoc name riece-ruby-output-queue-alist)))
+    (if handler-entry
+	(riece-funcall-ignore-errors (if (symbolp (cdr handler-entry))
+					 (symbol-name (cdr handler-entry))
+				       (format "%s-output-handler" name))
+				     (cdr handler-entry) name output time)
+      (if entry
+	  (setcdr entry (cons output (cdr entry)))
+	(setq riece-ruby-output-queue-alist
+	      (cons (list name (cons output time))
+		    riece-ruby-output-queue-alist))))))
 
 (defun riece-ruby-sentinel (process status)
   (kill-buffer (process-buffer process)))
@@ -246,13 +261,8 @@ Return a string name assigned by the server."
       (setq riece-ruby-process
 	    (apply #'start-process "riece-ruby" (generate-new-buffer " *Ruby*")
 		   riece-ruby-command
-		   (if (file-name-absolute-p riece-ruby-server-program)
-		       riece-ruby-server-program
-		     (expand-file-name
-		      riece-ruby-server-program
-		      (file-name-directory
-		       (locate-library
-			(symbol-file 'riece-ruby-execute)))))
+		   (expand-file-name riece-ruby-server-program
+				     riece-data-directory)
 		   riece-ruby-server-program-arguments))
       (process-kill-without-query riece-ruby-process)
       (set-process-filter riece-ruby-process #'riece-ruby-filter)
@@ -328,11 +338,24 @@ is specified.  Otherwise, it should be called explicitly."
   "Set an output-handler HANDLER for the program distinguished by NAME.
 An output-handler is called when the program sends any output by using
 `output' method in the Ruby program.
-An output-handler is called with two argument.  The first argument is
-the same as NAME.  The second argument is output string."
-  (let ((entry (assoc name riece-ruby-output-handler-alist)))
+An output-handler is called with three argument.  The first argument
+is the same as NAME.  The second argument is the output string.  The
+third argument is the timestamp of the output event."
+  (let ((entry (assoc name riece-ruby-output-handler-alist))
+	queue-entry pointer)
     (if handler
 	(progn
+	  (when (setq queue-entry (assoc name riece-ruby-output-queue-alist))
+	    (setq pointer (nreverse (cdr queue-entry))
+		  riece-ruby-output-queue-alist
+		  (delq queue-entry riece-ruby-output-queue-alist))
+	    (while pointer
+	      (riece-funcall-ignore-errors (if (symbolp handler)
+					       (symbol-name handler)
+					     (format "%s-output-handler" name))
+					   handler name (car (car pointer))
+					   (cdr (car pointer)))
+	      (setq pointer (cdr pointer))))
 	  (if entry
 	      (setcdr entry handler)
 	    (setq riece-ruby-output-handler-alist