-;;; riece-server.el --- functions to open and close servers
+;;; riece-server.el --- functions to open and close servers -*- lexical-binding: t -*-
;; Copyright (C) 1998-2003 Daiki Ueno
;; Author: Daiki Ueno <ueno@unixuser.org>
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Code:
(require 'riece-coding) ;riece-default-coding-system
(require 'riece-identity)
(require 'riece-compat)
+(require 'riece-cache)
+(require 'riece-debug)
(eval-and-compile
(defvar riece-server-keyword-map
'((:host)
(:service 6667)
(:nickname riece-nickname)
+ (:realname riece-realname)
(:username riece-username)
(:password)
(:function riece-default-open-connection-function)
plist)
(setq plist (cons `(:host ,host) plist))
(unless (equal service "")
- (setq plist (cons `(:service ,(string-to-int service)) plist)))
+ (setq plist (cons `(:service ,(string-to-number service)) plist)))
(unless (equal password "")
(setq plist (cons `(:password ,(substring password 1)) plist)))
(apply #'nconc plist))))
(put 'riece-with-server-buffer 'lisp-indent-function 1)
(put 'riece-with-server-buffer 'edebug-form-spec '(form body))
-(defun riece-flush-send-queue (process &optional force)
+(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."
+ (list (floor seconds 65536)
+ (floor (mod seconds 65536))
+ (floor (* (- seconds (ffloor seconds)) 1000000))))
+
+;; stolen (and renamed) from time-date.el.
+(defun riece-time-less-p (t1 t2)
+ "Say whether time value T1 is less than time value T2."
+ (or (< (car t1) (car t2))
+ (and (= (car t1) (car t2))
+ (< (nth 1 t1) (nth 1 t2)))))
+
+;; stolen (and renamed) from time-date.el.
+(defun riece-time-since (time)
+ "Return the time elapsed since TIME."
+ (let* ((current (current-time))
+ (rest (when (< (nth 1 current) (nth 1 time))
+ (expt 2 16))))
+ (list (- (+ (car current) (if rest -1 0)) (car time))
+ (- (+ (or rest 0) (nth 1 current)) (nth 1 time)))))
+
+(defun riece-flush-send-queue (process)
(with-current-buffer (process-buffer process)
(let ((length 0)
string)
- (if force
+ (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-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 t)))))
+ (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-flush-send-queue process nil))
+ (riece-queue-enqueue riece-send-queue string))
+ (riece-flush-send-queue process))
(defun riece-current-server-name ()
(or riece-overriding-server-name
(if (riece-server-opened "")
"")))))
-(defun riece-send-string (string)
- (let* ((server-name (riece-current-server-name))
+(defun riece-send-string (string &optional identity)
+ (let* ((server-name (if identity
+ (riece-identity-server identity)
+ (riece-current-server-name)))
(process (riece-server-process server-name)))
(unless process
(error "%s" (substitute-command-keys
"Type \\[riece-command-open-server] to open server.")))
- (riece-process-send-string process string)))
+ (riece-process-send-string
+ process
+ (with-current-buffer (process-buffer process)
+ (if identity
+ (riece-encode-coding-string-for-identity string identity)
+ (riece-encode-coding-string string))))))
(defun riece-open-server (server server-name)
(let ((protocol (or (plist-get server :protocol)
"-open-server")))
(unless function
(error "\"%S\" is not supported" protocol))
- (condition-case nil
- (setq process (funcall function server server-name))
- (error))
+ (setq process (riece-funcall-ignore-errors (symbol-name function)
+ function server server-name))
(when process
(with-current-buffer (process-buffer process)
(make-local-variable 'riece-protocol)
(funcall function process message))))
(defun riece-reset-process-buffer (process)
- (save-excursion
- (set-buffer (process-buffer process))
+ (with-current-buffer (process-buffer process)
(if (fboundp 'set-buffer-multibyte)
(set-buffer-multibyte nil))
(kill-all-local-variables)
(make-local-variable 'riece-channel-filter)
(make-local-variable 'riece-server-name)
(make-local-variable 'riece-read-point)
+ (setq riece-read-point (point-min))
+ (make-local-variable 'riece-filter-running)
(make-local-variable 'riece-send-queue)
- (make-local-variable 'riece-last-send-time)
- (setq riece-last-send-time '(0 0 0))
+ (setq riece-send-queue (riece-make-queue))
(make-local-variable 'riece-send-size)
(setq riece-send-size 0)
- (setq riece-read-point (point-min))
- (make-local-variable 'riece-obarray)
- (setq riece-obarray (make-vector riece-obarray-size 0))
+ (make-local-variable 'riece-last-send-time)
+ (setq riece-last-send-time '(0 0 0))
+ (make-local-variable 'riece-user-obarray)
+ (setq riece-user-obarray (make-vector riece-user-obarray-size 0))
+ (make-local-variable 'riece-channel-obarray)
+ (setq riece-channel-obarray (make-vector riece-channel-obarray-size 0))
(make-local-variable 'riece-coding-system)
+ (make-local-variable 'riece-channel-cache)
+ (setq riece-channel-cache (riece-make-cache riece-channel-cache-max-size))
+ (make-local-variable 'riece-user-cache)
+ (setq riece-user-cache (riece-make-cache riece-user-cache-max-size))
(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)
(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
projects / riece / blobdiff