Mercurial > emacs
annotate lisp/image.el @ 54736:b94de166de9d
(ethio-sera-being-called-by-w3): New
variable.
(ethio-sera-to-fidel-ethio): Check ethio-sera-being-called-by-w3
instead of sera-being-called-by-w3.
(ethio-fidel-to-sera-buffer): Likewise.
(ethio-find-file): Bind ethio-sera-being-called-by-w3 to t
instead of sera-being-called-by-w3.
(ethio-write-file): Likewise.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Mon, 05 Apr 2004 23:27:37 +0000 |
| parents | 695cf19ef79e |
| children | a7dfcd60873e 375f2633d815 |
| rev | line source |
|---|---|
| 25003 | 1 ;;; image.el --- image API |
| 2 | |
|
37035
b7bd53c4820a
(image-type-regexps): Change type for PS files
Gerd Moellmann <gerd@gnu.org>
parents:
34378
diff
changeset
|
3 ;; Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. |
| 42316 | 4 |
| 5 ;; Maintainer: FSF | |
| 25309 | 6 ;; Keywords: multimedia |
| 25003 | 7 |
| 8 ;; This file is part of GNU Emacs. | |
| 9 | |
| 10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
| 11 ;; it under the terms of the GNU General Public License as published by | |
| 12 ;; the Free Software Foundation; either version 2, or (at your option) | |
| 13 ;; any later version. | |
| 14 | |
| 15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
| 16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 18 ;; GNU General Public License for more details. | |
| 19 | |
| 20 ;; You should have received a copy of the GNU General Public License | |
| 21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
| 22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
| 23 ;; Boston, MA 02111-1307, USA. | |
| 24 | |
| 25 ;;; Commentary: | |
| 26 | |
| 27 ;;; Code: | |
| 28 | |
| 32166 | 29 |
| 30 (defgroup image () | |
| 31 "Image support." | |
| 32 :group 'multimedia) | |
| 33 | |
| 34 | |
| 25003 | 35 (defconst image-type-regexps |
|
38746
0fc8e4a27edc
(image-type-regexps): Allow whitespace at the start
Gerd Moellmann <gerd@gnu.org>
parents:
38732
diff
changeset
|
36 '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm) |
|
38709
00a56d6da660
(image-type-regexps): Use `\`' instead of `^' in
Gerd Moellmann <gerd@gnu.org>
parents:
37035
diff
changeset
|
37 ("\\`P[1-6]" . pbm) |
|
00a56d6da660
(image-type-regexps): Use `\`' instead of `^' in
Gerd Moellmann <gerd@gnu.org>
parents:
37035
diff
changeset
|
38 ("\\`GIF8" . gif) |
|
00a56d6da660
(image-type-regexps): Use `\`' instead of `^' in
Gerd Moellmann <gerd@gnu.org>
parents:
37035
diff
changeset
|
39 ("\\`\211PNG\r\n" . png) |
|
38746
0fc8e4a27edc
(image-type-regexps): Allow whitespace at the start
Gerd Moellmann <gerd@gnu.org>
parents:
38732
diff
changeset
|
40 ("\\`[\t\n\r ]*#define" . xbm) |
|
38884
afaef792868d
(image-type-regexps): Make sure that the TIFF
Gerd Moellmann <gerd@gnu.org>
parents:
38794
diff
changeset
|
41 ("\\`\\(MM\0\\*\\|II\\*\0\\)" . tiff) |
|
38746
0fc8e4a27edc
(image-type-regexps): Allow whitespace at the start
Gerd Moellmann <gerd@gnu.org>
parents:
38732
diff
changeset
|
42 ("\\`[\t\n\r ]*%!PS" . postscript) |
|
38732
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
43 ("\\`\xff\xd8" . (image-jpeg-p . jpeg))) |
| 25003 | 44 "Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types. |
| 45 When the first bytes of an image file match REGEXP, it is assumed to | |
|
38732
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
46 be of image type IMAGE-TYPE if IMAGE-TYPE is a symbol. If not a symbol, |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
47 IMAGE-TYPE must be a pair (PREDICATE . TYPE). PREDICATE is called |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
48 with one argument, a string containing the image data. If PREDICATE returns |
|
49589
de51db566826
(image-type-regexps): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents:
49588
diff
changeset
|
49 a non-nil value, TYPE is the image's type.") |
|
38732
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
50 |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
51 |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
52 (defun image-jpeg-p (data) |
|
46810
65ad7b458435
(image-jpeg-p): Accept "Exif" marker.
Richard M. Stallman <rms@gnu.org>
parents:
43834
diff
changeset
|
53 "Value is non-nil if DATA, a string, consists of JFIF image data. |
|
65ad7b458435
(image-jpeg-p): Accept "Exif" marker.
Richard M. Stallman <rms@gnu.org>
parents:
43834
diff
changeset
|
54 We accept the tag Exif because that is the same format." |
|
38732
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
55 (when (string-match "\\`\xff\xd8" data) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
56 (catch 'jfif |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
57 (let ((len (length data)) (i 2)) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
58 (while (< i len) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
59 (when (/= (aref data i) #xff) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
60 (throw 'jfif nil)) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
61 (setq i (1+ i)) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
62 (when (>= (+ i 2) len) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
63 (throw 'jfif nil)) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
64 (let ((nbytes (+ (lsh (aref data (+ i 1)) 8) |
|
38776
a679a282d5cb
(image-jpeg-p): Test for APPn markers in the range
Gerd Moellmann <gerd@gnu.org>
parents:
38746
diff
changeset
|
65 (aref data (+ i 2)))) |
|
a679a282d5cb
(image-jpeg-p): Test for APPn markers in the range
Gerd Moellmann <gerd@gnu.org>
parents:
38746
diff
changeset
|
66 (code (aref data i))) |
|
a679a282d5cb
(image-jpeg-p): Test for APPn markers in the range
Gerd Moellmann <gerd@gnu.org>
parents:
38746
diff
changeset
|
67 (when (and (>= code #xe0) (<= code #xef)) |
|
38732
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
68 ;; APP0 LEN1 LEN2 "JFIF\0" |
|
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48130
diff
changeset
|
69 (throw 'jfif |
|
52344
f1fd0b3a923e
(image-jpeg-p): Don't search beyond length of data.
John Paul Wallington <jpw@pobox.com>
parents:
49589
diff
changeset
|
70 (string-match "JFIF\\|Exif" |
|
f1fd0b3a923e
(image-jpeg-p): Don't search beyond length of data.
John Paul Wallington <jpw@pobox.com>
parents:
49589
diff
changeset
|
71 (substring data i (min (+ i nbytes) len))))) |
|
38746
0fc8e4a27edc
(image-type-regexps): Allow whitespace at the start
Gerd Moellmann <gerd@gnu.org>
parents:
38732
diff
changeset
|
72 (setq i (+ i 1 nbytes)))))))) |
| 25003 | 73 |
| 74 | |
| 75 ;;;###autoload | |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
76 (defun image-type-from-data (data) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
77 "Determine the image type from image data DATA. |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
78 Value is a symbol specifying the image type or nil if type cannot |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
79 be determined." |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
80 (let ((types image-type-regexps) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
81 type) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
82 (while (and types (null type)) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
83 (let ((regexp (car (car types))) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
84 (image-type (cdr (car types)))) |
|
38732
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
85 (when (or (and (symbolp image-type) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
86 (string-match regexp data)) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
87 (and (consp image-type) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
88 (funcall (car image-type) data) |
|
24fe4f884e82
(image-type-regexps): Allow predicates. Change the way
Gerd Moellmann <gerd@gnu.org>
parents:
38711
diff
changeset
|
89 (setq image-type (cdr image-type)))) |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
90 (setq type image-type)) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
91 (setq types (cdr types)))) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
92 type)) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
93 |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
94 |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
95 ;;;###autoload |
| 25003 | 96 (defun image-type-from-file-header (file) |
| 97 "Determine the type of image file FILE from its first few bytes. | |
| 98 Value is a symbol specifying the image type, or nil if type cannot | |
| 99 be determined." | |
| 100 (unless (file-name-directory file) | |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
101 (setq file (expand-file-name file data-directory))) |
| 25003 | 102 (setq file (expand-file-name file)) |
| 103 (let ((header (with-temp-buffer | |
|
43834
aa881082fd04
(image-type-from-file-header): Make temporary buffer unibyte.
Pavel Jan?k <Pavel@Janik.cz>
parents:
42316
diff
changeset
|
104 (set-buffer-multibyte nil) |
| 25003 | 105 (insert-file-contents-literally file nil 0 256) |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
106 (buffer-string)))) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
107 (image-type-from-data header))) |
| 25003 | 108 |
| 109 | |
| 110 ;;;###autoload | |
| 111 (defun image-type-available-p (type) | |
| 112 "Value is non-nil if image type TYPE is available. | |
| 113 Image types are symbols like `xbm' or `jpeg'." | |
|
28958
56c76b64f321
(image-type-available-p): Don't reference image-types
Eli Zaretskii <eliz@gnu.org>
parents:
28721
diff
changeset
|
114 (and (boundp 'image-types) (not (null (memq type image-types))))) |
| 25003 | 115 |
| 116 | |
| 117 ;;;###autoload | |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
118 (defun create-image (file-or-data &optional type data-p &rest props) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
119 "Create an image. |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
120 FILE-OR-DATA is an image file name or image data. |
| 25003 | 121 Optional TYPE is a symbol describing the image type. If TYPE is omitted |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
122 or nil, try to determine the image type from its first few bytes |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
123 of image data. If that doesn't work, and FILE-OR-DATA is a file name, |
|
34378
5ae7af279df7
(create-image): Doc fix; spotted by Per Cederqvist <ceder@lysator.liu.se>.
Eli Zaretskii <eliz@gnu.org>
parents:
32166
diff
changeset
|
124 use its file extension as image type. |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
125 Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data. |
| 25003 | 126 Optional PROPS are additional image attributes to assign to the image, |
| 31635 | 127 like, e.g. `:mask MASK'. |
| 25003 | 128 Value is the image created, or nil if images of type TYPE are not supported." |
|
27075
893ec72bd6b1
(create-image, defimage): Don't assume image data is a
Gerd Moellmann <gerd@gnu.org>
parents:
27073
diff
changeset
|
129 (when (and (not data-p) (not (stringp file-or-data))) |
|
893ec72bd6b1
(create-image, defimage): Don't assume image data is a
Gerd Moellmann <gerd@gnu.org>
parents:
27073
diff
changeset
|
130 (error "Invalid image file name `%s'" file-or-data)) |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
131 (cond ((null data-p) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
132 ;; FILE-OR-DATA is a file name. |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
133 (unless (or type |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
134 (setq type (image-type-from-file-header file-or-data))) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
135 (let ((extension (file-name-extension file-or-data))) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
136 (unless extension |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
137 (error "Cannot determine image type")) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
138 (setq type (intern extension))))) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
139 (t |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
140 ;; FILE-OR-DATA contains image data. |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
141 (unless type |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
142 (setq type (image-type-from-data file-or-data))))) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
143 (unless type |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
144 (error "Cannot determine image type")) |
| 25003 | 145 (unless (symbolp type) |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
146 (error "Invalid image type `%s'" type)) |
| 25003 | 147 (when (image-type-available-p type) |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
148 (append (list 'image :type type (if data-p :data :file) file-or-data) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
149 props))) |
| 25003 | 150 |
| 151 | |
| 152 ;;;###autoload | |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
153 (defun put-image (image pos &optional string area) |
|
25617
697b28471784
(put-image): Remove optional buffer parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25309
diff
changeset
|
154 "Put image IMAGE in front of POS in the current buffer. |
| 25003 | 155 IMAGE must be an image created with `create-image' or `defimage'. |
|
25816
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
156 IMAGE is displayed by putting an overlay into the current buffer with a |
|
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
157 `before-string' STRING that has a `display' property whose value is the |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
158 image. STRING is defaulted if you omit it. |
| 25003 | 159 POS may be an integer or marker. |
| 160 AREA is where to display the image. AREA nil or omitted means | |
| 161 display it in the text area, a value of `left-margin' means | |
| 162 display it in the left marginal area, a value of `right-margin' | |
|
25816
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
163 means display it in the right marginal area." |
|
29626
ecb96a7369d3
Fix last change to be in insert-image as intended.
Dave Love <fx@gnu.org>
parents:
29624
diff
changeset
|
164 (unless string (setq string "x")) |
|
25617
697b28471784
(put-image): Remove optional buffer parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25309
diff
changeset
|
165 (let ((buffer (current-buffer))) |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
166 (unless (eq (car-safe image) 'image) |
|
25617
697b28471784
(put-image): Remove optional buffer parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25309
diff
changeset
|
167 (error "Not an image: %s" image)) |
|
697b28471784
(put-image): Remove optional buffer parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25309
diff
changeset
|
168 (unless (or (null area) (memq area '(left-margin right-margin))) |
|
697b28471784
(put-image): Remove optional buffer parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25309
diff
changeset
|
169 (error "Invalid area %s" area)) |
|
25816
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
170 (setq string (copy-sequence string)) |
|
25617
697b28471784
(put-image): Remove optional buffer parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25309
diff
changeset
|
171 (let ((overlay (make-overlay pos pos buffer)) |
|
25816
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
172 (prop (if (null area) image (list (list 'margin area) image)))) |
|
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
173 (put-text-property 0 (length string) 'display prop string) |
|
25617
697b28471784
(put-image): Remove optional buffer parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25309
diff
changeset
|
174 (overlay-put overlay 'put-image t) |
|
697b28471784
(put-image): Remove optional buffer parameter.
Gerd Moellmann <gerd@gnu.org>
parents:
25309
diff
changeset
|
175 (overlay-put overlay 'before-string string)))) |
| 25003 | 176 |
| 177 | |
| 178 ;;;###autoload | |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
179 (defun insert-image (image &optional string area) |
| 25003 | 180 "Insert IMAGE into current buffer at point. |
|
25816
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
181 IMAGE is displayed by inserting STRING into the current buffer |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
182 with a `display' property whose value is the image. STRING is |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
183 defaulted if you omit it. |
| 25003 | 184 AREA is where to display the image. AREA nil or omitted means |
| 185 display it in the text area, a value of `left-margin' means | |
| 186 display it in the left marginal area, a value of `right-margin' | |
|
25816
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
187 means display it in the right marginal area." |
|
29626
ecb96a7369d3
Fix last change to be in insert-image as intended.
Dave Love <fx@gnu.org>
parents:
29624
diff
changeset
|
188 ;; Use a space as least likely to cause trouble when it's a hidden |
|
ecb96a7369d3
Fix last change to be in insert-image as intended.
Dave Love <fx@gnu.org>
parents:
29624
diff
changeset
|
189 ;; character in the buffer. |
|
ecb96a7369d3
Fix last change to be in insert-image as intended.
Dave Love <fx@gnu.org>
parents:
29624
diff
changeset
|
190 (unless string (setq string " ")) |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
191 (unless (eq (car-safe image) 'image) |
| 25003 | 192 (error "Not an image: %s" image)) |
| 193 (unless (or (null area) (memq area '(left-margin right-margin))) | |
| 194 (error "Invalid area %s" area)) | |
|
29607
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
195 (if area |
|
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
196 (setq image (list (list 'margin area) image)) |
|
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
197 ;; Cons up a new spec equal but not eq to `image' so that |
|
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
198 ;; inserting it twice in a row (adjacently) displays two copies of |
|
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
199 ;; the image. Don't try to avoid this by looking at the display |
|
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
200 ;; properties on either side so that we DTRT more often with |
|
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
201 ;; cut-and-paste. (Yanking killed image text next to another copy |
|
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
202 ;; of it loses anyway.) |
|
42d156d8d8eb
(insert-image): Save a little consing.
Dave Love <fx@gnu.org>
parents:
29470
diff
changeset
|
203 (setq image (cons 'image (cdr image)))) |
|
25816
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
204 (let ((start (point))) |
|
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
205 (insert string) |
|
2d53a03a3baa
(put-image, insert-image): Add string argument.
Gerd Moellmann <gerd@gnu.org>
parents:
25617
diff
changeset
|
206 (add-text-properties start (point) |
|
48130
b469af98b332
(insert-image): Don't make intangible since
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46810
diff
changeset
|
207 `(display ,image rear-nonsticky (display))))) |
|
26007
774b2504710b
(insert-image): Copy the image spec and add an intangible property.
Dave Love <fx@gnu.org>
parents:
25872
diff
changeset
|
208 |
| 25003 | 209 |
| 210 ;;;###autoload | |
| 211 (defun remove-images (start end &optional buffer) | |
| 212 "Remove images between START and END in BUFFER. | |
| 213 Remove only images that were put in BUFFER with calls to `put-image'. | |
| 214 BUFFER nil or omitted means use the current buffer." | |
| 215 (unless buffer | |
| 216 (setq buffer (current-buffer))) | |
| 217 (let ((overlays (overlays-in start end))) | |
| 218 (while overlays | |
| 219 (let ((overlay (car overlays))) | |
| 220 (when (overlay-get overlay 'put-image) | |
|
25857
fdc2bd91cf63
(defimage): Remove redundant code. Substitute file on image plist.
Dave Love <fx@gnu.org>
parents:
25816
diff
changeset
|
221 (delete-overlay overlay))) |
|
fdc2bd91cf63
(defimage): Remove redundant code. Substitute file on image plist.
Dave Love <fx@gnu.org>
parents:
25816
diff
changeset
|
222 (setq overlays (cdr overlays))))) |
| 25003 | 223 |
| 224 | |
| 225 ;;;###autoload | |
|
28721
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
226 (defun find-image (specs) |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
227 "Find an image, choosing one of a list of image specifications. |
| 25003 | 228 |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
229 SPECS is a list of image specifications. |
| 25003 | 230 |
| 231 Each image specification in SPECS is a property list. The contents of | |
| 232 a specification are image type dependent. All specifications must at | |
|
27059
6bb2a4a0413e
* image.el (defimage): Images with the :data keyword should be considered valid as well.
William M. Perry <wmperry@aventail.com>
parents:
26007
diff
changeset
|
233 least contain the properties `:type TYPE' and either `:file FILE' or |
|
6bb2a4a0413e
* image.el (defimage): Images with the :data keyword should be considered valid as well.
William M. Perry <wmperry@aventail.com>
parents:
26007
diff
changeset
|
234 `:data DATA', where TYPE is a symbol specifying the image type, |
|
6bb2a4a0413e
* image.el (defimage): Images with the :data keyword should be considered valid as well.
William M. Perry <wmperry@aventail.com>
parents:
26007
diff
changeset
|
235 e.g. `xbm', FILE is the file to load the image from, and DATA is a |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
236 string containing the actual image data. The specification whose TYPE |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
237 is supported, and FILE exists, is used to construct the image |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
238 specification to be returned. Return nil if no specification is |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
239 satisfied. |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
240 |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
241 The image is looked for first on `load-path' and then in `data-directory'." |
| 25003 | 242 (let (image) |
| 243 (while (and specs (null image)) | |
| 244 (let* ((spec (car specs)) | |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
245 (type (plist-get spec :type)) |
|
27059
6bb2a4a0413e
* image.el (defimage): Images with the :data keyword should be considered valid as well.
William M. Perry <wmperry@aventail.com>
parents:
26007
diff
changeset
|
246 (data (plist-get spec :data)) |
|
27921
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
247 (file (plist-get spec :file)) |
|
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
248 found) |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
249 (when (image-type-available-p type) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
250 (cond ((stringp file) |
|
27921
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
251 (let ((path load-path)) |
|
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
252 (while (and (not found) path) |
|
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
253 (let ((try-file (expand-file-name file (car path)))) |
|
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
254 (when (file-readable-p try-file) |
|
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
255 (setq found try-file))) |
|
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
256 (setq path (cdr path))) |
|
ea0a2a4f20b7
(defimage): Look for image files in load-path.
Gerd Moellmann <gerd@gnu.org>
parents:
27075
diff
changeset
|
257 (unless found |
|
29470
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
258 (let ((try-file (expand-file-name file data-directory))) |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
259 (if (file-readable-p try-file) |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
260 (setq found try-file)))) |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
261 (if found |
|
7bde123bed95
(find-image): Doc fix. Return nil if image not found.
Dave Love <fx@gnu.org>
parents:
28958
diff
changeset
|
262 (setq image |
|
30952
5042a3b24c96
(find-image): Copy `spec' before using plist-put.
Dave Love <fx@gnu.org>
parents:
29626
diff
changeset
|
263 (cons 'image (plist-put (copy-sequence spec) |
|
5042a3b24c96
(find-image): Copy `spec' before using plist-put.
Dave Love <fx@gnu.org>
parents:
29626
diff
changeset
|
264 :file found)))))) |
|
27075
893ec72bd6b1
(create-image, defimage): Don't assume image data is a
Gerd Moellmann <gerd@gnu.org>
parents:
27073
diff
changeset
|
265 ((not (null data)) |
|
27073
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
266 (setq image (cons 'image spec))))) |
|
aad0a025b1e3
(defimage): Handle specifications containing :data
Gerd Moellmann <gerd@gnu.org>
parents:
27059
diff
changeset
|
267 (setq specs (cdr specs)))) |
|
28721
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
268 image)) |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
269 |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
270 |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
271 ;;;###autoload |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
272 (defmacro defimage (symbol specs &optional doc) |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
273 "Define SYMBOL as an image. |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
274 |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
275 SPECS is a list of image specifications. DOC is an optional |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
276 documentation string. |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
277 |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
278 Each image specification in SPECS is a property list. The contents of |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
279 a specification are image type dependent. All specifications must at |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
280 least contain the properties `:type TYPE' and either `:file FILE' or |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
281 `:data DATA', where TYPE is a symbol specifying the image type, |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
282 e.g. `xbm', FILE is the file to load the image from, and DATA is a |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
283 string containing the actual image data. The first image |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
284 specification whose TYPE is supported, and FILE exists, is used to |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
285 define SYMBOL. |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
286 |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
287 Example: |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
288 |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
289 (defimage test-image ((:type xpm :file \"~/test1.xpm\") |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
290 (:type xbm :file \"~/test1.xbm\")))" |
|
b4ea18c92e38
(find-image): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
27921
diff
changeset
|
291 `(defvar ,symbol (find-image ',specs) ,doc)) |
| 25003 | 292 |
| 293 | |
| 294 (provide 'image) | |
| 295 | |
| 52401 | 296 ;;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3 |
| 25872 | 297 ;;; image.el ends here |
