(:nickname riece-nickname)
(:username riece-username)
(:password)
- (:function #'open-network-stream)
+ (:function riece-default-open-connection-function)
(:coding riece-default-coding-system))
"Mapping from keywords to default values.
All keywords that can be used must be listed here."))
(format "IRC<%s>" server-name)))
(defun riece-server-process (server-name)
- (get-process (riece-server-process-name server-name)))
+ (cdr (assoc server-name riece-server-process-alist)))
(defmacro riece-with-server-buffer (server-name &rest body)
`(let ((process (riece-server-process ,server-name)))
(error "Server closed"))))
(put 'riece-with-server-buffer 'lisp-indent-function 1)
+(put 'riece-with-server-buffer 'edebug-form-spec '(form body))
+
+;; 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-since (time)
+ "Return the time elapsed since TIME.
+TIME should be either a time value or a date-time string."
+ (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)))))
+
+;; 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)))))
+
+(defun riece-flush-send-queue (process)
+ (with-current-buffer (process-buffer process)
+ (let ((length 0)
+ string)
+ (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
+ (< riece-send-size riece-max-send-size))
+ (setq string (riece-encode-coding-string (car riece-send-queue))
+ length (length string))
+ (if (> length riece-max-send-size)
+ (message "Long message (%d > %d)" length riece-max-send-size)
+ (process-send-string process string)
+ (setq riece-send-size (+ riece-send-size length)))
+ (setq riece-send-queue (cdr riece-send-queue)))
+ (if riece-send-queue
+ (progn
+ (if riece-debug
+ (message "%d bytes sent, %d bytes left"
+ riece-send-size
+ (apply #'+ (mapcar #'length riece-send-queue))))
+ ;; schedule next send after a second
+ (riece-run-at-time riece-send-delay nil
+ #'riece-flush-send-queue process))
+ (if riece-debug
+ (message "%d bytes sent" riece-send-size)))
+ (setq riece-last-send-time (current-time)))))
(defun riece-process-send-string (process string)
(with-current-buffer (process-buffer process)
- (process-send-string process (riece-encode-coding-string string))))
+ (setq riece-send-queue (nconc riece-send-queue (list string))))
+ (riece-flush-send-queue process))
-(defun riece-send-string (string)
- (let* ((server-name
- (or riece-overriding-server-name
+(defun riece-current-server-name ()
+ (or riece-overriding-server-name
;already in the server buffer
- (if (local-variable-p 'riece-server-name (current-buffer))
- riece-server-name
- (if riece-current-channel
- (riece-identity-server riece-current-channel)
- (if (riece-server-opened "")
- "")))))
+ (if (local-variable-p 'riece-server-name (current-buffer))
+ riece-server-name
+ (if riece-current-channel
+ (riece-identity-server riece-current-channel)
+ (if (riece-server-opened "")
+ "")))))
+
+(defun riece-send-string (string)
+ (let* ((server-name (riece-current-server-name))
(process (riece-server-process server-name)))
(unless process
(error "%s" (substitute-command-keys
(riece-process-send-string process string)))
(defun riece-open-server (server server-name)
- (riece-server-keyword-bind server
- (let (selective-display
- (coding-system-for-read 'binary)
- (coding-system-for-write 'binary)
- process)
- (if (equal server-name "")
- (message "Connecting to IRC server...")
- (message "Connecting to %s..." server-name))
- (setq process
- (funcall function (riece-server-process-name server-name)
- (concat " *IRC*" server-name)
- host service))
- (if (equal server-name "")
- (message "Connecting to IRC server...done")
- (message "Connecting to %s...done" server-name))
- (riece-reset-process-buffer process)
- (with-current-buffer (process-buffer process)
- (setq riece-server-name server-name))
- (set-process-sentinel process 'riece-sentinel)
- (set-process-filter process 'riece-filter)
- (if (equal server-name "")
- (message "Logging in to IRC server...")
- (message "Logging in to %s..." server-name))
- (if riece-reconnect-with-password ;password incorrect or not set.
- (unwind-protect
- (setq password (riece-read-passwd "Password: "))
- (setq riece-reconnect-with-password nil)))
- (if password
- (riece-process-send-string process
- (format "PASS %s\r\n" password)))
- (riece-process-send-string process
- (format "USER %s * * :%s\r\n"
- (user-real-login-name)
- (or username
- "No information given")))
- (riece-process-send-string process (format "NICK %s\r\n" nickname))
+ (let ((protocol (or (plist-get server :protocol)
+ riece-protocol))
+ function
+ process)
+ (condition-case nil
+ (require (intern (concat "riece-" (symbol-name protocol))))
+ (error))
+ (setq function (intern-soft (concat "riece-"
+ (symbol-name protocol)
+ "-open-server")))
+ (unless function
+ (error "\"%S\" is not supported" protocol))
+ (condition-case nil
+ (setq process (funcall function server server-name))
+ (error))
+ (when process
(with-current-buffer (process-buffer process)
- (setq riece-last-nickname riece-real-nickname
- riece-nick-accepted 'sent
- riece-coding-system coding))
- (setq riece-process-list
- (cons process riece-process-list)))))
+ (make-local-variable 'riece-protocol)
+ (setq riece-protocol protocol))
+ (setq riece-server-process-alist
+ (cons (cons server-name process)
+ riece-server-process-alist)))))
+
+(defun riece-quit-server-process (process &optional message)
+ (let ((function (intern-soft
+ (concat "riece-"
+ (with-current-buffer (process-buffer process)
+ (symbol-name riece-protocol))
+ "-quit-server-process"))))
+ (if function
+ (funcall function process message))))
(defun riece-reset-process-buffer (process)
(save-excursion
(make-local-variable 'riece-channel-filter)
(make-local-variable 'riece-server-name)
(make-local-variable 'riece-read-point)
+ (make-local-variable 'riece-send-queue)
+ (make-local-variable 'riece-last-send-time)
+ (setq riece-last-send-time '(0 0 0))
+ (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))
(erase-buffer)))
(defun riece-close-server-process (process)
- (if riece-debug
- (delete-process process)
- (kill-buffer (process-buffer process)))
- (setq riece-process-list (delq process riece-process-list))
- ;; If no server process is available, exit.
- (unless riece-process-list
- (riece-exit)))
+ (kill-buffer (process-buffer process))
+ (setq riece-server-process-alist
+ (delq (rassq process riece-server-process-alist)
+ riece-server-process-alist)))
-(defun riece-server-opened (&optional server-name)
- (let ((process-list riece-process-list))
- (catch 'found
- (while process-list
- (if (memq (process-status (car process-list)) '(open run))
- (throw 'found t))
- (setq process-list (cdr process-list))))))
+(defun riece-server-process-opened (process)
+ (not (null (memq (process-status process) '(open run)))))
-(defun riece-quit-server-process (process &optional message)
- (run-at-time riece-quit-timeout nil
- (lambda (process)
- (if (memq process riece-process-list)
- (riece-close-server-process process)))
- process)
- (riece-process-send-string process
- (if message
- (format "QUIT :%s\r\n" message)
- "QUIT\r\n")))
+(defun riece-server-opened (&optional server-name)
+ (if server-name
+ (let ((process (riece-server-process server-name)))
+ (and process
+ (riece-server-process-opened process)))
+ (let ((alist riece-server-process-alist))
+ (catch 'found
+ (while alist
+ (if (riece-server-process-opened (cdr (car alist)))
+ (throw 'found t))
+ (setq alist (cdr alist)))))))
(provide 'riece-server)
projects / riece / blobdiff