projects
/
elisp
/
riece.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* riece-options.el (riece-realname): New user option.
[elisp/riece.git]
/
lisp
/
riece-server.el
diff --git
a/lisp/riece-server.el
b/lisp/riece-server.el
index
04ab199
..
8f3872a
100644
(file)
--- a/
lisp/riece-server.el
+++ b/
lisp/riece-server.el
@@
-19,8
+19,8
@@
;; 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
;; 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:
;;; Code:
@@
-29,12
+29,14
@@
(require 'riece-coding) ;riece-default-coding-system
(require 'riece-identity)
(require 'riece-compat)
(require 'riece-coding) ;riece-default-coding-system
(require 'riece-identity)
(require 'riece-compat)
+(require 'riece-cache)
(eval-and-compile
(defvar riece-server-keyword-map
'((:host)
(:service 6667)
(:nickname riece-nickname)
(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)
(:username riece-username)
(:password)
(:function riece-default-open-connection-function)
@@
-72,7
+74,7
@@
the `riece-server-keyword-map' variable."
plist)
(setq plist (cons `(:host ,host) plist))
(unless (equal service "")
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))))
(unless (equal password "")
(setq plist (cons `(:password ,(substring password 1)) plist)))
(apply #'nconc plist))))
@@
-162,8
+164,7
@@
the `riece-server-keyword-map' variable."
(setq riece-send-size 0))
(while (and (not (riece-queue-empty riece-send-queue))
(<= riece-send-size riece-max-send-size))
(setq riece-send-size 0))
(while (and (not (riece-queue-empty riece-send-queue))
(<= riece-send-size riece-max-send-size))
- (setq string (riece-encode-coding-string
- (riece-queue-dequeue 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)
length (length string))
(if (> length riece-max-send-size)
(message "Long message (%d > %d)" length riece-max-send-size)
@@
-193,13
+194,20
@@
the `riece-server-keyword-map' variable."
(if (riece-server-opened "")
"")))))
(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.")))
(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)
(defun riece-open-server (server server-name)
(let ((protocol (or (plist-get server :protocol)
@@
-259,13
+267,21
@@
the `riece-server-keyword-map' variable."
(setq riece-send-size 0)
(make-local-variable 'riece-last-send-time)
(setq riece-last-send-time '(0 0 0))
(setq riece-send-size 0)
(make-local-variable 'riece-last-send-time)
(setq riece-last-send-time '(0 0 0))
- (make-local-variable 'riece-obarray)
- (setq riece-obarray (make-vector riece-obarray-size 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-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)
(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)
(kill-buffer (process-buffer process))
(setq riece-server-process-alist
(delq (rassq process riece-server-process-alist)