;;; thumbs.el --- Thumbnails previewer for images files
-;; Copyright 2004, 2005 Free Software Foundation, Inc
+;; Copyright (C) 2004, 2005 Free Software Foundation, Inc.
;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
;; Keywords: Multimedia
;; 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.
;;
;; Thanks: Alex Schroeder <alex@gnu.org> for maintaining the package at some time
;; The peoples at #emacs@freenode.net for numerous help
:version "22.1"
:group 'multimedia)
-(defcustom thumbs-thumbsdir "~/.emacs-thumbs"
+(defcustom thumbs-thumbsdir "~/.emacs.d/thumbs"
"*Directory to store thumbnails."
:type 'directory
:group 'thumbs)
(defcustom thumbs-per-line 5
"*Number of thumbnails per line to show in directory."
- :type 'string
+ :type 'integer
:group 'thumbs)
(defcustom thumbs-thumbsdir-max-size 50000000
"Max size for thumbnails directory.
When it reaches that size (in bytes), a warning is sent."
- :type 'string
+ :type 'integer
:group 'thumbs)
(defcustom thumbs-conversion-program
(defcustom thumbs-relief 5
"*Size of button-like border around thumbnails."
- :type 'string
+ :type 'integer
:group 'thumbs)
(defcustom thumbs-margin 2
"*Size of the margin around thumbnails.
This is where you see the cursor."
- :type 'string
+ :type 'integer
:group 'thumbs)
(defcustom thumbs-thumbsdir-auto-clean t
(defcustom thumbs-image-resizing-step 10
"Step by which to resize image."
- :type 'string
+ :type 'integer
:group 'thumbs)
(defcustom thumbs-temp-dir temporary-file-directory
:group 'thumbs)
;; Initialize some variable, for later use.
-(defvar thumbs-current-tmp-filename
- nil
+(defvar thumbs-current-tmp-filename nil
"Temporary filename of current image.")
-(defvar thumbs-current-image-filename
- nil
+(make-variable-buffer-local 'thumbs-current-tmp-filename)
+
+(defvar thumbs-current-image-filename nil
"Filename of current image.")
-(defvar thumbs-current-image-size
- nil
+(make-variable-buffer-local 'thumbs-current-image-filename)
+
+(defvar thumbs-current-image-size nil
"Size of current image.")
-(defvar thumbs-image-num
- nil
+
+(defvar thumbs-image-num nil
"Number of current image.")
-(defvar thumbs-current-dir
- nil
+(make-variable-buffer-local 'thumbs-image-num)
+
+(defvar thumbs-current-dir nil
"Current directory.")
-(defvar thumbs-markedL
- nil
+
+(defvar thumbs-markedL nil
"List of marked files.")
(defalias 'thumbs-gensym
(1+ thumbs-gensym-counter))))))
(make-symbol (format "%s%d" pfix num))))))
+(defsubst thumbs-temp-dir ()
+ (file-name-as-directory (expand-file-name thumbs-temp-dir)))
+
(defun thumbs-temp-file ()
"Return a unique temporary filename for an image."
(format "%s%s-%s.jpg"
- (expand-file-name thumbs-temp-dir)
+ (thumbs-temp-dir)
thumbs-temp-prefix
(thumbs-gensym "T")))
(defun thumbs-thumbsdir ()
"Return the current thumbnails directory (from `thumbs-thumbsdir').
Create the thumbnails directory if it does not exist."
- (let ((thumbs-thumbsdir (expand-file-name thumbs-thumbsdir)))
+ (let ((thumbs-thumbsdir (file-name-as-directory
+ (expand-file-name thumbs-thumbsdir))))
(unless (file-directory-p thumbs-thumbsdir)
- (make-directory thumbs-thumbsdir)
+ (make-directory thumbs-thumbsdir t)
(message "Creating thumbnails directory"))
thumbs-thumbsdir))
(condition-case nil
(apply 'delete-file
(directory-files
- thumbs-temp-dir t
+ (thumbs-temp-dir) t
thumbs-temp-prefix))
(error nil))
(let ((buffer-read-only nil)
"Return a thumbnail name for the image IMG."
(convert-standard-filename
(let ((filename (expand-file-name img)))
- (format "%s/%08x-%s.jpg"
+ (format "%s%08x-%s.jpg"
(thumbs-thumbsdir)
(sxhash filename)
(subst-char-in-string
(cond ((string-match ".*\\.jpe?g\\'" img) 'jpeg)
((string-match ".*\\.xpm\\'" img) 'xpm)
((string-match ".*\\.xbm\\'" img) 'xbm)
+ ((string-match ".*\\.pbm\\'" img) 'pbm)
((string-match ".*\\.gif\\'" img) 'gif)
((string-match ".*\\.bmp\\'" img) 'bmp)
((string-match ".*\\.png\\'" img) 'png)
:conversion ,(if marked 'disabled)
:margin ,thumbs-margin)))
(insert-image i)
- (setq thumbs-current-image-size
- (image-size i t))))
+ (set (make-local-variable 'thumbs-current-image-size)
+ (image-size i t))))
(defun thumbs-insert-thumb (img &optional marked)
"Insert the thumbnail for IMG at point.
(thumbs-mode)
(thumbs-do-thumbs-insertion L)
(goto-char (point-min))
- (setq thumbs-current-dir default-directory)
- (make-variable-buffer-local 'thumbs-current-dir)))
+ (set (make-local-variable 'thumbs-current-dir) default-directory)))
;;;###autoload
(defun thumbs-show-all-from-dir (dir &optional reg same-window)
(setq thumbs-current-image-filename img
thumbs-current-tmp-filename nil
thumbs-image-num (or num 0))
- (make-variable-buffer-local 'thumbs-current-image-filename)
- (make-variable-buffer-local 'thumbs-current-tmp-filename)
- (make-variable-buffer-local 'thumbs-current-image-size)
- (make-variable-buffer-local 'thumbs-image-num)
(delete-region (point-min)(point-max))
(thumbs-insert-image img (thumbs-image-type img) 0)))
;; cleaning of old temp file
(mapc 'delete-file
(directory-files
- thumbs-temp-dir
+ (thumbs-temp-dir)
t
thumbs-temp-prefix))
(let ((buffer-read-only nil)