X-Git-Url: https://cgit.sxemacs.org/?p=riece;a=blobdiff_plain;f=lisp%2Friece-server.el;h=2323dddba49f4507bcb5cfcf4ed2cca44bc2bda2;hp=b38c925964ed3294936125e755dc1a7e0ed69487;hb=6d046bcb1450df250fb33796a99749ea68d88702;hpb=5bb47dd52a3519873065ff41c4a38ef11323aae9

diff --git a/lisp/riece-server.el b/lisp/riece-server.el
index b38c925..2323ddd 100644
--- a/lisp/riece-server.el
+++ b/lisp/riece-server.el
@@ -105,6 +105,31 @@ the `riece-server-keyword-map' variable."
 (put 'riece-with-server-buffer 'lisp-indent-function 1)
 (put 'riece-with-server-buffer 'edebug-form-spec '(form body))
 
+(defun riece-make-queue ()
+  "Make a queue object."
+  (vector nil nil))
+
+(defun riece-queue-enqueue (queue object)
+  "Add OBJECT to the end of QUEUE."
+  (if (aref queue 1)
+      (let ((last (list object)))
+	(nconc (aref queue 1) last)
+	(aset queue 1 last))
+    (aset queue 0 (list object))
+    (aset queue 1 (aref queue 0))))
+
+(defun riece-queue-dequeue (queue)
+  "Remove an object from the beginning of QUEUE."
+  (unless (aref queue 0)
+    (error "Empty queue"))
+  (prog1 (car (aref queue 0))
+    (unless (aset queue 0 (cdr (aref queue 0)))
+      (aset queue 1 nil))))
+
+(defun riece-queue-empty (queue)
+  "Return t if QUEUE is empty."
+  (null (aref queue 0)))
+
 ;; stolen (and renamed) from time-date.el.
 (defun riece-seconds-to-time (seconds)
   "Convert SECONDS (a floating point number) to a time value."
@@ -135,24 +160,27 @@ the `riece-server-keyword-map' variable."
       (if (riece-time-less-p (riece-seconds-to-time riece-send-delay)
 			     (riece-time-since riece-last-send-time))
 	  (setq riece-send-size 0))
-      (while (and riece-send-queue
+      (while (and (not (riece-queue-empty riece-send-queue))
 		  (<= riece-send-size riece-max-send-size))
-	(setq string (riece-encode-coding-string (car riece-send-queue))
+	(setq string (riece-encode-coding-string
+		      (riece-queue-dequeue riece-send-queue))
 	      length (length string))
 	(if (> length riece-max-send-size)
 	    (message "Long message (%d > %d)" length riece-max-send-size)
 	  (setq riece-send-size (+ riece-send-size length))
 	  (when (<= riece-send-size riece-max-send-size)
 	    (process-send-string process string)
-	    (setq riece-last-send-time (current-time))))
-	(setq riece-send-queue (cdr riece-send-queue)))
-      (if riece-send-queue
-	  (riece-run-at-time riece-send-delay nil
-			     #'riece-flush-send-queue process)))))
+	    (setq riece-last-send-time (current-time)))))
+      (unless (riece-queue-empty riece-send-queue)
+	(riece-run-at-time riece-send-delay nil
+			   (lambda (process)
+			     (if (riece-server-process-opened process)
+				 (riece-flush-send-queue process)))
+			   process)))))
 
 (defun riece-process-send-string (process string)
   (with-current-buffer (process-buffer process)
-    (setq riece-send-queue (nconc riece-send-queue (list string))))
+    (riece-queue-enqueue riece-send-queue string))
   (riece-flush-send-queue process))
 
 (defun riece-current-server-name ()
@@ -226,6 +254,7 @@ the `riece-server-keyword-map' variable."
     (make-local-variable 'riece-read-point)
     (setq riece-read-point (point-min))
     (make-local-variable 'riece-send-queue)
+    (setq riece-send-queue (riece-make-queue))
     (make-local-variable 'riece-send-size)
     (setq riece-send-size 0)
     (make-local-variable 'riece-last-send-time)
@@ -233,10 +262,14 @@ the `riece-server-keyword-map' variable."
     (make-local-variable 'riece-obarray)
     (setq riece-obarray (make-vector riece-obarray-size 0))
     (make-local-variable 'riece-coding-system)
+    (make-local-variable 'riece-filter-semaphore)
+    (setq riece-filter-semaphore '(nil))
     (buffer-disable-undo)
     (erase-buffer)))
 
 (defun riece-close-server-process (process)
+  (with-current-buffer (process-buffer process)
+    (run-hooks 'riece-after-close-hook))
   (kill-buffer (process-buffer process))
   (setq riece-server-process-alist
 	(delq (rassq process riece-server-process-alist)
@@ -257,6 +290,15 @@ the `riece-server-keyword-map' variable."
 	      (throw 'found t))
 	  (setq alist (cdr alist)))))))
 
+(defun riece-server-properties (server-name)
+  "Return a list of properties associated with SERVER-NAME."
+  (if (equal server-name "")
+      riece-server
+    (let ((entry (assoc server-name riece-server-alist)))
+      (unless entry
+	(error "No such server"))
+      (cdr entry))))
+
 (provide 'riece-server)
 
 ;;; riece-server.el ends here