X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Friece-mini.el;h=2c8800696d8803c3fb37016724ff83b08be62563;hb=ab1139e3887e977ca5bbc316047b4a267527afa2;hp=d134e84e8eed491b19adee6fe44e437918fc4080;hpb=0e139d36cb83d6ac6dd3e47181e208102bc054f5;p=elisp%2Friece.git

diff --git a/lisp/riece-mini.el b/lisp/riece-mini.el
index d134e84..2c88006 100644
--- a/lisp/riece-mini.el
+++ b/lisp/riece-mini.el
@@ -32,19 +32,35 @@
 ;; To use, add the following line to your ~/.riece/init.el:
 ;; (add-to-list 'riece-addons 'riece-mini)
 ;;
-;; And for using conveniently, bind any global key to
-;; `riece-mini-send-message'.
+;; For using conveniently, bind any global key to
+;; `riece-mini-send-message' and `riece-mini-show-backlog'.
 ;; For example:
 ;; (global-set-key "\C-cm" 'riece-mini-send-message)
+;; (global-set-key "\C-cb" 'riece-mini-show-backlog)
 
 ;;; Code:
 
-(eval-when-compile (require 'riece-message))
+(require 'riece-message)
+(require 'riece-biff)
+
+(defgroup riece-mini nil
+  "riece on minibuffer"
+  :group 'riece)
+
+(defcustom riece-mini-backlog-size 5
+  "*Line numbers for logging back log."
+  :type 'integer
+  :group 'riece-mini)
 
 (defvar riece-mini-last-channel nil)
+(defvar riece-mini-backlog-history nil)
+(defvar riece-mini-backlog-shown nil)
 
 (defvar riece-mini-enabled nil)
 
+(defconst riece-mini-description
+  "Send arrival messages to minibuffer")
+
 (defmacro riece-mini-message-no-log (string &rest args)
   "Like `message', except that message logging is disabled."
   (if (featurep 'xemacs)
@@ -56,16 +72,24 @@
 
 (defun riece-mini-display-message-function (message)
   "Show arrival messages to minibuffer."
-  (when (and riece-mini-enabled
-	     (not (or (eq (window-buffer (selected-window))
-			  (get-buffer riece-command-buffer))
-		      (riece-message-own-p message)
-		      (active-minibuffer-window))))
-    (unless (riece-message-type message)
-      (setq riece-mini-last-channel (riece-message-target message)))
-    (riece-mini-message-no-log
-     "%s" (concat (format-time-string "%H:%M") " "
-		  (riece-format-message message t)))))
+  (let ((string (concat (format-time-string "%H:%M") " "
+			(riece-format-message message t))))
+    (when (string-match "\\(.*\\)$" string)
+      (setq string (riece-match-string-no-properties 1 string)))
+    (while (>= (length riece-mini-backlog-history)
+	       riece-mini-backlog-size)
+      (setq riece-mini-backlog-history
+	    (cdr riece-mini-backlog-history)))
+    (setq riece-mini-backlog-history
+	  (reverse (cons string (reverse riece-mini-backlog-history))))
+    (when (and riece-mini-enabled
+	       (not (or (eq (window-buffer (selected-window))
+			    (get-buffer riece-command-buffer))
+			(riece-message-own-p message)
+			(active-minibuffer-window))))
+      (unless (riece-message-type message)
+	(setq riece-mini-last-channel (riece-message-target message)))
+      (riece-mini-message-no-log "%s" string))))
 
 (defun riece-mini-send-message (arg)
   "Send message using minibuffer.
@@ -91,9 +115,38 @@ If twice (C-u C-u), then ask the channel."
        (riece-make-message (riece-current-nickname) target
 			   message nil t)))))
 
+(defun riece-mini-show-backlog ()
+  "Send back logs to minibuffer."
+  (interactive)
+  (when riece-mini-backlog-history
+    (let ((height (1+ riece-mini-backlog-size)))
+      (mapc #'(lambda (string)
+		(setq height (+ height
+				(/ (length string) (window-width)))))
+	    riece-mini-backlog-history)
+      (let ((max-mini-window-height height)
+	    (resize-mini-windows t))
+	(setq riece-mini-backlog-shown t)
+	(when (and (memq 'riece-biff riece-addons)
+		   riece-biff-enabled)
+	  (riece-biff-clear))
+	(riece-mini-message-no-log
+	 "%s" (mapconcat #'identity riece-mini-backlog-history "\n"))))))
+
+(defun riece-mini-pre-command ()
+  (when riece-mini-backlog-shown
+    (let ((resize-mini-windows t))
+      (setq riece-mini-backlog-shown nil)
+      (riece-mini-message-no-log ""))))
+
+(defun riece-mini-requires ()
+  (if (memq 'riece-biff riece-addons)
+ '(riece-biff)))
+
 (defun riece-mini-insinuate ()
   (add-hook 'riece-after-display-message-functions
-	    'riece-mini-display-message-function))
+	    'riece-mini-display-message-function)
+  (add-hook 'pre-command-hook 'riece-mini-pre-command))
 
 (defun riece-mini-enable ()
   (setq riece-mini-enabled t))