;; 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-misc)
(require 'riece-server) ;riece-close-server
(require 'riece-identity)
+(require 'riece-debug)
(defun riece-handle-numeric-reply (prefix number name string)
(let ((base-number (* (/ number 100) 100))
function)
- (condition-case nil
- (require (intern (format "riece-%03d" base-number)))
- (error))
(setq function (intern-soft (format "riece-handle-%03d-message" number)))
(unless (and function
(symbol-function function))
(format "riece-handle-default-%03d-message" base-number))))
(if (and function
(symbol-function function))
- (condition-case error
- (funcall function prefix number name
- (riece-decode-coding-string string))
- (error
- (if riece-debug
- (message "Error in `%S': %S" function error)))))))
-
-(defun riece-default-handle-numeric-reply
- (client-prefix prefix number name string)
- (riece-insert
- (list riece-dialogue-buffer riece-others-buffer)
- (concat client-prefix
- (riece-concat-server-name
- (mapconcat #'identity (riece-split-parameters string) " "))
- "\n")))
+ (riece-funcall-ignore-errors (symbol-name function)
+ function prefix number name
+ (riece-decode-coding-string string)))))
(defun riece-handle-message (prefix message string)
(if (and prefix
(let ((function (intern-soft (concat "riece-handle-" message "-message")))
(hook (intern (concat "riece-" message "-hook")))
(after-hook (intern (concat "riece-after-" message "-hook"))))
- (unless (condition-case error
- (run-hook-with-args-until-success hook prefix string)
- (error
- (if riece-debug
- (message "Error in `%S': %S" hook error))
- nil))
+ (unless (riece-funcall-ignore-errors (symbol-name hook)
+ #'run-hook-with-args-until-success
+ hook prefix string)
(if function
- (condition-case error
- (funcall function prefix string)
- (error
- (if riece-debug
- (message "Error in `%S': %S" function error)))))
- (condition-case error
- (run-hook-with-args-until-success after-hook prefix string)
- (error
- (if riece-debug
- (message "Error in `%S': %S" after-hook error)))))))
+ (riece-funcall-ignore-errors (symbol-name function)
+ function prefix string))
+ (riece-funcall-ignore-errors (symbol-name after-hook)
+ #'run-hook-with-args-until-success
+ after-hook prefix string))))
+
+(defsubst riece-chomp-string (string)
+ (if (string-match "\r\\'" string)
+ (substring string 0 (match-beginning 0))
+ string))
(defun riece-filter (process input)
(save-excursion
(set-buffer (process-buffer process))
- (goto-char riece-read-point)
- (unless riece-debug
- (delete-region (riece-line-beginning-position) (point-min))
- (setq riece-read-point (point)))
+ (goto-char (point-max))
(insert input)
- (goto-char (prog1 riece-read-point
- (setq riece-read-point (point))))
- (beginning-of-line)
- (catch 'contiguous
- (while (not (eobp))
- (save-excursion
- (if (looking-at
- ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\) +\\(.*\\)\r\n")
- (riece-handle-numeric-reply
- (match-string 1) ;prefix
- (string-to-number (match-string 2)) ;number
- (match-string 3) ;name
- (match-string 4)) ;reply string
- (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)\r\n")
- (riece-handle-message
- (match-string 2) ;optional prefix
- (match-string 3) ;command
- (match-string 4)) ;params & trailing
- (if (looking-at ".*\r\n")
- (if riece-debug
- (message "Weird message from server: %s"
- (buffer-substring (point) (progn
- (end-of-line)
- (point)))))
- (throw 'contiguous nil)))))
- (forward-line)))))
+ (unless riece-filter-running
+ (unwind-protect
+ (progn
+ (setq riece-filter-running t)
+ (goto-char riece-read-point)
+ (beginning-of-line)
+ (while (looking-at ".*\n") ;the input line is finished
+ (save-excursion
+ (if (looking-at
+ ":\\([^ ]+\\) +\\([0-5][0-9][0-9]\\) +\\([^ ]+\\)\
+ +\\(.*\\)")
+ (riece-handle-numeric-reply
+ (match-string 1) ;prefix
+ (string-to-number (match-string 2)) ;number
+ (match-string 3) ;name
+ (riece-chomp-string (match-string 4))) ;reply string
+ (if (looking-at "\\(:\\([^ ]+\\) +\\)?\\([^ ]+\\) +\\(.*\\)")
+ (riece-handle-message
+ (match-string 2) ;optional prefix
+ (match-string 3) ;command
+ (riece-chomp-string (match-string 4))
+ ;params & trailing
+ )
+ (if riece-debug
+ (message "Weird message from server: %s"
+ (buffer-substring (point) (progn
+ (end-of-line)
+ (point))))))))
+ (forward-line))
+ (unless riece-debug
+ (delete-region (point-min) (point)))
+ (setq riece-read-point (point)))
+ (setq riece-filter-running nil)))))
(eval-when-compile
(autoload 'riece-exit "riece"))
riece-server-name)))
(if riece-debug
(if (equal server-name "")
- (message "Connection closed: %s"
- (substring status 0 (1- (length status))))
- (message "Connection to \"%s\" closed: %s"
- server-name (substring status 0 (1- (length status)))))
+ (riece-debug (format "Connection closed: %s"
+ (substring status 0 (1- (length status)))))
+ (riece-debug (format "Connection to \"%s\" closed: %s"
+ server-name
+ (substring status 0 (1- (length status))))))
(if (equal server-name "")
(message "Connection closed")
(message "Connection to \"%s\" closed" server-name)))