X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=tm-play.el;h=53b71722b682964fdf2b43a4cf13661cb60eb224;hb=86824724a2d5325e296ee93a1abb3952d2320a20;hp=941bbb6748a6b0293c4bb31005103ce13de64ca9;hpb=3b85dc0e066574902ba25bf597ee1c61789f01ed;p=elisp%2Ftm.git diff --git a/tm-play.el b/tm-play.el index 941bbb6..53b7172 100644 --- a/tm-play.el +++ b/tm-play.el @@ -1,37 +1,34 @@ -;;; ;;; tm-play.el --- decoder for tm-view.el -;;; -;;; Copyright (C) 1995 Free Software Foundation, Inc. -;;; Copyright (C) 1994 .. 1996 MORIOKA Tomohiko -;;; -;;; Author: MORIOKA Tomohiko -;;; Maintainer: MORIOKA Tomohiko -;;; Created: 1995/9/26 (separated from tm-view.el) -;;; Version: -;;; $Id: tm-play.el,v 7.13 1996/02/02 17:04:16 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 This program. If not, write to the Free Software -;;; Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. -;;; + +;; Copyright (C) 1994,1995,1996 Free Software Foundation, Inc. + +;; Author: MORIOKA Tomohiko +;; 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 ;;; @@ -54,11 +51,10 @@ )) )))) - (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)) ) @@ -69,34 +65,41 @@ (if (< (point-max) end) (setq end (point-max)) ) - (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) - )) - )) + (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) ) @@ -127,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)) @@ -164,8 +168,13 @@ (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) )) @@ -200,18 +209,17 @@ (setq ret (assoc "name" param)) (setq ret (assoc "x-name" param)) ) - (rfc822/strip-quoted-string (cdr ret)) + (std11-strip-quoted-string (cdr ret)) ) (if (setq ret - (or (rfc822/get-field-body "Content-Description") - (rfc822/get-field-body "Subject") - )) + (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)) @@ -353,13 +361,17 @@ (progn ;;(delete-other-windows) (set-window-configuration win-conf) - (select-window (get-buffer-window mother)) - (let ((file-coding-system-for-read - (if (boundp 'MULE) *noconv*)) - kanji-fileio-code) - (set-buffer (get-buffer-create "FULL")) - (insert-file-contents file) - ) + (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)) @@ -388,12 +400,11 @@ (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))