(require 'riece-options)
(require 'riece-globals) ;for server local variables.
(require 'riece-coding) ;riece-default-coding-system
+(require 'riece-identity)
+(require 'riece-compat)
(eval-and-compile
(defvar riece-server-keyword-map
(put 'riece-server-keyword-bind 'lisp-indent-function 1)
(put 'riece-server-keyword-bind 'edebug-form-spec '(form body))
-(defun riece-clear-system ()
- (while riece-buffer-list
- (if (and (get-buffer (car riece-buffer-list))
- (buffer-live-p (car riece-buffer-list)))
- (funcall riece-buffer-dispose-function (car riece-buffer-list)))
- (setq riece-buffer-list (cdr riece-buffer-list)))
- (setq riece-current-channels nil
- riece-current-channel nil
- riece-user-indicator nil
- riece-channel-indicator "None"
- riece-channel-list-indicator "No channel"
- riece-away-indicator "-"
- riece-operator-indicator "-"
- riece-freeze-indicator "-")
- (delete-other-windows))
-
(defun riece-server-parse-string (string)
"Convert a STRING set as `riece-server' and return a property list."
(when (or (string-match "^\\[\\([^]]+\\)\\]:?\\([0-9]*\\)" string)
(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))
(defun riece-process-send-string (process string)
(with-current-buffer (process-buffer process)
(process-send-string process (riece-encode-coding-string string))))
-(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)
- (if (equal server-name "")
- (message "Connecting to IRC server...")
- (message "Connecting to %s..." server-name))
(riece-server-keyword-bind server
- (let* (selective-display
- (coding-system-for-read 'binary)
- (coding-system-for-write 'binary)
- (process
+ (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)))
+ 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 (or password
- riece-reconnect-with-password)
+ (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
+ ;; XEmacs signals an error when the keyboard cannot be grabbed.
+ (condition-case nil
+ (setq password (riece-read-passwd "Password: "))
+ (error))
+ (setq riece-reconnect-with-password nil)))
+ (if password
(riece-process-send-string process
- (format "PASS %s\r\n"
- (or password
- (riece-read-passwd
- "Password: ")))))
+ (format "PASS %s\r\n" password)))
(riece-process-send-string process
(format "USER %s * * :%s\r\n"
(user-real-login-name)
(setq riece-last-nickname riece-real-nickname
riece-nick-accepted 'sent
riece-coding-system coding))
- (setq riece-process-list
- (cons process riece-process-list))))
- (if (equal server-name "")
- (message "Connecting to IRC server...done")
- (message "Connecting to %s...done" server-name)))
+ (setq riece-server-process-alist
+ (cons (cons server-name process)
+ riece-server-process-alist)))))
(defun riece-reset-process-buffer (process)
(save-excursion
(if riece-debug
(delete-process process)
(kill-buffer (process-buffer process)))
- (setq riece-process-list (delq process riece-process-list)))
+ (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-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)))))))
+
+(eval-when-compile
+ (autoload 'riece-exit "riece"))
(defun riece-quit-server-process (process &optional message)
- (run-at-time riece-quit-timeout nil
- (lambda (process)
- (if (memq process riece-process-list)
- (kill-process (process-buffer process))))
- process)
+ (if riece-quit-timeout
+ (riece-run-at-time riece-quit-timeout nil
+ (lambda (process)
+ (when (rassq process riece-server-process-alist)
+ (riece-close-server-process process)
+ ;; If no server process is available, exit.
+ (unless riece-server-process-alist
+ (riece-exit))))
+ process))
(riece-process-send-string process
(if message
(format "QUIT :%s\r\n" message)
projects / riece / blobdiff