-(defun riece-open-server (server &optional server-name)
- (if server-name
- (message "Connecting to IRC server on %s..." server-name)
- (message "Connecting to IRC server..."))
- (riece-server-keyword-bind server
- (let* (selective-display
- (coding-system-for-read 'binary)
- (coding-system-for-write 'binary)
- (process
- (funcall function "IRC"
- (get-buffer-create
- (if server-name
- (format " *IRC*%s" server-name)
- " *IRC*"))
- host service)))
- (riece-reset-process-buffer process)
- (setq riece-server-name server-name)
- (set-process-sentinel process 'riece-sentinel)
- (set-process-filter process 'riece-filter)
- (if (or password
- riece-reconnect-with-password)
- (riece-process-send-string process
- (format "PASS %s\r\n"
- (or password
- (riece-read-passwd
- "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))
+(defun riece-server-process-name (server-name)
+ (if (equal server-name "")
+ "IRC"
+ (format "IRC<%s>" server-name)))
+
+(defun riece-server-process (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)))
+ (if process
+ (with-current-buffer (process-buffer process)
+ ,@body)
+ (error "Server closed"))))
+
+(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."
+ (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 (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 (not (riece-queue-empty riece-send-queue))
+ (<= riece-send-size riece-max-send-size))
+ (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)))))
+ (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)
+ (riece-queue-enqueue riece-send-queue string))
+ (riece-flush-send-queue process))
+
+(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 "")
+ "")))))
+
+(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
+ (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)
+ 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
projects / riece / blobdiff