X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-play.el;h=53b71722b682964fdf2b43a4cf13661cb60eb224;hb=b0328c066861ec36c6122f9331461175bda8b745;hp=7fbe1f0679b81d2e4e57e3600ea71c963f1f4005;hpb=5b8e54451b6d4b008a242a124e6233b77f6b2506;p=elisp%2Ftm.git

diff --git a/tm-play.el b/tm-play.el
index 7fbe1f0..53b7172 100644
--- a/tm-play.el
+++ b/tm-play.el
@@ -1,20 +1,34 @@
-;;;
 ;;; tm-play.el --- decoder for tm-view.el
-;;;
-;;; Copyright (C) 1995 Free Software Foundation, Inc.
-;;; Copyright (C) 1994,1995 MORIOKA Tomohiko
-;;;
-;;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;;; Version:
-;;;	$Id: tm-play.el,v 7.1 1995/11/10 11:13:32 morioka Exp $
-;;; Keywords: mail, news, MIME, multimedia
-;;;
-;;; This file is part of tm (Tools for MIME).
-;;;
 
-(require 'tm-view)
+;; Copyright (C) 1994,1995,1996 Free Software Foundation, Inc.
+
+;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Created: 1995/9/26 (separated from tm-view.el)
+;; Version: $Id: tm-play.el,v 7.33 1996/12/07 08:26:26 morioka Exp $
+;; Keywords: mail, news, MIME, multimedia
+
+;; This file is part of tm (Tools for MIME).
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
+
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
 
+;; 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.
 
+;;; Code:
+
+(require 'tm-view)
+
+  
 ;;; @ content decoder
 ;;;
 
@@ -22,7 +36,7 @@
 
 (defun mime-preview/decode-content ()
   (interactive)
-  (let ((pc (mime::point-preview-content (point))))
+  (let ((pc (mime-preview/point-pcinfo (point))))
     (if pc
 	(let ((the-buf (current-buffer)))
 	  (setq mime-preview/after-decoded-position (point))
@@ -37,42 +51,55 @@
 		))
 	  ))))
 
-
 (defun mime-article/decode-content (cinfo)
   (let ((beg (mime::content-info/point-min cinfo))
 	(end (mime::content-info/point-max cinfo))
-	(ctype (mime::content-info/type cinfo))
+	(ctype (or (mime::content-info/type cinfo) "text/plain"))
 	(params (mime::content-info/parameters cinfo))
 	(encoding (mime::content-info/encoding cinfo))
 	)
-    (if ctype
-	(let (method cal ret)
-	  (setq cal (append (list (cons 'type ctype)
-				  (cons 'encoding encoding)
-				  (cons 'major-mode major-mode)
-				  )
-			    params))
-	  (if mime-viewer/decoding-mode
-	      (setq cal (cons
-			 (cons 'mode mime-viewer/decoding-mode)
-			 cal))
-	    )
-	  (setq ret (mime/get-content-decoding-alist cal))
-	  (setq method (cdr (assoc 'method ret)))
-	  (cond ((and (symbolp method)
-		      (fboundp method))
-		 (funcall method beg end ret)
-		 )
-		((and (listp method)(stringp (car method)))
-		 (mime-article/start-external-method-region beg end ret)
-		 )
-		(t
-		 (mime-article/show-output-buffer
-		  "No method are specified for %s\n" ctype)
-		 ))
-	  ))
+    ;; Check for VM
+    (if (< beg (point-min))
+	(setq beg (point-min))
+      )
+    (if (< (point-max) end)
+	(setq end (point-max))
+      )
+    (let (method cal ret)
+      (setq cal (list* (cons 'type ctype)
+		       (cons 'encoding encoding)
+		       (cons 'major-mode major-mode)
+		       params))
+      (if mime-viewer/decoding-mode
+	  (setq cal (cons
+		     (cons 'mode mime-viewer/decoding-mode)
+		     cal))
+	)
+      (setq ret (mime/get-content-decoding-alist cal))
+      (setq method (cdr (assq 'method ret)))
+      (cond ((and (symbolp method)
+		  (fboundp method))
+	     (funcall method beg end ret)
+	     )
+	    ((and (listp method)(stringp (car method)))
+	     (mime-article/start-external-method-region beg end ret)
+	     )
+	    (t
+	     (mime-article/show-output-buffer
+	      "No method are specified for %s\n" ctype)
+	     ))
+      )
     ))
 
+(defun field-unifier-for-mode (a b)
+  (let ((va (cdr a)))
+    (if (if (consp va)
+	    (member (cdr b) va)
+	  (equal va (cdr b))
+	  )
+	(list nil b nil)
+      )))
+
 (defun mime/get-content-decoding-alist (al)
   (get-unified-alist mime/content-decoding-condition al)
   )
@@ -87,7 +114,7 @@
       (narrow-to-region beg end)
       (goto-char beg)
       (let ((method (cdr (assoc 'method cal)))
-	    (name (mime-article/get-name cal))
+	    (name (mime-article/get-filename cal))
 	    )
 	(if method
 	    (let ((file (make-temp-name
@@ -103,6 +130,7 @@
 		)
 	      (goto-char b)
 	      (write-region b end file)
+	      (message "External method is starting...")
 	      (setq cal (put-alist
 			 'name (replace-as-filename name) cal))
 	      (setq cal (put-alist 'file file cal))
@@ -123,20 +151,30 @@
 	   (lambda (arg)
 	     (if (stringp arg)
 		 arg
-	       (let ((ret (cdr (assoc (eval arg) cal))))
+	       (let* ((item (eval arg))
+		      (ret (cdr (assoc item cal)))
+		      )
 		 (if ret
 		     ret
-		   "")
+		   (if (eq item 'encoding)
+		       "7bit"
+		     ""))
 		 ))
 	     ))
 	  format))
 
 (defun mime-article/show-output-buffer (&rest forms)
+  (get-buffer-create mime/output-buffer-name)
   (let ((the-win (selected-window))
 	(win (get-buffer-window mime/output-buffer-name))
 	)
-    (if (null win)
-	(progn
+    (or win
+	(if (and mime/output-buffer-window-is-shared-with-bbdb
+		 (boundp 'bbdb-buffer-name)
+		 (setq win (get-buffer-window bbdb-buffer-name))
+		 )
+	    (set-window-buffer win mime/output-buffer-name)
+	  (select-window (get-buffer-window mime::article/preview-buffer))
 	  (setq win (split-window-vertically (/ (* (window-height) 3) 4)))
 	  (set-window-buffer win mime/output-buffer-name)
 	  ))
@@ -162,26 +200,43 @@
   (concat (regexp-* mime-viewer/file-name-char-regexp)
 	  "\\(\\." mime-viewer/file-name-char-regexp "+\\)*"))
 
-(defun mime-article/get-name (param)
-  (let ((str (mime-viewer/get-subject param)))
-    (if (string-match " " str)
-	(if (or (string-match mime-viewer/file-name-regexp-1 str)
-		(string-match mime-viewer/file-name-regexp-2 str))
-	    (substring str (match-beginning 0)(match-end 0))
-	  )
-      (replace-as-filename str)
-      )))
+(defun mime-article/get-original-filename (param &optional encoding)
+  (or (mime-article/get-uu-filename param encoding)
+      (let (ret)
+	(or (if (or (and (setq ret (mime/Content-Disposition))
+			 (setq ret (assoc "filename" (cdr ret)))
+			 )
+		    (setq ret (assoc "name" param))
+		    (setq ret (assoc "x-name" param))
+		    )
+		(std11-strip-quoted-string (cdr ret))
+	      )
+	    (if (setq ret
+		      (std11-find-field-body '("Content-Description"
+					       "Subject")))
+		(if (or (string-match mime-viewer/file-name-regexp-1 ret)
+			(string-match mime-viewer/file-name-regexp-2 ret))
+		    (substring ret (match-beginning 0)(match-end 0))
+		  ))
+	    ))
+      ))
+
+(defun mime-article/get-filename (param)
+  (replace-as-filename (mime-article/get-original-filename param))
+  )
 
 
 ;;; @ mail/news message
 ;;;
 
 (defun mime-viewer/quitting-method-for-mime/show-message-mode ()
-  (set-window-configuration mime/show-mode-old-window-configuration)
-  (let ((mother mime::preview/mother-buffer))
+  (let ((mother mime::preview/mother-buffer)
+	(win-conf mime::preview/original-window-configuration)
+	)
     (kill-buffer
      (mime::preview-content-info/buffer (car mime::preview/content-list)))
     (mime-viewer/kill-buffer)
+    (set-window-configuration win-conf)
     (pop-to-buffer mother)
     ;;(goto-char (point-min))
     ;;(mime-viewer/up-content)
@@ -192,6 +247,9 @@
 	 (cur-buf (current-buffer))
 	 (new-name (format "%s-%s" (buffer-name) cnum))
 	 (mother mime::article/preview-buffer)
+	 (code-converter
+	  (or (cdr (assq major-mode mime-viewer/code-converter-alist))
+	      'mime-viewer/default-code-convert-region))
 	 str)
     (setq str (buffer-substring beg end))
     (switch-to-buffer new-name)
@@ -202,6 +260,7 @@
 	(delete-region (point-min) (match-end 0))
       )
     (setq major-mode 'mime/show-message-mode)
+    (setq mime::article/code-converter code-converter)
     (mime/viewer-mode mother)
     ))
 
@@ -230,7 +289,11 @@
 	 (total (cdr (assoc "total" cal)))
 	 (the-buf (current-buffer))
 	 file
-	 (mother mime::article/preview-buffer))
+	 (mother mime::article/preview-buffer)
+	 (win-conf (save-excursion
+		     (set-buffer mother)
+		     mime::preview/original-window-configuration))
+	 )
     (if (not (file-exists-p root-dir))
 	(make-directory root-dir)
       )
@@ -258,10 +321,10 @@
 		)
 	    (write-region (point) (point-max) file)
 	    )
-	  (if (get-buffer "*MIME-temp*")
-	      (kill-buffer "*MIME-temp*")
+	  (if (get-buffer mime/temp-buffer-name)
+	      (kill-buffer mime/temp-buffer-name)
 	    )
-	  (switch-to-buffer "*MIME-temp*")
+	  (switch-to-buffer mime/temp-buffer-name)
 	  (let ((i 1)
 		(max (string-to-int total))
 		(file-coding-system-for-read (if (boundp 'MULE)
@@ -279,23 +342,39 @@
 		(goto-char (point-max))
 		(setq i (1+ i))
 		)
-	      (delete-other-windows)
-	      (write-file (concat root-dir "/FULL"))
-	      (setq major-mode 'mime/show-message-mode)
+	      ;;(delete-other-windows)
+	      (let ((buf (current-buffer)))
+		(write-file (concat root-dir "/FULL"))
+		(set-window-configuration win-conf)
+		(let ((win (get-buffer-window mother)))
+		  (if win
+		      (select-window win)
+		    ))
+		(set-window-buffer (selected-window) buf)
+		;;(set-window-buffer buf)
+		(setq major-mode 'mime/show-message-mode)
+		)
 	      (mime/viewer-mode mother)
 	      (pop-to-buffer (current-buffer))
 	      ))
 	  )
       (progn
-	(delete-other-windows)
-	(let ((file-coding-system-for-read
-	       (if (boundp 'MULE) *noconv*))
-	      kanji-fileio-code)
-	  (find-file file)
-	  )
+	;;(delete-other-windows)
+	(set-window-configuration win-conf)
+	(select-window (or (get-buffer-window mother)
+			   (get-buffer-window
+			    (save-excursion
+			      (set-buffer mother)
+			      mime::preview/article-buffer))
+			   (get-largest-window)
+			   ))
+	(as-binary-input-file
+	 (set-buffer (get-buffer-create "FULL"))
+	 (insert-file-contents file)
+	 )
 	(setq major-mode 'mime/show-message-mode)
 	(mime/viewer-mode mother)
-	(pop-to-buffer (current-buffer))
+	;;(pop-to-buffer (current-buffer))
 	))
     ))
 
@@ -308,23 +387,24 @@
 	 (cur-buf (current-buffer))
 	 (new-name (format "%s-%s" (buffer-name) cnum))
 	 (mother mime::article/preview-buffer)
-	 (charset (cdr (assoc "charset" params)))
+	 (charset (cdr (assoc "charset" cal)))
+	 (encoding (cdr (assq 'encoding cal)))
 	 (mode major-mode)
 	 str)
     (setq str (buffer-substring beg end))
     (switch-to-buffer new-name)
+    (setq buffer-read-only nil)
     (erase-buffer)
     (insert str)
     (goto-char (point-min))
     (if (re-search-forward "^\n" nil t)
 	(delete-region (point-min) (match-end 0))
       )
-    (let ((m (assq mode mime-viewer/code-converter-alist)))
-      (if (and m (fboundp (setq m (cdr m))))
-	  (funcall m (point-min) (point-max) charset encoding)
-	(mime-viewer/default-code-convert-region (point-min) (point-max)
-						 charset encoding)
-	))
+    (let ((m (cdr (or (assq mode mime-viewer/code-converter-alist)
+		      (assq t mime-viewer/code-converter-alist)))))
+      (and (functionp m)
+	   (funcall m charset encoding)
+	   ))
     (save-excursion
       (set-mark (point-min))
       (goto-char (point-max))
@@ -338,3 +418,5 @@
 ;;;
 
 (provide 'tm-play)
+
+;;; tm-play.el ends here