X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Friece-message.el;h=f9d3740f9cf94a5673de1fbf835f73c6a2785d8e;hb=3b8a7caa8eb1f6e8cbaea54b7cc139e95f07ee50;hp=60702ebf35266cf246fb087b0defac9524dad21f;hpb=9174f38ace6e8cd879b41adc4d6aa4b5b727f7ea;p=riece

diff --git a/lisp/riece-message.el b/lisp/riece-message.el
index 60702eb..f9d3740 100644
--- a/lisp/riece-message.el
+++ b/lisp/riece-message.el
@@ -66,10 +66,10 @@
 
 (defun riece-message-make-open-bracket (message)
   "Make `open-bracket' string for MESSAGE."
-  (if (riece-message-own-p message)
-      ">"
-    (if (eq (riece-message-type message) 'notice)
-	"{"
+  (if (eq (riece-message-type message) 'notice)
+      "{"
+    (if (riece-message-own-p message)
+	">"
       (if (riece-message-private-p message)
 	  "="
 	(if (riece-message-external-p message)
@@ -78,10 +78,10 @@
 
 (defun riece-message-make-close-bracket (message)
   "Make `close-bracket' string for MESSAGE."
-  (if (riece-message-own-p message)
-      "<"
-    (if (eq (riece-message-type message) 'notice)
-	"}"
+  (if (eq (riece-message-type message) 'notice)
+      "}"
+    (if (riece-message-own-p message)
+	"<"
       (if (riece-message-private-p message)
 	  "="
 	(if (riece-message-external-p message)
@@ -117,8 +117,7 @@
       ;; If you are not joined any channel,
       ;; switch to the target immediately.
       (unless riece-current-channel
-	(riece-switch-to-channel target))
-      (riece-redisplay-buffers))
+	(riece-switch-to-channel target)))
     (riece-channel-buffer target)))
 
 (defun riece-message-parent-buffers (message buffer)
@@ -143,35 +142,38 @@ Normally they are *Dialogue* and/or *Others*."
 	(list riece-dialogue-buffer riece-others-buffer)
       riece-dialogue-buffer)))
 
-(defun riece-display-message-1 (message)
+(defun riece-format-message (message &optional global)
   (let ((open-bracket
 	 (funcall riece-message-make-open-bracket-function message))
 	(close-bracket
 	 (funcall riece-message-make-close-bracket-function message))
 	(name
-	 (funcall riece-message-make-name-function message))
-	(global-name
-	 (funcall riece-message-make-global-name-function message))
-	(buffer (riece-message-buffer message))
-	(server-name (riece-identity-server (riece-message-speaker message)))
+	 (if global
+	     (funcall riece-message-make-global-name-function message)
+	   (funcall riece-message-make-name-function message)))
+	(server-name (riece-identity-server (riece-message-speaker message))))
+    (riece-with-server-buffer server-name
+      (concat
+       (if global
+	   (riece-concat-server-name
+	    (concat open-bracket name close-bracket
+		    " " (riece-message-text message)))
+	 (concat open-bracket name close-bracket
+		 " " (riece-message-text message)))
+       "\n"))))
+
+(defun riece-display-message-1 (message)
+  (let ((buffer (riece-message-buffer message))
 	parent-buffers)
     (when (and buffer
 	       (riece-message-own-p message)
 	       (riece-own-frozen buffer))
       (with-current-buffer buffer
 	(setq riece-freeze nil))
-      (riece-update-status-indicators))
+      (riece-emit-signal 'buffer-freeze-changed buffer nil))
     (setq parent-buffers (riece-message-parent-buffers message buffer))
-    (riece-insert buffer
-		  (concat open-bracket name close-bracket
-			  " " (riece-message-text message) "\n"))
-    (riece-insert parent-buffers
-		  (if (equal server-name "")
-		      (concat open-bracket global-name close-bracket
-			      " " (riece-message-text message) "\n")
-		     (concat open-bracket global-name close-bracket
-			     " " (riece-message-text message)
-			     " (from " server-name ")\n")))
+    (riece-insert buffer (riece-format-message message))
+    (riece-insert parent-buffers (riece-format-message message t))
     (run-hook-with-args 'riece-after-display-message-functions message)))
 
 (defun riece-display-message (message)
@@ -215,6 +217,27 @@ Currently possible values are `action' and `notice'."
   "Return t if MESSAGE is not from the network."
   (aref message 4))
 
+(defun riece-message-set-speaker (message speaker)
+  "Set the sender of MESSAGE."
+  (aset message 0 speaker))
+
+(defun riece-message-set-target (message target)
+  "Set the receiver of MESSAGE."
+  (aset message 1 target))
+
+(defun riece-message-set-text (message text)
+  "Set the text part of MESSAGE."
+  (aset message 2 text))
+
+(defun riece-message-set-type (message type)
+  "Set the type of MESSAGE.
+Currently possible values are `action' and `notice'."
+  (aset message 3 type))
+
+(defun riece-message-set-own-p (message own-p)
+  "Set t if MESSAGE is not from the network."
+  (aset message 4 own-p))
+
 (defun riece-message-private-p (message)
   "Return t if MESSAGE is a private message."
   (not (or (riece-channel-p (riece-identity-prefix
@@ -230,7 +253,7 @@ Currently possible values are `action' and `notice'."
 	  (riece-with-server-buffer (riece-identity-server target)
 	    (mapcar
 	     (lambda (user)
-	       (riece-make-identity user riece-server-name))
+	       (riece-make-identity (car user) riece-server-name))
 	     (riece-channel-get-users (riece-identity-prefix target))))))))
 
 (provide 'riece-message)