Mercurial > emacs
annotate src/image.c @ 94942:3cef4d4e304b
(x_load_resources): Don't setup a fontset resource.
| author | Kenichi Handa <handa@m17n.org> |
|---|---|
| date | Wed, 14 May 2008 01:43:24 +0000 |
| parents | 669d4161a058 |
| children | 8971ddf55736 |
| rev | line source |
|---|---|
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1 /* Functions for image support on window system. |
|
64770
a0d1312ede66
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64084
diff
changeset
|
2 Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
| 79759 | 3 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 |
| 4 Free Software Foundation, Inc. | |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6 This file is part of GNU Emacs. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8 GNU Emacs is free software; you can redistribute it and/or modify |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9 it under the terms of the GNU General Public License as published by |
|
78260
922696f363b0
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
78036
diff
changeset
|
10 the Free Software Foundation; either version 3, or (at your option) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
11 any later version. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
12 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
13 GNU Emacs is distributed in the hope that it will be useful, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
14 but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
16 GNU General Public License for more details. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
17 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
18 You should have received a copy of the GNU General Public License |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
19 along with GNU Emacs; see the file COPYING. If not, write to |
| 64084 | 20 the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 21 Boston, MA 02110-1301, USA. */ | |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
22 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
23 #include <config.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
24 #include <stdio.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
25 #include <math.h> |
| 56065 | 26 #include <ctype.h> |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
27 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
28 #ifdef HAVE_UNISTD_H |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
29 #include <unistd.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
30 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
31 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
32 /* This makes the fields of a Display accessible, in Xlib header files. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
33 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
34 #define XLIB_ILLEGAL_ACCESS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
35 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
36 #include "lisp.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
37 #include "frame.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
38 #include "window.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
39 #include "dispextern.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
40 #include "blockinput.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
41 #include "systime.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
42 #include <epaths.h> |
|
94934
669d4161a058
(image_ascent): Don't include "charset.h". Include
Kenichi Handa <handa@m17n.org>
parents:
94780
diff
changeset
|
43 #include "character.h" |
|
69771
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
44 #include "coding.h" |
|
92110
458c8171667a
Include termhooks.h to find the image_cache slot in terminal objects.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92109
diff
changeset
|
45 #include "termhooks.h" |
|
94934
669d4161a058
(image_ascent): Don't include "charset.h". Include
Kenichi Handa <handa@m17n.org>
parents:
94780
diff
changeset
|
46 #include "font.h" |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
47 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
48 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
49 #include "xterm.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
50 #include <sys/types.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
51 #include <sys/stat.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
52 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
53 #define COLOR_TABLE_SUPPORT 1 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
54 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
55 typedef struct x_bitmap_record Bitmap_Record; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
56 #define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
57 #define NO_PIXMAP None |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
58 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
59 #define RGB_PIXEL_COLOR unsigned long |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
60 |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
61 #define PIX_MASK_RETAIN 0 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
62 #define PIX_MASK_DRAW 1 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
63 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
64 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
65 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
66 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
67 #include "w32term.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
68 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
69 /* W32_TODO : Color tables on W32. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
70 #undef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
71 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
72 typedef struct w32_bitmap_record Bitmap_Record; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
73 #define GET_PIXEL(ximg, x, y) GetPixel(ximg, x, y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
74 #define NO_PIXMAP 0 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
75 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
76 #define RGB_PIXEL_COLOR COLORREF |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
77 |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
78 #define PIX_MASK_RETAIN 0 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
79 #define PIX_MASK_DRAW 1 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
80 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
81 #define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
82 #define x_defined_color w32_defined_color |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
83 #define DefaultDepthOfScreen(screen) (one_w32_display_info.n_cbits) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
84 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
85 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
86 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
87 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
88 #include "macterm.h" |
|
59146
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
59073
diff
changeset
|
89 #include <sys/stat.h> |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
90 #ifndef MAC_OSX |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
91 #include <alloca.h> |
|
59146
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
59073
diff
changeset
|
92 #include <sys/param.h> |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
93 #endif |
|
60359
1c6de5f7952b
[!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
59146
diff
changeset
|
94 #if TARGET_API_MAC_CARBON |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
95 #ifdef MAC_OSX |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
96 #include <QuickTime/QuickTime.h> |
|
60359
1c6de5f7952b
[!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
59146
diff
changeset
|
97 #else /* not MAC_OSX */ |
|
1c6de5f7952b
[!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
59146
diff
changeset
|
98 #include <QuickTime.h> |
|
1c6de5f7952b
[!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
59146
diff
changeset
|
99 #endif /* not MAC_OSX */ |
|
1c6de5f7952b
[!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
59146
diff
changeset
|
100 #else /* not TARGET_API_MAC_CARBON */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
101 #include <Windows.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
102 #include <Gestalt.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
103 #include <TextUtils.h> |
|
59146
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
59073
diff
changeset
|
104 #include <ImageCompression.h> |
|
9bde7721ad0f
* dispextern.h: Change HAVE_CARBON to MAC_OS.
Steven Tamm <steventamm@mac.com>
parents:
59073
diff
changeset
|
105 #include <QuickTimeComponents.h> |
|
60359
1c6de5f7952b
[!MAC_OSX && TARGET_API_MAC_CARBON]: Include QuickTime.h.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
59146
diff
changeset
|
106 #endif /* not TARGET_API_MAC_CARBON */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
107 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
108 /* MAC_TODO : Color tables on Mac. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
109 #undef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
110 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
111 #define ZPixmap 0 /* arbitrary */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
112 typedef struct mac_bitmap_record Bitmap_Record; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
113 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
114 #define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
115 #define NO_PIXMAP 0 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
116 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
117 #define RGB_PIXEL_COLOR unsigned long |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
118 |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
119 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
120 #define PIX_MASK_DRAW 255 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
121 #define PIX_MASK_RETAIN 0 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
122 #else |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
123 /* A black pixel in a mask bitmap/pixmap means ``draw a source |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
124 pixel''. A white pixel means ``retain the current pixel''. */ |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
125 #define PIX_MASK_DRAW RGB_TO_ULONG(0,0,0) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
126 #define PIX_MASK_RETAIN RGB_TO_ULONG(255,255,255) |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
127 #endif |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
128 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
129 #define FRAME_X_VISUAL(f) FRAME_X_DISPLAY_INFO (f)->visual |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
130 #define x_defined_color mac_defined_color |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
131 #define DefaultDepthOfScreen(screen) (one_mac_display_info.n_planes) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
132 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
133 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
134 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
135 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
136 /* Search path for bitmap files. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
137 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
138 Lisp_Object Vx_bitmap_file_path; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
139 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
140 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
141 static void x_disable_image P_ ((struct frame *, struct image *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
142 static void x_edge_detection P_ ((struct frame *, struct image *, Lisp_Object, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
143 Lisp_Object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
144 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
145 static void init_color_table P_ ((void)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
146 static unsigned long lookup_rgb_color P_ ((struct frame *f, int r, int g, int b)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
147 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
148 static void free_color_table P_ ((void)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
149 static unsigned long *colors_in_color_table P_ ((int *n)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
150 static unsigned long lookup_pixel_color P_ ((struct frame *f, unsigned long p)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
151 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
152 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
153 /* Code to deal with bitmaps. Bitmaps are referenced by their bitmap |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
154 id, which is just an int that this section returns. Bitmaps are |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
155 reference counted so they can be shared among frames. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
156 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
157 Bitmap indices are guaranteed to be > 0, so a negative number can |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
158 be used to indicate no bitmap. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
159 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
160 If you use x_create_bitmap_from_data, then you must keep track of |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
161 the bitmaps yourself. That is, creating a bitmap from the same |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
162 data more than once will not be caught. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
163 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
164 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
165 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
166 static XImagePtr |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
167 XGetImage (display, pixmap, x, y, width, height, plane_mask, format) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
168 Display *display; /* not used */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
169 Pixmap pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
170 int x, y; /* not used */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
171 unsigned int width, height; /* not used */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
172 unsigned long plane_mask; /* not used */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
173 int format; /* not used */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
174 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
175 #if !USE_MAC_IMAGE_IO |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
176 #if GLYPH_DEBUG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
177 xassert (x == 0 && y == 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
178 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
179 Rect ri, rp; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
180 SetRect (&ri, 0, 0, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
181 xassert (EqualRect (&ri, GetPixBounds (GetGWorldPixMap (pixmap), &rp))); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
182 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
183 xassert (! (pixelsLocked & GetPixelsState (GetGWorldPixMap (pixmap)))); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
184 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
185 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
186 LockPixels (GetGWorldPixMap (pixmap)); |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
187 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
188 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
189 return pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
190 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
191 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
192 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
193 XPutPixel (ximage, x, y, pixel) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
194 XImagePtr ximage; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
195 int x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
196 unsigned long pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
197 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
198 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
199 if (ximage->bits_per_pixel == 32) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
200 ((unsigned int *)(ximage->data + y * ximage->bytes_per_line))[x] = pixel; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
201 else |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
202 ((unsigned char *)(ximage->data + y * ximage->bytes_per_line))[x] = pixel; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
203 #else |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
204 PixMapHandle pixmap = GetGWorldPixMap (ximage); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
205 short depth = GetPixDepth (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
206 |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
207 #if defined (WORDS_BIG_ENDIAN) || !USE_CG_DRAWING |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
208 if (depth == 32) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
209 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
210 char *base_addr = GetPixBaseAddr (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
211 short row_bytes = GetPixRowBytes (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
212 |
|
69333
d42b2aec70a4
[MAC_OS] (XPutPixel): Set alpha channel bits if pixmap depth is 32.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
213 ((unsigned long *) (base_addr + y * row_bytes))[x] = 0xff000000 | pixel; |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
214 } |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
215 else |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
216 #endif |
|
70068
2c4ba2c48153
(x_create_bitmap_from_data) [MAC_OS]: Don't check return
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69958
diff
changeset
|
217 if (depth == 1) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
218 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
219 char *base_addr = GetPixBaseAddr (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
220 short row_bytes = GetPixRowBytes (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
221 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
222 if (pixel == PIX_MASK_DRAW) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
223 base_addr[y * row_bytes + x / 8] |= (1 << 7) >> (x & 7); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
224 else |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
225 base_addr[y * row_bytes + x / 8] &= ~((1 << 7) >> (x & 7)); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
226 } |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
227 else |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
228 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
229 CGrafPtr old_port; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
230 GDHandle old_gdh; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
231 RGBColor color; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
232 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
233 GetGWorld (&old_port, &old_gdh); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
234 SetGWorld (ximage, NULL); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
235 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
236 color.red = RED16_FROM_ULONG (pixel); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
237 color.green = GREEN16_FROM_ULONG (pixel); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
238 color.blue = BLUE16_FROM_ULONG (pixel); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
239 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
240 SetCPixel (x, y, &color); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
241 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
242 SetGWorld (old_port, old_gdh); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
243 } |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
244 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
245 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
246 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
247 static unsigned long |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
248 XGetPixel (ximage, x, y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
249 XImagePtr ximage; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
250 int x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
251 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
252 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
253 if (ximage->bits_per_pixel == 32) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
254 return ((unsigned int *)(ximage->data + y * ximage->bytes_per_line))[x]; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
255 else |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
256 return ((unsigned char *)(ximage->data + y * ximage->bytes_per_line))[x]; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
257 #else |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
258 PixMapHandle pixmap = GetGWorldPixMap (ximage); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
259 short depth = GetPixDepth (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
260 |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
261 #if defined (WORDS_BIG_ENDIAN) || !USE_CG_DRAWING |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
262 if (depth == 32) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
263 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
264 char *base_addr = GetPixBaseAddr (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
265 short row_bytes = GetPixRowBytes (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
266 |
|
69333
d42b2aec70a4
[MAC_OS] (XPutPixel): Set alpha channel bits if pixmap depth is 32.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
68651
diff
changeset
|
267 return ((unsigned long *) (base_addr + y * row_bytes))[x] & 0x00ffffff; |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
268 } |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
269 else |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
270 #endif |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
271 if (depth == 1) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
272 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
273 char *base_addr = GetPixBaseAddr (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
274 short row_bytes = GetPixRowBytes (pixmap); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
275 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
276 if (base_addr[y * row_bytes + x / 8] & (1 << (~x & 7))) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
277 return PIX_MASK_DRAW; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
278 else |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
279 return PIX_MASK_RETAIN; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
280 } |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
281 else |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
282 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
283 CGrafPtr old_port; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
284 GDHandle old_gdh; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
285 RGBColor color; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
286 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
287 GetGWorld (&old_port, &old_gdh); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
288 SetGWorld (ximage, NULL); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
289 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
290 GetCPixel (x, y, &color); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
291 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
292 SetGWorld (old_port, old_gdh); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
293 return RGB_TO_ULONG (color.red >> 8, color.green >> 8, color.blue >> 8); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
294 } |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
295 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
296 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
297 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
298 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
299 XDestroyImage (ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
300 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
301 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
302 #if !USE_MAC_IMAGE_IO |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
303 UnlockPixels (GetGWorldPixMap (ximg)); |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
304 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
305 } |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
306 |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
307 #if USE_CG_DRAWING |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
308 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
309 void |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
310 mac_data_provider_release_data (info, data, size) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
311 void *info; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
312 const void *data; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
313 size_t size; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
314 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
315 xfree ((void *)data); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
316 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
317 #endif |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
318 |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
319 static CGImageRef |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
320 mac_create_cg_image_from_image (f, img) |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
321 struct frame *f; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
322 struct image *img; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
323 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
324 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
325 XImagePtr ximg = img->pixmap; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
326 CGDataProviderRef provider; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
327 CGImageRef result; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
328 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
329 if (img->mask) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
330 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
331 int x, y; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
332 unsigned long color, alpha; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
333 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
334 for (y = 0; y < ximg->height; y++) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
335 for (x = 0; x < ximg->width; x++) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
336 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
337 color = XGetPixel (ximg, x, y); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
338 alpha = XGetPixel (img->mask, x, y); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
339 XPutPixel (ximg, x, y, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
340 ARGB_TO_ULONG (alpha, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
341 RED_FROM_ULONG (color) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
342 * alpha / PIX_MASK_DRAW, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
343 GREEN_FROM_ULONG (color) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
344 * alpha / PIX_MASK_DRAW, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
345 BLUE_FROM_ULONG (color) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
346 * alpha / PIX_MASK_DRAW)); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
347 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
348 xfree (img->mask->data); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
349 img->mask->data = NULL; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
350 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
351 BLOCK_INPUT; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
352 provider = CGDataProviderCreateWithData (NULL, ximg->data, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
353 ximg->bytes_per_line * ximg->height, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
354 mac_data_provider_release_data); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
355 ximg->data = NULL; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
356 result = CGImageCreate (ximg->width, ximg->height, 8, 32, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
357 ximg->bytes_per_line, mac_cg_color_space_rgb, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
358 (img->mask ? kCGImageAlphaPremultipliedFirst |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
359 : kCGImageAlphaNoneSkipFirst) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
360 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
361 | kCGBitmapByteOrder32Host |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
362 #endif |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
363 , provider, NULL, 0, kCGRenderingIntentDefault); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
364 CGDataProviderRelease (provider); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
365 UNBLOCK_INPUT; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
366 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
367 return result; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
368 #else |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
369 Pixmap mask; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
370 CGImageRef result = NULL; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
371 |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
372 BLOCK_INPUT; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
373 if (img->mask) |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
374 mask = img->mask; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
375 else |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
376 { |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
377 mask = XCreatePixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
378 img->width, img->height, 1); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
379 if (mask) |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
380 { |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
381 CGrafPtr old_port; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
382 GDHandle old_gdh; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
383 Rect r; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
384 |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
385 GetGWorld (&old_port, &old_gdh); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
386 SetGWorld (mask, NULL); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
387 BackColor (blackColor); /* Don't mask. */ |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
388 SetRect (&r, 0, 0, img->width, img->height); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
389 EraseRect (&r); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
390 SetGWorld (old_port, old_gdh); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
391 } |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
392 } |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
393 if (mask) |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
394 { |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
395 CreateCGImageFromPixMaps (GetGWorldPixMap (img->pixmap), |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
396 GetGWorldPixMap (mask), &result); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
397 if (mask != img->mask) |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
398 XFreePixmap (FRAME_X_DISPLAY (f), mask); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
399 } |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
400 UNBLOCK_INPUT; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
401 |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
402 return result; |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
403 #endif |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
404 } |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
405 #endif /* USE_CG_DRAWING */ |
|
55886
ae9227eb8392
Work around bugs/problems with MinGW builds of graphics libraries
Juanma Barranquero <lekktu@gmail.com>
parents:
55540
diff
changeset
|
406 #endif /* MAC_OS */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
407 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
408 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
409 /* Functions to access the contents of a bitmap, given an id. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
410 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
411 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
412 x_bitmap_height (f, id) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
413 FRAME_PTR f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
414 int id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
415 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
416 return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
417 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
418 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
419 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
420 x_bitmap_width (f, id) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
421 FRAME_PTR f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
422 int id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
423 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
424 return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
425 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
426 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
427 #if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
428 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
429 x_bitmap_pixmap (f, id) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
430 FRAME_PTR f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
431 int id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
432 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
433 return (int) FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
434 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
435 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
436 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
437 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
438 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
439 x_bitmap_mask (f, id) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
440 FRAME_PTR f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
441 int id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
442 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
443 return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
444 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
445 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
446 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
447 /* Allocate a new bitmap record. Returns index of new record. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
448 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
449 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
450 x_allocate_bitmap_record (f) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
451 FRAME_PTR f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
452 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
453 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
454 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
455 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
456 if (dpyinfo->bitmaps == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
457 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
458 dpyinfo->bitmaps_size = 10; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
459 dpyinfo->bitmaps |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
460 = (Bitmap_Record *) xmalloc (dpyinfo->bitmaps_size * sizeof (Bitmap_Record)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
461 dpyinfo->bitmaps_last = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
462 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
463 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
464 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
465 if (dpyinfo->bitmaps_last < dpyinfo->bitmaps_size) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
466 return ++dpyinfo->bitmaps_last; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
467 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
468 for (i = 0; i < dpyinfo->bitmaps_size; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
469 if (dpyinfo->bitmaps[i].refcount == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
470 return i + 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
471 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
472 dpyinfo->bitmaps_size *= 2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
473 dpyinfo->bitmaps |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
474 = (Bitmap_Record *) xrealloc (dpyinfo->bitmaps, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
475 dpyinfo->bitmaps_size * sizeof (Bitmap_Record)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
476 return ++dpyinfo->bitmaps_last; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
477 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
478 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
479 /* Add one reference to the reference count of the bitmap with id ID. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
480 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
481 void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
482 x_reference_bitmap (f, id) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
483 FRAME_PTR f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
484 int id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
485 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
486 ++FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].refcount; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
487 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
488 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
489 /* Create a bitmap for frame F from a HEIGHT x WIDTH array of bits at BITS. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
490 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
491 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
492 x_create_bitmap_from_data (f, bits, width, height) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
493 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
494 char *bits; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
495 unsigned int width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
496 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
497 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
498 int id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
499 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
500 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
501 Pixmap bitmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
502 bitmap = XCreateBitmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
503 bits, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
504 if (! bitmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
505 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
506 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
507 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
508 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
509 Pixmap bitmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
510 bitmap = CreateBitmap (width, height, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
511 FRAME_X_DISPLAY_INFO (XFRAME (frame))->n_planes, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
512 FRAME_X_DISPLAY_INFO (XFRAME (frame))->n_cbits, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
513 bits); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
514 if (! bitmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
515 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
516 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
517 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
518 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
519 /* MAC_TODO: for now fail if width is not mod 16 (toolbox requires it) */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
520 if (width % 16 != 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
521 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
522 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
523 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
524 id = x_allocate_bitmap_record (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
525 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
526 dpyinfo->bitmaps[id - 1].bitmap_data = (char *) xmalloc (height * width); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
527 bcopy (bits, dpyinfo->bitmaps[id - 1].bitmap_data, height * width); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
528 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
529 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
530 dpyinfo->bitmaps[id - 1].file = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
531 dpyinfo->bitmaps[id - 1].height = height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
532 dpyinfo->bitmaps[id - 1].width = width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
533 dpyinfo->bitmaps[id - 1].refcount = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
534 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
535 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
536 dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
537 dpyinfo->bitmaps[id - 1].have_mask = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
538 dpyinfo->bitmaps[id - 1].depth = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
539 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
540 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
541 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
542 dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
543 dpyinfo->bitmaps[id - 1].hinst = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
544 dpyinfo->bitmaps[id - 1].depth = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
545 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
546 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
547 return id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
548 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
549 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
550 /* Create bitmap from file FILE for frame F. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
551 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
552 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
553 x_create_bitmap_from_file (f, file) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
554 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
555 Lisp_Object file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
556 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
557 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
558 return -1; /* MAC_TODO : bitmap support */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
559 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
560 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
561 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
562 return -1; /* W32_TODO : bitmap support */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
563 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
564 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
565 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
566 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
567 unsigned int width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
568 Pixmap bitmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
569 int xhot, yhot, result, id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
570 Lisp_Object found; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
571 int fd; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
572 char *filename; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
573 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
574 /* Look for an existing bitmap with the same name. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
575 for (id = 0; id < dpyinfo->bitmaps_last; ++id) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
576 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
577 if (dpyinfo->bitmaps[id].refcount |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
578 && dpyinfo->bitmaps[id].file |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
579 && !strcmp (dpyinfo->bitmaps[id].file, (char *) SDATA (file))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
580 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
581 ++dpyinfo->bitmaps[id].refcount; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
582 return id + 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
583 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
584 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
585 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
586 /* Search bitmap-file-path for the file, if appropriate. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
587 fd = openp (Vx_bitmap_file_path, file, Qnil, &found, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
588 if (fd < 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
589 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
590 emacs_close (fd); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
591 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
592 filename = (char *) SDATA (found); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
593 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
594 result = XReadBitmapFile (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
595 filename, &width, &height, &bitmap, &xhot, &yhot); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
596 if (result != BitmapSuccess) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
597 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
598 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
599 id = x_allocate_bitmap_record (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
600 dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
601 dpyinfo->bitmaps[id - 1].have_mask = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
602 dpyinfo->bitmaps[id - 1].refcount = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
603 dpyinfo->bitmaps[id - 1].file = (char *) xmalloc (SBYTES (file) + 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
604 dpyinfo->bitmaps[id - 1].depth = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
605 dpyinfo->bitmaps[id - 1].height = height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
606 dpyinfo->bitmaps[id - 1].width = width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
607 strcpy (dpyinfo->bitmaps[id - 1].file, SDATA (file)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
608 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
609 return id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
610 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
611 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
612 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
613 /* Free bitmap B. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
614 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
615 static void |
|
85095
4f61ded4a62e
(free_bitmap_record): Renamed from Free_Bitmap_Record.
Richard M. Stallman <rms@gnu.org>
parents:
85039
diff
changeset
|
616 free_bitmap_record (dpyinfo, bm) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
617 Display_Info *dpyinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
618 Bitmap_Record *bm; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
619 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
620 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
621 XFreePixmap (dpyinfo->display, bm->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
622 if (bm->have_mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
623 XFreePixmap (dpyinfo->display, bm->mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
624 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
625 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
626 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
627 DeleteObject (bm->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
628 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
629 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
630 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
631 xfree (bm->bitmap_data); /* Added ++kfs */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
632 bm->bitmap_data = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
633 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
634 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
635 if (bm->file) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
636 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
637 xfree (bm->file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
638 bm->file = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
639 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
640 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
641 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
642 /* Remove reference to bitmap with id number ID. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
643 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
644 void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
645 x_destroy_bitmap (f, id) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
646 FRAME_PTR f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
647 int id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
648 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
649 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
650 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
651 if (id > 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
652 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
653 Bitmap_Record *bm = &dpyinfo->bitmaps[id - 1]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
654 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
655 if (--bm->refcount == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
656 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
657 BLOCK_INPUT; |
|
85095
4f61ded4a62e
(free_bitmap_record): Renamed from Free_Bitmap_Record.
Richard M. Stallman <rms@gnu.org>
parents:
85039
diff
changeset
|
658 free_bitmap_record (dpyinfo, bm); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
659 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
660 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
661 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
662 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
663 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
664 /* Free all the bitmaps for the display specified by DPYINFO. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
665 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
666 void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
667 x_destroy_all_bitmaps (dpyinfo) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
668 Display_Info *dpyinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
669 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
670 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
671 Bitmap_Record *bm = dpyinfo->bitmaps; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
672 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
673 for (i = 0; i < dpyinfo->bitmaps_last; i++, bm++) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
674 if (bm->refcount > 0) |
|
85095
4f61ded4a62e
(free_bitmap_record): Renamed from Free_Bitmap_Record.
Richard M. Stallman <rms@gnu.org>
parents:
85039
diff
changeset
|
675 free_bitmap_record (dpyinfo, bm); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
676 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
677 dpyinfo->bitmaps_last = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
678 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
679 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
680 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
681 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
682 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
683 /* Useful functions defined in the section |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
684 `Image type independent image structures' below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
685 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
686 static unsigned long four_corners_best P_ ((XImagePtr ximg, |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
687 int *corners, |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
688 unsigned long width, |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
689 unsigned long height)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
690 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
691 static int x_create_x_image_and_pixmap P_ ((struct frame *f, int width, int height, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
692 int depth, XImagePtr *ximg, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
693 Pixmap *pixmap)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
694 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
695 static void x_destroy_x_image P_ ((XImagePtr ximg)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
696 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
697 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
698 /* Create a mask of a bitmap. Note is this not a perfect mask. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
699 It's nicer with some borders in this context */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
700 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
701 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
702 x_create_bitmap_mask (f, id) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
703 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
704 int id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
705 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
706 Pixmap pixmap, mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
707 XImagePtr ximg, mask_img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
708 unsigned long width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
709 int result; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
710 unsigned long bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
711 unsigned long x, y, xp, xm, yp, ym; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
712 GC gc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
713 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
714 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
715 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
716 if (!(id > 0)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
717 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
718 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
719 pixmap = x_bitmap_pixmap (f, id); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
720 width = x_bitmap_width (f, id); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
721 height = x_bitmap_height (f, id); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
722 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
723 BLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
724 ximg = XGetImage (FRAME_X_DISPLAY (f), pixmap, 0, 0, width, height, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
725 ~0, ZPixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
726 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
727 if (!ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
728 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
729 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
730 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
731 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
732 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
733 result = x_create_x_image_and_pixmap (f, width, height, 1, &mask_img, &mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
734 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
735 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
736 if (!result) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
737 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
738 XDestroyImage (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
739 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
740 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
741 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
742 bg = four_corners_best (ximg, NULL, width, height); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
743 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
744 for (y = 0; y < ximg->height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
745 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
746 for (x = 0; x < ximg->width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
747 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
748 xp = x != ximg->width - 1 ? x + 1 : 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
749 xm = x != 0 ? x - 1 : ximg->width - 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
750 yp = y != ximg->height - 1 ? y + 1 : 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
751 ym = y != 0 ? y - 1 : ximg->height - 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
752 if (XGetPixel (ximg, x, y) == bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
753 && XGetPixel (ximg, x, yp) == bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
754 && XGetPixel (ximg, x, ym) == bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
755 && XGetPixel (ximg, xp, y) == bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
756 && XGetPixel (ximg, xp, yp) == bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
757 && XGetPixel (ximg, xp, ym) == bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
758 && XGetPixel (ximg, xm, y) == bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
759 && XGetPixel (ximg, xm, yp) == bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
760 && XGetPixel (ximg, xm, ym) == bg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
761 XPutPixel (mask_img, x, y, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
762 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
763 XPutPixel (mask_img, x, y, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
764 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
765 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
766 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
767 xassert (interrupt_input_blocked); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
768 gc = XCreateGC (FRAME_X_DISPLAY (f), mask, 0, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
769 XPutImage (FRAME_X_DISPLAY (f), mask, gc, mask_img, 0, 0, 0, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
770 width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
771 XFreeGC (FRAME_X_DISPLAY (f), gc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
772 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
773 dpyinfo->bitmaps[id - 1].have_mask = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
774 dpyinfo->bitmaps[id - 1].mask = mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
775 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
776 XDestroyImage (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
777 x_destroy_x_image (mask_img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
778 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
779 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
780 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
781 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
782 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
783 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
784 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
785 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
786 Image types |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
787 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
788 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
789 /* Value is the number of elements of vector VECTOR. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
790 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
791 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
792 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
793 /* List of supported image types. Use define_image_type to add new |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
794 types. Use lookup_image_type to find a type for a given symbol. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
795 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
796 static struct image_type *image_types; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
797 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
798 /* A list of symbols, one for each supported image type. */ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
799 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
800 Lisp_Object Vimage_types; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
801 |
|
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
802 /* An alist of image types and libraries that implement the type. */ |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
803 |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
804 Lisp_Object Vimage_library_alist; |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
805 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
806 /* Cache for delayed-loading image types. */ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
807 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
808 static Lisp_Object Vimage_type_cache; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
809 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
810 /* The symbol `xbm' which is used as the type symbol for XBM images. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
811 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
812 Lisp_Object Qxbm; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
813 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
814 /* Keywords. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
815 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
816 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile; |
|
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
817 extern Lisp_Object QCdata, QCtype; |
| 54427 | 818 extern Lisp_Object Qcenter; |
|
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
819 Lisp_Object QCascent, QCmargin, QCrelief, Qcount; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
820 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
821 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
822 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
823 /* Other symbols. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
824 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
825 Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
826 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
827 /* Time in seconds after which images should be removed from the cache |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
828 if not displayed. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
829 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
830 Lisp_Object Vimage_cache_eviction_delay; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
831 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
832 /* Function prototypes. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
833 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
834 static Lisp_Object define_image_type P_ ((struct image_type *type, int loaded)); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
835 static struct image_type *lookup_image_type P_ ((Lisp_Object symbol)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
836 static void image_error P_ ((char *format, Lisp_Object, Lisp_Object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
837 static void x_laplace P_ ((struct frame *, struct image *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
838 static void x_emboss P_ ((struct frame *, struct image *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
839 static int x_build_heuristic_mask P_ ((struct frame *, struct image *, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
840 Lisp_Object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
841 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
842 #define CACHE_IMAGE_TYPE(type, status) \ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
843 do { Vimage_type_cache = Fcons (Fcons (type, status), Vimage_type_cache); } while (0) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
844 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
845 #define ADD_IMAGE_TYPE(type) \ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
846 do { Vimage_types = Fcons (type, Vimage_types); } while (0) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
847 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
848 /* Define a new image type from TYPE. This adds a copy of TYPE to |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
849 image_types and caches the loading status of TYPE. */ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
850 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
851 static Lisp_Object |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
852 define_image_type (type, loaded) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
853 struct image_type *type; |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
854 int loaded; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
855 { |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
856 Lisp_Object success; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
857 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
858 if (!loaded) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
859 success = Qnil; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
860 else |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
861 { |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
862 /* Make a copy of TYPE to avoid a bus error in a dumped Emacs. |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
863 The initialized data segment is read-only. */ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
864 struct image_type *p = (struct image_type *) xmalloc (sizeof *p); |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
865 bcopy (type, p, sizeof *p); |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
866 p->next = image_types; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
867 image_types = p; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
868 success = Qt; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
869 } |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
870 |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
871 CACHE_IMAGE_TYPE (*type->type, success); |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
872 return success; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
873 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
874 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
875 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
876 /* Look up image type SYMBOL, and return a pointer to its image_type |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
877 structure. Value is null if SYMBOL is not a known image type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
878 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
879 static INLINE struct image_type * |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
880 lookup_image_type (symbol) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
881 Lisp_Object symbol; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
882 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
883 struct image_type *type; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
884 |
|
56132
56c3ef9caeed
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Miles Bader <miles@gnu.org>
parents:
56104
diff
changeset
|
885 /* We must initialize the image-type if it hasn't been already. */ |
|
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
886 if (NILP (Finit_image_library (symbol, Vimage_library_alist))) |
|
56132
56c3ef9caeed
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Miles Bader <miles@gnu.org>
parents:
56104
diff
changeset
|
887 return 0; /* unimplemented */ |
|
56c3ef9caeed
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Miles Bader <miles@gnu.org>
parents:
56104
diff
changeset
|
888 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
889 for (type = image_types; type; type = type->next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
890 if (EQ (symbol, *type->type)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
891 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
892 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
893 return type; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
894 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
895 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
896 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
897 /* Value is non-zero if OBJECT is a valid Lisp image specification. A |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
898 valid image specification is a list whose car is the symbol |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
899 `image', and whose rest is a property list. The property list must |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
900 contain a value for key `:type'. That value must be the name of a |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
901 supported image type. The rest of the property list depends on the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
902 image type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
903 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
904 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
905 valid_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
906 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
907 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
908 int valid_p = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
909 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
910 if (IMAGEP (object)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
911 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
912 Lisp_Object tem; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
913 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
914 for (tem = XCDR (object); CONSP (tem); tem = XCDR (tem)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
915 if (EQ (XCAR (tem), QCtype)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
916 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
917 tem = XCDR (tem); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
918 if (CONSP (tem) && SYMBOLP (XCAR (tem))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
919 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
920 struct image_type *type; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
921 type = lookup_image_type (XCAR (tem)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
922 if (type) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
923 valid_p = type->valid_p (object); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
924 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
925 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
926 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
927 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
928 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
929 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
930 return valid_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
931 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
932 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
933 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
934 /* Log error message with format string FORMAT and argument ARG. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
935 Signaling an error, e.g. when an image cannot be loaded, is not a |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
936 good idea because this would interrupt redisplay, and the error |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
937 message display would lead to another redisplay. This function |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
938 therefore simply displays a message. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
939 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
940 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
941 image_error (format, arg1, arg2) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
942 char *format; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
943 Lisp_Object arg1, arg2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
944 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
945 add_to_log (format, arg1, arg2); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
946 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
947 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
948 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
949 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
950 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
951 Image specifications |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
952 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
953 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
954 enum image_value_type |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
955 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
956 IMAGE_DONT_CHECK_VALUE_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
957 IMAGE_STRING_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
958 IMAGE_STRING_OR_NIL_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
959 IMAGE_SYMBOL_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
960 IMAGE_POSITIVE_INTEGER_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
961 IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
962 IMAGE_NON_NEGATIVE_INTEGER_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
963 IMAGE_ASCENT_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
964 IMAGE_INTEGER_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
965 IMAGE_FUNCTION_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
966 IMAGE_NUMBER_VALUE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
967 IMAGE_BOOL_VALUE |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
968 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
969 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
970 /* Structure used when parsing image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
971 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
972 struct image_keyword |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
973 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
974 /* Name of keyword. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
975 char *name; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
976 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
977 /* The type of value allowed. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
978 enum image_value_type type; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
979 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
980 /* Non-zero means key must be present. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
981 int mandatory_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
982 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
983 /* Used to recognize duplicate keywords in a property list. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
984 int count; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
985 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
986 /* The value that was found. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
987 Lisp_Object value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
988 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
989 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
990 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
991 static int parse_image_spec P_ ((Lisp_Object, struct image_keyword *, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
992 int, Lisp_Object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
993 static Lisp_Object image_spec_value P_ ((Lisp_Object, Lisp_Object, int *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
994 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
995 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
996 /* Parse image spec SPEC according to KEYWORDS. A valid image spec |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
997 has the format (image KEYWORD VALUE ...). One of the keyword/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
998 value pairs must be `:type TYPE'. KEYWORDS is a vector of |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
999 image_keywords structures of size NKEYWORDS describing other |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1000 allowed keyword/value pairs. Value is non-zero if SPEC is valid. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1001 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1002 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1003 parse_image_spec (spec, keywords, nkeywords, type) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1004 Lisp_Object spec; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1005 struct image_keyword *keywords; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1006 int nkeywords; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1007 Lisp_Object type; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1008 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1009 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1010 Lisp_Object plist; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1011 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1012 if (!IMAGEP (spec)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1013 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1014 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1015 plist = XCDR (spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1016 while (CONSP (plist)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1017 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1018 Lisp_Object key, value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1019 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1020 /* First element of a pair must be a symbol. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1021 key = XCAR (plist); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1022 plist = XCDR (plist); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1023 if (!SYMBOLP (key)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1024 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1025 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1026 /* There must follow a value. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1027 if (!CONSP (plist)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1028 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1029 value = XCAR (plist); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1030 plist = XCDR (plist); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1031 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1032 /* Find key in KEYWORDS. Error if not found. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1033 for (i = 0; i < nkeywords; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1034 if (strcmp (keywords[i].name, SDATA (SYMBOL_NAME (key))) == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1035 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1036 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1037 if (i == nkeywords) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1038 continue; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1039 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1040 /* Record that we recognized the keyword. If a keywords |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1041 was found more than once, it's an error. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1042 keywords[i].value = value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1043 ++keywords[i].count; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1044 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1045 if (keywords[i].count > 1) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1046 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1047 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1048 /* Check type of value against allowed type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1049 switch (keywords[i].type) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1050 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1051 case IMAGE_STRING_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1052 if (!STRINGP (value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1053 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1054 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1055 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1056 case IMAGE_STRING_OR_NIL_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1057 if (!STRINGP (value) && !NILP (value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1058 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1059 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1060 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1061 case IMAGE_SYMBOL_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1062 if (!SYMBOLP (value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1063 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1064 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1065 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1066 case IMAGE_POSITIVE_INTEGER_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1067 if (!INTEGERP (value) || XINT (value) <= 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1068 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1069 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1070 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1071 case IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1072 if (INTEGERP (value) && XINT (value) >= 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1073 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1074 if (CONSP (value) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1075 && INTEGERP (XCAR (value)) && INTEGERP (XCDR (value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1076 && XINT (XCAR (value)) >= 0 && XINT (XCDR (value)) >= 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1077 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1078 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1079 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1080 case IMAGE_ASCENT_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1081 if (SYMBOLP (value) && EQ (value, Qcenter)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1082 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1083 else if (INTEGERP (value) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1084 && XINT (value) >= 0 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1085 && XINT (value) <= 100) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1086 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1087 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1088 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1089 case IMAGE_NON_NEGATIVE_INTEGER_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1090 if (!INTEGERP (value) || XINT (value) < 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1091 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1092 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1093 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1094 case IMAGE_DONT_CHECK_VALUE_TYPE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1095 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1096 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1097 case IMAGE_FUNCTION_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1098 value = indirect_function (value); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1099 if (SUBRP (value) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1100 || COMPILEDP (value) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1101 || (CONSP (value) && EQ (XCAR (value), Qlambda))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1102 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1103 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1104 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1105 case IMAGE_NUMBER_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1106 if (!INTEGERP (value) && !FLOATP (value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1107 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1108 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1109 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1110 case IMAGE_INTEGER_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1111 if (!INTEGERP (value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1112 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1113 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1114 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1115 case IMAGE_BOOL_VALUE: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1116 if (!NILP (value) && !EQ (value, Qt)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1117 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1118 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1119 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1120 default: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1121 abort (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1122 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1123 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1124 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1125 if (EQ (key, QCtype) && !EQ (type, value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1126 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1127 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1128 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1129 /* Check that all mandatory fields are present. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1130 for (i = 0; i < nkeywords; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1131 if (keywords[i].mandatory_p && keywords[i].count == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1132 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1133 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1134 return NILP (plist); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1135 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1136 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1137 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1138 /* Return the value of KEY in image specification SPEC. Value is nil |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1139 if KEY is not present in SPEC. if FOUND is not null, set *FOUND |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1140 to 1 if KEY was found in SPEC, set it to 0 otherwise. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1141 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1142 static Lisp_Object |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1143 image_spec_value (spec, key, found) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1144 Lisp_Object spec, key; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1145 int *found; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1146 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1147 Lisp_Object tail; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1148 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1149 xassert (valid_image_p (spec)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1150 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1151 for (tail = XCDR (spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1152 CONSP (tail) && CONSP (XCDR (tail)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1153 tail = XCDR (XCDR (tail))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1154 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1155 if (EQ (XCAR (tail), key)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1156 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1157 if (found) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1158 *found = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1159 return XCAR (XCDR (tail)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1160 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1161 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1162 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1163 if (found) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1164 *found = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1165 return Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1166 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1167 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1168 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1169 DEFUN ("image-size", Fimage_size, Simage_size, 1, 3, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1170 doc: /* Return the size of image SPEC as pair (WIDTH . HEIGHT). |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1171 PIXELS non-nil means return the size in pixels, otherwise return the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1172 size in canonical character units. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1173 FRAME is the frame on which the image will be displayed. FRAME nil |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1174 or omitted means use the selected frame. */) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1175 (spec, pixels, frame) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1176 Lisp_Object spec, pixels, frame; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1177 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1178 Lisp_Object size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1179 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1180 size = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1181 if (valid_image_p (spec)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1182 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1183 struct frame *f = check_x_frame (frame); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1184 int id = lookup_image (f, spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1185 struct image *img = IMAGE_FROM_ID (f, id); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1186 int width = img->width + 2 * img->hmargin; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1187 int height = img->height + 2 * img->vmargin; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1188 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1189 if (NILP (pixels)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1190 size = Fcons (make_float ((double) width / FRAME_COLUMN_WIDTH (f)), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1191 make_float ((double) height / FRAME_LINE_HEIGHT (f))); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1192 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1193 size = Fcons (make_number (width), make_number (height)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1194 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1195 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1196 error ("Invalid image specification"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1197 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1198 return size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1199 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1200 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1201 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1202 DEFUN ("image-mask-p", Fimage_mask_p, Simage_mask_p, 1, 2, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1203 doc: /* Return t if image SPEC has a mask bitmap. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1204 FRAME is the frame on which the image will be displayed. FRAME nil |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1205 or omitted means use the selected frame. */) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1206 (spec, frame) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1207 Lisp_Object spec, frame; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1208 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1209 Lisp_Object mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1210 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1211 mask = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1212 if (valid_image_p (spec)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1213 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1214 struct frame *f = check_x_frame (frame); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1215 int id = lookup_image (f, spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1216 struct image *img = IMAGE_FROM_ID (f, id); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1217 if (img->mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1218 mask = Qt; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1219 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1220 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1221 error ("Invalid image specification"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1222 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1223 return mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1224 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1225 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1226 DEFUN ("image-extension-data", Fimage_extension_data, Simage_extension_data, 1, 2, 0, |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1227 doc: /* Return extension data for image SPEC. |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1228 FRAME is the frame on which the image will be displayed. FRAME nil |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1229 or omitted means use the selected frame. */) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1230 (spec, frame) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1231 Lisp_Object spec, frame; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1232 { |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1233 Lisp_Object ext; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1234 |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1235 ext = Qnil; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1236 if (valid_image_p (spec)) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1237 { |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1238 struct frame *f = check_x_frame (frame); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1239 int id = lookup_image (f, spec); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1240 struct image *img = IMAGE_FROM_ID (f, id); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1241 ext = img->data.lisp_val; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1242 } |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1243 |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1244 return ext; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1245 } |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1246 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1247 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1248 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1249 Image type independent image structures |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1250 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1251 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1252 static struct image *make_image P_ ((Lisp_Object spec, unsigned hash)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1253 static void free_image P_ ((struct frame *f, struct image *img)); |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1254 static int check_image_size P_ ((struct frame *f, int width, int height)); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1255 |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1256 #define MAX_IMAGE_SIZE 6.0 |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1257 Lisp_Object Vmax_image_size; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1258 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1259 /* Allocate and return a new image structure for image specification |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1260 SPEC. SPEC has a hash value of HASH. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1261 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1262 static struct image * |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1263 make_image (spec, hash) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1264 Lisp_Object spec; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1265 unsigned hash; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1266 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1267 struct image *img = (struct image *) xmalloc (sizeof *img); |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1268 Lisp_Object file = image_spec_value (spec, QCfile, NULL); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1269 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1270 xassert (valid_image_p (spec)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1271 bzero (img, sizeof *img); |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1272 img->dependencies = NILP (file) ? Qnil : list1 (file); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1273 img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1274 xassert (img->type != NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1275 img->spec = spec; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1276 img->data.lisp_val = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1277 img->ascent = DEFAULT_IMAGE_ASCENT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1278 img->hash = hash; |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1279 img->corners[BOT_CORNER] = -1; /* Full image */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1280 return img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1281 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1282 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1283 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1284 /* Free image IMG which was used on frame F, including its resources. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1285 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1286 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1287 free_image (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1288 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1289 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1290 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1291 if (img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1292 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1293 struct image_cache *c = FRAME_IMAGE_CACHE (f); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1294 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1295 /* Remove IMG from the hash table of its cache. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1296 if (img->prev) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1297 img->prev->next = img->next; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1298 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1299 c->buckets[img->hash % IMAGE_CACHE_BUCKETS_SIZE] = img->next; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1300 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1301 if (img->next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1302 img->next->prev = img->prev; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1303 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1304 c->images[img->id] = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1305 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1306 /* Free resources, then free IMG. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1307 img->type->free (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1308 xfree (img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1309 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1310 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1311 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1312 /* Return 1 if the given widths and heights are valid for display; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1313 otherwise, return 0. */ |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1314 |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1315 int |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1316 check_image_size (f, width, height) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1317 struct frame *f; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1318 int width; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1319 int height; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1320 { |
|
66208
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1321 int w, h; |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1322 |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1323 if (width <= 0 || height <= 0) |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1324 return 0; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1325 |
|
66208
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1326 if (INTEGERP (Vmax_image_size)) |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1327 w = h = XINT (Vmax_image_size); |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1328 else if (FLOATP (Vmax_image_size)) |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1329 { |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1330 if (f != NULL) |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1331 { |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1332 w = FRAME_PIXEL_WIDTH (f); |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1333 h = FRAME_PIXEL_HEIGHT (f); |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1334 } |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1335 else |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1336 w = h = 1024; /* Arbitrary size for unknown frame. */ |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1337 w = (int) (XFLOAT_DATA (Vmax_image_size) * w); |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1338 h = (int) (XFLOAT_DATA (Vmax_image_size) * h); |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1339 } |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1340 else |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1341 return 1; |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1342 |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1343 return (width <= w && height <= h); |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1344 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1345 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1346 /* Prepare image IMG for display on frame F. Must be called before |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1347 drawing an image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1348 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1349 void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1350 prepare_image_for_display (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1351 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1352 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1353 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1354 EMACS_TIME t; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1355 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1356 /* We're about to display IMG, so set its timestamp to `now'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1357 EMACS_GET_TIME (t); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1358 img->timestamp = EMACS_SECS (t); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1359 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1360 /* If IMG doesn't have a pixmap yet, load it now, using the image |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1361 type dependent loader function. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1362 if (img->pixmap == NO_PIXMAP && !img->load_failed_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1363 img->load_failed_p = img->type->load (f, img) == 0; |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1364 |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1365 #if defined (MAC_OS) && USE_CG_DRAWING |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1366 if (!img->load_failed_p && img->data.ptr_val == NULL) |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1367 { |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1368 img->data.ptr_val = mac_create_cg_image_from_image (f, img); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1369 if (img->data.ptr_val == NULL) |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1370 { |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1371 img->load_failed_p = 1; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1372 img->type->free (f, img); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1373 } |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1374 } |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1375 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1376 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1377 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1378 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1379 /* Value is the number of pixels for the ascent of image IMG when |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1380 drawn in face FACE. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1381 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1382 int |
|
55022
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1383 image_ascent (img, face, slice) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1384 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1385 struct face *face; |
|
55022
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1386 struct glyph_slice *slice; |
|
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1387 { |
|
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1388 int height; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1389 int ascent; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1390 |
|
55022
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1391 if (slice->height == img->height) |
|
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1392 height = img->height + img->vmargin; |
|
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1393 else if (slice->y == 0) |
|
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1394 height = slice->height + img->vmargin; |
|
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1395 else |
|
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1396 height = slice->height; |
|
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1397 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1398 if (img->ascent == CENTERED_IMAGE_ASCENT) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1399 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1400 if (face->font) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1401 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1402 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1403 /* W32 specific version. Why?. ++kfs */ |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
1404 ascent = height / 2 - (FONT_DESCENT (face->font) |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
1405 - FONT_BASE (face->font)) / 2; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1406 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1407 /* This expression is arranged so that if the image can't be |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1408 exactly centered, it will be moved slightly up. This is |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1409 because a typical font is `top-heavy' (due to the presence |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1410 uppercase letters), so the image placement should err towards |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1411 being top-heavy too. It also just generally looks better. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1412 ascent = (height + face->font->ascent - face->font->descent + 1) / 2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1413 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1414 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1415 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1416 ascent = height / 2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1417 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1418 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1419 ascent = (int) (height * img->ascent / 100.0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1420 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1421 return ascent; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1422 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1423 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1424 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1425 /* Image background colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1426 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1427 /* Find the "best" corner color of a bitmap. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1428 On W32, XIMG is assumed to a device context with the bitmap selected. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1429 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1430 static RGB_PIXEL_COLOR |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1431 four_corners_best (ximg, corners, width, height) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1432 XImagePtr_or_DC ximg; |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1433 int *corners; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1434 unsigned long width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1435 { |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1436 RGB_PIXEL_COLOR corner_pixels[4], best; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1437 int i, best_count; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1438 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1439 if (corners && corners[BOT_CORNER] >= 0) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1440 { |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1441 /* Get the colors at the corner_pixels of ximg. */ |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1442 corner_pixels[0] = GET_PIXEL (ximg, corners[LEFT_CORNER], corners[TOP_CORNER]); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1443 corner_pixels[1] = GET_PIXEL (ximg, corners[RIGHT_CORNER] - 1, corners[TOP_CORNER]); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1444 corner_pixels[2] = GET_PIXEL (ximg, corners[RIGHT_CORNER] - 1, corners[BOT_CORNER] - 1); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1445 corner_pixels[3] = GET_PIXEL (ximg, corners[LEFT_CORNER], corners[BOT_CORNER] - 1); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1446 } |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1447 else |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1448 { |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1449 /* Get the colors at the corner_pixels of ximg. */ |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1450 corner_pixels[0] = GET_PIXEL (ximg, 0, 0); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1451 corner_pixels[1] = GET_PIXEL (ximg, width - 1, 0); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1452 corner_pixels[2] = GET_PIXEL (ximg, width - 1, height - 1); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1453 corner_pixels[3] = GET_PIXEL (ximg, 0, height - 1); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1454 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1455 /* Choose the most frequently found color as background. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1456 for (i = best_count = 0; i < 4; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1457 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1458 int j, n; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1459 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1460 for (j = n = 0; j < 4; ++j) |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1461 if (corner_pixels[i] == corner_pixels[j]) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1462 ++n; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1463 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1464 if (n > best_count) |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1465 best = corner_pixels[i], best_count = n; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1466 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1467 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1468 return best; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1469 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1470 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1471 /* Portability macros */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1472 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1473 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1474 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1475 #define Destroy_Image(img_dc, prev) \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1476 do { SelectObject (img_dc, prev); DeleteDC (img_dc); } while (0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1477 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1478 #define Free_Pixmap(display, pixmap) \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1479 DeleteObject (pixmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1480 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1481 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1482 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1483 #define Destroy_Image(ximg, dummy) \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1484 XDestroyImage (ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1485 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1486 #define Free_Pixmap(display, pixmap) \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1487 XFreePixmap (display, pixmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1488 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1489 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1490 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1491 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1492 /* Return the `background' field of IMG. If IMG doesn't have one yet, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1493 it is guessed heuristically. If non-zero, XIMG is an existing |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1494 XImage object (or device context with the image selected on W32) to |
|
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
1495 use for the heuristic. */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1496 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1497 RGB_PIXEL_COLOR |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1498 image_background (img, f, ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1499 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1500 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1501 XImagePtr_or_DC ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1502 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1503 if (! img->background_valid) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1504 /* IMG doesn't have a background yet, try to guess a reasonable value. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1505 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1506 int free_ximg = !ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1507 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1508 HGDIOBJ prev; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1509 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1510 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1511 if (free_ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1512 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1513 #ifndef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1514 ximg = XGetImage (FRAME_X_DISPLAY (f), img->pixmap, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1515 0, 0, img->width, img->height, ~0, ZPixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1516 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1517 HDC frame_dc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1518 ximg = CreateCompatibleDC (frame_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1519 release_frame_dc (f, frame_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1520 prev = SelectObject (ximg, img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1521 #endif /* !HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1522 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1523 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1524 img->background = four_corners_best (ximg, img->corners, img->width, img->height); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1525 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1526 if (free_ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1527 Destroy_Image (ximg, prev); |
|
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
1528 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1529 img->background_valid = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1530 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1531 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1532 return img->background; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1533 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1534 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1535 /* Return the `background_transparent' field of IMG. If IMG doesn't |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1536 have one yet, it is guessed heuristically. If non-zero, MASK is an |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1537 existing XImage object to use for the heuristic. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1538 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1539 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1540 image_background_transparent (img, f, mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1541 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1542 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1543 XImagePtr_or_DC mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1544 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1545 if (! img->background_transparent_valid) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1546 /* IMG doesn't have a background yet, try to guess a reasonable value. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1547 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1548 if (img->mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1549 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1550 int free_mask = !mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1551 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1552 HGDIOBJ prev; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1553 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1554 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1555 if (free_mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1556 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1557 #ifndef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1558 mask = XGetImage (FRAME_X_DISPLAY (f), img->mask, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1559 0, 0, img->width, img->height, ~0, ZPixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1560 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1561 HDC frame_dc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1562 mask = CreateCompatibleDC (frame_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1563 release_frame_dc (f, frame_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1564 prev = SelectObject (mask, img->mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1565 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1566 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1567 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1568 img->background_transparent |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1569 = (four_corners_best (mask, img->corners, img->width, img->height) == PIX_MASK_RETAIN); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1570 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1571 if (free_mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1572 Destroy_Image (mask, prev); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1573 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1574 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1575 img->background_transparent = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1576 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1577 img->background_transparent_valid = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1578 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1579 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1580 return img->background_transparent; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1581 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1582 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1583 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1584 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1585 Helper functions for X image types |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1586 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1587 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1588 static void x_clear_image_1 P_ ((struct frame *, struct image *, int, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1589 int, int)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1590 static void x_clear_image P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1591 static unsigned long x_alloc_image_color P_ ((struct frame *f, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1592 struct image *img, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1593 Lisp_Object color_name, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1594 unsigned long dflt)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1595 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1596 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1597 /* Clear X resources of image IMG on frame F. PIXMAP_P non-zero means |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1598 free the pixmap if any. MASK_P non-zero means clear the mask |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1599 pixmap if any. COLORS_P non-zero means free colors allocated for |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1600 the image, if any. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1601 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1602 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1603 x_clear_image_1 (f, img, pixmap_p, mask_p, colors_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1604 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1605 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1606 int pixmap_p, mask_p, colors_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1607 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1608 if (pixmap_p && img->pixmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1609 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1610 Free_Pixmap (FRAME_X_DISPLAY (f), img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1611 img->pixmap = NO_PIXMAP; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1612 img->background_valid = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1613 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1614 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1615 if (mask_p && img->mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1616 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1617 Free_Pixmap (FRAME_X_DISPLAY (f), img->mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1618 img->mask = NO_PIXMAP; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1619 img->background_transparent_valid = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1620 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1621 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1622 if (colors_p && img->ncolors) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1623 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1624 /* MAC_TODO: color table support. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1625 /* W32_TODO: color table support. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1626 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1627 x_free_colors (f, img->colors, img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1628 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1629 xfree (img->colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1630 img->colors = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1631 img->ncolors = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1632 } |
|
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1633 |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1634 #if defined (MAC_OS) && USE_CG_DRAWING |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1635 if (img->data.ptr_val) |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1636 { |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1637 CGImageRelease (img->data.ptr_val); |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1638 img->data.ptr_val = NULL; |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1639 } |
|
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1640 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1641 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1642 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1643 /* Free X resources of image IMG which is used on frame F. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1644 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1645 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1646 x_clear_image (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1647 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1648 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1649 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1650 BLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1651 x_clear_image_1 (f, img, 1, 1, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1652 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1653 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1654 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1655 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1656 /* Allocate color COLOR_NAME for image IMG on frame F. If color |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1657 cannot be allocated, use DFLT. Add a newly allocated color to |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1658 IMG->colors, so that it can be freed again. Value is the pixel |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1659 color. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1660 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1661 static unsigned long |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1662 x_alloc_image_color (f, img, color_name, dflt) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1663 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1664 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1665 Lisp_Object color_name; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1666 unsigned long dflt; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1667 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1668 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1669 unsigned long result; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1670 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1671 xassert (STRINGP (color_name)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1672 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1673 if (x_defined_color (f, SDATA (color_name), &color, 1)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1674 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1675 /* This isn't called frequently so we get away with simply |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1676 reallocating the color vector to the needed size, here. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1677 ++img->ncolors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1678 img->colors = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1679 (unsigned long *) xrealloc (img->colors, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1680 img->ncolors * sizeof *img->colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1681 img->colors[img->ncolors - 1] = color.pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1682 result = color.pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1683 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1684 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1685 result = dflt; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1686 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1687 return result; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1688 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1689 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1690 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1691 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1692 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1693 Image Cache |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1694 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1695 |
|
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1696 static struct image *search_image_cache P_ ((struct frame *, Lisp_Object, unsigned)); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1697 static void cache_image P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1698 static void postprocess_image P_ ((struct frame *, struct image *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1699 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1700 /* Return a new, initialized image cache that is allocated from the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1701 heap. Call free_image_cache to free an image cache. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1702 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1703 struct image_cache * |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1704 make_image_cache () |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1705 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1706 struct image_cache *c = (struct image_cache *) xmalloc (sizeof *c); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1707 int size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1708 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1709 bzero (c, sizeof *c); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1710 c->size = 50; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1711 c->images = (struct image **) xmalloc (c->size * sizeof *c->images); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1712 size = IMAGE_CACHE_BUCKETS_SIZE * sizeof *c->buckets; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1713 c->buckets = (struct image **) xmalloc (size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1714 bzero (c->buckets, size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1715 return c; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1716 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1717 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1718 |
|
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1719 /* Find an image matching SPEC in the cache, and return it. If no |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1720 image is found, return NULL. */ |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1721 static struct image * |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1722 search_image_cache (f, spec, hash) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1723 struct frame *f; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1724 Lisp_Object spec; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1725 unsigned hash; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1726 { |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1727 struct image *img; |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1728 struct image_cache *c = FRAME_IMAGE_CACHE (f); |
|
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1729 int i = hash % IMAGE_CACHE_BUCKETS_SIZE; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1730 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1731 if (!c) return NULL; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1732 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1733 /* If the image spec does not specify a background color, the cached |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1734 image must have the same background color as the current frame. |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1735 The foreground color must also match, for the sake of monochrome |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1736 images. |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1737 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1738 In fact, we could ignore the foreground color matching condition |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1739 for color images, or if the image spec specifies :foreground; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1740 similarly we could ignore the background color matching condition |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1741 for formats that don't use transparency (such as jpeg), or if the |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1742 image spec specifies :background. However, the extra memory |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1743 usage is probably negligible in practice, so we don't bother. */ |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1744 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1745 for (img = c->buckets[i]; img; img = img->next) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1746 if (img->hash == hash |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1747 && !NILP (Fequal (img->spec, spec)) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1748 && img->frame_foreground == FRAME_FOREGROUND_PIXEL (f) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1749 && img->frame_background == FRAME_BACKGROUND_PIXEL (f)) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1750 break; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1751 return img; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1752 } |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1753 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1754 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1755 /* Search frame F for an image with spec SPEC, and free it. */ |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1756 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1757 static void |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1758 uncache_image (f, spec) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1759 struct frame *f; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1760 Lisp_Object spec; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1761 { |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1762 struct image *img = search_image_cache (f, spec, sxhash (spec, 0)); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1763 if (img) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1764 free_image (f, img); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1765 } |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1766 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1767 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1768 /* Free image cache of frame F. Be aware that X frames share images |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1769 caches. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1770 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1771 void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1772 free_image_cache (f) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1773 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1774 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1775 struct image_cache *c = FRAME_IMAGE_CACHE (f); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1776 if (c) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1777 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1778 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1779 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1780 /* Cache should not be referenced by any frame when freed. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1781 xassert (c->refcount == 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1782 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1783 for (i = 0; i < c->used; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1784 free_image (f, c->images[i]); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1785 xfree (c->images); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1786 xfree (c->buckets); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1787 xfree (c); |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1788 FRAME_IMAGE_CACHE (f) = NULL; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1789 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1790 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1791 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1792 |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1793 /* Clear image cache of frame F. FILTER=t means free all images. |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1794 FILTER=nil means clear only images that haven't been |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1795 displayed for some time. |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1796 Else, only free the images which have FILTER in their `dependencies'. |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1797 Should be called from time to time to reduce the number of loaded images. |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1798 If image-cache-eviction-delay is non-nil, this frees images in the cache |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1799 which weren't displayed for at least that many seconds. */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1800 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1801 void |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1802 clear_image_cache (struct frame *f, Lisp_Object filter) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1803 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1804 struct image_cache *c = FRAME_IMAGE_CACHE (f); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1805 |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1806 if (c && (!NILP (filter) || INTEGERP (Vimage_cache_eviction_delay))) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1807 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1808 EMACS_TIME t; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1809 unsigned long old; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1810 int i, nfreed; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1811 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1812 EMACS_GET_TIME (t); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1813 old = EMACS_SECS (t) - XFASTINT (Vimage_cache_eviction_delay); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1814 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1815 /* Block input so that we won't be interrupted by a SIGIO |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1816 while being in an inconsistent state. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1817 BLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1818 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1819 for (i = nfreed = 0; i < c->used; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1820 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1821 struct image *img = c->images[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1822 if (img != NULL |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1823 && (NILP (filter) ? img->timestamp < old |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1824 : (EQ (Qt, filter) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1825 || !NILP (Fmember (filter, img->dependencies))))) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1826 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1827 free_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1828 ++nfreed; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1829 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1830 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1831 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1832 /* We may be clearing the image cache because, for example, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1833 Emacs was iconified for a longer period of time. In that |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1834 case, current matrices may still contain references to |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1835 images freed above. So, clear these matrices. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1836 if (nfreed) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1837 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1838 Lisp_Object tail, frame; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1839 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1840 FOR_EACH_FRAME (tail, frame) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1841 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1842 struct frame *f = XFRAME (frame); |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1843 if (FRAME_IMAGE_CACHE (f) == c) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1844 clear_current_matrices (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1845 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1846 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1847 ++windows_or_buffers_changed; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1848 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1849 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1850 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1851 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1852 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1853 |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1854 void |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1855 clear_image_caches (Lisp_Object filter) |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1856 { |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1857 /* FIXME: We want to do |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1858 * struct terminal *t; |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1859 * for (t = terminal_list; t; t = t->next_terminal) |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1860 * clear_image_cache (t, filter); */ |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1861 Lisp_Object tail, frame; |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1862 FOR_EACH_FRAME (tail, frame) |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1863 if (FRAME_WINDOW_P (XFRAME (frame))) |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1864 clear_image_cache (XFRAME (frame), filter); |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1865 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1866 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1867 DEFUN ("clear-image-cache", Fclear_image_cache, Sclear_image_cache, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1868 0, 1, 0, |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1869 doc: /* Clear the image cache. |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1870 FILTER nil or a frame means clear all images in the selected frame. |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1871 FILTER t means clear the image caches of all frames. |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1872 Anything else, means only clear those images which refer to FILTER, |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1873 which is then usually a filename. */) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1874 (filter) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1875 Lisp_Object filter; |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1876 { |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1877 if (!(EQ (filter, Qnil) || FRAMEP (filter))) |
|
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1878 clear_image_caches (filter); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1879 else |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1880 clear_image_cache (check_x_frame (filter), Qt); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1881 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1882 return Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1883 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1884 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1885 |
|
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1886 DEFUN ("image-refresh", Fimage_refresh, Simage_refresh, |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1887 1, 2, 0, |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1888 doc: /* Refresh the image with specification SPEC on frame FRAME. |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1889 If SPEC specifies an image file, the displayed image is updated with |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1890 the current contents of that file. |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1891 FRAME nil or omitted means use the selected frame. |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1892 FRAME t means refresh the image on all frames. */) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1893 (spec, frame) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1894 Lisp_Object spec, frame; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1895 { |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1896 if (!valid_image_p (spec)) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1897 error ("Invalid image specification"); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1898 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1899 if (EQ (frame, Qt)) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1900 { |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1901 Lisp_Object tail; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1902 FOR_EACH_FRAME (tail, frame) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1903 { |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1904 struct frame *f = XFRAME (frame); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1905 if (FRAME_WINDOW_P (f)) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1906 uncache_image (f, spec); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1907 } |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1908 } |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1909 else |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1910 uncache_image (check_x_frame (frame), spec); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1911 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1912 return Qnil; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1913 } |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1914 |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1915 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1916 /* Compute masks and transform image IMG on frame F, as specified |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1917 by the image's specification, */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1918 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1919 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1920 postprocess_image (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1921 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1922 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1923 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1924 /* Manipulation of the image's mask. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1925 if (img->pixmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1926 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1927 Lisp_Object conversion, spec; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1928 Lisp_Object mask; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1929 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1930 spec = img->spec; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1931 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1932 /* `:heuristic-mask t' |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1933 `:mask heuristic' |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1934 means build a mask heuristically. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1935 `:heuristic-mask (R G B)' |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1936 `:mask (heuristic (R G B))' |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1937 means build a mask from color (R G B) in the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1938 image. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1939 `:mask nil' |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1940 means remove a mask, if any. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1941 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1942 mask = image_spec_value (spec, QCheuristic_mask, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1943 if (!NILP (mask)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1944 x_build_heuristic_mask (f, img, mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1945 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1946 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1947 int found_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1948 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1949 mask = image_spec_value (spec, QCmask, &found_p); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1950 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1951 if (EQ (mask, Qheuristic)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1952 x_build_heuristic_mask (f, img, Qt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1953 else if (CONSP (mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1954 && EQ (XCAR (mask), Qheuristic)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1955 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1956 if (CONSP (XCDR (mask))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1957 x_build_heuristic_mask (f, img, XCAR (XCDR (mask))); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1958 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1959 x_build_heuristic_mask (f, img, XCDR (mask)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1960 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1961 else if (NILP (mask) && found_p && img->mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1962 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1963 Free_Pixmap (FRAME_X_DISPLAY (f), img->mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1964 img->mask = NO_PIXMAP; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1965 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1966 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1967 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1968 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1969 /* Should we apply an image transformation algorithm? */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1970 conversion = image_spec_value (spec, QCconversion, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1971 if (EQ (conversion, Qdisabled)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1972 x_disable_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1973 else if (EQ (conversion, Qlaplace)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1974 x_laplace (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1975 else if (EQ (conversion, Qemboss)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1976 x_emboss (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1977 else if (CONSP (conversion) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1978 && EQ (XCAR (conversion), Qedge_detection)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1979 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1980 Lisp_Object tem; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1981 tem = XCDR (conversion); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1982 if (CONSP (tem)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1983 x_edge_detection (f, img, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1984 Fplist_get (tem, QCmatrix), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1985 Fplist_get (tem, QCcolor_adjustment)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1986 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1987 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1988 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1989 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1990 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1991 /* Return the id of image with Lisp specification SPEC on frame F. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1992 SPEC must be a valid Lisp image specification (see valid_image_p). */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1993 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1994 int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1995 lookup_image (f, spec) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1996 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1997 Lisp_Object spec; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1998 { |
|
83436
f67e432d150c
Fix crash in lookup_image on termcap frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
67785
diff
changeset
|
1999 struct image_cache *c; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2000 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2001 unsigned hash; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2002 struct gcpro gcpro1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2003 EMACS_TIME now; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2004 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2005 /* F must be a window-system frame, and SPEC must be a valid image |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2006 specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2007 xassert (FRAME_WINDOW_P (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2008 xassert (valid_image_p (spec)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2009 |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2010 c = FRAME_IMAGE_CACHE (f); |
|
83436
f67e432d150c
Fix crash in lookup_image on termcap frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
67785
diff
changeset
|
2011 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2012 GCPRO1 (spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2013 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2014 /* Look up SPEC in the hash table of the image cache. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2015 hash = sxhash (spec, 0); |
|
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
2016 img = search_image_cache (f, spec, hash); |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2017 if (img && img->load_failed_p) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2018 { |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2019 free_image (f, img); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2020 img = NULL; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2021 } |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2022 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2023 /* If not found, create a new image and cache it. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2024 if (img == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2025 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2026 extern Lisp_Object Qpostscript; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2027 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2028 BLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2029 img = make_image (spec, hash); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2030 cache_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2031 img->load_failed_p = img->type->load (f, img) == 0; |
|
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
2032 img->frame_foreground = FRAME_FOREGROUND_PIXEL (f); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
2033 img->frame_background = FRAME_BACKGROUND_PIXEL (f); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2034 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2035 /* If we can't load the image, and we don't have a width and |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2036 height, use some arbitrary width and height so that we can |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2037 draw a rectangle for it. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2038 if (img->load_failed_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2039 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2040 Lisp_Object value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2041 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2042 value = image_spec_value (spec, QCwidth, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2043 img->width = (INTEGERP (value) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2044 ? XFASTINT (value) : DEFAULT_IMAGE_WIDTH); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2045 value = image_spec_value (spec, QCheight, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2046 img->height = (INTEGERP (value) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2047 ? XFASTINT (value) : DEFAULT_IMAGE_HEIGHT); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2048 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2049 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2050 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2051 /* Handle image type independent image attributes |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2052 `:ascent ASCENT', `:margin MARGIN', `:relief RELIEF', |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2053 `:background COLOR'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2054 Lisp_Object ascent, margin, relief, bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2055 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2056 ascent = image_spec_value (spec, QCascent, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2057 if (INTEGERP (ascent)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2058 img->ascent = XFASTINT (ascent); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2059 else if (EQ (ascent, Qcenter)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2060 img->ascent = CENTERED_IMAGE_ASCENT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2061 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2062 margin = image_spec_value (spec, QCmargin, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2063 if (INTEGERP (margin) && XINT (margin) >= 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2064 img->vmargin = img->hmargin = XFASTINT (margin); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2065 else if (CONSP (margin) && INTEGERP (XCAR (margin)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2066 && INTEGERP (XCDR (margin))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2067 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2068 if (XINT (XCAR (margin)) > 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2069 img->hmargin = XFASTINT (XCAR (margin)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2070 if (XINT (XCDR (margin)) > 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2071 img->vmargin = XFASTINT (XCDR (margin)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2072 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2073 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2074 relief = image_spec_value (spec, QCrelief, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2075 if (INTEGERP (relief)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2076 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2077 img->relief = XINT (relief); |
| 85254 | 2078 img->hmargin += eabs (img->relief); |
| 2079 img->vmargin += eabs (img->relief); | |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2080 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2081 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2082 if (! img->background_valid) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2083 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2084 bg = image_spec_value (img->spec, QCbackground, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2085 if (!NILP (bg)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2086 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2087 img->background |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2088 = x_alloc_image_color (f, img, bg, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2089 FRAME_BACKGROUND_PIXEL (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2090 img->background_valid = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2091 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2092 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2093 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2094 /* Do image transformations and compute masks, unless we |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2095 don't have the image yet. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2096 if (!EQ (*img->type->type, Qpostscript)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2097 postprocess_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2098 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2099 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2100 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2101 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2102 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2103 /* We're using IMG, so set its timestamp to `now'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2104 EMACS_GET_TIME (now); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2105 img->timestamp = EMACS_SECS (now); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2106 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2107 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2108 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2109 /* Value is the image id. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2110 return img->id; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2111 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2112 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2113 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2114 /* Cache image IMG in the image cache of frame F. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2115 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2116 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2117 cache_image (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2118 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2119 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2120 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2121 struct image_cache *c = FRAME_IMAGE_CACHE (f); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2122 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2123 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2124 /* Find a free slot in c->images. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2125 for (i = 0; i < c->used; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2126 if (c->images[i] == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2127 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2128 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2129 /* If no free slot found, maybe enlarge c->images. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2130 if (i == c->used && c->used == c->size) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2131 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2132 c->size *= 2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2133 c->images = (struct image **) xrealloc (c->images, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2134 c->size * sizeof *c->images); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2135 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2136 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2137 /* Add IMG to c->images, and assign IMG an id. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2138 c->images[i] = img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2139 img->id = i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2140 if (i == c->used) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2141 ++c->used; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2142 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2143 /* Add IMG to the cache's hash table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2144 i = img->hash % IMAGE_CACHE_BUCKETS_SIZE; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2145 img->next = c->buckets[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2146 if (img->next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2147 img->next->prev = img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2148 img->prev = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2149 c->buckets[i] = img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2150 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2151 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2152 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2153 /* Call FN on every image in the image cache of frame F. Used to mark |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2154 Lisp Objects in the image cache. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2155 |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2156 /* Mark Lisp objects in image IMG. */ |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2157 |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2158 static void |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2159 mark_image (img) |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2160 struct image *img; |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2161 { |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2162 mark_object (img->spec); |
|
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
2163 mark_object (img->dependencies); |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2164 |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2165 if (!NILP (img->data.lisp_val)) |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2166 mark_object (img->data.lisp_val); |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2167 } |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2168 |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2169 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2170 void |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2171 mark_image_cache (struct image_cache *c) |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2172 { |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2173 if (c) |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2174 { |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2175 int i; |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2176 for (i = 0; i < c->used; ++i) |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2177 if (c->images[i]) |
|
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2178 mark_image (c->images[i]); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2179 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2180 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2181 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2182 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2183 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2184 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2185 X / MAC / W32 support code |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2186 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2187 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2188 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2189 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2190 /* Macro for defining functions that will be loaded from image DLLs. */ |
|
62561
a8d780395b8f
(lookup_image, png_read_from_memory): Remove hacks (and misleading comments).
Juanma Barranquero <lekktu@gmail.com>
parents:
62216
diff
changeset
|
2191 #define DEF_IMGLIB_FN(func) int (FAR CDECL *fn_##func)() |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2192 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2193 /* Macro for loading those image functions from the library. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2194 #define LOAD_IMGLIB_FN(lib,func) { \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2195 fn_##func = (void *) GetProcAddress (lib, #func); \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2196 if (!fn_##func) return 0; \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2197 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2198 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2199 /* Load a DLL implementing an image type. |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2200 The `image-library-alist' variable associates a symbol, |
|
82820
2f1e57a528f0
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
82795
diff
changeset
|
2201 identifying an image type, to a list of possible filenames. |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2202 The function returns NULL if no library could be loaded for |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2203 the given image type, or if the library was previously loaded; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2204 else the handle of the DLL. */ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2205 static HMODULE |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2206 w32_delayed_load (Lisp_Object libraries, Lisp_Object type) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2207 { |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2208 HMODULE library = NULL; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2209 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2210 if (CONSP (libraries) && NILP (Fassq (type, Vimage_type_cache))) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2211 { |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2212 Lisp_Object dlls = Fassq (type, libraries); |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2213 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2214 if (CONSP (dlls)) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2215 for (dlls = XCDR (dlls); CONSP (dlls); dlls = XCDR (dlls)) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2216 { |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2217 CHECK_STRING_CAR (dlls); |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2218 if (library = LoadLibrary (SDATA (XCAR (dlls)))) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2219 break; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2220 } |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2221 } |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2222 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2223 return library; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2224 } |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2225 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2226 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2227 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2228 static int x_create_x_image_and_pixmap P_ ((struct frame *, int, int, int, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2229 XImagePtr *, Pixmap *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2230 static void x_destroy_x_image P_ ((XImagePtr)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2231 static void x_put_x_image P_ ((struct frame *, XImagePtr, Pixmap, int, int)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2232 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2233 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2234 /* Create an XImage and a pixmap of size WIDTH x HEIGHT for use on |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2235 frame F. Set *XIMG and *PIXMAP to the XImage and Pixmap created. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2236 Set (*XIMG)->data to a raster of WIDTH x HEIGHT pixels allocated |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2237 via xmalloc. Print error messages via image_error if an error |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2238 occurs. Value is non-zero if successful. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2239 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2240 On W32, a DEPTH of zero signifies a 24 bit image, otherwise DEPTH |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2241 should indicate the bit depth of the image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2242 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2243 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2244 x_create_x_image_and_pixmap (f, width, height, depth, ximg, pixmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2245 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2246 int width, height, depth; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2247 XImagePtr *ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2248 Pixmap *pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2249 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2250 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2251 Display *display = FRAME_X_DISPLAY (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2252 Window window = FRAME_X_WINDOW (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2253 Screen *screen = FRAME_X_SCREEN (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2254 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2255 xassert (interrupt_input_blocked); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2256 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2257 if (depth <= 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2258 depth = DefaultDepthOfScreen (screen); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2259 *ximg = XCreateImage (display, DefaultVisualOfScreen (screen), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2260 depth, ZPixmap, 0, NULL, width, height, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2261 depth > 16 ? 32 : depth > 8 ? 16 : 8, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2262 if (*ximg == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2263 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2264 image_error ("Unable to allocate X image", Qnil, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2265 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2266 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2267 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2268 /* Allocate image raster. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2269 (*ximg)->data = (char *) xmalloc ((*ximg)->bytes_per_line * height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2270 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2271 /* Allocate a pixmap of the same size. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2272 *pixmap = XCreatePixmap (display, window, width, height, depth); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2273 if (*pixmap == NO_PIXMAP) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2274 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2275 x_destroy_x_image (*ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2276 *ximg = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2277 image_error ("Unable to create X pixmap", Qnil, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2278 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2279 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2280 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2281 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2282 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2283 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2284 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2285 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2286 BITMAPINFOHEADER *header; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2287 HDC hdc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2288 int scanline_width_bits; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2289 int remainder; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2290 int palette_colors = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2291 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2292 if (depth == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2293 depth = 24; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2294 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2295 if (depth != 1 && depth != 4 && depth != 8 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2296 && depth != 16 && depth != 24 && depth != 32) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2297 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2298 image_error ("Invalid image bit depth specified", Qnil, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2299 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2300 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2301 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2302 scanline_width_bits = width * depth; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2303 remainder = scanline_width_bits % 32; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2304 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2305 if (remainder) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2306 scanline_width_bits += 32 - remainder; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2307 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2308 /* Bitmaps with a depth less than 16 need a palette. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2309 /* BITMAPINFO structure already contains the first RGBQUAD. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2310 if (depth < 16) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2311 palette_colors = 1 << depth - 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2312 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2313 *ximg = xmalloc (sizeof (XImage) + palette_colors * sizeof (RGBQUAD)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2314 if (*ximg == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2315 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2316 image_error ("Unable to allocate memory for XImage", Qnil, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2317 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2318 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2319 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2320 header = &((*ximg)->info.bmiHeader); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2321 bzero (&((*ximg)->info), sizeof (BITMAPINFO)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2322 header->biSize = sizeof (*header); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2323 header->biWidth = width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2324 header->biHeight = -height; /* negative indicates a top-down bitmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2325 header->biPlanes = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2326 header->biBitCount = depth; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2327 header->biCompression = BI_RGB; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2328 header->biClrUsed = palette_colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2329 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2330 /* TODO: fill in palette. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2331 if (depth == 1) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2332 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2333 (*ximg)->info.bmiColors[0].rgbBlue = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2334 (*ximg)->info.bmiColors[0].rgbGreen = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2335 (*ximg)->info.bmiColors[0].rgbRed = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2336 (*ximg)->info.bmiColors[0].rgbReserved = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2337 (*ximg)->info.bmiColors[1].rgbBlue = 255; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2338 (*ximg)->info.bmiColors[1].rgbGreen = 255; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2339 (*ximg)->info.bmiColors[1].rgbRed = 255; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2340 (*ximg)->info.bmiColors[1].rgbReserved = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2341 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2342 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2343 hdc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2344 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2345 /* Create a DIBSection and raster array for the bitmap, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2346 and store its handle in *pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2347 *pixmap = CreateDIBSection (hdc, &((*ximg)->info), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2348 (depth < 16) ? DIB_PAL_COLORS : DIB_RGB_COLORS, |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
2349 /* casting avoids a GCC warning */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
2350 (void **)&((*ximg)->data), NULL, 0); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2351 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2352 /* Realize display palette and garbage all frames. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2353 release_frame_dc (f, hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2354 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2355 if (*pixmap == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2356 { |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
2357 DWORD err = GetLastError (); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2358 Lisp_Object errcode; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2359 /* All system errors are < 10000, so the following is safe. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2360 XSETINT (errcode, (int) err); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2361 image_error ("Unable to create bitmap, error code %d", errcode, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2362 x_destroy_x_image (*ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2363 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2364 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2365 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2366 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2367 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2368 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2369 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2370 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2371 Display *display = FRAME_X_DISPLAY (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2372 Window window = FRAME_X_WINDOW (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2373 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2374 xassert (interrupt_input_blocked); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2375 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2376 /* Allocate a pixmap of the same size. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2377 *pixmap = XCreatePixmap (display, window, width, height, depth); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2378 if (*pixmap == NO_PIXMAP) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2379 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2380 *ximg = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2381 image_error ("Unable to create X pixmap", Qnil, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2382 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2383 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2384 |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2385 #if !USE_MAC_IMAGE_IO |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2386 LockPixels (GetGWorldPixMap (*pixmap)); |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2387 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2388 *ximg = *pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2389 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2390 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2391 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2392 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2393 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2394 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2395 /* Destroy XImage XIMG. Free XIMG->data. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2396 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2397 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2398 x_destroy_x_image (ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2399 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2400 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2401 xassert (interrupt_input_blocked); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2402 if (ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2403 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2404 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2405 xfree (ximg->data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2406 ximg->data = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2407 XDestroyImage (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2408 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2409 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2410 /* Data will be freed by DestroyObject. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2411 ximg->data = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2412 xfree (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2413 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2414 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2415 XDestroyImage (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2416 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2417 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2418 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2419 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2420 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2421 /* Put XImage XIMG into pixmap PIXMAP on frame F. WIDTH and HEIGHT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2422 are width and height of both the image and pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2423 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2424 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2425 x_put_x_image (f, ximg, pixmap, width, height) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2426 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2427 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2428 Pixmap pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2429 int width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2430 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2431 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2432 GC gc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2433 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2434 xassert (interrupt_input_blocked); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2435 gc = XCreateGC (FRAME_X_DISPLAY (f), pixmap, 0, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2436 XPutImage (FRAME_X_DISPLAY (f), pixmap, gc, ximg, 0, 0, 0, 0, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2437 XFreeGC (FRAME_X_DISPLAY (f), gc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2438 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2439 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2440 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2441 #if 0 /* I don't think this is necessary looking at where it is used. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2442 HDC hdc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2443 SetDIBits (hdc, pixmap, 0, height, ximg->data, &(ximg->info), DIB_RGB_COLORS); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2444 release_frame_dc (f, hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2445 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2446 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2447 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2448 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2449 xassert (ximg == pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2450 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2451 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2452 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2453 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2454 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2455 File Handling |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2456 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2457 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2458 static unsigned char *slurp_file P_ ((char *, int *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2459 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2460 |
|
82736
ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents:
82518
diff
changeset
|
2461 /* Find image file FILE. Look in data-directory/images, then |
|
69771
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2462 x-bitmap-file-path. Value is the encoded full name of the file |
|
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2463 found, or nil if not found. */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2464 |
|
54391
138155b7215e
(x_find_image_file): Make extern.
Kim F. Storm <storm@cua.dk>
parents:
54363
diff
changeset
|
2465 Lisp_Object |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2466 x_find_image_file (file) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2467 Lisp_Object file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2468 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2469 Lisp_Object file_found, search_path; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2470 struct gcpro gcpro1, gcpro2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2471 int fd; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2472 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2473 file_found = Qnil; |
|
82736
ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents:
82518
diff
changeset
|
2474 /* TODO I think this should use something like image-load-path |
|
ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents:
82518
diff
changeset
|
2475 instead. Unfortunately, that can contain non-string elements. */ |
|
ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents:
82518
diff
changeset
|
2476 search_path = Fcons (Fexpand_file_name (build_string ("images"), |
|
ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents:
82518
diff
changeset
|
2477 Vdata_directory), |
|
ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents:
82518
diff
changeset
|
2478 Vx_bitmap_file_path); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2479 GCPRO2 (file_found, search_path); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2480 |
| 83770 | 2481 /* Try to find FILE in data-directory/images, then x-bitmap-file-path. */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2482 fd = openp (search_path, file, Qnil, &file_found, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2483 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2484 if (fd == -1) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2485 file_found = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2486 else |
|
69771
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2487 { |
|
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2488 file_found = ENCODE_FILE (file_found); |
|
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2489 close (fd); |
|
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2490 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2491 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2492 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2493 return file_found; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2494 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2495 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2496 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2497 /* Read FILE into memory. Value is a pointer to a buffer allocated |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2498 with xmalloc holding FILE's contents. Value is null if an error |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2499 occurred. *SIZE is set to the size of the file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2500 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2501 static unsigned char * |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2502 slurp_file (file, size) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2503 char *file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2504 int *size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2505 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2506 FILE *fp = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2507 unsigned char *buf = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2508 struct stat st; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2509 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2510 if (stat (file, &st) == 0 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2511 && (fp = fopen (file, "rb")) != NULL |
|
65764
375ab086d366
* image.c (slurp_file, xbm_read_bitmap_data): Cast to the correct
Dan Nicolaescu <dann@ics.uci.edu>
parents:
65723
diff
changeset
|
2512 && (buf = (unsigned char *) xmalloc (st.st_size), |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2513 fread (buf, 1, st.st_size, fp) == st.st_size)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2514 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2515 *size = st.st_size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2516 fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2517 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2518 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2519 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2520 if (fp) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2521 fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2522 if (buf) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2523 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2524 xfree (buf); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2525 buf = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2526 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2527 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2528 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2529 return buf; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2530 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2531 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2532 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2533 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2534 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2535 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2536 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2537 MAC Image Load Functions |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2538 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2539 |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2540 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2541 static int |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2542 image_load_image_io (f, img, type) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2543 struct frame *f; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2544 struct image *img; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2545 CFStringRef type; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2546 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2547 CFDictionaryRef options, src_props = NULL, props = NULL; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2548 CFStringRef keys[2]; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2549 CFTypeRef values[2]; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2550 Lisp_Object specified_file, specified_data; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2551 CGImageSourceRef source = NULL; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2552 size_t count; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2553 CGImageRef image = NULL; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2554 int loop_count = -1; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2555 double delay_time = -1.0; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2556 int width, height; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2557 XImagePtr ximg = NULL; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2558 CGContextRef context; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2559 CGRect rectangle; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2560 int has_alpha_p, gif_p; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2561 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2562 gif_p = UTTypeEqual (type, kUTTypeGIF); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2563 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2564 keys[0] = kCGImageSourceTypeIdentifierHint; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2565 values[0] = (CFTypeRef) type; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2566 keys[1] = kCGImageSourceShouldCache; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2567 values[1] = (CFTypeRef) kCFBooleanFalse; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2568 options = CFDictionaryCreate (NULL, (const void **) keys, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2569 (const void **) values, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2570 sizeof (keys) / sizeof (keys[0]), |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2571 &kCFTypeDictionaryKeyCallBacks, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2572 &kCFTypeDictionaryValueCallBacks); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2573 if (options == NULL) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2574 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2575 image_error ("Error creating options for image `%s'", img->spec, Qnil); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2576 return 0; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2577 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2578 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2579 /* Open the file. */ |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2580 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2581 specified_data = image_spec_value (img->spec, QCdata, NULL); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2582 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2583 if (NILP (specified_data)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2584 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2585 Lisp_Object file; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2586 CFStringRef path; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2587 CFURLRef url; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2588 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2589 file = x_find_image_file (specified_file); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2590 if (!STRINGP (file)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2591 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2592 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2593 return 0; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2594 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2595 path = cfstring_create_with_utf8_cstring (SDATA (file)); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2596 if (path) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2597 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2598 url = CFURLCreateWithFileSystemPath (NULL, path, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2599 kCFURLPOSIXPathStyle, 0); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2600 CFRelease (path); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2601 if (url) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2602 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2603 source = CGImageSourceCreateWithURL (url, NULL); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2604 CFRelease (url); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2605 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2606 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2607 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2608 else |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2609 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2610 CFDataRef data = CFDataCreate (NULL, SDATA (specified_data), |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2611 SBYTES (specified_data)); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2612 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2613 if (data) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2614 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2615 source = CGImageSourceCreateWithData (data, options); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2616 CFRelease (data); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2617 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2618 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2619 CFRelease (options); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2620 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2621 if (source) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2622 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2623 CFStringRef real_type = CGImageSourceGetType (source); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2624 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2625 if (real_type && UTTypeEqual (type, real_type)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2626 src_props = CGImageSourceCopyProperties (source, NULL); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2627 if (src_props) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2628 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2629 EMACS_INT ino = 0; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2630 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2631 count = CGImageSourceGetCount (source); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2632 if (gif_p) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2633 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2634 Lisp_Object image = image_spec_value (img->spec, QCindex, NULL); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2635 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2636 if (INTEGERP (image)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2637 ino = XFASTINT (image); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2638 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2639 if (ino >= 0 && ino < count) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2640 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2641 props = CGImageSourceCopyPropertiesAtIndex (source, ino, NULL); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2642 if (props) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2643 image = CGImageSourceCreateImageAtIndex (source, ino, NULL); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2644 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2645 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2646 CFRelease (source); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2647 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2648 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2649 if (image == NULL) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2650 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2651 if (src_props) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2652 CFRelease (src_props); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2653 if (props) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2654 CFRelease (props); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2655 image_error ("Error reading image `%s'", img->spec, Qnil); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2656 return 0; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2657 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2658 else |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2659 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2660 CFBooleanRef boolean; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2661 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2662 if (CFDictionaryGetValueIfPresent (props, kCGImagePropertyHasAlpha, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2663 (const void **) &boolean)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2664 has_alpha_p = CFBooleanGetValue (boolean); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2665 if (gif_p) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2666 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2667 CFDictionaryRef dict; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2668 CFNumberRef number; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2669 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2670 dict = CFDictionaryGetValue (src_props, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2671 kCGImagePropertyGIFDictionary); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2672 if (dict |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2673 && CFDictionaryGetValueIfPresent (dict, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2674 kCGImagePropertyGIFLoopCount, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2675 (const void **) &number)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2676 CFNumberGetValue (number, kCFNumberIntType, &loop_count); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2677 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2678 dict = CFDictionaryGetValue (props, kCGImagePropertyGIFDictionary); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2679 if (dict |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2680 && CFDictionaryGetValueIfPresent (dict, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2681 kCGImagePropertyGIFDelayTime, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2682 (const void **) &number)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2683 CFNumberGetValue (number, kCFNumberDoubleType, &delay_time); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2684 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2685 CFRelease (src_props); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2686 CFRelease (props); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2687 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2688 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2689 width = img->width = CGImageGetWidth (image); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2690 height = img->height = CGImageGetHeight (image); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2691 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2692 if (!check_image_size (f, width, height)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2693 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2694 CGImageRelease (image); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2695 image_error ("Invalid image size", Qnil, Qnil); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2696 return 0; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2697 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2698 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2699 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2700 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2701 CGImageRelease (image); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2702 image_error ("Out of memory (%s)", img->spec, Qnil); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2703 return 0; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2704 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2705 rectangle = CGRectMake (0, 0, width, height); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2706 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2707 context = CGBitmapContextCreate (ximg->data, ximg->width, ximg->height, 8, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2708 ximg->bytes_per_line, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2709 mac_cg_color_space_rgb, |
|
80554
831994031d63
[USE_MAC_IMAGE_IO] (image_load_image_io):
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80545
diff
changeset
|
2710 kCGImageAlphaNoneSkipFirst |
|
831994031d63
[USE_MAC_IMAGE_IO] (image_load_image_io):
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80545
diff
changeset
|
2711 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 |
|
831994031d63
[USE_MAC_IMAGE_IO] (image_load_image_io):
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80545
diff
changeset
|
2712 | kCGBitmapByteOrder32Host |
|
831994031d63
[USE_MAC_IMAGE_IO] (image_load_image_io):
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80545
diff
changeset
|
2713 #endif |
|
831994031d63
[USE_MAC_IMAGE_IO] (image_load_image_io):
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80545
diff
changeset
|
2714 ); |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2715 if (has_alpha_p) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2716 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2717 Lisp_Object specified_bg; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2718 XColor color; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2719 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2720 specified_bg = image_spec_value (img->spec, QCbackground, NULL); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2721 if (!STRINGP (specified_bg) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2722 || !mac_defined_color (f, SDATA (specified_bg), &color, 0)) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2723 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2724 color.pixel = FRAME_BACKGROUND_PIXEL (f); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2725 color.red = RED16_FROM_ULONG (color.pixel); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2726 color.green = GREEN16_FROM_ULONG (color.pixel); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2727 color.blue = BLUE16_FROM_ULONG (color.pixel); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2728 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2729 CGContextSetRGBFillColor (context, color.red / 65535.0, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2730 color.green / 65535.0, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2731 color.blue / 65535.0, 1.0); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2732 CGContextFillRect (context, rectangle); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2733 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2734 CGContextDrawImage (context, rectangle, image); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2735 CGContextRelease (context); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2736 CGImageRelease (image); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2737 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2738 /* Save GIF image extension data for `image-extension-data'. |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2739 Format is (count IMAGES |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2740 0xff "NETSCAPE2.0" 0x00 DATA_SUB_BLOCK_FOR_LOOP_COUNT |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2741 0xf9 GRAPHIC_CONTROL_EXTENSION_BLOCK). */ |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2742 if (gif_p) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2743 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2744 img->data.lisp_val = Qnil; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2745 if (delay_time >= 0) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2746 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2747 Lisp_Object gce = make_uninit_string (4); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2748 int centisec = delay_time * 100.0 + 0.5; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2749 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2750 /* Fill the delay time field. */ |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2751 SSET (gce, 1, centisec & 0xff); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2752 SSET (gce, 2, (centisec >> 8) & 0xff); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2753 /* We don't know about other fields. */ |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2754 SSET (gce, 0, 0); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2755 SSET (gce, 3, 0); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2756 img->data.lisp_val = Fcons (make_number (0xf9), |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2757 Fcons (gce, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2758 img->data.lisp_val)); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2759 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2760 if (loop_count >= 0) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2761 { |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2762 Lisp_Object data_sub_block = make_uninit_string (3); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2763 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2764 SSET (data_sub_block, 0, 0x01); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2765 SSET (data_sub_block, 1, loop_count & 0xff); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2766 SSET (data_sub_block, 2, (loop_count >> 8) & 0xff); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2767 img->data.lisp_val = Fcons (make_number (0), |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2768 Fcons (data_sub_block, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2769 img->data.lisp_val)); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2770 img->data.lisp_val = Fcons (make_number (0xff), |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2771 Fcons (build_string ("NETSCAPE2.0"), |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2772 img->data.lisp_val)); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2773 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2774 if (count > 1) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2775 img->data.lisp_val = Fcons (Qcount, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2776 Fcons (make_number (count), |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2777 img->data.lisp_val)); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2778 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2779 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2780 /* Maybe fill in the background field while we have ximg handy. */ |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2781 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2782 IMAGE_BACKGROUND (img, f, ximg); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2783 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2784 /* Put the image into the pixmap. */ |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2785 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2786 x_destroy_x_image (ximg); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2787 return 1; |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2788 } |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
2789 #else /* !USE_MAC_IMAGE_IO */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2790 static int image_load_quicktime P_ ((struct frame *, struct image *img, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2791 OSType)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2792 #ifdef MAC_OSX |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2793 static int image_load_quartz2d P_ ((struct frame *, struct image *img, int)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2794 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2795 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2796 static OSErr |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2797 find_image_fsspec (specified_file, file, fss) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2798 Lisp_Object specified_file, *file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2799 FSSpec *fss; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2800 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2801 OSErr err; |
|
67785
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2802 AEDesc desc; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2803 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2804 *file = x_find_image_file (specified_file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2805 if (!STRINGP (*file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2806 return fnfErr; /* file or directory not found; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2807 incomplete pathname */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2808 /* Try to open the image file. */ |
|
67785
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2809 err = AECoercePtr (TYPE_FILE_NAME, SDATA (*file), |
|
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2810 SBYTES (*file), typeFSS, &desc); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2811 if (err == noErr) |
|
67785
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2812 { |
|
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2813 #if TARGET_API_MAC_CARBON |
|
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2814 err = AEGetDescData (&desc, fss, sizeof (FSSpec)); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2815 #else |
|
67785
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2816 *fss = *(FSSpec *)(*(desc.dataHandle)); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2817 #endif |
|
67785
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2818 AEDisposeDesc (&desc); |
|
9574f135f272
[MAC_OS] (find_image_fsspec): Use coercion of Apple event data for
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
67454
diff
changeset
|
2819 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2820 return err; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2821 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2822 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2823 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2824 image_load_qt_1 (f, img, type, fss, dh) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2825 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2826 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2827 OSType type; |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
2828 const FSSpec *fss; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2829 Handle dh; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2830 { |
|
72539
4bfe39423884
[TARGET_API_MAC_CARBON] (image_load_qt_1): Use ComponentResult instead
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70942
diff
changeset
|
2831 ComponentResult err; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2832 GraphicsImportComponent gi; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2833 Rect rect; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2834 int width, height; |
|
66430
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2835 ImageDescriptionHandle desc_handle; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2836 short draw_all_pixels; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2837 Lisp_Object specified_bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2838 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2839 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2840 RGBColor bg_color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2841 |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
2842 err = OpenADefaultComponent (GraphicsImporterComponentType, type, &gi); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2843 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2844 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2845 image_error ("Cannot get importer component for `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2846 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2847 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2848 if (dh == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2849 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2850 /* read from file system spec */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2851 err = GraphicsImportSetDataFile (gi, fss); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2852 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2853 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2854 image_error ("Cannot set fsspec to graphics importer for '%s'", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2855 img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2856 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2857 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2858 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2859 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2860 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2861 /* read from data handle */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2862 err = GraphicsImportSetDataHandle (gi, dh); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2863 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2864 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2865 image_error ("Cannot set data handle to graphics importer for `%s'", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2866 img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2867 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2868 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2869 } |
|
66430
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2870 err = GraphicsImportGetImageDescription (gi, &desc_handle); |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2871 if (err != noErr || desc_handle == NULL) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2872 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2873 image_error ("Error reading `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2874 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2875 } |
|
66430
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2876 width = img->width = (*desc_handle)->width; |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2877 height = img->height = (*desc_handle)->height; |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2878 DisposeHandle ((Handle)desc_handle); |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2879 |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2880 if (!check_image_size (f, width, height)) |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2881 { |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2882 image_error ("Invalid image size", Qnil, Qnil); |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2883 goto error; |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2884 } |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
2885 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2886 err = GraphicsImportDoesDrawAllPixels (gi, &draw_all_pixels); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2887 #if 0 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2888 /* Don't check the error code here. It may have an undocumented |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2889 value -32766. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2890 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2891 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2892 image_error ("Error reading `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2893 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2894 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2895 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2896 if (draw_all_pixels != graphicsImporterDrawsAllPixels) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2897 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2898 specified_bg = image_spec_value (img->spec, QCbackground, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2899 if (!STRINGP (specified_bg) || |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2900 !mac_defined_color (f, SDATA (specified_bg), &color, 0)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2901 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2902 color.pixel = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2903 color.red = RED16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2904 color.green = GREEN16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2905 color.blue = BLUE16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2906 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2907 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2908 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2909 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2910 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2911 if (draw_all_pixels != graphicsImporterDrawsAllPixels) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2912 { |
|
55412
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
2913 CGrafPtr old_port; |
|
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
2914 GDHandle old_gdh; |
|
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
2915 |
|
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
2916 GetGWorld (&old_port, &old_gdh); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2917 SetGWorld (ximg, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2918 bg_color.red = color.red; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2919 bg_color.green = color.green; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2920 bg_color.blue = color.blue; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2921 RGBBackColor (&bg_color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2922 #if TARGET_API_MAC_CARBON |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2923 GetPortBounds (ximg, &rect); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2924 EraseRect (&rect); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2925 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2926 EraseRect (&(ximg->portRect)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2927 #endif |
|
55412
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
2928 SetGWorld (old_port, old_gdh); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2929 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2930 GraphicsImportSetGWorld (gi, ximg, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2931 GraphicsImportDraw (gi); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2932 CloseComponent (gi); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2933 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2934 /* Maybe fill in the background field while we have ximg handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2935 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2936 IMAGE_BACKGROUND (img, f, ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2937 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2938 /* Put the image into the pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2939 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2940 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2941 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2942 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2943 error: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2944 CloseComponent (gi); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2945 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2946 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2947 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2948 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2949 /* Load an image using the QuickTime Graphics Importer. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2950 Note: The alpha channel does not work for PNG images. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2951 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2952 image_load_quicktime (f, img, type) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2953 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2954 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2955 OSType type; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2956 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2957 Lisp_Object specified_file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2958 Lisp_Object specified_data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2959 OSErr err; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2960 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2961 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2962 specified_data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2963 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2964 if (NILP (specified_data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2965 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2966 /* Read from a file */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2967 Lisp_Object file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2968 FSSpec fss; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2969 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2970 err = find_image_fsspec (specified_file, &file, &fss); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2971 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2972 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2973 if (err == fnfErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2974 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2975 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2976 image_error ("Cannot open `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2977 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2978 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2979 return image_load_qt_1 (f, img, type, &fss, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2980 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2981 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2982 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2983 /* Memory source! */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2984 int success_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2985 Handle dh; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2986 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2987 err = PtrToHand (SDATA (specified_data), &dh, SBYTES (specified_data)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2988 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2989 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2990 image_error ("Cannot allocate data handle for `%s'", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2991 img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2992 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2993 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2994 success_p = image_load_qt_1 (f, img, type, NULL, dh); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2995 DisposeHandle (dh); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2996 return success_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2997 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2998 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2999 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3000 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3001 #ifdef MAC_OSX |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3002 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3003 image_load_quartz2d (f, img, png_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3004 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3005 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3006 int png_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3007 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3008 Lisp_Object file, specified_file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3009 Lisp_Object specified_data, specified_bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3010 struct gcpro gcpro1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3011 CGDataProviderRef source; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3012 CGImageRef image; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3013 int width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3014 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3015 XImagePtr ximg = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3016 CGContextRef context; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3017 CGRect rectangle; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3018 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3019 /* Open the file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3020 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3021 specified_data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3022 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3023 file = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3024 GCPRO1 (file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3025 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3026 if (NILP (specified_data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3027 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3028 CFStringRef path; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3029 CFURLRef url; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3030 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3031 file = x_find_image_file (specified_file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3032 if (!STRINGP (file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3033 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3034 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3035 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3036 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3037 } |
|
70431
7c25b386a4c3
(Qduration) [MAC_OS]: New variable.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70168
diff
changeset
|
3038 path = cfstring_create_with_utf8_cstring (SDATA (file)); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3039 url = CFURLCreateWithFileSystemPath (NULL, path, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3040 kCFURLPOSIXPathStyle, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3041 CFRelease (path); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3042 source = CGDataProviderCreateWithURL (url); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3043 CFRelease (url); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3044 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3045 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3046 source = CGDataProviderCreateWithData (NULL, SDATA (specified_data), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3047 SBYTES (specified_data), NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3048 |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
3049 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3050 if (png_p) |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
3051 image = CGImageCreateWithPNGDataProvider (source, NULL, false, |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
3052 kCGRenderingIntentDefault); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3053 else |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
3054 #endif |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
3055 image = CGImageCreateWithJPEGDataProvider (source, NULL, false, |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3056 kCGRenderingIntentDefault); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3057 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3058 CGDataProviderRelease (source); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3059 if (image == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3060 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3061 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3062 image_error ("Error reading image `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3063 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3064 } |
|
66430
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3065 width = img->width = CGImageGetWidth (image); |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3066 height = img->height = CGImageGetHeight (image); |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3067 |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3068 if (!check_image_size (f, width, height)) |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3069 { |
|
66762
7929133d8782
[MAC_OSX] (image_load_quartz2d): Fix memory leak.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66430
diff
changeset
|
3070 CGImageRelease (image); |
|
66430
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3071 UNGCPRO; |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3072 image_error ("Invalid image size", Qnil, Qnil); |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3073 return 0; |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3074 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3075 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3076 if (png_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3077 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3078 specified_bg = image_spec_value (img->spec, QCbackground, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3079 if (!STRINGP (specified_bg) || |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3080 !mac_defined_color (f, SDATA (specified_bg), &color, 0)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3081 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3082 color.pixel = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3083 color.red = RED16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3084 color.green = GREEN16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3085 color.blue = BLUE16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3086 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3087 } |
|
66430
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
3088 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3089 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3090 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3091 CGImageRelease (image); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3092 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3093 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3094 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3095 rectangle = CGRectMake (0, 0, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3096 QDBeginCGContext (ximg, &context); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3097 if (png_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3098 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3099 CGContextSetRGBFillColor (context, color.red / 65535.0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3100 color.green / 65535.0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3101 color.blue / 65535.0, 1.0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3102 CGContextFillRect (context, rectangle); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3103 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3104 CGContextDrawImage (context, rectangle, image); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3105 QDEndCGContext (ximg, &context); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3106 CGImageRelease (image); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3107 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3108 /* Maybe fill in the background field while we have ximg handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3109 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3110 IMAGE_BACKGROUND (img, f, ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3111 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3112 /* Put the image into the pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3113 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3114 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3115 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3116 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3117 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3118 #endif |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
3119 #endif /* !USE_MAC_IMAGE_IO */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3120 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3121 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3122 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3123 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3124 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3125 XBM images |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3126 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3127 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3128 static int xbm_scan P_ ((unsigned char **, unsigned char *, char *, int *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3129 static int xbm_load P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3130 static int xbm_load_image P_ ((struct frame *f, struct image *img, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3131 unsigned char *, unsigned char *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3132 static int xbm_image_p P_ ((Lisp_Object object)); |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
3133 static int xbm_read_bitmap_data P_ ((struct frame *f, |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
3134 unsigned char *, unsigned char *, |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3135 int *, int *, unsigned char **)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3136 static int xbm_file_p P_ ((Lisp_Object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3137 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3138 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3139 /* Indices of image specification fields in xbm_format, below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3140 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3141 enum xbm_keyword_index |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3142 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3143 XBM_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3144 XBM_FILE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3145 XBM_WIDTH, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3146 XBM_HEIGHT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3147 XBM_DATA, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3148 XBM_FOREGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3149 XBM_BACKGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3150 XBM_ASCENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3151 XBM_MARGIN, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3152 XBM_RELIEF, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3153 XBM_ALGORITHM, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3154 XBM_HEURISTIC_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3155 XBM_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3156 XBM_LAST |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3157 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3158 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3159 /* Vector of image_keyword structures describing the format |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3160 of valid XBM image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3161 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3162 static struct image_keyword xbm_format[XBM_LAST] = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3163 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3164 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3165 {":file", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3166 {":width", IMAGE_POSITIVE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3167 {":height", IMAGE_POSITIVE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3168 {":data", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3169 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3170 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3171 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3172 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3173 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3174 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3175 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3176 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0} |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3177 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3178 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3179 /* Structure describing the image type XBM. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3180 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3181 static struct image_type xbm_type = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3182 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3183 &Qxbm, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3184 xbm_image_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3185 xbm_load, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3186 x_clear_image, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3187 NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3188 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3189 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3190 /* Tokens returned from xbm_scan. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3191 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3192 enum xbm_token |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3193 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3194 XBM_TK_IDENT = 256, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3195 XBM_TK_NUMBER |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3196 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3197 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3198 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3199 /* Return non-zero if OBJECT is a valid XBM-type image specification. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3200 A valid specification is a list starting with the symbol `image' |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3201 The rest of the list is a property list which must contain an |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3202 entry `:type xbm.. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3203 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3204 If the specification specifies a file to load, it must contain |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3205 an entry `:file FILENAME' where FILENAME is a string. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3206 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3207 If the specification is for a bitmap loaded from memory it must |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3208 contain `:width WIDTH', `:height HEIGHT', and `:data DATA', where |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3209 WIDTH and HEIGHT are integers > 0. DATA may be: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3210 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3211 1. a string large enough to hold the bitmap data, i.e. it must |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3212 have a size >= (WIDTH + 7) / 8 * HEIGHT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3213 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3214 2. a bool-vector of size >= WIDTH * HEIGHT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3215 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3216 3. a vector of strings or bool-vectors, one for each line of the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3217 bitmap. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3218 |
|
78970
35f78a0b1e30
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78863
diff
changeset
|
3219 4. a string containing an in-memory XBM file. WIDTH and HEIGHT |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3220 may not be specified in this case because they are defined in the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3221 XBM file. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3222 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3223 Both the file and data forms may contain the additional entries |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3224 `:background COLOR' and `:foreground COLOR'. If not present, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3225 foreground and background of the frame on which the image is |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3226 displayed is used. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3227 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3228 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3229 xbm_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3230 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3231 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3232 struct image_keyword kw[XBM_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3233 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3234 bcopy (xbm_format, kw, sizeof kw); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3235 if (!parse_image_spec (object, kw, XBM_LAST, Qxbm)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3236 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3237 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3238 xassert (EQ (kw[XBM_TYPE].value, Qxbm)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3239 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3240 if (kw[XBM_FILE].count) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3241 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3242 if (kw[XBM_WIDTH].count || kw[XBM_HEIGHT].count || kw[XBM_DATA].count) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3243 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3244 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3245 else if (kw[XBM_DATA].count && xbm_file_p (kw[XBM_DATA].value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3246 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3247 /* In-memory XBM file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3248 if (kw[XBM_WIDTH].count || kw[XBM_HEIGHT].count || kw[XBM_FILE].count) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3249 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3250 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3251 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3252 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3253 Lisp_Object data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3254 int width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3255 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3256 /* Entries for `:width', `:height' and `:data' must be present. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3257 if (!kw[XBM_WIDTH].count |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3258 || !kw[XBM_HEIGHT].count |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3259 || !kw[XBM_DATA].count) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3260 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3261 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3262 data = kw[XBM_DATA].value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3263 width = XFASTINT (kw[XBM_WIDTH].value); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3264 height = XFASTINT (kw[XBM_HEIGHT].value); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3265 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3266 /* Check type of data, and width and height against contents of |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3267 data. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3268 if (VECTORP (data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3269 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3270 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3271 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3272 /* Number of elements of the vector must be >= height. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3273 if (XVECTOR (data)->size < height) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3274 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3275 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3276 /* Each string or bool-vector in data must be large enough |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3277 for one line of the image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3278 for (i = 0; i < height; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3279 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3280 Lisp_Object elt = XVECTOR (data)->contents[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3281 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3282 if (STRINGP (elt)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3283 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3284 if (SCHARS (elt) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3285 < (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3286 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3287 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3288 else if (BOOL_VECTOR_P (elt)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3289 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3290 if (XBOOL_VECTOR (elt)->size < width) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3291 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3292 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3293 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3294 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3295 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3296 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3297 else if (STRINGP (data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3298 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3299 if (SCHARS (data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3300 < (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR * height) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3301 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3302 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3303 else if (BOOL_VECTOR_P (data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3304 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3305 if (XBOOL_VECTOR (data)->size < width * height) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3306 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3307 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3308 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3309 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3310 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3311 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3312 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3313 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3314 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3315 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3316 /* Scan a bitmap file. FP is the stream to read from. Value is |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3317 either an enumerator from enum xbm_token, or a character for a |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3318 single-character token, or 0 at end of file. If scanning an |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3319 identifier, store the lexeme of the identifier in SVAL. If |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3320 scanning a number, store its value in *IVAL. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3321 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3322 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3323 xbm_scan (s, end, sval, ival) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3324 unsigned char **s, *end; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3325 char *sval; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3326 int *ival; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3327 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3328 unsigned int c; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3329 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3330 loop: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3331 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3332 /* Skip white space. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3333 while (*s < end && (c = *(*s)++, isspace (c))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3334 ; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3335 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3336 if (*s >= end) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3337 c = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3338 else if (isdigit (c)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3339 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3340 int value = 0, digit; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3341 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3342 if (c == '0' && *s < end) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3343 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3344 c = *(*s)++; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3345 if (c == 'x' || c == 'X') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3346 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3347 while (*s < end) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3348 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3349 c = *(*s)++; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3350 if (isdigit (c)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3351 digit = c - '0'; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3352 else if (c >= 'a' && c <= 'f') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3353 digit = c - 'a' + 10; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3354 else if (c >= 'A' && c <= 'F') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3355 digit = c - 'A' + 10; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3356 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3357 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3358 value = 16 * value + digit; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3359 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3360 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3361 else if (isdigit (c)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3362 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3363 value = c - '0'; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3364 while (*s < end |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3365 && (c = *(*s)++, isdigit (c))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3366 value = 8 * value + c - '0'; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3367 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3368 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3369 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3370 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3371 value = c - '0'; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3372 while (*s < end |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3373 && (c = *(*s)++, isdigit (c))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3374 value = 10 * value + c - '0'; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3375 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3376 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3377 if (*s < end) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3378 *s = *s - 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3379 *ival = value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3380 c = XBM_TK_NUMBER; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3381 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3382 else if (isalpha (c) || c == '_') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3383 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3384 *sval++ = c; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3385 while (*s < end |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3386 && (c = *(*s)++, (isalnum (c) || c == '_'))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3387 *sval++ = c; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3388 *sval = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3389 if (*s < end) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3390 *s = *s - 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3391 c = XBM_TK_IDENT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3392 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3393 else if (c == '/' && **s == '*') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3394 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3395 /* C-style comment. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3396 ++*s; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3397 while (**s && (**s != '*' || *(*s + 1) != '/')) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3398 ++*s; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3399 if (**s) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3400 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3401 *s += 2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3402 goto loop; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3403 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3404 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3405 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3406 return c; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3407 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3408 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3409 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3410 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3411 /* Create a Windows bitmap from X bitmap data. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3412 static HBITMAP |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3413 w32_create_pixmap_from_bitmap_data (int width, int height, char *data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3414 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3415 static unsigned char swap_nibble[16] |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3416 = { 0x0, 0x8, 0x4, 0xc, /* 0000 1000 0100 1100 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3417 0x2, 0xa, 0x6, 0xe, /* 0010 1010 0110 1110 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3418 0x1, 0x9, 0x5, 0xd, /* 0001 1001 0101 1101 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3419 0x3, 0xb, 0x7, 0xf }; /* 0011 1011 0111 1111 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3420 int i, j, w1, w2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3421 unsigned char *bits, *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3422 HBITMAP bmp; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3423 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3424 w1 = (width + 7) / 8; /* nb of 8bits elt in X bitmap */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3425 w2 = ((width + 15) / 16) * 2; /* nb of 16bits elt in W32 bitmap */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3426 bits = (unsigned char *) alloca (height * w2); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3427 bzero (bits, height * w2); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3428 for (i = 0; i < height; i++) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3429 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3430 p = bits + i*w2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3431 for (j = 0; j < w1; j++) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3432 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3433 /* Bitswap XBM bytes to match how Windows does things. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3434 unsigned char c = *data++; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3435 *p++ = (unsigned char)((swap_nibble[c & 0xf] << 4) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3436 | (swap_nibble[(c>>4) & 0xf])); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3437 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3438 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3439 bmp = CreateBitmap (width, height, 1, 1, (char *) bits); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3440 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3441 return bmp; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3442 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3443 |
|
78692
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
3444 static void |
|
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
3445 convert_mono_to_color_image (f, img, foreground, background) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3446 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3447 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3448 COLORREF foreground, background; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3449 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3450 HDC hdc, old_img_dc, new_img_dc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3451 HGDIOBJ old_prev, new_prev; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3452 HBITMAP new_pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3453 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3454 hdc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3455 old_img_dc = CreateCompatibleDC (hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3456 new_img_dc = CreateCompatibleDC (hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3457 new_pixmap = CreateCompatibleBitmap (hdc, img->width, img->height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3458 release_frame_dc (f, hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3459 old_prev = SelectObject (old_img_dc, img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3460 new_prev = SelectObject (new_img_dc, new_pixmap); |
|
79528
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3461 /* Windows convention for mono bitmaps is black = background, |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3462 white = foreground. */ |
|
78036
3766144496c2
(convert_mono_to_color_image): Swap fore and background.
Jason Rumney <jasonr@gnu.org>
parents:
77929
diff
changeset
|
3463 SetTextColor (new_img_dc, background); |
|
3766144496c2
(convert_mono_to_color_image): Swap fore and background.
Jason Rumney <jasonr@gnu.org>
parents:
77929
diff
changeset
|
3464 SetBkColor (new_img_dc, foreground); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3465 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3466 BitBlt (new_img_dc, 0, 0, img->width, img->height, old_img_dc, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3467 0, 0, SRCCOPY); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3468 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3469 SelectObject (old_img_dc, old_prev); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3470 SelectObject (new_img_dc, new_prev); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3471 DeleteDC (old_img_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3472 DeleteDC (new_img_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3473 DeleteObject (img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3474 if (new_pixmap == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3475 fprintf (stderr, "Failed to convert image to color.\n"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3476 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3477 img->pixmap = new_pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3478 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3479 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3480 #define XBM_BIT_SHUFFLE(b) (~(b)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3481 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3482 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3483 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3484 #define XBM_BIT_SHUFFLE(b) (b) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3485 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3486 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3487 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3488 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3489 static void |
|
82820
2f1e57a528f0
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
82795
diff
changeset
|
3490 Create_Pixmap_From_Bitmap_Data (f, img, data, fg, bg, non_default_colors) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3491 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3492 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3493 char *data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3494 RGB_PIXEL_COLOR fg, bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3495 int non_default_colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3496 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3497 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3498 img->pixmap |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3499 = w32_create_pixmap_from_bitmap_data (img->width, img->height, data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3500 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3501 /* If colors were specified, transfer the bitmap to a color one. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3502 if (non_default_colors) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3503 convert_mono_to_color_image (f, img, fg, bg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3504 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3505 img->pixmap |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3506 = XCreatePixmapFromBitmapData (FRAME_X_DISPLAY (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3507 FRAME_X_WINDOW (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3508 data, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3509 img->width, img->height, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3510 fg, bg, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3511 DefaultDepthOfScreen (FRAME_X_SCREEN (f))); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3512 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3513 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3514 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3515 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3516 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3517 /* Replacement for XReadBitmapFileData which isn't available under old |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3518 X versions. CONTENTS is a pointer to a buffer to parse; END is the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3519 buffer's end. Set *WIDTH and *HEIGHT to the width and height of |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3520 the image. Return in *DATA the bitmap data allocated with xmalloc. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3521 Value is non-zero if successful. DATA null means just test if |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3522 CONTENTS looks like an in-memory XBM file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3523 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3524 static int |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
3525 xbm_read_bitmap_data (f, contents, end, width, height, data) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
3526 struct frame *f; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3527 unsigned char *contents, *end; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3528 int *width, *height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3529 unsigned char **data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3530 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3531 unsigned char *s = contents; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3532 char buffer[BUFSIZ]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3533 int padding_p = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3534 int v10 = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3535 int bytes_per_line, i, nbytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3536 unsigned char *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3537 int value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3538 int LA1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3539 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3540 #define match() \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3541 LA1 = xbm_scan (&s, end, buffer, &value) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3542 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3543 #define expect(TOKEN) \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3544 if (LA1 != (TOKEN)) \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3545 goto failure; \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3546 else \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3547 match () |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3548 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3549 #define expect_ident(IDENT) \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3550 if (LA1 == XBM_TK_IDENT && strcmp (buffer, (IDENT)) == 0) \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3551 match (); \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3552 else \ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3553 goto failure |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3554 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3555 *width = *height = -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3556 if (data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3557 *data = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3558 LA1 = xbm_scan (&s, end, buffer, &value); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3559 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3560 /* Parse defines for width, height and hot-spots. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3561 while (LA1 == '#') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3562 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3563 match (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3564 expect_ident ("define"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3565 expect (XBM_TK_IDENT); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3566 |
|
73346
ba22be0026c7
(xbm_read_bitmap_data): Delete extra semicolon.
Romain Francoise <romain@orebokech.com>
parents:
72539
diff
changeset
|
3567 if (LA1 == XBM_TK_NUMBER) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3568 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3569 char *p = strrchr (buffer, '_'); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3570 p = p ? p + 1 : buffer; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3571 if (strcmp (p, "width") == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3572 *width = value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3573 else if (strcmp (p, "height") == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3574 *height = value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3575 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3576 expect (XBM_TK_NUMBER); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3577 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3578 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
3579 if (!check_image_size (f, *width, *height)) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3580 goto failure; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3581 else if (data == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3582 goto success; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3583 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3584 /* Parse bits. Must start with `static'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3585 expect_ident ("static"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3586 if (LA1 == XBM_TK_IDENT) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3587 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3588 if (strcmp (buffer, "unsigned") == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3589 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3590 match (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3591 expect_ident ("char"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3592 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3593 else if (strcmp (buffer, "short") == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3594 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3595 match (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3596 v10 = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3597 if (*width % 16 && *width % 16 < 9) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3598 padding_p = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3599 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3600 else if (strcmp (buffer, "char") == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3601 match (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3602 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3603 goto failure; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3604 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3605 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3606 goto failure; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3607 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3608 expect (XBM_TK_IDENT); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3609 expect ('['); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3610 expect (']'); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3611 expect ('='); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3612 expect ('{'); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3613 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3614 bytes_per_line = (*width + 7) / 8 + padding_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3615 nbytes = bytes_per_line * *height; |
|
65764
375ab086d366
* image.c (slurp_file, xbm_read_bitmap_data): Cast to the correct
Dan Nicolaescu <dann@ics.uci.edu>
parents:
65723
diff
changeset
|
3616 p = *data = (unsigned char *) xmalloc (nbytes); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3617 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3618 if (v10) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3619 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3620 for (i = 0; i < nbytes; i += 2) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3621 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3622 int val = value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3623 expect (XBM_TK_NUMBER); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3624 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3625 *p++ = XBM_BIT_SHUFFLE (val); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3626 if (!padding_p || ((i + 2) % bytes_per_line)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3627 *p++ = XBM_BIT_SHUFFLE (value >> 8); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3628 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3629 if (LA1 == ',' || LA1 == '}') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3630 match (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3631 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3632 goto failure; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3633 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3634 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3635 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3636 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3637 for (i = 0; i < nbytes; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3638 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3639 int val = value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3640 expect (XBM_TK_NUMBER); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3641 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3642 *p++ = XBM_BIT_SHUFFLE (val); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3643 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3644 if (LA1 == ',' || LA1 == '}') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3645 match (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3646 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3647 goto failure; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3648 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3649 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3650 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3651 success: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3652 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3653 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3654 failure: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3655 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3656 if (data && *data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3657 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3658 xfree (*data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3659 *data = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3660 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3661 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3662 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3663 #undef match |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3664 #undef expect |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3665 #undef expect_ident |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3666 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3667 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3668 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3669 /* Load XBM image IMG which will be displayed on frame F from buffer |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3670 CONTENTS. END is the end of the buffer. Value is non-zero if |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3671 successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3672 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3673 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3674 xbm_load_image (f, img, contents, end) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3675 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3676 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3677 unsigned char *contents, *end; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3678 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3679 int rc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3680 unsigned char *data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3681 int success_p = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3682 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
3683 rc = xbm_read_bitmap_data (f, contents, end, &img->width, &img->height, &data); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3684 if (rc) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3685 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3686 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3687 unsigned long background = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3688 int non_default_colors = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3689 Lisp_Object value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3690 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3691 xassert (img->width > 0 && img->height > 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3692 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3693 /* Get foreground and background colors, maybe allocate colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3694 value = image_spec_value (img->spec, QCforeground, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3695 if (!NILP (value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3696 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3697 foreground = x_alloc_image_color (f, img, value, foreground); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3698 non_default_colors = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3699 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3700 value = image_spec_value (img->spec, QCbackground, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3701 if (!NILP (value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3702 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3703 background = x_alloc_image_color (f, img, value, background); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3704 img->background = background; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3705 img->background_valid = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3706 non_default_colors = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3707 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3708 |
|
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
3709 Create_Pixmap_From_Bitmap_Data (f, img, data, |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3710 foreground, background, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3711 non_default_colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3712 xfree (data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3713 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3714 if (img->pixmap == NO_PIXMAP) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3715 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3716 x_clear_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3717 image_error ("Unable to create X pixmap for `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3718 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3719 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3720 success_p = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3721 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3722 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3723 image_error ("Error loading XBM image `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3724 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3725 return success_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3726 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3727 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3728 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3729 /* Value is non-zero if DATA looks like an in-memory XBM file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3730 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3731 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3732 xbm_file_p (data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3733 Lisp_Object data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3734 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3735 int w, h; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3736 return (STRINGP (data) |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
3737 && xbm_read_bitmap_data (NULL, SDATA (data), |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3738 (SDATA (data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3739 + SBYTES (data)), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3740 &w, &h, NULL)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3741 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3742 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3743 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3744 /* Fill image IMG which is used on frame F with pixmap data. Value is |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3745 non-zero if successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3746 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3747 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3748 xbm_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3749 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3750 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3751 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3752 int success_p = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3753 Lisp_Object file_name; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3754 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3755 xassert (xbm_image_p (img->spec)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3756 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3757 /* If IMG->spec specifies a file name, create a non-file spec from it. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3758 file_name = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3759 if (STRINGP (file_name)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3760 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3761 Lisp_Object file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3762 unsigned char *contents; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3763 int size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3764 struct gcpro gcpro1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3765 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3766 file = x_find_image_file (file_name); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3767 GCPRO1 (file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3768 if (!STRINGP (file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3769 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3770 image_error ("Cannot find image file `%s'", file_name, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3771 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3772 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3773 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3774 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3775 contents = slurp_file (SDATA (file), &size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3776 if (contents == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3777 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3778 image_error ("Error loading XBM image `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3779 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3780 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3781 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3782 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3783 success_p = xbm_load_image (f, img, contents, contents + size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3784 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3785 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3786 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3787 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3788 struct image_keyword fmt[XBM_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3789 Lisp_Object data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3790 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3791 unsigned long background = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3792 int non_default_colors = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3793 char *bits; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3794 int parsed_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3795 int in_memory_file_p = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3796 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3797 /* See if data looks like an in-memory XBM file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3798 data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3799 in_memory_file_p = xbm_file_p (data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3800 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3801 /* Parse the image specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3802 bcopy (xbm_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3803 parsed_p = parse_image_spec (img->spec, fmt, XBM_LAST, Qxbm); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3804 xassert (parsed_p); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3805 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3806 /* Get specified width, and height. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3807 if (!in_memory_file_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3808 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3809 img->width = XFASTINT (fmt[XBM_WIDTH].value); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3810 img->height = XFASTINT (fmt[XBM_HEIGHT].value); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3811 xassert (img->width > 0 && img->height > 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3812 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3813 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3814 /* Get foreground and background colors, maybe allocate colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3815 if (fmt[XBM_FOREGROUND].count |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3816 && STRINGP (fmt[XBM_FOREGROUND].value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3817 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3818 foreground = x_alloc_image_color (f, img, fmt[XBM_FOREGROUND].value, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3819 foreground); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3820 non_default_colors = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3821 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3822 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3823 if (fmt[XBM_BACKGROUND].count |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3824 && STRINGP (fmt[XBM_BACKGROUND].value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3825 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3826 background = x_alloc_image_color (f, img, fmt[XBM_BACKGROUND].value, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3827 background); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3828 non_default_colors = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3829 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3830 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3831 if (in_memory_file_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3832 success_p = xbm_load_image (f, img, SDATA (data), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3833 (SDATA (data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3834 + SBYTES (data))); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3835 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3836 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3837 if (VECTORP (data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3838 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3839 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3840 char *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3841 int nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3842 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3843 p = bits = (char *) alloca (nbytes * img->height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3844 for (i = 0; i < img->height; ++i, p += nbytes) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3845 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3846 Lisp_Object line = XVECTOR (data)->contents[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3847 if (STRINGP (line)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3848 bcopy (SDATA (line), p, nbytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3849 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3850 bcopy (XBOOL_VECTOR (line)->data, p, nbytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3851 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3852 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3853 else if (STRINGP (data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3854 bits = SDATA (data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3855 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3856 bits = XBOOL_VECTOR (data)->data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3857 |
|
79528
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3858 #ifdef WINDOWSNT |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3859 { |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3860 char *invertedBits; |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3861 int nbytes, i; |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3862 /* Windows mono bitmaps are reversed compared with X. */ |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3863 invertedBits = bits; |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3864 nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3865 * img->height; |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3866 bits = (char *) alloca(nbytes); |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3867 for (i = 0; i < nbytes; i++) |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3868 bits[i] = XBM_BIT_SHUFFLE (invertedBits[i]); |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3869 } |
|
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3870 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3871 /* Create the pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3872 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3873 Create_Pixmap_From_Bitmap_Data (f, img, bits, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3874 foreground, background, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3875 non_default_colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3876 if (img->pixmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3877 success_p = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3878 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3879 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3880 image_error ("Unable to create pixmap for XBM image `%s'", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3881 img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3882 x_clear_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3883 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3884 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3885 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3886 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3887 return success_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3888 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3889 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3890 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3891 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3892 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3893 XPM images |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3894 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3895 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3896 #if defined (HAVE_XPM) || defined (MAC_OS) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3897 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3898 static int xpm_image_p P_ ((Lisp_Object object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3899 static int xpm_load P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3900 static int xpm_valid_color_symbols_p P_ ((Lisp_Object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3901 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3902 #endif /* HAVE_XPM || MAC_OS */ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3903 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3904 #ifdef HAVE_XPM |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3905 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3906 /* Indicate to xpm.h that we don't have Xlib. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3907 #define FOR_MSW |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3908 /* simx.h in xpm defines XColor and XImage differently than Emacs. */ |
|
55375
b9215c2d57ad
(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.
Jason Rumney <jasonr@gnu.org>
parents:
55022
diff
changeset
|
3909 /* It also defines Display the same way as Emacs, but gcc 3.3 still barfs. */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3910 #define XColor xpm_XColor |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3911 #define XImage xpm_XImage |
|
55375
b9215c2d57ad
(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.
Jason Rumney <jasonr@gnu.org>
parents:
55022
diff
changeset
|
3912 #define Display xpm_Display |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3913 #define PIXEL_ALREADY_TYPEDEFED |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3914 #include "X11/xpm.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3915 #undef FOR_MSW |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3916 #undef XColor |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3917 #undef XImage |
|
55375
b9215c2d57ad
(Display) [HAVE_NTGUI]: Redefine while loading xpm.h to avoid name clash.
Jason Rumney <jasonr@gnu.org>
parents:
55022
diff
changeset
|
3918 #undef Display |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3919 #undef PIXEL_ALREADY_TYPEDEFED |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3920 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3921 #include "X11/xpm.h" |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3922 #endif /* HAVE_NTGUI */ |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3923 #endif /* HAVE_XPM */ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3924 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3925 #if defined (HAVE_XPM) || defined (MAC_OS) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3926 /* The symbol `xpm' identifying XPM-format images. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3927 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3928 Lisp_Object Qxpm; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3929 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3930 /* Indices of image specification fields in xpm_format, below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3931 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3932 enum xpm_keyword_index |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3933 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3934 XPM_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3935 XPM_FILE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3936 XPM_DATA, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3937 XPM_ASCENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3938 XPM_MARGIN, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3939 XPM_RELIEF, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3940 XPM_ALGORITHM, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3941 XPM_HEURISTIC_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3942 XPM_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3943 XPM_COLOR_SYMBOLS, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3944 XPM_BACKGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3945 XPM_LAST |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3946 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3947 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3948 /* Vector of image_keyword structures describing the format |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3949 of valid XPM image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3950 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3951 static struct image_keyword xpm_format[XPM_LAST] = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3952 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3953 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3954 {":file", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3955 {":data", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3956 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3957 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3958 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3959 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3960 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3961 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3962 {":color-symbols", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3963 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3964 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3965 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3966 /* Structure describing the image type XPM. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3967 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3968 static struct image_type xpm_type = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3969 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3970 &Qxpm, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3971 xpm_image_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3972 xpm_load, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3973 x_clear_image, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3974 NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3975 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3976 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3977 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3978 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3979 /* Define ALLOC_XPM_COLORS if we can use Emacs' own color allocation |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3980 functions for allocating image colors. Our own functions handle |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3981 color allocation failures more gracefully than the ones on the XPM |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3982 lib. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3983 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3984 #if defined XpmAllocColor && defined XpmFreeColors && defined XpmColorClosure |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3985 #define ALLOC_XPM_COLORS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3986 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3987 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3988 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3989 #ifdef ALLOC_XPM_COLORS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3990 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3991 static void xpm_init_color_cache P_ ((struct frame *, XpmAttributes *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3992 static void xpm_free_color_cache P_ ((void)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3993 static int xpm_lookup_color P_ ((struct frame *, char *, XColor *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3994 static int xpm_color_bucket P_ ((char *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3995 static struct xpm_cached_color *xpm_cache_color P_ ((struct frame *, char *, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3996 XColor *, int)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3997 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3998 /* An entry in a hash table used to cache color definitions of named |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3999 colors. This cache is necessary to speed up XPM image loading in |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4000 case we do color allocations ourselves. Without it, we would need |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4001 a call to XParseColor per pixel in the image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4002 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4003 struct xpm_cached_color |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4004 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4005 /* Next in collision chain. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4006 struct xpm_cached_color *next; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4007 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4008 /* Color definition (RGB and pixel color). */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4009 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4010 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4011 /* Color name. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4012 char name[1]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4013 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4014 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4015 /* The hash table used for the color cache, and its bucket vector |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4016 size. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4017 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4018 #define XPM_COLOR_CACHE_BUCKETS 1001 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4019 struct xpm_cached_color **xpm_color_cache; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4020 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4021 /* Initialize the color cache. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4022 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4023 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4024 xpm_init_color_cache (f, attrs) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4025 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4026 XpmAttributes *attrs; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4027 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4028 size_t nbytes = XPM_COLOR_CACHE_BUCKETS * sizeof *xpm_color_cache; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4029 xpm_color_cache = (struct xpm_cached_color **) xmalloc (nbytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4030 memset (xpm_color_cache, 0, nbytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4031 init_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4032 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4033 if (attrs->valuemask & XpmColorSymbols) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4034 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4035 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4036 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4037 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4038 for (i = 0; i < attrs->numsymbols; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4039 if (XParseColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4040 attrs->colorsymbols[i].value, &color)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4041 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4042 color.pixel = lookup_rgb_color (f, color.red, color.green, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4043 color.blue); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4044 xpm_cache_color (f, attrs->colorsymbols[i].name, &color, -1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4045 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4046 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4047 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4048 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4049 /* Free the color cache. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4050 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4051 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4052 xpm_free_color_cache () |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4053 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4054 struct xpm_cached_color *p, *next; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4055 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4056 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4057 for (i = 0; i < XPM_COLOR_CACHE_BUCKETS; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4058 for (p = xpm_color_cache[i]; p; p = next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4059 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4060 next = p->next; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4061 xfree (p); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4062 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4063 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4064 xfree (xpm_color_cache); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4065 xpm_color_cache = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4066 free_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4067 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4068 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4069 /* Return the bucket index for color named COLOR_NAME in the color |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4070 cache. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4071 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4072 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4073 xpm_color_bucket (color_name) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4074 char *color_name; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4075 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4076 unsigned h = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4077 char *s; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4078 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4079 for (s = color_name; *s; ++s) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4080 h = (h << 2) ^ *s; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4081 return h %= XPM_COLOR_CACHE_BUCKETS; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4082 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4083 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4084 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4085 /* On frame F, cache values COLOR for color with name COLOR_NAME. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4086 BUCKET, if >= 0, is a precomputed bucket index. Value is the cache |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4087 entry added. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4088 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4089 static struct xpm_cached_color * |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4090 xpm_cache_color (f, color_name, color, bucket) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4091 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4092 char *color_name; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4093 XColor *color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4094 int bucket; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4095 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4096 size_t nbytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4097 struct xpm_cached_color *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4098 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4099 if (bucket < 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4100 bucket = xpm_color_bucket (color_name); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4101 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4102 nbytes = sizeof *p + strlen (color_name); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4103 p = (struct xpm_cached_color *) xmalloc (nbytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4104 strcpy (p->name, color_name); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4105 p->color = *color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4106 p->next = xpm_color_cache[bucket]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4107 xpm_color_cache[bucket] = p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4108 return p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4109 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4110 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4111 /* Look up color COLOR_NAME for frame F in the color cache. If found, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4112 return the cached definition in *COLOR. Otherwise, make a new |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4113 entry in the cache and allocate the color. Value is zero if color |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4114 allocation failed. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4115 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4116 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4117 xpm_lookup_color (f, color_name, color) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4118 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4119 char *color_name; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4120 XColor *color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4121 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4122 struct xpm_cached_color *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4123 int h = xpm_color_bucket (color_name); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4124 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4125 for (p = xpm_color_cache[h]; p; p = p->next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4126 if (strcmp (p->name, color_name) == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4127 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4128 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4129 if (p != NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4130 *color = p->color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4131 else if (XParseColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4132 color_name, color)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4133 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4134 color->pixel = lookup_rgb_color (f, color->red, color->green, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4135 color->blue); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4136 p = xpm_cache_color (f, color_name, color, h); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4137 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4138 /* You get `opaque' at least from ImageMagick converting pbm to xpm |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4139 with transparency, and it's useful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4140 else if (strcmp ("opaque", color_name) == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4141 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4142 bzero (color, sizeof (XColor)); /* Is this necessary/correct? */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4143 color->pixel = FRAME_FOREGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4144 p = xpm_cache_color (f, color_name, color, h); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4145 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4146 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4147 return p != NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4148 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4149 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4150 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4151 /* Callback for allocating color COLOR_NAME. Called from the XPM lib. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4152 CLOSURE is a pointer to the frame on which we allocate the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4153 color. Return in *COLOR the allocated color. Value is non-zero |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4154 if successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4155 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4156 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4157 xpm_alloc_color (dpy, cmap, color_name, color, closure) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4158 Display *dpy; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4159 Colormap cmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4160 char *color_name; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4161 XColor *color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4162 void *closure; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4163 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4164 return xpm_lookup_color ((struct frame *) closure, color_name, color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4165 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4166 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4167 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4168 /* Callback for freeing NPIXELS colors contained in PIXELS. CLOSURE |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4169 is a pointer to the frame on which we allocate the color. Value is |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4170 non-zero if successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4171 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4172 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4173 xpm_free_colors (dpy, cmap, pixels, npixels, closure) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4174 Display *dpy; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4175 Colormap cmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4176 Pixel *pixels; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4177 int npixels; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4178 void *closure; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4179 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4180 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4181 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4182 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4183 #endif /* ALLOC_XPM_COLORS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4184 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4185 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4186 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4187 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4188 /* XPM library details. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4189 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4190 DEF_IMGLIB_FN (XpmFreeAttributes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4191 DEF_IMGLIB_FN (XpmCreateImageFromBuffer); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4192 DEF_IMGLIB_FN (XpmReadFileToImage); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4193 DEF_IMGLIB_FN (XImageFree); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4194 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4195 static int |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
4196 init_xpm_functions (Lisp_Object libraries) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4197 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4198 HMODULE library; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4199 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
4200 if (!(library = w32_delayed_load (libraries, Qxpm))) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4201 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4202 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4203 LOAD_IMGLIB_FN (library, XpmFreeAttributes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4204 LOAD_IMGLIB_FN (library, XpmCreateImageFromBuffer); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4205 LOAD_IMGLIB_FN (library, XpmReadFileToImage); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4206 LOAD_IMGLIB_FN (library, XImageFree); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4207 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4208 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4209 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4210 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4211 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4212 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4213 /* Value is non-zero if COLOR_SYMBOLS is a valid color symbols list |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4214 for XPM images. Such a list must consist of conses whose car and |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4215 cdr are strings. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4216 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4217 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4218 xpm_valid_color_symbols_p (color_symbols) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4219 Lisp_Object color_symbols; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4220 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4221 while (CONSP (color_symbols)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4222 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4223 Lisp_Object sym = XCAR (color_symbols); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4224 if (!CONSP (sym) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4225 || !STRINGP (XCAR (sym)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4226 || !STRINGP (XCDR (sym))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4227 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4228 color_symbols = XCDR (color_symbols); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4229 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4230 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4231 return NILP (color_symbols); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4232 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4233 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4234 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4235 /* Value is non-zero if OBJECT is a valid XPM image specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4236 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4237 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4238 xpm_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4239 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4240 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4241 struct image_keyword fmt[XPM_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4242 bcopy (xpm_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4243 return (parse_image_spec (object, fmt, XPM_LAST, Qxpm) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4244 /* Either `:file' or `:data' must be present. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4245 && fmt[XPM_FILE].count + fmt[XPM_DATA].count == 1 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4246 /* Either no `:color-symbols' or it's a list of conses |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4247 whose car and cdr are strings. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4248 && (fmt[XPM_COLOR_SYMBOLS].count == 0 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4249 || xpm_valid_color_symbols_p (fmt[XPM_COLOR_SYMBOLS].value))); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4250 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4251 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4252 #endif /* HAVE_XPM || MAC_OS */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4253 |
|
66919
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4254 #if defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4255 int |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4256 x_create_bitmap_from_xpm_data (f, bits) |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4257 struct frame *f; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4258 char **bits; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4259 { |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4260 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4261 int id, rc; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4262 XpmAttributes attrs; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4263 Pixmap bitmap, mask; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4264 |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4265 bzero (&attrs, sizeof attrs); |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4266 |
|
66924
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
4267 attrs.visual = FRAME_X_VISUAL (f); |
|
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
4268 attrs.colormap = FRAME_X_COLORMAP (f); |
|
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
4269 attrs.valuemask |= XpmVisual; |
|
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
4270 attrs.valuemask |= XpmColormap; |
|
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
4271 |
|
66919
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4272 rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4273 bits, &bitmap, &mask, &attrs); |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4274 if (rc != XpmSuccess) |
|
66984
9d0a2cc054be
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents:
66924
diff
changeset
|
4275 { |
|
9d0a2cc054be
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents:
66924
diff
changeset
|
4276 XpmFreeAttributes (&attrs); |
|
9d0a2cc054be
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents:
66924
diff
changeset
|
4277 return -1; |
|
9d0a2cc054be
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents:
66924
diff
changeset
|
4278 } |
|
66919
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4279 |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4280 id = x_allocate_bitmap_record (f); |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4281 dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4282 dpyinfo->bitmaps[id - 1].have_mask = 1; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4283 dpyinfo->bitmaps[id - 1].mask = mask; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4284 dpyinfo->bitmaps[id - 1].file = NULL; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4285 dpyinfo->bitmaps[id - 1].height = attrs.height; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4286 dpyinfo->bitmaps[id - 1].width = attrs.width; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4287 dpyinfo->bitmaps[id - 1].depth = attrs.depth; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4288 dpyinfo->bitmaps[id - 1].refcount = 1; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4289 |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4290 XpmFreeAttributes (&attrs); |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4291 return id; |
|
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4292 } |
| 66994 | 4293 #endif /* defined (HAVE_XPM) && defined (HAVE_X_WINDOWS) */ |
|
66919
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
4294 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4295 /* Load image IMG which will be displayed on frame F. Value is |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4296 non-zero if successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4297 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4298 #ifdef HAVE_XPM |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4299 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4300 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4301 xpm_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4302 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4303 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4304 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4305 int rc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4306 XpmAttributes attrs; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4307 Lisp_Object specified_file, color_symbols; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4308 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4309 HDC hdc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4310 xpm_XImage * xpm_image = NULL, * xpm_mask = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4311 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4312 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4313 /* Configure the XPM lib. Use the visual of frame F. Allocate |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4314 close colors. Return colors allocated. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4315 bzero (&attrs, sizeof attrs); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4316 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4317 #ifndef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4318 attrs.visual = FRAME_X_VISUAL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4319 attrs.colormap = FRAME_X_COLORMAP (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4320 attrs.valuemask |= XpmVisual; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4321 attrs.valuemask |= XpmColormap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4322 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4323 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4324 #ifdef ALLOC_XPM_COLORS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4325 /* Allocate colors with our own functions which handle |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4326 failing color allocation more gracefully. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4327 attrs.color_closure = f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4328 attrs.alloc_color = xpm_alloc_color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4329 attrs.free_colors = xpm_free_colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4330 attrs.valuemask |= XpmAllocColor | XpmFreeColors | XpmColorClosure; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4331 #else /* not ALLOC_XPM_COLORS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4332 /* Let the XPM lib allocate colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4333 attrs.valuemask |= XpmReturnAllocPixels; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4334 #ifdef XpmAllocCloseColors |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4335 attrs.alloc_close_colors = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4336 attrs.valuemask |= XpmAllocCloseColors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4337 #else /* not XpmAllocCloseColors */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4338 attrs.closeness = 600; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4339 attrs.valuemask |= XpmCloseness; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4340 #endif /* not XpmAllocCloseColors */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4341 #endif /* ALLOC_XPM_COLORS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4342 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4343 /* If image specification contains symbolic color definitions, add |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4344 these to `attrs'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4345 color_symbols = image_spec_value (img->spec, QCcolor_symbols, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4346 if (CONSP (color_symbols)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4347 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4348 Lisp_Object tail; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4349 XpmColorSymbol *xpm_syms; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4350 int i, size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4351 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4352 attrs.valuemask |= XpmColorSymbols; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4353 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4354 /* Count number of symbols. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4355 attrs.numsymbols = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4356 for (tail = color_symbols; CONSP (tail); tail = XCDR (tail)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4357 ++attrs.numsymbols; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4358 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4359 /* Allocate an XpmColorSymbol array. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4360 size = attrs.numsymbols * sizeof *xpm_syms; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4361 xpm_syms = (XpmColorSymbol *) alloca (size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4362 bzero (xpm_syms, size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4363 attrs.colorsymbols = xpm_syms; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4364 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4365 /* Fill the color symbol array. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4366 for (tail = color_symbols, i = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4367 CONSP (tail); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4368 ++i, tail = XCDR (tail)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4369 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4370 Lisp_Object name = XCAR (XCAR (tail)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4371 Lisp_Object color = XCDR (XCAR (tail)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4372 xpm_syms[i].name = (char *) alloca (SCHARS (name) + 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4373 strcpy (xpm_syms[i].name, SDATA (name)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4374 xpm_syms[i].value = (char *) alloca (SCHARS (color) + 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4375 strcpy (xpm_syms[i].value, SDATA (color)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4376 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4377 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4378 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4379 /* Create a pixmap for the image, either from a file, or from a |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4380 string buffer containing data in the same format as an XPM file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4381 #ifdef ALLOC_XPM_COLORS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4382 xpm_init_color_cache (f, &attrs); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4383 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4384 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4385 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4386 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4387 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4388 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4389 HDC frame_dc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4390 hdc = CreateCompatibleDC (frame_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4391 release_frame_dc (f, frame_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4392 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4393 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4394 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4395 if (STRINGP (specified_file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4396 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4397 Lisp_Object file = x_find_image_file (specified_file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4398 if (!STRINGP (file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4399 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4400 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4401 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4402 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4403 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4404 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4405 /* XpmReadFileToPixmap is not available in the Windows port of |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4406 libxpm. But XpmReadFileToImage almost does what we want. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4407 rc = fn_XpmReadFileToImage (&hdc, SDATA (file), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4408 &xpm_image, &xpm_mask, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4409 &attrs); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4410 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4411 rc = XpmReadFileToPixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4412 SDATA (file), &img->pixmap, &img->mask, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4413 &attrs); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4414 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4415 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4416 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4417 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4418 Lisp_Object buffer = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4419 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4420 /* XpmCreatePixmapFromBuffer is not available in the Windows port |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4421 of libxpm. But XpmCreateImageFromBuffer almost does what we want. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4422 rc = fn_XpmCreateImageFromBuffer (&hdc, SDATA (buffer), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4423 &xpm_image, &xpm_mask, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4424 &attrs); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4425 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4426 rc = XpmCreatePixmapFromBuffer (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4427 SDATA (buffer), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4428 &img->pixmap, &img->mask, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4429 &attrs); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4430 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4431 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4432 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4433 if (rc == XpmSuccess) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4434 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4435 #if defined (COLOR_TABLE_SUPPORT) && defined (ALLOC_XPM_COLORS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4436 img->colors = colors_in_color_table (&img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4437 #else /* not ALLOC_XPM_COLORS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4438 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4439 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4440 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4441 /* W32 XPM uses XImage to wrap what W32 Emacs calls a Pixmap, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4442 plus some duplicate attributes. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4443 if (xpm_image && xpm_image->bitmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4444 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4445 img->pixmap = xpm_image->bitmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4446 /* XImageFree in libXpm frees XImage struct without destroying |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4447 the bitmap, which is what we want. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4448 fn_XImageFree (xpm_image); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4449 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4450 if (xpm_mask && xpm_mask->bitmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4451 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4452 /* The mask appears to be inverted compared with what we expect. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4453 TODO: invert our expectations. See other places where we |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4454 have to invert bits because our idea of masks is backwards. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4455 HGDIOBJ old_obj; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4456 old_obj = SelectObject (hdc, xpm_mask->bitmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4457 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4458 PatBlt (hdc, 0, 0, xpm_mask->width, xpm_mask->height, DSTINVERT); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4459 SelectObject (hdc, old_obj); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4460 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4461 img->mask = xpm_mask->bitmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4462 fn_XImageFree (xpm_mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4463 DeleteDC (hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4464 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4465 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4466 DeleteDC (hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4467 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4468 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4469 /* Remember allocated colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4470 img->ncolors = attrs.nalloc_pixels; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4471 img->colors = (unsigned long *) xmalloc (img->ncolors |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4472 * sizeof *img->colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4473 for (i = 0; i < attrs.nalloc_pixels; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4474 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4475 img->colors[i] = attrs.alloc_pixels[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4476 #ifdef DEBUG_X_COLORS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4477 register_color (img->colors[i]); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4478 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4479 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4480 #endif /* not ALLOC_XPM_COLORS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4481 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4482 img->width = attrs.width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4483 img->height = attrs.height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4484 xassert (img->width > 0 && img->height > 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4485 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4486 /* The call to XpmFreeAttributes below frees attrs.alloc_pixels. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4487 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4488 fn_XpmFreeAttributes (&attrs); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4489 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4490 XpmFreeAttributes (&attrs); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4491 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4492 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4493 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4494 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4495 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4496 DeleteDC (hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4497 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4498 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4499 switch (rc) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4500 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4501 case XpmOpenFailed: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4502 image_error ("Error opening XPM file (%s)", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4503 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4504 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4505 case XpmFileInvalid: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4506 image_error ("Invalid XPM file (%s)", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4507 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4508 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4509 case XpmNoMemory: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4510 image_error ("Out of memory (%s)", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4511 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4512 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4513 case XpmColorFailed: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4514 image_error ("Color allocation error (%s)", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4515 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4516 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4517 default: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4518 image_error ("Unknown error (%s)", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4519 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4520 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4521 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4522 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4523 #ifdef ALLOC_XPM_COLORS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4524 xpm_free_color_cache (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4525 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4526 return rc == XpmSuccess; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4527 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4528 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4529 #endif /* HAVE_XPM */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4530 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4531 #ifdef MAC_OS |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4532 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4533 /* XPM support functions for Mac OS where libxpm is not available. |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4534 Only XPM version 3 (without any extensions) is supported. */ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4535 |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4536 static int xpm_scan P_ ((const unsigned char **, const unsigned char *, |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4537 const unsigned char **, int *)); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4538 static Lisp_Object xpm_make_color_table_v |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4539 P_ ((void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object), |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4540 Lisp_Object (**) (Lisp_Object, const unsigned char *, int))); |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4541 static void xpm_put_color_table_v P_ ((Lisp_Object, const unsigned char *, |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4542 int, Lisp_Object)); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4543 static Lisp_Object xpm_get_color_table_v P_ ((Lisp_Object, |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4544 const unsigned char *, int)); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4545 static Lisp_Object xpm_make_color_table_h |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4546 P_ ((void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object), |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4547 Lisp_Object (**) (Lisp_Object, const unsigned char *, int))); |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4548 static void xpm_put_color_table_h P_ ((Lisp_Object, const unsigned char *, |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4549 int, Lisp_Object)); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4550 static Lisp_Object xpm_get_color_table_h P_ ((Lisp_Object, |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4551 const unsigned char *, int)); |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4552 static int xpm_str_to_color_key P_ ((const char *)); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4553 static int xpm_load_image P_ ((struct frame *, struct image *, |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4554 const unsigned char *, const unsigned char *)); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4555 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4556 /* Tokens returned from xpm_scan. */ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4557 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4558 enum xpm_token |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4559 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4560 XPM_TK_IDENT = 256, |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4561 XPM_TK_STRING, |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4562 XPM_TK_EOF |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4563 }; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4564 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4565 /* Scan an XPM data and return a character (< 256) or a token defined |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4566 by enum xpm_token above. *S and END are the start (inclusive) and |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4567 the end (exclusive) addresses of the data, respectively. Advance |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4568 *S while scanning. If token is either XPM_TK_IDENT or |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4569 XPM_TK_STRING, *BEG and *LEN are set to the start address and the |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4570 length of the corresponding token, respectively. */ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4571 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4572 static int |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4573 xpm_scan (s, end, beg, len) |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4574 const unsigned char **s, *end, **beg; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4575 int *len; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4576 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4577 int c; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4578 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4579 while (*s < end) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4580 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4581 /* Skip white-space. */ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4582 while (*s < end && (c = *(*s)++, isspace (c))) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4583 ; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4584 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4585 /* gnus-pointer.xpm uses '-' in its identifier. |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4586 sb-dir-plus.xpm uses '+' in its identifier. */ |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4587 if (isalpha (c) || c == '_' || c == '-' || c == '+') |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4588 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4589 *beg = *s - 1; |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
4590 while (*s < end |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
4591 && (c = **s, isalnum (c) || c == '_' || c == '-' || c == '+')) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4592 ++*s; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4593 *len = *s - *beg; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4594 return XPM_TK_IDENT; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4595 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4596 else if (c == '"') |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4597 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4598 *beg = *s; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4599 while (*s < end && **s != '"') |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4600 ++*s; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4601 *len = *s - *beg; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4602 if (*s < end) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4603 ++*s; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4604 return XPM_TK_STRING; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4605 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4606 else if (c == '/') |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4607 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4608 if (*s < end && **s == '*') |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4609 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4610 /* C-style comment. */ |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4611 ++*s; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4612 do |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4613 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4614 while (*s < end && *(*s)++ != '*') |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4615 ; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4616 } |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4617 while (*s < end && **s != '/'); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4618 if (*s < end) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4619 ++*s; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4620 } |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4621 else |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4622 return c; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4623 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4624 else |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4625 return c; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4626 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4627 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4628 return XPM_TK_EOF; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4629 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4630 |
|
78970
35f78a0b1e30
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78863
diff
changeset
|
4631 /* Functions for color table lookup in XPM data. A key is a string |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4632 specifying the color of each pixel in XPM data. A value is either |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4633 an integer that specifies a pixel color, Qt that specifies |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4634 transparency, or Qnil for the unspecified color. If the length of |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4635 the key string is one, a vector is used as a table. Otherwise, a |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4636 hash table is used. */ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4637 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4638 static Lisp_Object |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4639 xpm_make_color_table_v (put_func, get_func) |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4640 void (**put_func) (Lisp_Object, const unsigned char *, int, Lisp_Object); |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4641 Lisp_Object (**get_func) (Lisp_Object, const unsigned char *, int); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4642 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4643 *put_func = xpm_put_color_table_v; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4644 *get_func = xpm_get_color_table_v; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4645 return Fmake_vector (make_number (256), Qnil); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4646 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4647 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4648 static void |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4649 xpm_put_color_table_v (color_table, chars_start, chars_len, color) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4650 Lisp_Object color_table; |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4651 const unsigned char *chars_start; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4652 int chars_len; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4653 Lisp_Object color; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4654 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4655 XVECTOR (color_table)->contents[*chars_start] = color; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4656 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4657 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4658 static Lisp_Object |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4659 xpm_get_color_table_v (color_table, chars_start, chars_len) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4660 Lisp_Object color_table; |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4661 const unsigned char *chars_start; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4662 int chars_len; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4663 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4664 return XVECTOR (color_table)->contents[*chars_start]; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4665 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4666 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4667 static Lisp_Object |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4668 xpm_make_color_table_h (put_func, get_func) |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4669 void (**put_func) (Lisp_Object, const unsigned char *, int, Lisp_Object); |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4670 Lisp_Object (**get_func) (Lisp_Object, const unsigned char *, int); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4671 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4672 *put_func = xpm_put_color_table_h; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4673 *get_func = xpm_get_color_table_h; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4674 return make_hash_table (Qequal, make_number (DEFAULT_HASH_SIZE), |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4675 make_float (DEFAULT_REHASH_SIZE), |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4676 make_float (DEFAULT_REHASH_THRESHOLD), |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4677 Qnil, Qnil, Qnil); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4678 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4679 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4680 static void |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4681 xpm_put_color_table_h (color_table, chars_start, chars_len, color) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4682 Lisp_Object color_table; |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4683 const unsigned char *chars_start; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4684 int chars_len; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4685 Lisp_Object color; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4686 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4687 struct Lisp_Hash_Table *table = XHASH_TABLE (color_table); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4688 unsigned hash_code; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4689 Lisp_Object chars = make_unibyte_string (chars_start, chars_len); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4690 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4691 hash_lookup (table, chars, &hash_code); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4692 hash_put (table, chars, color, hash_code); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4693 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4694 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4695 static Lisp_Object |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4696 xpm_get_color_table_h (color_table, chars_start, chars_len) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4697 Lisp_Object color_table; |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4698 const unsigned char *chars_start; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4699 int chars_len; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4700 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4701 struct Lisp_Hash_Table *table = XHASH_TABLE (color_table); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4702 int i = hash_lookup (table, make_unibyte_string (chars_start, chars_len), |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4703 NULL); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4704 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4705 return i >= 0 ? HASH_VALUE (table, i) : Qnil; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4706 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4707 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4708 enum xpm_color_key { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4709 XPM_COLOR_KEY_S, |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4710 XPM_COLOR_KEY_M, |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4711 XPM_COLOR_KEY_G4, |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4712 XPM_COLOR_KEY_G, |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4713 XPM_COLOR_KEY_C |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4714 }; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4715 |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4716 static const char xpm_color_key_strings[][4] = {"s", "m", "g4", "g", "c"}; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4717 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4718 static int |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4719 xpm_str_to_color_key (s) |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4720 const char *s; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4721 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4722 int i; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4723 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4724 for (i = 0; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4725 i < sizeof xpm_color_key_strings / sizeof xpm_color_key_strings[0]; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4726 i++) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4727 if (strcmp (xpm_color_key_strings[i], s) == 0) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4728 return i; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4729 return -1; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4730 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4731 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4732 static int |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4733 xpm_load_image (f, img, contents, end) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4734 struct frame *f; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4735 struct image *img; |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4736 const unsigned char *contents, *end; |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4737 { |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4738 const unsigned char *s = contents, *beg, *str; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4739 unsigned char buffer[BUFSIZ]; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4740 int width, height, x, y; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4741 int num_colors, chars_per_pixel; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4742 int len, LA1; |
|
73570
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4743 void (*put_color_table) (Lisp_Object, const unsigned char *, int, Lisp_Object); |
|
a87d92458ce0
[MAC_OS] (image_load_qt_1, xpm_scan, xpm_make_color_table_v)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73346
diff
changeset
|
4744 Lisp_Object (*get_color_table) (Lisp_Object, const unsigned char *, int); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4745 Lisp_Object frame, color_symbols, color_table; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4746 int best_key, have_mask = 0; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4747 XImagePtr ximg = NULL, mask_img = NULL; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4748 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4749 #define match() \ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4750 LA1 = xpm_scan (&s, end, &beg, &len) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4751 |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4752 #define expect(TOKEN) \ |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4753 if (LA1 != (TOKEN)) \ |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4754 goto failure; \ |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4755 else \ |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4756 match () |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4757 |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4758 #define expect_ident(IDENT) \ |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4759 if (LA1 == XPM_TK_IDENT \ |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4760 && strlen ((IDENT)) == len && memcmp ((IDENT), beg, len) == 0) \ |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4761 match (); \ |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4762 else \ |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4763 goto failure |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4764 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4765 if (!(end - s >= 9 && memcmp (s, "/* XPM */", 9) == 0)) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4766 goto failure; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4767 s += 9; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4768 match(); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4769 expect_ident ("static"); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4770 expect_ident ("char"); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4771 expect ('*'); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4772 expect (XPM_TK_IDENT); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4773 expect ('['); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4774 expect (']'); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4775 expect ('='); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4776 expect ('{'); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4777 expect (XPM_TK_STRING); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4778 if (len >= BUFSIZ) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4779 goto failure; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4780 memcpy (buffer, beg, len); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4781 buffer[len] = '\0'; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4782 if (sscanf (buffer, "%d %d %d %d", &width, &height, |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4783 &num_colors, &chars_per_pixel) != 4 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4784 || width <= 0 || height <= 0 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4785 || num_colors <= 0 || chars_per_pixel <= 0) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4786 goto failure; |
|
66430
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4787 |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4788 if (!check_image_size (f, width, height)) |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4789 { |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4790 image_error ("Invalid image size", Qnil, Qnil); |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4791 goto failure; |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4792 } |
|
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4793 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4794 expect (','); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4795 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4796 XSETFRAME (frame, f); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4797 if (!NILP (Fxw_display_color_p (frame))) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4798 best_key = XPM_COLOR_KEY_C; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4799 else if (!NILP (Fx_display_grayscale_p (frame))) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4800 best_key = (XFASTINT (Fx_display_planes (frame)) > 2 |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4801 ? XPM_COLOR_KEY_G : XPM_COLOR_KEY_G4); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4802 else |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4803 best_key = XPM_COLOR_KEY_M; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4804 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4805 color_symbols = image_spec_value (img->spec, QCcolor_symbols, NULL); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4806 if (chars_per_pixel == 1) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4807 color_table = xpm_make_color_table_v (&put_color_table, |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4808 &get_color_table); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4809 else |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4810 color_table = xpm_make_color_table_h (&put_color_table, |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4811 &get_color_table); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4812 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4813 while (num_colors-- > 0) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4814 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4815 unsigned char *color, *max_color; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4816 int key, next_key, max_key = 0; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4817 Lisp_Object symbol_color = Qnil, color_val; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4818 XColor cdef; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4819 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4820 expect (XPM_TK_STRING); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4821 if (len <= chars_per_pixel || len >= BUFSIZ + chars_per_pixel) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4822 goto failure; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4823 memcpy (buffer, beg + chars_per_pixel, len - chars_per_pixel); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4824 buffer[len - chars_per_pixel] = '\0'; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4825 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4826 str = strtok (buffer, " \t"); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4827 if (str == NULL) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4828 goto failure; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4829 key = xpm_str_to_color_key (str); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4830 if (key < 0) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4831 goto failure; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4832 do |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4833 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4834 color = strtok (NULL, " \t"); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4835 if (color == NULL) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4836 goto failure; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4837 |
|
69958
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4838 while ((str = strtok (NULL, " \t")) != NULL) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4839 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4840 next_key = xpm_str_to_color_key (str); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4841 if (next_key >= 0) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4842 break; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4843 color[strlen (color)] = ' '; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4844 } |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4845 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4846 if (key == XPM_COLOR_KEY_S) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4847 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4848 if (NILP (symbol_color)) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4849 symbol_color = build_string (color); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4850 } |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4851 else if (max_key < key && key <= best_key) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4852 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4853 max_key = key; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4854 max_color = color; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4855 } |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4856 key = next_key; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4857 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4858 while (str); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4859 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4860 color_val = Qnil; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4861 if (!NILP (color_symbols) && !NILP (symbol_color)) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4862 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4863 Lisp_Object specified_color = Fassoc (symbol_color, color_symbols); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4864 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4865 if (CONSP (specified_color) && STRINGP (XCDR (specified_color))) |
|
69958
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4866 { |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4867 if (xstricmp (SDATA (XCDR (specified_color)), "None") == 0) |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4868 color_val = Qt; |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4869 else if (x_defined_color (f, SDATA (XCDR (specified_color)), |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4870 &cdef, 0)) |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4871 color_val = make_number (cdef.pixel); |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4872 } |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4873 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4874 if (NILP (color_val) && max_key > 0) |
|
69958
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4875 { |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4876 if (xstricmp (max_color, "None") == 0) |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4877 color_val = Qt; |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4878 else if (x_defined_color (f, max_color, &cdef, 0)) |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4879 color_val = make_number (cdef.pixel); |
|
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4880 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4881 if (!NILP (color_val)) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4882 (*put_color_table) (color_table, beg, chars_per_pixel, color_val); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4883 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4884 expect (','); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4885 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4886 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4887 if (!x_create_x_image_and_pixmap (f, width, height, 0, |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4888 &ximg, &img->pixmap) |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4889 || !x_create_x_image_and_pixmap (f, width, height, 1, |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4890 &mask_img, &img->mask)) |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4891 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4892 image_error ("Out of memory (%s)", img->spec, Qnil); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4893 goto error; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4894 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4895 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4896 for (y = 0; y < height; y++) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4897 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4898 expect (XPM_TK_STRING); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4899 str = beg; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4900 if (len < width * chars_per_pixel) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4901 goto failure; |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4902 for (x = 0; x < width; x++, str += chars_per_pixel) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4903 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4904 Lisp_Object color_val = |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4905 (*get_color_table) (color_table, str, chars_per_pixel); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4906 |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4907 XPutPixel (ximg, x, y, |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4908 (INTEGERP (color_val) ? XINT (color_val) |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4909 : FRAME_FOREGROUND_PIXEL (f))); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4910 XPutPixel (mask_img, x, y, |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4911 (!EQ (color_val, Qt) ? PIX_MASK_DRAW |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4912 : (have_mask = 1, PIX_MASK_RETAIN))); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4913 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4914 if (y + 1 < height) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4915 expect (','); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4916 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4917 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4918 img->width = width; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4919 img->height = height; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4920 |
|
70147
37f988f09f67
[MAC_OS] (xpm_load_image): Fill in background field
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70068
diff
changeset
|
4921 /* Maybe fill in the background field while we have ximg handy. */ |
|
37f988f09f67
[MAC_OS] (xpm_load_image): Fill in background field
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70068
diff
changeset
|
4922 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
37f988f09f67
[MAC_OS] (xpm_load_image): Fill in background field
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70068
diff
changeset
|
4923 IMAGE_BACKGROUND (img, f, ximg); |
|
37f988f09f67
[MAC_OS] (xpm_load_image): Fill in background field
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70068
diff
changeset
|
4924 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4925 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4926 x_destroy_x_image (ximg); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4927 if (have_mask) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4928 { |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4929 /* Fill in the background_transparent field while we have the |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4930 mask handy. */ |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4931 image_background_transparent (img, f, mask_img); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4932 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4933 x_put_x_image (f, mask_img, img->mask, width, height); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4934 x_destroy_x_image (mask_img); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4935 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4936 else |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4937 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4938 x_destroy_x_image (mask_img); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4939 Free_Pixmap (FRAME_X_DISPLAY (f), img->mask); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4940 img->mask = NO_PIXMAP; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4941 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4942 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4943 return 1; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4944 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4945 failure: |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4946 image_error ("Invalid XPM file (%s)", img->spec, Qnil); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4947 error: |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4948 x_destroy_x_image (ximg); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4949 x_destroy_x_image (mask_img); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4950 x_clear_image (f, img); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4951 return 0; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4952 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4953 #undef match |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4954 #undef expect |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4955 #undef expect_ident |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4956 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4957 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4958 static int |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4959 xpm_load (f, img) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4960 struct frame *f; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4961 struct image *img; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4962 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4963 int success_p = 0; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4964 Lisp_Object file_name; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4965 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4966 /* If IMG->spec specifies a file name, create a non-file spec from it. */ |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4967 file_name = image_spec_value (img->spec, QCfile, NULL); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4968 if (STRINGP (file_name)) |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4969 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4970 Lisp_Object file; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4971 unsigned char *contents; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4972 int size; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4973 struct gcpro gcpro1; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4974 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4975 file = x_find_image_file (file_name); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4976 GCPRO1 (file); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4977 if (!STRINGP (file)) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4978 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4979 image_error ("Cannot find image file `%s'", file_name, Qnil); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4980 UNGCPRO; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4981 return 0; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4982 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4983 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4984 contents = slurp_file (SDATA (file), &size); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4985 if (contents == NULL) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4986 { |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4987 image_error ("Error loading XPM image `%s'", img->spec, Qnil); |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4988 UNGCPRO; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4989 return 0; |
|
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
4990 } |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4991 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4992 success_p = xpm_load_image (f, img, contents, contents + size); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4993 xfree (contents); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4994 UNGCPRO; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4995 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4996 else |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4997 { |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4998 Lisp_Object data; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4999 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5000 data = image_spec_value (img->spec, QCdata, NULL); |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5001 success_p = xpm_load_image (f, img, SDATA (data), |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
5002 SDATA (data) + SBYTES (data)); |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5003 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5004 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5005 return success_p; |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5006 } |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5007 |
|
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5008 #endif /* MAC_OS */ |
|
55886
ae9227eb8392
Work around bugs/problems with MinGW builds of graphics libraries
Juanma Barranquero <lekktu@gmail.com>
parents:
55540
diff
changeset
|
5009 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
5010 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5011 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5012 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5013 Color table |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5014 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5015 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5016 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5017 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5018 /* An entry in the color table mapping an RGB color to a pixel color. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5019 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5020 struct ct_color |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5021 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5022 int r, g, b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5023 unsigned long pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5024 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5025 /* Next in color table collision list. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5026 struct ct_color *next; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5027 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5028 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5029 /* The bucket vector size to use. Must be prime. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5030 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5031 #define CT_SIZE 101 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5032 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5033 /* Value is a hash of the RGB color given by R, G, and B. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5034 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5035 #define CT_HASH_RGB(R, G, B) (((R) << 16) ^ ((G) << 8) ^ (B)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5036 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5037 /* The color hash table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5038 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5039 struct ct_color **ct_table; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5040 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5041 /* Number of entries in the color table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5042 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5043 int ct_colors_allocated; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5044 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5045 /* Initialize the color table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5046 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5047 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5048 init_color_table () |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5049 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5050 int size = CT_SIZE * sizeof (*ct_table); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5051 ct_table = (struct ct_color **) xmalloc (size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5052 bzero (ct_table, size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5053 ct_colors_allocated = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5054 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5055 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5056 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5057 /* Free memory associated with the color table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5058 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5059 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5060 free_color_table () |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5061 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5062 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5063 struct ct_color *p, *next; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5064 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5065 for (i = 0; i < CT_SIZE; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5066 for (p = ct_table[i]; p; p = next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5067 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5068 next = p->next; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5069 xfree (p); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5070 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5071 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5072 xfree (ct_table); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5073 ct_table = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5074 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5075 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5076 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5077 /* Value is a pixel color for RGB color R, G, B on frame F. If an |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5078 entry for that color already is in the color table, return the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5079 pixel color of that entry. Otherwise, allocate a new color for R, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5080 G, B, and make an entry in the color table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5081 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5082 static unsigned long |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5083 lookup_rgb_color (f, r, g, b) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5084 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5085 int r, g, b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5086 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5087 unsigned hash = CT_HASH_RGB (r, g, b); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5088 int i = hash % CT_SIZE; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5089 struct ct_color *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5090 Display_Info *dpyinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5091 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5092 /* Handle TrueColor visuals specially, which improves performance by |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5093 two orders of magnitude. Freeing colors on TrueColor visuals is |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5094 a nop, and pixel colors specify RGB values directly. See also |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5095 the Xlib spec, chapter 3.1. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5096 dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5097 if (dpyinfo->red_bits > 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5098 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5099 unsigned long pr, pg, pb; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5100 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5101 /* Apply gamma-correction like normal color allocation does. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5102 if (f->gamma) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5103 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5104 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5105 color.red = r, color.green = g, color.blue = b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5106 gamma_correct (f, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5107 r = color.red, g = color.green, b = color.blue; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5108 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5109 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5110 /* Scale down RGB values to the visual's bits per RGB, and shift |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5111 them to the right position in the pixel color. Note that the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5112 original RGB values are 16-bit values, as usual in X. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5113 pr = (r >> (16 - dpyinfo->red_bits)) << dpyinfo->red_offset; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5114 pg = (g >> (16 - dpyinfo->green_bits)) << dpyinfo->green_offset; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5115 pb = (b >> (16 - dpyinfo->blue_bits)) << dpyinfo->blue_offset; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5116 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5117 /* Assemble the pixel color. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5118 return pr | pg | pb; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5119 } |
|
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
5120 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5121 for (p = ct_table[i]; p; p = p->next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5122 if (p->r == r && p->g == g && p->b == b) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5123 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5124 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5125 if (p == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5126 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5127 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5128 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5129 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5130 Colormap cmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5131 int rc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5132 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5133 color.red = r; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5134 color.green = g; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5135 color.blue = b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5136 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5137 cmap = FRAME_X_COLORMAP (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5138 rc = x_alloc_nearest_color (f, cmap, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5139 if (rc) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5140 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5141 ++ct_colors_allocated; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5142 p = (struct ct_color *) xmalloc (sizeof *p); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5143 p->r = r; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5144 p->g = g; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5145 p->b = b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5146 p->pixel = color.pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5147 p->next = ct_table[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5148 ct_table[i] = p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5149 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5150 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5151 return FRAME_FOREGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5152 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5153 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5154 COLORREF color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5155 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5156 color = PALETTERGB (r, g, b); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5157 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5158 color = RGB_TO_ULONG (r, g, b); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5159 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5160 ++ct_colors_allocated; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5161 p = (struct ct_color *) xmalloc (sizeof *p); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5162 p->r = r; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5163 p->g = g; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5164 p->b = b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5165 p->pixel = color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5166 p->next = ct_table[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5167 ct_table[i] = p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5168 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5169 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5170 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5171 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5172 return p->pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5173 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5174 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5175 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5176 /* Look up pixel color PIXEL which is used on frame F in the color |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5177 table. If not already present, allocate it. Value is PIXEL. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5178 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5179 static unsigned long |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5180 lookup_pixel_color (f, pixel) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5181 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5182 unsigned long pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5183 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5184 int i = pixel % CT_SIZE; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5185 struct ct_color *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5186 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5187 for (p = ct_table[i]; p; p = p->next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5188 if (p->pixel == pixel) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5189 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5190 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5191 if (p == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5192 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5193 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5194 Colormap cmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5195 int rc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5196 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5197 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5198 cmap = FRAME_X_COLORMAP (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5199 color.pixel = pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5200 x_query_color (f, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5201 rc = x_alloc_nearest_color (f, cmap, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5202 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5203 BLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5204 cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5205 color.pixel = pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5206 XQueryColor (NULL, cmap, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5207 rc = x_alloc_nearest_color (f, cmap, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5208 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5209 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5210 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5211 if (rc) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5212 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5213 ++ct_colors_allocated; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5214 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5215 p = (struct ct_color *) xmalloc (sizeof *p); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5216 p->r = color.red; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5217 p->g = color.green; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5218 p->b = color.blue; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5219 p->pixel = pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5220 p->next = ct_table[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5221 ct_table[i] = p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5222 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5223 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5224 return FRAME_FOREGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5225 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5226 return p->pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5227 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5228 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5229 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5230 /* Value is a vector of all pixel colors contained in the color table, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5231 allocated via xmalloc. Set *N to the number of colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5232 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5233 static unsigned long * |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5234 colors_in_color_table (n) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5235 int *n; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5236 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5237 int i, j; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5238 struct ct_color *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5239 unsigned long *colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5240 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5241 if (ct_colors_allocated == 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5242 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5243 *n = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5244 colors = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5245 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5246 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5247 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5248 colors = (unsigned long *) xmalloc (ct_colors_allocated |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5249 * sizeof *colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5250 *n = ct_colors_allocated; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5251 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5252 for (i = j = 0; i < CT_SIZE; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5253 for (p = ct_table[i]; p; p = p->next) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5254 colors[j++] = p->pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5255 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5256 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5257 return colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5258 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5259 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5260 #else /* COLOR_TABLE_SUPPORT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5261 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5262 static unsigned long |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5263 lookup_rgb_color (f, r, g, b) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5264 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5265 int r, g, b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5266 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5267 unsigned long pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5268 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5269 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5270 pixel = RGB_TO_ULONG (r >> 8, g >> 8, b >> 8); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5271 gamma_correct (f, &pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5272 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5273 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5274 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5275 pixel = PALETTERGB (r >> 8, g >> 8, b >> 8); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5276 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5277 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5278 return pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5279 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5280 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5281 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5282 init_color_table () |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5283 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5284 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5285 #endif /* COLOR_TABLE_SUPPORT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5286 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5287 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5288 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5289 Algorithms |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5290 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5291 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5292 static XColor *x_to_xcolors P_ ((struct frame *, struct image *, int)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5293 static void x_from_xcolors P_ ((struct frame *, struct image *, XColor *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5294 static void x_detect_edges P_ ((struct frame *, struct image *, int[9], int)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5295 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5296 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5297 static void XPutPixel (XImagePtr , int, int, COLORREF); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5298 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5299 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5300 /* Non-zero means draw a cross on images having `:conversion |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5301 disabled'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5302 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5303 int cross_disabled_images; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5304 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5305 /* Edge detection matrices for different edge-detection |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5306 strategies. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5307 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5308 static int emboss_matrix[9] = { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5309 /* x - 1 x x + 1 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5310 2, -1, 0, /* y - 1 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5311 -1, 0, 1, /* y */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5312 0, 1, -2 /* y + 1 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5313 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5314 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5315 static int laplace_matrix[9] = { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5316 /* x - 1 x x + 1 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5317 1, 0, 0, /* y - 1 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5318 0, 0, 0, /* y */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5319 0, 0, -1 /* y + 1 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5320 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5321 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5322 /* Value is the intensity of the color whose red/green/blue values |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5323 are R, G, and B. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5324 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5325 #define COLOR_INTENSITY(R, G, B) ((2 * (R) + 3 * (G) + (B)) / 6) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5326 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5327 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5328 /* On frame F, return an array of XColor structures describing image |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5329 IMG->pixmap. Each XColor structure has its pixel color set. RGB_P |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5330 non-zero means also fill the red/green/blue members of the XColor |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5331 structures. Value is a pointer to the array of XColors structures, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5332 allocated with xmalloc; it must be freed by the caller. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5333 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5334 static XColor * |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5335 x_to_xcolors (f, img, rgb_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5336 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5337 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5338 int rgb_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5339 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5340 int x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5341 XColor *colors, *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5342 XImagePtr_or_DC ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5343 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5344 HDC hdc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5345 HGDIOBJ prev; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5346 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5347 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5348 colors = (XColor *) xmalloc (img->width * img->height * sizeof *colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5349 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5350 #ifndef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5351 /* Get the X image IMG->pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5352 ximg = XGetImage (FRAME_X_DISPLAY (f), img->pixmap, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5353 0, 0, img->width, img->height, ~0, ZPixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5354 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5355 /* Load the image into a memory device context. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5356 hdc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5357 ximg = CreateCompatibleDC (hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5358 release_frame_dc (f, hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5359 prev = SelectObject (ximg, img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5360 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5361 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5362 /* Fill the `pixel' members of the XColor array. I wished there |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5363 were an easy and portable way to circumvent XGetPixel. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5364 p = colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5365 for (y = 0; y < img->height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5366 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5367 XColor *row = p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5368 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5369 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5370 for (x = 0; x < img->width; ++x, ++p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5371 p->pixel = XGetPixel (ximg, x, y); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5372 if (rgb_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5373 x_query_colors (f, row, img->width); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5374 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5375 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5376 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5377 for (x = 0; x < img->width; ++x, ++p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5378 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5379 /* W32_TODO: palette support needed here? */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5380 p->pixel = GET_PIXEL (ximg, x, y); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5381 if (rgb_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5382 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5383 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5384 p->red = RED16_FROM_ULONG (p->pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5385 p->green = GREEN16_FROM_ULONG (p->pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5386 p->blue = BLUE16_FROM_ULONG (p->pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5387 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5388 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5389 p->red = 256 * GetRValue (p->pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5390 p->green = 256 * GetGValue (p->pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5391 p->blue = 256 * GetBValue (p->pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5392 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5393 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5394 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5395 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5396 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5397 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5398 Destroy_Image (ximg, prev); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5399 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5400 return colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5401 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5402 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5403 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5404 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5405 /* Put a pixel of COLOR at position X, Y in XIMG. XIMG must have been |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5406 created with CreateDIBSection, with the pointer to the bit values |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5407 stored in ximg->data. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5408 |
|
78692
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
5409 static void |
|
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
5410 XPutPixel (ximg, x, y, color) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5411 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5412 int x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5413 COLORREF color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5414 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5415 int width = ximg->info.bmiHeader.biWidth; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5416 int height = ximg->info.bmiHeader.biHeight; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5417 unsigned char * pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5418 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5419 /* True color images. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5420 if (ximg->info.bmiHeader.biBitCount == 24) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5421 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5422 int rowbytes = width * 3; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5423 /* Ensure scanlines are aligned on 4 byte boundaries. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5424 if (rowbytes % 4) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5425 rowbytes += 4 - (rowbytes % 4); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5426 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5427 pixel = ximg->data + y * rowbytes + x * 3; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5428 /* Windows bitmaps are in BGR order. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5429 *pixel = GetBValue (color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5430 *(pixel + 1) = GetGValue (color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5431 *(pixel + 2) = GetRValue (color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5432 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5433 /* Monochrome images. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5434 else if (ximg->info.bmiHeader.biBitCount == 1) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5435 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5436 int rowbytes = width / 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5437 /* Ensure scanlines are aligned on 4 byte boundaries. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5438 if (rowbytes % 4) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5439 rowbytes += 4 - (rowbytes % 4); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5440 pixel = ximg->data + y * rowbytes + x / 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5441 /* Filter out palette info. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5442 if (color & 0x00ffffff) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5443 *pixel = *pixel | (1 << x % 8); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5444 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5445 *pixel = *pixel & ~(1 << x % 8); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5446 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5447 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5448 image_error ("XPutPixel: palette image not supported", Qnil, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5449 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5450 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5451 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5452 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5453 /* Create IMG->pixmap from an array COLORS of XColor structures, whose |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5454 RGB members are set. F is the frame on which this all happens. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5455 COLORS will be freed; an existing IMG->pixmap will be freed, too. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5456 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5457 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5458 x_from_xcolors (f, img, colors) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5459 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5460 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5461 XColor *colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5462 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5463 int x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5464 XImagePtr oimg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5465 Pixmap pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5466 XColor *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5467 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5468 init_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5469 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5470 x_create_x_image_and_pixmap (f, img->width, img->height, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5471 &oimg, &pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5472 p = colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5473 for (y = 0; y < img->height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5474 for (x = 0; x < img->width; ++x, ++p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5475 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5476 unsigned long pixel; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5477 pixel = lookup_rgb_color (f, p->red, p->green, p->blue); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5478 XPutPixel (oimg, x, y, pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5479 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5480 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5481 xfree (colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5482 x_clear_image_1 (f, img, 1, 0, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5483 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5484 x_put_x_image (f, oimg, pixmap, img->width, img->height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5485 x_destroy_x_image (oimg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5486 img->pixmap = pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5487 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5488 img->colors = colors_in_color_table (&img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5489 free_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5490 #endif /* COLOR_TABLE_SUPPORT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5491 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5492 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5493 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5494 /* On frame F, perform edge-detection on image IMG. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5495 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5496 MATRIX is a nine-element array specifying the transformation |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5497 matrix. See emboss_matrix for an example. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5498 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5499 COLOR_ADJUST is a color adjustment added to each pixel of the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5500 outgoing image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5501 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5502 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5503 x_detect_edges (f, img, matrix, color_adjust) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5504 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5505 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5506 int matrix[9], color_adjust; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5507 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5508 XColor *colors = x_to_xcolors (f, img, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5509 XColor *new, *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5510 int x, y, i, sum; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5511 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5512 for (i = sum = 0; i < 9; ++i) |
| 85254 | 5513 sum += eabs (matrix[i]); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5514 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5515 #define COLOR(A, X, Y) ((A) + (Y) * img->width + (X)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5516 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5517 new = (XColor *) xmalloc (img->width * img->height * sizeof *new); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5518 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5519 for (y = 0; y < img->height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5520 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5521 p = COLOR (new, 0, y); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5522 p->red = p->green = p->blue = 0xffff/2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5523 p = COLOR (new, img->width - 1, y); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5524 p->red = p->green = p->blue = 0xffff/2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5525 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5526 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5527 for (x = 1; x < img->width - 1; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5528 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5529 p = COLOR (new, x, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5530 p->red = p->green = p->blue = 0xffff/2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5531 p = COLOR (new, x, img->height - 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5532 p->red = p->green = p->blue = 0xffff/2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5533 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5534 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5535 for (y = 1; y < img->height - 1; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5536 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5537 p = COLOR (new, 1, y); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5538 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5539 for (x = 1; x < img->width - 1; ++x, ++p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5540 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5541 int r, g, b, y1, x1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5542 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5543 r = g = b = i = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5544 for (y1 = y - 1; y1 < y + 2; ++y1) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5545 for (x1 = x - 1; x1 < x + 2; ++x1, ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5546 if (matrix[i]) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5547 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5548 XColor *t = COLOR (colors, x1, y1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5549 r += matrix[i] * t->red; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5550 g += matrix[i] * t->green; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5551 b += matrix[i] * t->blue; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5552 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5553 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5554 r = (r / sum + color_adjust) & 0xffff; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5555 g = (g / sum + color_adjust) & 0xffff; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5556 b = (b / sum + color_adjust) & 0xffff; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5557 p->red = p->green = p->blue = COLOR_INTENSITY (r, g, b); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5558 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5559 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5560 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5561 xfree (colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5562 x_from_xcolors (f, img, new); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5563 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5564 #undef COLOR |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5565 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5566 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5567 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5568 /* Perform the pre-defined `emboss' edge-detection on image IMG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5569 on frame F. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5570 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5571 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5572 x_emboss (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5573 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5574 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5575 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5576 x_detect_edges (f, img, emboss_matrix, 0xffff / 2); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5577 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5578 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5579 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5580 /* Transform image IMG which is used on frame F with a Laplace |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5581 edge-detection algorithm. The result is an image that can be used |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5582 to draw disabled buttons, for example. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5583 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5584 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5585 x_laplace (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5586 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5587 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5588 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5589 x_detect_edges (f, img, laplace_matrix, 45000); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5590 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5591 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5592 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5593 /* Perform edge-detection on image IMG on frame F, with specified |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5594 transformation matrix MATRIX and color-adjustment COLOR_ADJUST. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5595 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5596 MATRIX must be either |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5597 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5598 - a list of at least 9 numbers in row-major form |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5599 - a vector of at least 9 numbers |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5600 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5601 COLOR_ADJUST nil means use a default; otherwise it must be a |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5602 number. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5603 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5604 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5605 x_edge_detection (f, img, matrix, color_adjust) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5606 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5607 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5608 Lisp_Object matrix, color_adjust; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5609 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5610 int i = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5611 int trans[9]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5612 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5613 if (CONSP (matrix)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5614 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5615 for (i = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5616 i < 9 && CONSP (matrix) && NUMBERP (XCAR (matrix)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5617 ++i, matrix = XCDR (matrix)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5618 trans[i] = XFLOATINT (XCAR (matrix)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5619 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5620 else if (VECTORP (matrix) && ASIZE (matrix) >= 9) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5621 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5622 for (i = 0; i < 9 && NUMBERP (AREF (matrix, i)); ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5623 trans[i] = XFLOATINT (AREF (matrix, i)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5624 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5625 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5626 if (NILP (color_adjust)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5627 color_adjust = make_number (0xffff / 2); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5628 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5629 if (i == 9 && NUMBERP (color_adjust)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5630 x_detect_edges (f, img, trans, (int) XFLOATINT (color_adjust)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5631 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5632 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5633 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5634 /* Transform image IMG on frame F so that it looks disabled. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5635 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5636 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5637 x_disable_image (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5638 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5639 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5640 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5641 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5642 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5643 int n_planes = dpyinfo->n_planes * dpyinfo->n_cbits; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5644 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5645 int n_planes = dpyinfo->n_planes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5646 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5647 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5648 if (n_planes >= 2) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5649 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5650 /* Color (or grayscale). Convert to gray, and equalize. Just |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5651 drawing such images with a stipple can look very odd, so |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5652 we're using this method instead. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5653 XColor *colors = x_to_xcolors (f, img, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5654 XColor *p, *end; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5655 const int h = 15000; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5656 const int l = 30000; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5657 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5658 for (p = colors, end = colors + img->width * img->height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5659 p < end; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5660 ++p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5661 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5662 int i = COLOR_INTENSITY (p->red, p->green, p->blue); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5663 int i2 = (0xffff - h - l) * i / 0xffff + l; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5664 p->red = p->green = p->blue = i2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5665 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5666 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5667 x_from_xcolors (f, img, colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5668 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5669 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5670 /* Draw a cross over the disabled image, if we must or if we |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5671 should. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5672 if (n_planes < 2 || cross_disabled_images) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5673 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5674 #ifndef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5675 Display *dpy = FRAME_X_DISPLAY (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5676 GC gc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5677 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5678 #ifdef MAC_OS |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
5679 #define MaskForeground(f) PIX_MASK_DRAW |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5680 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5681 #define MaskForeground(f) WHITE_PIX_DEFAULT (f) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5682 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5683 |
|
75153
fd0c738b5d49
(XDrawLine) [MAC_OS]: Remove macro.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73570
diff
changeset
|
5684 gc = XCreateGC (dpy, img->pixmap, 0, NULL); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5685 XSetForeground (dpy, gc, BLACK_PIX_DEFAULT (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5686 XDrawLine (dpy, img->pixmap, gc, 0, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5687 img->width - 1, img->height - 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5688 XDrawLine (dpy, img->pixmap, gc, 0, img->height - 1, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5689 img->width - 1, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5690 XFreeGC (dpy, gc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5691 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5692 if (img->mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5693 { |
|
75153
fd0c738b5d49
(XDrawLine) [MAC_OS]: Remove macro.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73570
diff
changeset
|
5694 gc = XCreateGC (dpy, img->mask, 0, NULL); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5695 XSetForeground (dpy, gc, MaskForeground (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5696 XDrawLine (dpy, img->mask, gc, 0, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5697 img->width - 1, img->height - 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5698 XDrawLine (dpy, img->mask, gc, 0, img->height - 1, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5699 img->width - 1, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5700 XFreeGC (dpy, gc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5701 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5702 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5703 HDC hdc, bmpdc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5704 HGDIOBJ prev; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5705 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5706 hdc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5707 bmpdc = CreateCompatibleDC (hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5708 release_frame_dc (f, hdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5709 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5710 prev = SelectObject (bmpdc, img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5711 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5712 SetTextColor (bmpdc, BLACK_PIX_DEFAULT (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5713 MoveToEx (bmpdc, 0, 0, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5714 LineTo (bmpdc, img->width - 1, img->height - 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5715 MoveToEx (bmpdc, 0, img->height - 1, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5716 LineTo (bmpdc, img->width - 1, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5717 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5718 if (img->mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5719 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5720 SelectObject (bmpdc, img->mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5721 SetTextColor (bmpdc, WHITE_PIX_DEFAULT (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5722 MoveToEx (bmpdc, 0, 0, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5723 LineTo (bmpdc, img->width - 1, img->height - 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5724 MoveToEx (bmpdc, 0, img->height - 1, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5725 LineTo (bmpdc, img->width - 1, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5726 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5727 SelectObject (bmpdc, prev); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5728 DeleteDC (bmpdc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5729 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5730 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5731 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5732 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5733 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5734 /* Build a mask for image IMG which is used on frame F. FILE is the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5735 name of an image file, for error messages. HOW determines how to |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5736 determine the background color of IMG. If it is a list '(R G B)', |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5737 with R, G, and B being integers >= 0, take that as the color of the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5738 background. Otherwise, determine the background color of IMG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5739 heuristically. Value is non-zero if successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5740 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5741 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5742 x_build_heuristic_mask (f, img, how) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5743 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5744 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5745 Lisp_Object how; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5746 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5747 XImagePtr_or_DC ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5748 #ifndef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5749 XImagePtr mask_img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5750 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5751 HDC frame_dc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5752 HGDIOBJ prev; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5753 char *mask_img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5754 int row_width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5755 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5756 int x, y, rc, use_img_background; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5757 unsigned long bg = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5758 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5759 if (img->mask) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5760 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5761 Free_Pixmap (FRAME_X_DISPLAY (f), img->mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5762 img->mask = NO_PIXMAP; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5763 img->background_transparent_valid = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5764 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5765 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5766 #ifndef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5767 /* Create an image and pixmap serving as mask. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5768 rc = x_create_x_image_and_pixmap (f, img->width, img->height, 1, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5769 &mask_img, &img->mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5770 if (!rc) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5771 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5772 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5773 /* Get the X image of IMG->pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5774 ximg = XGetImage (FRAME_X_DISPLAY (f), img->pixmap, 0, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5775 img->width, img->height, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5776 ~0, ZPixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5777 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5778 /* Create the bit array serving as mask. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5779 row_width = (img->width + 7) / 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5780 mask_img = xmalloc (row_width * img->height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5781 bzero (mask_img, row_width * img->height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5782 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5783 /* Create a memory device context for IMG->pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5784 frame_dc = get_frame_dc (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5785 ximg = CreateCompatibleDC (frame_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5786 release_frame_dc (f, frame_dc); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5787 prev = SelectObject (ximg, img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5788 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5789 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5790 /* Determine the background color of ximg. If HOW is `(R G B)' |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5791 take that as color. Otherwise, use the image's background color. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5792 use_img_background = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5793 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5794 if (CONSP (how)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5795 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5796 int rgb[3], i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5797 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5798 for (i = 0; i < 3 && CONSP (how) && NATNUMP (XCAR (how)); ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5799 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5800 rgb[i] = XFASTINT (XCAR (how)) & 0xffff; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5801 how = XCDR (how); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5802 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5803 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5804 if (i == 3 && NILP (how)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5805 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5806 char color_name[30]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5807 sprintf (color_name, "#%04x%04x%04x", rgb[0], rgb[1], rgb[2]); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5808 bg = ( |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5809 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5810 0x00ffffff & /* Filter out palette info. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5811 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5812 x_alloc_image_color (f, img, build_string (color_name), 0)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5813 use_img_background = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5814 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5815 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5816 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5817 if (use_img_background) |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
5818 bg = four_corners_best (ximg, img->corners, img->width, img->height); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5819 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5820 /* Set all bits in mask_img to 1 whose color in ximg is different |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5821 from the background color bg. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5822 #ifndef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5823 for (y = 0; y < img->height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5824 for (x = 0; x < img->width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5825 XPutPixel (mask_img, x, y, (XGetPixel (ximg, x, y) != bg |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
5826 ? PIX_MASK_DRAW : PIX_MASK_RETAIN)); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5827 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5828 /* Fill in the background_transparent field while we have the mask handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5829 image_background_transparent (img, f, mask_img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5830 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5831 /* Put mask_img into img->mask. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5832 x_put_x_image (f, mask_img, img->mask, img->width, img->height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5833 x_destroy_x_image (mask_img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5834 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5835 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5836 for (y = 0; y < img->height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5837 for (x = 0; x < img->width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5838 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5839 COLORREF p = GetPixel (ximg, x, y); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5840 if (p != bg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5841 mask_img[y * row_width + x / 8] |= 1 << (x % 8); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5842 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5843 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5844 /* Create the mask image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5845 img->mask = w32_create_pixmap_from_bitmap_data (img->width, img->height, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5846 mask_img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5847 /* Fill in the background_transparent field while we have the mask handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5848 SelectObject (ximg, img->mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5849 image_background_transparent (img, f, ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5850 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5851 /* Was: x_destroy_x_image ((XImagePtr )mask_img); which seems bogus ++kfs */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5852 xfree (mask_img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5853 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5854 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5855 Destroy_Image (ximg, prev); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5856 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5857 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5858 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5859 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5860 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5861 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5862 PBM (mono, gray, color) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5863 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5864 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5865 static int pbm_image_p P_ ((Lisp_Object object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5866 static int pbm_load P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5867 static int pbm_scan_number P_ ((unsigned char **, unsigned char *)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5868 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5869 /* The symbol `pbm' identifying images of this type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5870 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5871 Lisp_Object Qpbm; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5872 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5873 /* Indices of image specification fields in gs_format, below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5874 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5875 enum pbm_keyword_index |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5876 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5877 PBM_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5878 PBM_FILE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5879 PBM_DATA, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5880 PBM_ASCENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5881 PBM_MARGIN, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5882 PBM_RELIEF, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5883 PBM_ALGORITHM, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5884 PBM_HEURISTIC_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5885 PBM_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5886 PBM_FOREGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5887 PBM_BACKGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5888 PBM_LAST |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5889 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5890 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5891 /* Vector of image_keyword structures describing the format |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5892 of valid user-defined image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5893 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5894 static struct image_keyword pbm_format[PBM_LAST] = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5895 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5896 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5897 {":file", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5898 {":data", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5899 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5900 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5901 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5902 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5903 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5904 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5905 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5906 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5907 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5908 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5909 /* Structure describing the image type `pbm'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5910 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5911 static struct image_type pbm_type = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5912 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5913 &Qpbm, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5914 pbm_image_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5915 pbm_load, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5916 x_clear_image, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5917 NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5918 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5919 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5920 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5921 /* Return non-zero if OBJECT is a valid PBM image specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5922 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5923 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5924 pbm_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5925 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5926 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5927 struct image_keyword fmt[PBM_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5928 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5929 bcopy (pbm_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5930 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5931 if (!parse_image_spec (object, fmt, PBM_LAST, Qpbm)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5932 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5933 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5934 /* Must specify either :data or :file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5935 return fmt[PBM_DATA].count + fmt[PBM_FILE].count == 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5936 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5937 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5938 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5939 /* Scan a decimal number from *S and return it. Advance *S while |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5940 reading the number. END is the end of the string. Value is -1 at |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5941 end of input. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5942 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5943 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5944 pbm_scan_number (s, end) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5945 unsigned char **s, *end; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5946 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5947 int c = 0, val = -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5948 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5949 while (*s < end) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5950 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5951 /* Skip white-space. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5952 while (*s < end && (c = *(*s)++, isspace (c))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5953 ; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5954 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5955 if (c == '#') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5956 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5957 /* Skip comment to end of line. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5958 while (*s < end && (c = *(*s)++, c != '\n')) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5959 ; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5960 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5961 else if (isdigit (c)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5962 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5963 /* Read decimal number. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5964 val = c - '0'; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5965 while (*s < end && (c = *(*s)++, isdigit (c))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5966 val = 10 * val + c - '0'; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5967 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5968 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5969 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5970 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5971 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5972 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5973 return val; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5974 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5975 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5976 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5977 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5978 #if 0 /* Unused. ++kfs */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5979 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5980 /* Read FILE into memory. Value is a pointer to a buffer allocated |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5981 with xmalloc holding FILE's contents. Value is null if an error |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5982 occurred. *SIZE is set to the size of the file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5983 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5984 static char * |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5985 pbm_read_file (file, size) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5986 Lisp_Object file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5987 int *size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5988 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5989 FILE *fp = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5990 char *buf = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5991 struct stat st; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5992 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5993 if (stat (SDATA (file), &st) == 0 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5994 && (fp = fopen (SDATA (file), "rb")) != NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5995 && (buf = (char *) xmalloc (st.st_size), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5996 fread (buf, 1, st.st_size, fp) == st.st_size)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5997 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5998 *size = st.st_size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5999 fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6000 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6001 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6002 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6003 if (fp) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6004 fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6005 if (buf) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6006 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6007 xfree (buf); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6008 buf = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6009 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6010 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6011 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6012 return buf; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6013 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6014 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6015 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6016 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6017 /* Load PBM image IMG for use on frame F. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6018 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6019 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6020 pbm_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6021 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6022 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6023 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6024 int raw_p, x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6025 int width, height, max_color_idx = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6026 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6027 Lisp_Object file, specified_file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6028 enum {PBM_MONO, PBM_GRAY, PBM_COLOR} type; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6029 struct gcpro gcpro1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6030 unsigned char *contents = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6031 unsigned char *end, *p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6032 int size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6033 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6034 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6035 file = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6036 GCPRO1 (file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6037 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6038 if (STRINGP (specified_file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6039 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6040 file = x_find_image_file (specified_file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6041 if (!STRINGP (file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6042 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6043 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6044 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6045 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6046 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6047 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6048 contents = slurp_file (SDATA (file), &size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6049 if (contents == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6050 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6051 image_error ("Error reading `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6052 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6053 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6054 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6055 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6056 p = contents; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6057 end = contents + size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6058 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6059 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6060 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6061 Lisp_Object data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6062 data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6063 p = SDATA (data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6064 end = p + SBYTES (data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6065 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6066 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6067 /* Check magic number. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6068 if (end - p < 2 || *p++ != 'P') |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6069 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6070 image_error ("Not a PBM image: `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6071 error: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6072 xfree (contents); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6073 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6074 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6075 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6076 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6077 switch (*p++) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6078 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6079 case '1': |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6080 raw_p = 0, type = PBM_MONO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6081 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6082 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6083 case '2': |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6084 raw_p = 0, type = PBM_GRAY; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6085 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6086 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6087 case '3': |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6088 raw_p = 0, type = PBM_COLOR; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6089 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6090 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6091 case '4': |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6092 raw_p = 1, type = PBM_MONO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6093 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6094 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6095 case '5': |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6096 raw_p = 1, type = PBM_GRAY; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6097 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6098 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6099 case '6': |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6100 raw_p = 1, type = PBM_COLOR; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6101 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6102 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6103 default: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6104 image_error ("Not a PBM image: `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6105 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6106 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6107 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6108 /* Read width, height, maximum color-component. Characters |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6109 starting with `#' up to the end of a line are ignored. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6110 width = pbm_scan_number (&p, end); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6111 height = pbm_scan_number (&p, end); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6112 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6113 if (type != PBM_MONO) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6114 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6115 max_color_idx = pbm_scan_number (&p, end); |
|
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6116 if (max_color_idx > 65535 || max_color_idx < 0) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6117 { |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6118 image_error ("Unsupported maximum PBM color value", Qnil, Qnil); |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6119 goto error; |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6120 } |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6121 } |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6122 |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6123 if (!check_image_size (f, width, height)) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6124 { |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6125 image_error ("Invalid image size", Qnil, Qnil); |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6126 goto error; |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6127 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6128 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6129 if (!x_create_x_image_and_pixmap (f, width, height, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6130 &ximg, &img->pixmap)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6131 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6132 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6133 /* Initialize the color hash table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6134 init_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6135 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6136 if (type == PBM_MONO) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6137 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6138 int c = 0, g; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6139 struct image_keyword fmt[PBM_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6140 unsigned long fg = FRAME_FOREGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6141 unsigned long bg = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6142 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6143 /* Parse the image specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6144 bcopy (pbm_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6145 parse_image_spec (img->spec, fmt, PBM_LAST, Qpbm); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6146 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6147 /* Get foreground and background colors, maybe allocate colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6148 if (fmt[PBM_FOREGROUND].count |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6149 && STRINGP (fmt[PBM_FOREGROUND].value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6150 fg = x_alloc_image_color (f, img, fmt[PBM_FOREGROUND].value, fg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6151 if (fmt[PBM_BACKGROUND].count |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6152 && STRINGP (fmt[PBM_BACKGROUND].value)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6153 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6154 bg = x_alloc_image_color (f, img, fmt[PBM_BACKGROUND].value, bg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6155 img->background = bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6156 img->background_valid = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6157 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6158 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6159 for (y = 0; y < height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6160 for (x = 0; x < width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6161 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6162 if (raw_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6163 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6164 if ((x & 7) == 0) |
|
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6165 { |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6166 if (p >= end) |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6167 { |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6168 x_destroy_x_image (ximg); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6169 x_clear_image (f, img); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6170 image_error ("Invalid image size in image `%s'", |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6171 img->spec, Qnil); |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6172 goto error; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6173 } |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6174 c = *p++; |
|
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
6175 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6176 g = c & 0x80; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6177 c <<= 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6178 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6179 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6180 g = pbm_scan_number (&p, end); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6181 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6182 XPutPixel (ximg, x, y, g ? fg : bg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6183 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6184 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6185 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6186 { |
|
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6187 int expected_size = height * width; |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6188 if (max_color_idx > 255) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6189 expected_size *= 2; |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6190 if (type == PBM_COLOR) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6191 expected_size *= 3; |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6192 |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6193 if (raw_p && p + expected_size > end) |
|
76550
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
6194 { |
|
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
6195 x_destroy_x_image (ximg); |
|
77692
f6cc3f58ce04
(pbm_load): Correctly check image size for greyscale pbm.
Chong Yidong <cyd@stupidchicken.com>
parents:
76550
diff
changeset
|
6196 x_clear_image (f, img); |
|
76550
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
6197 image_error ("Invalid image size in image `%s'", |
|
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
6198 img->spec, Qnil); |
|
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
6199 goto error; |
|
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
6200 } |
|
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
6201 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6202 for (y = 0; y < height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6203 for (x = 0; x < width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6204 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6205 int r, g, b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6206 |
|
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6207 if (type == PBM_GRAY && raw_p) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6208 { |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6209 r = g = b = *p++; |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6210 if (max_color_idx > 255) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6211 r = g = b = r * 256 + *p++; |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6212 } |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6213 else if (type == PBM_GRAY) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6214 r = g = b = pbm_scan_number (&p, end); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6215 else if (raw_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6216 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6217 r = *p++; |
|
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6218 if (max_color_idx > 255) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6219 r = r * 256 + *p++; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6220 g = *p++; |
|
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6221 if (max_color_idx > 255) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6222 g = g * 256 + *p++; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6223 b = *p++; |
|
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6224 if (max_color_idx > 255) |
|
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
6225 b = b * 256 + *p++; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6226 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6227 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6228 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6229 r = pbm_scan_number (&p, end); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6230 g = pbm_scan_number (&p, end); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6231 b = pbm_scan_number (&p, end); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6232 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6233 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6234 if (r < 0 || g < 0 || b < 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6235 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6236 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6237 image_error ("Invalid pixel value in image `%s'", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6238 img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6239 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6240 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6241 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6242 /* RGB values are now in the range 0..max_color_idx. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6243 Scale this to the range 0..0xffff supported by X. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6244 r = (double) r * 65535 / max_color_idx; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6245 g = (double) g * 65535 / max_color_idx; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6246 b = (double) b * 65535 / max_color_idx; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6247 XPutPixel (ximg, x, y, lookup_rgb_color (f, r, g, b)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6248 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6249 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6250 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6251 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6252 /* Store in IMG->colors the colors allocated for the image, and |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6253 free the color table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6254 img->colors = colors_in_color_table (&img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6255 free_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6256 #endif /* COLOR_TABLE_SUPPORT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6257 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6258 img->width = width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6259 img->height = height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6260 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6261 /* Maybe fill in the background field while we have ximg handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6262 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6263 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6264 /* Casting avoids a GCC warning. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6265 IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6266 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6267 /* Put the image into a pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6268 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6269 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6270 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6271 /* X and W32 versions did it here, MAC version above. ++kfs |
|
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
6272 img->width = width; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6273 img->height = height; */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6274 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6275 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6276 xfree (contents); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6277 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6278 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6279 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6280 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6281 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6282 PNG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6283 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6284 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6285 #if defined (HAVE_PNG) || defined (MAC_OS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6286 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6287 /* Function prototypes. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6288 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6289 static int png_image_p P_ ((Lisp_Object object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6290 static int png_load P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6291 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6292 /* The symbol `png' identifying images of this type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6293 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6294 Lisp_Object Qpng; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6295 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6296 /* Indices of image specification fields in png_format, below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6297 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6298 enum png_keyword_index |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6299 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6300 PNG_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6301 PNG_DATA, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6302 PNG_FILE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6303 PNG_ASCENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6304 PNG_MARGIN, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6305 PNG_RELIEF, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6306 PNG_ALGORITHM, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6307 PNG_HEURISTIC_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6308 PNG_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6309 PNG_BACKGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6310 PNG_LAST |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6311 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6312 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6313 /* Vector of image_keyword structures describing the format |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6314 of valid user-defined image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6315 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6316 static struct image_keyword png_format[PNG_LAST] = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6317 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6318 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6319 {":data", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6320 {":file", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6321 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6322 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6323 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6324 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6325 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6326 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6327 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6328 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6329 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6330 /* Structure describing the image type `png'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6331 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6332 static struct image_type png_type = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6333 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6334 &Qpng, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6335 png_image_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6336 png_load, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6337 x_clear_image, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6338 NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6339 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6340 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6341 /* Return non-zero if OBJECT is a valid PNG image specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6342 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6343 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6344 png_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6345 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6346 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6347 struct image_keyword fmt[PNG_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6348 bcopy (png_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6349 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6350 if (!parse_image_spec (object, fmt, PNG_LAST, Qpng)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6351 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6352 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6353 /* Must specify either the :data or :file keyword. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6354 return fmt[PNG_FILE].count + fmt[PNG_DATA].count == 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6355 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6356 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6357 #endif /* HAVE_PNG || MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6358 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6359 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6360 #ifdef HAVE_PNG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6361 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6362 #if defined HAVE_LIBPNG_PNG_H |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6363 # include <libpng/png.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6364 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6365 # include <png.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6366 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6367 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6368 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6369 /* PNG library details. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6370 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6371 DEF_IMGLIB_FN (png_get_io_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6372 DEF_IMGLIB_FN (png_check_sig); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6373 DEF_IMGLIB_FN (png_create_read_struct); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6374 DEF_IMGLIB_FN (png_create_info_struct); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6375 DEF_IMGLIB_FN (png_destroy_read_struct); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6376 DEF_IMGLIB_FN (png_set_read_fn); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6377 DEF_IMGLIB_FN (png_set_sig_bytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6378 DEF_IMGLIB_FN (png_read_info); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6379 DEF_IMGLIB_FN (png_get_IHDR); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6380 DEF_IMGLIB_FN (png_get_valid); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6381 DEF_IMGLIB_FN (png_set_strip_16); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6382 DEF_IMGLIB_FN (png_set_expand); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6383 DEF_IMGLIB_FN (png_set_gray_to_rgb); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6384 DEF_IMGLIB_FN (png_set_background); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6385 DEF_IMGLIB_FN (png_get_bKGD); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6386 DEF_IMGLIB_FN (png_read_update_info); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6387 DEF_IMGLIB_FN (png_get_channels); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6388 DEF_IMGLIB_FN (png_get_rowbytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6389 DEF_IMGLIB_FN (png_read_image); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6390 DEF_IMGLIB_FN (png_read_end); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6391 DEF_IMGLIB_FN (png_error); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6392 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6393 static int |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
6394 init_png_functions (Lisp_Object libraries) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6395 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6396 HMODULE library; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6397 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6398 /* Try loading libpng under probable names. */ |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
6399 if (!(library = w32_delayed_load (libraries, Qpng))) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6400 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6401 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6402 LOAD_IMGLIB_FN (library, png_get_io_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6403 LOAD_IMGLIB_FN (library, png_check_sig); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6404 LOAD_IMGLIB_FN (library, png_create_read_struct); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6405 LOAD_IMGLIB_FN (library, png_create_info_struct); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6406 LOAD_IMGLIB_FN (library, png_destroy_read_struct); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6407 LOAD_IMGLIB_FN (library, png_set_read_fn); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6408 LOAD_IMGLIB_FN (library, png_set_sig_bytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6409 LOAD_IMGLIB_FN (library, png_read_info); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6410 LOAD_IMGLIB_FN (library, png_get_IHDR); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6411 LOAD_IMGLIB_FN (library, png_get_valid); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6412 LOAD_IMGLIB_FN (library, png_set_strip_16); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6413 LOAD_IMGLIB_FN (library, png_set_expand); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6414 LOAD_IMGLIB_FN (library, png_set_gray_to_rgb); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6415 LOAD_IMGLIB_FN (library, png_set_background); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6416 LOAD_IMGLIB_FN (library, png_get_bKGD); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6417 LOAD_IMGLIB_FN (library, png_read_update_info); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6418 LOAD_IMGLIB_FN (library, png_get_channels); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6419 LOAD_IMGLIB_FN (library, png_get_rowbytes); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6420 LOAD_IMGLIB_FN (library, png_read_image); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6421 LOAD_IMGLIB_FN (library, png_read_end); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6422 LOAD_IMGLIB_FN (library, png_error); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6423 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6424 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6425 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6426 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6427 #define fn_png_get_io_ptr png_get_io_ptr |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6428 #define fn_png_check_sig png_check_sig |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6429 #define fn_png_create_read_struct png_create_read_struct |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6430 #define fn_png_create_info_struct png_create_info_struct |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6431 #define fn_png_destroy_read_struct png_destroy_read_struct |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6432 #define fn_png_set_read_fn png_set_read_fn |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6433 #define fn_png_set_sig_bytes png_set_sig_bytes |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6434 #define fn_png_read_info png_read_info |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6435 #define fn_png_get_IHDR png_get_IHDR |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6436 #define fn_png_get_valid png_get_valid |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6437 #define fn_png_set_strip_16 png_set_strip_16 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6438 #define fn_png_set_expand png_set_expand |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6439 #define fn_png_set_gray_to_rgb png_set_gray_to_rgb |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6440 #define fn_png_set_background png_set_background |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6441 #define fn_png_get_bKGD png_get_bKGD |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6442 #define fn_png_read_update_info png_read_update_info |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6443 #define fn_png_get_channels png_get_channels |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6444 #define fn_png_get_rowbytes png_get_rowbytes |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6445 #define fn_png_read_image png_read_image |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6446 #define fn_png_read_end png_read_end |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6447 #define fn_png_error png_error |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6448 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6449 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6450 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6451 /* Error and warning handlers installed when the PNG library |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6452 is initialized. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6453 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6454 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6455 my_png_error (png_ptr, msg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6456 png_struct *png_ptr; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6457 char *msg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6458 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6459 xassert (png_ptr != NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6460 image_error ("PNG error: %s", build_string (msg), Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6461 longjmp (png_ptr->jmpbuf, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6462 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6463 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6464 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6465 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6466 my_png_warning (png_ptr, msg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6467 png_struct *png_ptr; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6468 char *msg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6469 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6470 xassert (png_ptr != NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6471 image_error ("PNG warning: %s", build_string (msg), Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6472 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6473 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6474 /* Memory source for PNG decoding. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6475 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6476 struct png_memory_storage |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6477 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6478 unsigned char *bytes; /* The data */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6479 size_t len; /* How big is it? */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6480 int index; /* Where are we? */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6481 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6482 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6483 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6484 /* Function set as reader function when reading PNG image from memory. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6485 PNG_PTR is a pointer to the PNG control structure. Copy LENGTH |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6486 bytes from the input to DATA. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6487 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6488 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6489 png_read_from_memory (png_ptr, data, length) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6490 png_structp png_ptr; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6491 png_bytep data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6492 png_size_t length; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6493 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6494 struct png_memory_storage *tbr |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6495 = (struct png_memory_storage *) fn_png_get_io_ptr (png_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6496 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6497 if (length > tbr->len - tbr->index) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6498 fn_png_error (png_ptr, "Read error"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6499 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6500 bcopy (tbr->bytes + tbr->index, data, length); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6501 tbr->index = tbr->index + length; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6502 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6503 |
|
55886
ae9227eb8392
Work around bugs/problems with MinGW builds of graphics libraries
Juanma Barranquero <lekktu@gmail.com>
parents:
55540
diff
changeset
|
6504 |
|
63684
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6505 /* Function set as reader function when reading PNG image from a file. |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6506 PNG_PTR is a pointer to the PNG control structure. Copy LENGTH |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6507 bytes from the input to DATA. */ |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6508 |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6509 static void |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6510 png_read_from_file (png_ptr, data, length) |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6511 png_structp png_ptr; |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6512 png_bytep data; |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6513 png_size_t length; |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6514 { |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6515 FILE *fp = (FILE *) fn_png_get_io_ptr (png_ptr); |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6516 |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6517 if (fread (data, 1, length, fp) < length) |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6518 fn_png_error (png_ptr, "Read error"); |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6519 } |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6520 |
|
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6521 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6522 /* Load PNG image IMG for use on frame F. Value is non-zero if |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6523 successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6524 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6525 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6526 png_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6527 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6528 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6529 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6530 Lisp_Object file, specified_file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6531 Lisp_Object specified_data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6532 int x, y, i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6533 XImagePtr ximg, mask_img = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6534 struct gcpro gcpro1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6535 png_struct *png_ptr = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6536 png_info *info_ptr = NULL, *end_info = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6537 FILE *volatile fp = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6538 png_byte sig[8]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6539 png_byte * volatile pixels = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6540 png_byte ** volatile rows = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6541 png_uint_32 width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6542 int bit_depth, color_type, interlace_type; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6543 png_byte channels; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6544 png_uint_32 row_bytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6545 int transparent_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6546 struct png_memory_storage tbr; /* Data to be read */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6547 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6548 /* Find out what file to load. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6549 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6550 specified_data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6551 file = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6552 GCPRO1 (file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6553 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6554 if (NILP (specified_data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6555 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6556 file = x_find_image_file (specified_file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6557 if (!STRINGP (file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6558 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6559 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6560 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6561 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6562 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6563 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6564 /* Open the image file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6565 fp = fopen (SDATA (file), "rb"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6566 if (!fp) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6567 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6568 image_error ("Cannot open image file `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6569 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6570 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6571 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6572 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6573 /* Check PNG signature. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6574 if (fread (sig, 1, sizeof sig, fp) != sizeof sig |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6575 || !fn_png_check_sig (sig, sizeof sig)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6576 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6577 image_error ("Not a PNG file: `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6578 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6579 fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6580 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6581 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6582 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6583 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6584 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6585 /* Read from memory. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6586 tbr.bytes = SDATA (specified_data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6587 tbr.len = SBYTES (specified_data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6588 tbr.index = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6589 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6590 /* Check PNG signature. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6591 if (tbr.len < sizeof sig |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6592 || !fn_png_check_sig (tbr.bytes, sizeof sig)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6593 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6594 image_error ("Not a PNG image: `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6595 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6596 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6597 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6598 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6599 /* Need to skip past the signature. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6600 tbr.bytes += sizeof (sig); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6601 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6602 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6603 /* Initialize read and info structs for PNG lib. Casting return |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6604 value avoids a GCC warning on W32. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6605 png_ptr = (png_structp)fn_png_create_read_struct (PNG_LIBPNG_VER_STRING, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6606 NULL, my_png_error, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6607 my_png_warning); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6608 if (!png_ptr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6609 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6610 if (fp) fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6611 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6612 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6613 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6614 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6615 /* Casting return value avoids a GCC warning on W32. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6616 info_ptr = (png_infop)fn_png_create_info_struct (png_ptr); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6617 if (!info_ptr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6618 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6619 fn_png_destroy_read_struct (&png_ptr, NULL, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6620 if (fp) fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6621 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6622 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6623 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6624 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6625 /* Casting return value avoids a GCC warning on W32. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6626 end_info = (png_infop)fn_png_create_info_struct (png_ptr); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6627 if (!end_info) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6628 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6629 fn_png_destroy_read_struct (&png_ptr, &info_ptr, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6630 if (fp) fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6631 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6632 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6633 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6634 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6635 /* Set error jump-back. We come back here when the PNG library |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6636 detects an error. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6637 if (setjmp (png_ptr->jmpbuf)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6638 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6639 error: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6640 if (png_ptr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6641 fn_png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6642 xfree (pixels); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6643 xfree (rows); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6644 if (fp) fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6645 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6646 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6647 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6648 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6649 /* Read image info. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6650 if (!NILP (specified_data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6651 fn_png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6652 else |
|
63684
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6653 fn_png_set_read_fn (png_ptr, (void *) fp, png_read_from_file); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6654 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6655 fn_png_set_sig_bytes (png_ptr, sizeof sig); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6656 fn_png_read_info (png_ptr, info_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6657 fn_png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6658 &interlace_type, NULL, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6659 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6660 if (!check_image_size (f, width, height)) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6661 goto error; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6662 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6663 /* If image contains simply transparency data, we prefer to |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6664 construct a clipping mask. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6665 if (fn_png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6666 transparent_p = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6667 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6668 transparent_p = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6669 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6670 /* This function is easier to write if we only have to handle |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6671 one data format: RGB or RGBA with 8 bits per channel. Let's |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6672 transform other formats into that format. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6673 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6674 /* Strip more than 8 bits per channel. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6675 if (bit_depth == 16) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6676 fn_png_set_strip_16 (png_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6677 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6678 /* Expand data to 24 bit RGB, or 8 bit grayscale, with alpha channel |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6679 if available. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6680 fn_png_set_expand (png_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6681 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6682 /* Convert grayscale images to RGB. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6683 if (color_type == PNG_COLOR_TYPE_GRAY |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6684 || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6685 fn_png_set_gray_to_rgb (png_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6686 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6687 /* Handle alpha channel by combining the image with a background |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6688 color. Do this only if a real alpha channel is supplied. For |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6689 simple transparency, we prefer a clipping mask. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6690 if (!transparent_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6691 { |
|
83763
14a686983252
(png_load): Comment-out var only used in commented-out code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83676
diff
changeset
|
6692 /* png_color_16 *image_bg; */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6693 Lisp_Object specified_bg |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6694 = image_spec_value (img->spec, QCbackground, NULL); |
|
94780
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6695 int shift = (bit_depth == 16) ? 0 : 8; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6696 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6697 if (STRINGP (specified_bg)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6698 /* The user specified `:background', use that. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6699 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6700 /* W32 version incorrectly used COLORREF here!! ++kfs */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6701 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6702 if (x_defined_color (f, SDATA (specified_bg), &color, 0)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6703 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6704 png_color_16 user_bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6705 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6706 bzero (&user_bg, sizeof user_bg); |
|
94780
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6707 user_bg.red = color.red >> shift; |
|
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6708 user_bg.green = color.green >> shift; |
|
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6709 user_bg.blue = color.blue >> shift; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6710 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6711 fn_png_set_background (png_ptr, &user_bg, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6712 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6713 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6714 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6715 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6716 { |
|
94780
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6717 /* We use the current frame background, ignoring any default |
|
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6718 background color set by the image. */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6719 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6720 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6721 png_color_16 frame_background; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6722 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6723 color.pixel = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6724 x_query_color (f, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6725 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6726 bzero (&frame_background, sizeof frame_background); |
|
94780
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6727 frame_background.red = color.red >> shift; |
|
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6728 frame_background.green = color.green >> shift; |
|
80207eb81324
(png_load): Use correct bit-depth for setting background color.
Chong Yidong <cyd@stupidchicken.com>
parents:
94615
diff
changeset
|
6729 frame_background.blue = color.blue >> shift; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6730 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6731 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6732 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6733 COLORREF color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6734 png_color_16 frame_background; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6735 color = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6736 #if 0 /* W32 TODO : Colormap support. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6737 x_query_color (f, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6738 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6739 bzero (&frame_background, sizeof frame_background); |
|
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
6740 frame_background.red = GetRValue (color); |
|
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
6741 frame_background.green = GetGValue (color); |
|
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
6742 frame_background.blue = GetBValue (color); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6743 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6744 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6745 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6746 unsigned long color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6747 png_color_16 frame_background; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6748 color = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6749 #if 0 /* MAC/W32 TODO : Colormap support. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6750 x_query_color (f, &color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6751 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6752 bzero (&frame_background, sizeof frame_background); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6753 frame_background.red = RED_FROM_ULONG (color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6754 frame_background.green = GREEN_FROM_ULONG (color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6755 frame_background.blue = BLUE_FROM_ULONG (color); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6756 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6757 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6758 fn_png_set_background (png_ptr, &frame_background, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6759 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6760 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6761 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6762 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6763 /* Update info structure. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6764 fn_png_read_update_info (png_ptr, info_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6765 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6766 /* Get number of channels. Valid values are 1 for grayscale images |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6767 and images with a palette, 2 for grayscale images with transparency |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6768 information (alpha channel), 3 for RGB images, and 4 for RGB |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6769 images with alpha channel, i.e. RGBA. If conversions above were |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6770 sufficient we should only have 3 or 4 channels here. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6771 channels = fn_png_get_channels (png_ptr, info_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6772 xassert (channels == 3 || channels == 4); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6773 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6774 /* Number of bytes needed for one row of the image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6775 row_bytes = fn_png_get_rowbytes (png_ptr, info_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6776 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6777 /* Allocate memory for the image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6778 pixels = (png_byte *) xmalloc (row_bytes * height * sizeof *pixels); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6779 rows = (png_byte **) xmalloc (height * sizeof *rows); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6780 for (i = 0; i < height; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6781 rows[i] = pixels + i * row_bytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6782 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6783 /* Read the entire image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6784 fn_png_read_image (png_ptr, rows); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6785 fn_png_read_end (png_ptr, info_ptr); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6786 if (fp) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6787 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6788 fclose (fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6789 fp = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6790 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6791 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6792 /* Create the X image and pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6793 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6794 &img->pixmap)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6795 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6796 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6797 /* Create an image and pixmap serving as mask if the PNG image |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6798 contains an alpha channel. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6799 if (channels == 4 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6800 && !transparent_p |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6801 && !x_create_x_image_and_pixmap (f, width, height, 1, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6802 &mask_img, &img->mask)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6803 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6804 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6805 Free_Pixmap (FRAME_X_DISPLAY (f), img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6806 img->pixmap = NO_PIXMAP; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6807 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6808 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6809 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6810 /* Fill the X image and mask from PNG data. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6811 init_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6812 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6813 for (y = 0; y < height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6814 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6815 png_byte *p = rows[y]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6816 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6817 for (x = 0; x < width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6818 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6819 unsigned r, g, b; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6820 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6821 r = *p++ << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6822 g = *p++ << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6823 b = *p++ << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6824 XPutPixel (ximg, x, y, lookup_rgb_color (f, r, g, b)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6825 /* An alpha channel, aka mask channel, associates variable |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6826 transparency with an image. Where other image formats |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6827 support binary transparency---fully transparent or fully |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6828 opaque---PNG allows up to 254 levels of partial transparency. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6829 The PNG library implements partial transparency by combining |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6830 the image with a specified background color. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6831 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6832 I'm not sure how to handle this here nicely: because the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6833 background on which the image is displayed may change, for |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6834 real alpha channel support, it would be necessary to create |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6835 a new image for each possible background. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6836 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6837 What I'm doing now is that a mask is created if we have |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6838 boolean transparency information. Otherwise I'm using |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6839 the frame's background color to combine the image with. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6840 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6841 if (channels == 4) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6842 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6843 if (mask_img) |
|
65250
8105f38368d5
(PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
64967
diff
changeset
|
6844 XPutPixel (mask_img, x, y, *p > 0 ? PIX_MASK_DRAW : PIX_MASK_RETAIN); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6845 ++p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6846 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6847 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6848 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6849 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6850 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6851 /* Set IMG's background color from the PNG image, unless the user |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6852 overrode it. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6853 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6854 png_color_16 *bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6855 if (fn_png_get_bKGD (png_ptr, info_ptr, &bg)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6856 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6857 img->background = lookup_rgb_color (f, bg->red, bg->green, bg->blue); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6858 img->background_valid = 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6859 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6860 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6861 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6862 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6863 /* Remember colors allocated for this image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6864 img->colors = colors_in_color_table (&img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6865 free_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6866 #endif /* COLOR_TABLE_SUPPORT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6867 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6868 /* Clean up. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6869 fn_png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6870 xfree (rows); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6871 xfree (pixels); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6872 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6873 img->width = width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6874 img->height = height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6875 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6876 /* Maybe fill in the background field while we have ximg handy. |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6877 Casting avoids a GCC warning. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6878 IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6879 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6880 /* Put the image into the pixmap, then free the X image and its buffer. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6881 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6882 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6883 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6884 /* Same for the mask. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6885 if (mask_img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6886 { |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6887 /* Fill in the background_transparent field while we have the |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6888 mask handy. Casting avoids a GCC warning. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6889 image_background_transparent (img, f, (XImagePtr_or_DC)mask_img); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6890 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6891 x_put_x_image (f, mask_img, img->mask, img->width, img->height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6892 x_destroy_x_image (mask_img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6893 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6894 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6895 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6896 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6897 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6898 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6899 #else /* HAVE_PNG */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6900 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6901 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6902 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6903 png_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6904 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6905 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6906 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
6907 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
6908 return image_load_image_io (f, img, kUTTypePNG); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
6909 #elif MAC_OS_X_VERSION_MAX_ALLOWED >= 1020 |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
6910 return image_load_quartz2d (f, img, 1); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
6911 #else |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
6912 return image_load_quicktime (f, img, kQTFileTypePNG); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6913 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6914 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6915 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6916 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6917 #endif /* !HAVE_PNG */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6918 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6919 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6920 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6921 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6922 JPEG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6923 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6924 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6925 #if defined (HAVE_JPEG) || defined (MAC_OS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6926 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6927 static int jpeg_image_p P_ ((Lisp_Object object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6928 static int jpeg_load P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6929 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6930 /* The symbol `jpeg' identifying images of this type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6931 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6932 Lisp_Object Qjpeg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6933 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6934 /* Indices of image specification fields in gs_format, below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6935 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6936 enum jpeg_keyword_index |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6937 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6938 JPEG_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6939 JPEG_DATA, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6940 JPEG_FILE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6941 JPEG_ASCENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6942 JPEG_MARGIN, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6943 JPEG_RELIEF, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6944 JPEG_ALGORITHM, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6945 JPEG_HEURISTIC_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6946 JPEG_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6947 JPEG_BACKGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6948 JPEG_LAST |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6949 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6950 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6951 /* Vector of image_keyword structures describing the format |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6952 of valid user-defined image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6953 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6954 static struct image_keyword jpeg_format[JPEG_LAST] = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6955 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6956 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6957 {":data", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6958 {":file", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6959 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6960 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6961 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6962 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6963 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6964 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6965 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6966 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6967 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6968 /* Structure describing the image type `jpeg'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6969 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6970 static struct image_type jpeg_type = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6971 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6972 &Qjpeg, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6973 jpeg_image_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6974 jpeg_load, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6975 x_clear_image, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6976 NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6977 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6978 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6979 /* Return non-zero if OBJECT is a valid JPEG image specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6980 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6981 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6982 jpeg_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6983 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6984 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6985 struct image_keyword fmt[JPEG_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6986 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6987 bcopy (jpeg_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6988 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6989 if (!parse_image_spec (object, fmt, JPEG_LAST, Qjpeg)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6990 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6991 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6992 /* Must specify either the :data or :file keyword. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6993 return fmt[JPEG_FILE].count + fmt[JPEG_DATA].count == 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6994 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6995 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6996 #endif /* HAVE_JPEG || MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6997 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6998 #ifdef HAVE_JPEG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6999 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7000 /* Work around a warning about HAVE_STDLIB_H being redefined in |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7001 jconfig.h. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7002 #ifdef HAVE_STDLIB_H |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7003 #define HAVE_STDLIB_H_1 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7004 #undef HAVE_STDLIB_H |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7005 #endif /* HAVE_STLIB_H */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7006 |
|
59073
3501c078df60
(__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents:
58846
diff
changeset
|
7007 #if defined (HAVE_NTGUI) && !defined (__WIN32__) |
| 63112 | 7008 /* In older releases of the jpeg library, jpeglib.h will define boolean |
| 7009 differently depending on __WIN32__, so make sure it is defined. */ | |
|
59073
3501c078df60
(__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents:
58846
diff
changeset
|
7010 #define __WIN32__ 1 |
|
3501c078df60
(__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents:
58846
diff
changeset
|
7011 #endif |
|
3501c078df60
(__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents:
58846
diff
changeset
|
7012 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7013 #include <jpeglib.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7014 #include <jerror.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7015 #include <setjmp.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7016 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7017 #ifdef HAVE_STLIB_H_1 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7018 #define HAVE_STDLIB_H 1 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7019 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7020 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7021 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7022 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7023 /* JPEG library details. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7024 DEF_IMGLIB_FN (jpeg_CreateDecompress); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7025 DEF_IMGLIB_FN (jpeg_start_decompress); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7026 DEF_IMGLIB_FN (jpeg_finish_decompress); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7027 DEF_IMGLIB_FN (jpeg_destroy_decompress); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7028 DEF_IMGLIB_FN (jpeg_read_header); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7029 DEF_IMGLIB_FN (jpeg_read_scanlines); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7030 DEF_IMGLIB_FN (jpeg_std_error); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7031 DEF_IMGLIB_FN (jpeg_resync_to_restart); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7032 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7033 static int |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
7034 init_jpeg_functions (Lisp_Object libraries) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7035 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7036 HMODULE library; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7037 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
7038 if (!(library = w32_delayed_load (libraries, Qjpeg))) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7039 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7040 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7041 LOAD_IMGLIB_FN (library, jpeg_finish_decompress); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7042 LOAD_IMGLIB_FN (library, jpeg_read_scanlines); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7043 LOAD_IMGLIB_FN (library, jpeg_start_decompress); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7044 LOAD_IMGLIB_FN (library, jpeg_read_header); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7045 LOAD_IMGLIB_FN (library, jpeg_CreateDecompress); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7046 LOAD_IMGLIB_FN (library, jpeg_destroy_decompress); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7047 LOAD_IMGLIB_FN (library, jpeg_std_error); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7048 LOAD_IMGLIB_FN (library, jpeg_resync_to_restart); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7049 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7050 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7051 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7052 /* Wrapper since we can't directly assign the function pointer |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7053 to another function pointer that was declared more completely easily. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7054 static boolean |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7055 jpeg_resync_to_restart_wrapper (cinfo, desired) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7056 j_decompress_ptr cinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7057 int desired; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7058 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7059 return fn_jpeg_resync_to_restart (cinfo, desired); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7060 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7061 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7062 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7063 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7064 #define fn_jpeg_CreateDecompress(a,b,c) jpeg_create_decompress(a) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7065 #define fn_jpeg_start_decompress jpeg_start_decompress |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7066 #define fn_jpeg_finish_decompress jpeg_finish_decompress |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7067 #define fn_jpeg_destroy_decompress jpeg_destroy_decompress |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7068 #define fn_jpeg_read_header jpeg_read_header |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7069 #define fn_jpeg_read_scanlines jpeg_read_scanlines |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7070 #define fn_jpeg_std_error jpeg_std_error |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7071 #define jpeg_resync_to_restart_wrapper jpeg_resync_to_restart |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7072 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7073 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7074 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7075 struct my_jpeg_error_mgr |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7076 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7077 struct jpeg_error_mgr pub; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7078 jmp_buf setjmp_buffer; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7079 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7080 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7081 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7082 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7083 my_error_exit (cinfo) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7084 j_common_ptr cinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7085 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7086 struct my_jpeg_error_mgr *mgr = (struct my_jpeg_error_mgr *) cinfo->err; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7087 longjmp (mgr->setjmp_buffer, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7088 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7089 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7090 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7091 /* Init source method for JPEG data source manager. Called by |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7092 jpeg_read_header() before any data is actually read. See |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7093 libjpeg.doc from the JPEG lib distribution. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7094 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7095 static void |
|
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7096 our_common_init_source (cinfo) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7097 j_decompress_ptr cinfo; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7098 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7099 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7100 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7101 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7102 /* Method to terminate data source. Called by |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7103 jpeg_finish_decompress() after all data has been processed. */ |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7104 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7105 static void |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7106 our_common_term_source (cinfo) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7107 j_decompress_ptr cinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7108 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7109 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7110 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7111 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7112 /* Fill input buffer method for JPEG data source manager. Called |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7113 whenever more data is needed. We read the whole image in one step, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7114 so this only adds a fake end of input marker at the end. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7115 |
|
78863
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
7116 static JOCTET our_memory_buffer[2]; |
|
78788
c077ece08ff6
(our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
Glenn Morris <rgm@gnu.org>
parents:
78746
diff
changeset
|
7117 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7118 static boolean |
|
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7119 our_memory_fill_input_buffer (cinfo) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7120 j_decompress_ptr cinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7121 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7122 /* Insert a fake EOI marker. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7123 struct jpeg_source_mgr *src = cinfo->src; |
|
78788
c077ece08ff6
(our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
Glenn Morris <rgm@gnu.org>
parents:
78746
diff
changeset
|
7124 |
|
78863
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
7125 our_memory_buffer[0] = (JOCTET) 0xFF; |
|
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
7126 our_memory_buffer[1] = (JOCTET) JPEG_EOI; |
|
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
7127 |
|
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
7128 src->next_input_byte = our_memory_buffer; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7129 src->bytes_in_buffer = 2; |
|
58846
4d7444f1a64c
(our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE, init_image):
Richard M. Stallman <rms@gnu.org>
parents:
58752
diff
changeset
|
7130 return 1; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7131 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7132 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7133 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7134 /* Method to skip over NUM_BYTES bytes in the image data. CINFO->src |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7135 is the JPEG data source manager. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7136 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7137 static void |
|
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7138 our_memory_skip_input_data (cinfo, num_bytes) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7139 j_decompress_ptr cinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7140 long num_bytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7141 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7142 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *) cinfo->src; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7143 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7144 if (src) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7145 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7146 if (num_bytes > src->bytes_in_buffer) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7147 ERREXIT (cinfo, JERR_INPUT_EOF); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7148 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7149 src->bytes_in_buffer -= num_bytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7150 src->next_input_byte += num_bytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7151 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7152 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7153 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7154 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7155 /* Set up the JPEG lib for reading an image from DATA which contains |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7156 LEN bytes. CINFO is the decompression info structure created for |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7157 reading the image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7158 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7159 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7160 jpeg_memory_src (cinfo, data, len) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7161 j_decompress_ptr cinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7162 JOCTET *data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7163 unsigned int len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7164 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7165 struct jpeg_source_mgr *src; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7166 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7167 if (cinfo->src == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7168 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7169 /* First time for this JPEG object? */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7170 cinfo->src = (struct jpeg_source_mgr *) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7171 (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7172 sizeof (struct jpeg_source_mgr)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7173 src = (struct jpeg_source_mgr *) cinfo->src; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7174 src->next_input_byte = data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7175 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7176 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7177 src = (struct jpeg_source_mgr *) cinfo->src; |
|
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7178 src->init_source = our_common_init_source; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7179 src->fill_input_buffer = our_memory_fill_input_buffer; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7180 src->skip_input_data = our_memory_skip_input_data; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7181 src->resync_to_restart = jpeg_resync_to_restart_wrapper; /* Use default method. */ |
|
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7182 src->term_source = our_common_term_source; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7183 src->bytes_in_buffer = len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7184 src->next_input_byte = data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7185 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7186 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7187 |
|
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7188 struct jpeg_stdio_mgr |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7189 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7190 struct jpeg_source_mgr mgr; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7191 boolean finished; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7192 FILE *file; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7193 JOCTET *buffer; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7194 }; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7195 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7196 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7197 /* Size of buffer to read JPEG from file. |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7198 Not too big, as we want to use alloc_small. */ |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7199 #define JPEG_STDIO_BUFFER_SIZE 8192 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7200 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7201 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7202 /* Fill input buffer method for JPEG data source manager. Called |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7203 whenever more data is needed. The data is read from a FILE *. */ |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7204 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7205 static boolean |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7206 our_stdio_fill_input_buffer (cinfo) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7207 j_decompress_ptr cinfo; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7208 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7209 struct jpeg_stdio_mgr *src; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7210 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7211 src = (struct jpeg_stdio_mgr *) cinfo->src; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7212 if (!src->finished) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7213 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7214 size_t bytes; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7215 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7216 bytes = fread (src->buffer, 1, JPEG_STDIO_BUFFER_SIZE, src->file); |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7217 if (bytes > 0) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7218 src->mgr.bytes_in_buffer = bytes; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7219 else |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7220 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7221 WARNMS (cinfo, JWRN_JPEG_EOF); |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7222 src->finished = 1; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7223 src->buffer[0] = (JOCTET) 0xFF; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7224 src->buffer[1] = (JOCTET) JPEG_EOI; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7225 src->mgr.bytes_in_buffer = 2; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7226 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7227 src->mgr.next_input_byte = src->buffer; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7228 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7229 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7230 return 1; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7231 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7232 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7233 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7234 /* Method to skip over NUM_BYTES bytes in the image data. CINFO->src |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7235 is the JPEG data source manager. */ |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7236 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7237 static void |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7238 our_stdio_skip_input_data (cinfo, num_bytes) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7239 j_decompress_ptr cinfo; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7240 long num_bytes; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7241 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7242 struct jpeg_stdio_mgr *src; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7243 src = (struct jpeg_stdio_mgr *) cinfo->src; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7244 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7245 while (num_bytes > 0 && !src->finished) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7246 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7247 if (num_bytes <= src->mgr.bytes_in_buffer) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7248 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7249 src->mgr.bytes_in_buffer -= num_bytes; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7250 src->mgr.next_input_byte += num_bytes; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7251 break; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7252 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7253 else |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7254 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7255 num_bytes -= src->mgr.bytes_in_buffer; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7256 src->mgr.bytes_in_buffer = 0; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7257 src->mgr.next_input_byte = NULL; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7258 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7259 our_stdio_fill_input_buffer (cinfo); |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7260 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7261 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7262 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7263 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7264 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7265 /* Set up the JPEG lib for reading an image from a FILE *. |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7266 CINFO is the decompression info structure created for |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7267 reading the image. */ |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7268 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7269 static void |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7270 jpeg_file_src (cinfo, fp) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7271 j_decompress_ptr cinfo; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7272 FILE *fp; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7273 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7274 struct jpeg_stdio_mgr *src; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7275 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7276 if (cinfo->src != NULL) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7277 src = (struct jpeg_stdio_mgr *) cinfo->src; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7278 else |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7279 { |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7280 /* First time for this JPEG object? */ |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7281 cinfo->src = (struct jpeg_source_mgr *) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7282 (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7283 sizeof (struct jpeg_stdio_mgr)); |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7284 src = (struct jpeg_stdio_mgr *) cinfo->src; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7285 src->buffer = (JOCTET *) |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7286 (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7287 JPEG_STDIO_BUFFER_SIZE); |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7288 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7289 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7290 src->file = fp; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7291 src->finished = 0; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7292 src->mgr.init_source = our_common_init_source; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7293 src->mgr.fill_input_buffer = our_stdio_fill_input_buffer; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7294 src->mgr.skip_input_data = our_stdio_skip_input_data; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7295 src->mgr.resync_to_restart = jpeg_resync_to_restart_wrapper; /* Use default method. */ |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7296 src->mgr.term_source = our_common_term_source; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7297 src->mgr.bytes_in_buffer = 0; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7298 src->mgr.next_input_byte = NULL; |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7299 } |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7300 |
|
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7301 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7302 /* Load image IMG for use on frame F. Patterned after example.c |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7303 from the JPEG lib. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7304 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7305 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7306 jpeg_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7307 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7308 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7309 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7310 struct jpeg_decompress_struct cinfo; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7311 struct my_jpeg_error_mgr mgr; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7312 Lisp_Object file, specified_file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7313 Lisp_Object specified_data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7314 FILE * volatile fp = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7315 JSAMPARRAY buffer; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7316 int row_stride, x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7317 XImagePtr ximg = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7318 int rc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7319 unsigned long *colors; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7320 int width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7321 struct gcpro gcpro1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7322 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7323 /* Open the JPEG file. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7324 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7325 specified_data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7326 file = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7327 GCPRO1 (file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7328 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7329 if (NILP (specified_data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7330 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7331 file = x_find_image_file (specified_file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7332 if (!STRINGP (file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7333 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7334 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7335 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7336 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7337 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7338 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7339 fp = fopen (SDATA (file), "rb"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7340 if (fp == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7341 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7342 image_error ("Cannot open `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7343 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7344 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7345 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7346 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7347 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7348 /* Customize libjpeg's error handling to call my_error_exit when an |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7349 error is detected. This function will perform a longjmp. |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7350 Casting return value avoids a GCC warning on W32. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7351 cinfo.err = (struct jpeg_error_mgr *)fn_jpeg_std_error (&mgr.pub); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7352 mgr.pub.error_exit = my_error_exit; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7353 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7354 if ((rc = setjmp (mgr.setjmp_buffer)) != 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7355 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7356 if (rc == 1) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7357 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7358 /* Called from my_error_exit. Display a JPEG error. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7359 char buffer[JMSG_LENGTH_MAX]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7360 cinfo.err->format_message ((j_common_ptr) &cinfo, buffer); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7361 image_error ("Error reading JPEG image `%s': %s", img->spec, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7362 build_string (buffer)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7363 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7364 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7365 /* Close the input file and destroy the JPEG object. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7366 if (fp) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7367 fclose ((FILE *) fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7368 fn_jpeg_destroy_decompress (&cinfo); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7369 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7370 /* If we already have an XImage, free that. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7371 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7372 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7373 /* Free pixmap and colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7374 x_clear_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7375 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7376 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7377 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7378 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7379 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7380 /* Create the JPEG decompression object. Let it read from fp. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7381 Read the JPEG image header. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7382 fn_jpeg_CreateDecompress (&cinfo, JPEG_LIB_VERSION, sizeof (cinfo)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7383 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7384 if (NILP (specified_data)) |
|
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
7385 jpeg_file_src (&cinfo, (FILE *) fp); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7386 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7387 jpeg_memory_src (&cinfo, SDATA (specified_data), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7388 SBYTES (specified_data)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7389 |
|
58846
4d7444f1a64c
(our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE, init_image):
Richard M. Stallman <rms@gnu.org>
parents:
58752
diff
changeset
|
7390 fn_jpeg_read_header (&cinfo, 1); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7391 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7392 /* Customize decompression so that color quantization will be used. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7393 Start decompression. */ |
|
58846
4d7444f1a64c
(our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE, init_image):
Richard M. Stallman <rms@gnu.org>
parents:
58752
diff
changeset
|
7394 cinfo.quantize_colors = 1; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7395 fn_jpeg_start_decompress (&cinfo); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7396 width = img->width = cinfo.output_width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7397 height = img->height = cinfo.output_height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7398 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7399 if (!check_image_size (f, width, height)) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7400 { |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7401 image_error ("Invalid image size", Qnil, Qnil); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7402 longjmp (mgr.setjmp_buffer, 2); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7403 } |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7404 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7405 /* Create X image and pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7406 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7407 longjmp (mgr.setjmp_buffer, 2); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7408 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7409 /* Allocate colors. When color quantization is used, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7410 cinfo.actual_number_of_colors has been set with the number of |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7411 colors generated, and cinfo.colormap is a two-dimensional array |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7412 of color indices in the range 0..cinfo.actual_number_of_colors. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7413 No more than 255 colors will be generated. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7414 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7415 int i, ir, ig, ib; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7416 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7417 if (cinfo.out_color_components > 2) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7418 ir = 0, ig = 1, ib = 2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7419 else if (cinfo.out_color_components > 1) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7420 ir = 0, ig = 1, ib = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7421 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7422 ir = 0, ig = 0, ib = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7423 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7424 /* Use the color table mechanism because it handles colors that |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7425 cannot be allocated nicely. Such colors will be replaced with |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7426 a default color, and we don't have to care about which colors |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7427 can be freed safely, and which can't. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7428 init_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7429 colors = (unsigned long *) alloca (cinfo.actual_number_of_colors |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7430 * sizeof *colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7431 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7432 for (i = 0; i < cinfo.actual_number_of_colors; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7433 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7434 /* Multiply RGB values with 255 because X expects RGB values |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7435 in the range 0..0xffff. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7436 int r = cinfo.colormap[ir][i] << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7437 int g = cinfo.colormap[ig][i] << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7438 int b = cinfo.colormap[ib][i] << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7439 colors[i] = lookup_rgb_color (f, r, g, b); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7440 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7441 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7442 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7443 /* Remember those colors actually allocated. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7444 img->colors = colors_in_color_table (&img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7445 free_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7446 #endif /* COLOR_TABLE_SUPPORT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7447 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7448 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7449 /* Read pixels. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7450 row_stride = width * cinfo.output_components; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7451 buffer = cinfo.mem->alloc_sarray ((j_common_ptr) &cinfo, JPOOL_IMAGE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7452 row_stride, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7453 for (y = 0; y < height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7454 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7455 fn_jpeg_read_scanlines (&cinfo, buffer, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7456 for (x = 0; x < cinfo.output_width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7457 XPutPixel (ximg, x, y, colors[buffer[0][x]]); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7458 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7459 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7460 /* Clean up. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7461 fn_jpeg_finish_decompress (&cinfo); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7462 fn_jpeg_destroy_decompress (&cinfo); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7463 if (fp) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7464 fclose ((FILE *) fp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7465 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7466 /* Maybe fill in the background field while we have ximg handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7467 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7468 /* Casting avoids a GCC warning. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7469 IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7470 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7471 /* Put the image into the pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7472 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7473 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7474 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7475 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7476 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7477 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7478 #else /* HAVE_JPEG */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7479 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7480 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7481 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7482 jpeg_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7483 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7484 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7485 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
7486 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
7487 return image_load_image_io (f, img, kUTTypeJPEG); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
7488 #elif defined (MAC_OSX) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7489 return image_load_quartz2d (f, img, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7490 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7491 return image_load_quicktime (f, img, kQTFileTypeJPEG); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7492 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7493 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7494 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7495 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7496 #endif /* !HAVE_JPEG */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7497 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7498 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7499 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7500 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7501 TIFF |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7502 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7503 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7504 #if defined (HAVE_TIFF) || defined (MAC_OS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7505 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7506 static int tiff_image_p P_ ((Lisp_Object object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7507 static int tiff_load P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7508 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7509 /* The symbol `tiff' identifying images of this type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7510 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7511 Lisp_Object Qtiff; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7512 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7513 /* Indices of image specification fields in tiff_format, below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7514 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7515 enum tiff_keyword_index |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7516 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7517 TIFF_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7518 TIFF_DATA, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7519 TIFF_FILE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7520 TIFF_ASCENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7521 TIFF_MARGIN, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7522 TIFF_RELIEF, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7523 TIFF_ALGORITHM, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7524 TIFF_HEURISTIC_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7525 TIFF_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7526 TIFF_BACKGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7527 TIFF_LAST |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7528 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7529 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7530 /* Vector of image_keyword structures describing the format |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7531 of valid user-defined image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7532 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7533 static struct image_keyword tiff_format[TIFF_LAST] = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7534 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7535 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7536 {":data", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7537 {":file", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7538 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7539 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7540 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7541 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7542 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7543 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7544 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7545 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7546 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7547 /* Structure describing the image type `tiff'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7548 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7549 static struct image_type tiff_type = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7550 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7551 &Qtiff, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7552 tiff_image_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7553 tiff_load, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7554 x_clear_image, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7555 NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7556 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7557 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7558 /* Return non-zero if OBJECT is a valid TIFF image specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7559 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7560 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7561 tiff_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7562 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7563 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7564 struct image_keyword fmt[TIFF_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7565 bcopy (tiff_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7566 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7567 if (!parse_image_spec (object, fmt, TIFF_LAST, Qtiff)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7568 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7569 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7570 /* Must specify either the :data or :file keyword. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7571 return fmt[TIFF_FILE].count + fmt[TIFF_DATA].count == 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7572 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7573 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7574 #endif /* HAVE_TIFF || MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7575 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7576 #ifdef HAVE_TIFF |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7577 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7578 #include <tiffio.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7579 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7580 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7581 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7582 /* TIFF library details. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7583 DEF_IMGLIB_FN (TIFFSetErrorHandler); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7584 DEF_IMGLIB_FN (TIFFSetWarningHandler); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7585 DEF_IMGLIB_FN (TIFFOpen); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7586 DEF_IMGLIB_FN (TIFFClientOpen); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7587 DEF_IMGLIB_FN (TIFFGetField); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7588 DEF_IMGLIB_FN (TIFFReadRGBAImage); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7589 DEF_IMGLIB_FN (TIFFClose); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7590 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7591 static int |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
7592 init_tiff_functions (Lisp_Object libraries) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7593 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7594 HMODULE library; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7595 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
7596 if (!(library = w32_delayed_load (libraries, Qtiff))) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7597 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7598 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7599 LOAD_IMGLIB_FN (library, TIFFSetErrorHandler); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7600 LOAD_IMGLIB_FN (library, TIFFSetWarningHandler); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7601 LOAD_IMGLIB_FN (library, TIFFOpen); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7602 LOAD_IMGLIB_FN (library, TIFFClientOpen); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7603 LOAD_IMGLIB_FN (library, TIFFGetField); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7604 LOAD_IMGLIB_FN (library, TIFFReadRGBAImage); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7605 LOAD_IMGLIB_FN (library, TIFFClose); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7606 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7607 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7608 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7609 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7610 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7611 #define fn_TIFFSetErrorHandler TIFFSetErrorHandler |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7612 #define fn_TIFFSetWarningHandler TIFFSetWarningHandler |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7613 #define fn_TIFFOpen TIFFOpen |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7614 #define fn_TIFFClientOpen TIFFClientOpen |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7615 #define fn_TIFFGetField TIFFGetField |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7616 #define fn_TIFFReadRGBAImage TIFFReadRGBAImage |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7617 #define fn_TIFFClose TIFFClose |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7618 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7619 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7620 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7621 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7622 /* Reading from a memory buffer for TIFF images Based on the PNG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7623 memory source, but we have to provide a lot of extra functions. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7624 Blah. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7625 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7626 We really only need to implement read and seek, but I am not |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7627 convinced that the TIFF library is smart enough not to destroy |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7628 itself if we only hand it the function pointers we need to |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7629 override. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7630 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7631 typedef struct |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7632 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7633 unsigned char *bytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7634 size_t len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7635 int index; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7636 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7637 tiff_memory_source; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7638 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7639 static size_t |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7640 tiff_read_from_memory (data, buf, size) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7641 thandle_t data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7642 tdata_t buf; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7643 tsize_t size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7644 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7645 tiff_memory_source *src = (tiff_memory_source *) data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7646 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7647 if (size > src->len - src->index) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7648 return (size_t) -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7649 bcopy (src->bytes + src->index, buf, size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7650 src->index += size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7651 return size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7652 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7653 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7654 static size_t |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7655 tiff_write_from_memory (data, buf, size) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7656 thandle_t data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7657 tdata_t buf; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7658 tsize_t size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7659 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7660 return (size_t) -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7661 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7662 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7663 static toff_t |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7664 tiff_seek_in_memory (data, off, whence) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7665 thandle_t data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7666 toff_t off; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7667 int whence; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7668 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7669 tiff_memory_source *src = (tiff_memory_source *) data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7670 int idx; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7671 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7672 switch (whence) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7673 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7674 case SEEK_SET: /* Go from beginning of source. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7675 idx = off; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7676 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7677 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7678 case SEEK_END: /* Go from end of source. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7679 idx = src->len + off; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7680 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7681 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7682 case SEEK_CUR: /* Go from current position. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7683 idx = src->index + off; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7684 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7685 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7686 default: /* Invalid `whence'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7687 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7688 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7689 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7690 if (idx > src->len || idx < 0) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7691 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7692 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7693 src->index = idx; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7694 return src->index; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7695 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7696 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7697 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7698 tiff_close_memory (data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7699 thandle_t data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7700 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7701 /* NOOP */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7702 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7703 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7704 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7705 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7706 tiff_mmap_memory (data, pbase, psize) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7707 thandle_t data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7708 tdata_t *pbase; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7709 toff_t *psize; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7710 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7711 /* It is already _IN_ memory. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7712 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7713 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7714 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7715 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7716 tiff_unmap_memory (data, base, size) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7717 thandle_t data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7718 tdata_t base; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7719 toff_t size; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7720 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7721 /* We don't need to do this. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7722 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7723 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7724 static toff_t |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7725 tiff_size_of_memory (data) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7726 thandle_t data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7727 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7728 return ((tiff_memory_source *) data)->len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7729 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7730 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7731 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7732 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7733 tiff_error_handler (title, format, ap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7734 const char *title, *format; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7735 va_list ap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7736 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7737 char buf[512]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7738 int len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7739 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7740 len = sprintf (buf, "TIFF error: %s ", title); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7741 vsprintf (buf + len, format, ap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7742 add_to_log (buf, Qnil, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7743 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7744 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7745 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7746 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7747 tiff_warning_handler (title, format, ap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7748 const char *title, *format; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7749 va_list ap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7750 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7751 char buf[512]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7752 int len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7753 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7754 len = sprintf (buf, "TIFF warning: %s ", title); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7755 vsprintf (buf + len, format, ap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7756 add_to_log (buf, Qnil, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7757 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7758 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7759 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7760 /* Load TIFF image IMG for use on frame F. Value is non-zero if |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7761 successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7762 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7763 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7764 tiff_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7765 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7766 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7767 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7768 Lisp_Object file, specified_file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7769 Lisp_Object specified_data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7770 TIFF *tiff; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7771 int width, height, x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7772 uint32 *buf; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7773 int rc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7774 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7775 struct gcpro gcpro1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7776 tiff_memory_source memsrc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7777 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7778 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7779 specified_data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7780 file = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7781 GCPRO1 (file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7782 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7783 fn_TIFFSetErrorHandler (tiff_error_handler); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7784 fn_TIFFSetWarningHandler (tiff_warning_handler); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7785 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7786 if (NILP (specified_data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7787 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7788 /* Read from a file */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7789 file = x_find_image_file (specified_file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7790 if (!STRINGP (file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7791 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7792 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7793 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7794 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7795 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7796 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7797 /* Try to open the image file. Casting return value avoids a |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7798 GCC warning on W32. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7799 tiff = (TIFF *)fn_TIFFOpen (SDATA (file), "r"); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7800 if (tiff == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7801 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7802 image_error ("Cannot open `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7803 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7804 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7805 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7806 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7807 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7808 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7809 /* Memory source! */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7810 memsrc.bytes = SDATA (specified_data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7811 memsrc.len = SBYTES (specified_data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7812 memsrc.index = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7813 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7814 /* Casting return value avoids a GCC warning on W32. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7815 tiff = (TIFF *)fn_TIFFClientOpen ("memory_source", "r", &memsrc, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7816 (TIFFReadWriteProc) tiff_read_from_memory, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7817 (TIFFReadWriteProc) tiff_write_from_memory, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7818 tiff_seek_in_memory, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7819 tiff_close_memory, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7820 tiff_size_of_memory, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7821 tiff_mmap_memory, |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7822 tiff_unmap_memory); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7823 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7824 if (!tiff) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7825 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7826 image_error ("Cannot open memory source for `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7827 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7828 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7829 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7830 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7831 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7832 /* Get width and height of the image, and allocate a raster buffer |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7833 of width x height 32-bit values. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7834 fn_TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &width); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7835 fn_TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &height); |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7836 |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7837 if (!check_image_size (f, width, height)) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7838 { |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7839 image_error ("Invalid image size", Qnil, Qnil); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7840 UNGCPRO; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7841 return 0; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7842 } |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7843 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7844 buf = (uint32 *) xmalloc (width * height * sizeof *buf); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7845 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7846 rc = fn_TIFFReadRGBAImage (tiff, width, height, buf, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7847 fn_TIFFClose (tiff); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7848 if (!rc) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7849 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7850 image_error ("Error reading TIFF image `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7851 xfree (buf); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7852 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7853 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7854 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7855 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7856 /* Create the X image and pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7857 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7858 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7859 xfree (buf); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7860 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7861 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7862 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7863 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7864 /* Initialize the color table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7865 init_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7866 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7867 /* Process the pixel raster. Origin is in the lower-left corner. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7868 for (y = 0; y < height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7869 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7870 uint32 *row = buf + y * width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7871 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7872 for (x = 0; x < width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7873 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7874 uint32 abgr = row[x]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7875 int r = TIFFGetR (abgr) << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7876 int g = TIFFGetG (abgr) << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7877 int b = TIFFGetB (abgr) << 8; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7878 XPutPixel (ximg, x, height - 1 - y, lookup_rgb_color (f, r, g, b)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7879 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7880 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7881 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7882 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7883 /* Remember the colors allocated for the image. Free the color table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7884 img->colors = colors_in_color_table (&img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7885 free_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7886 #endif /* COLOR_TABLE_SUPPORT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7887 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7888 img->width = width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7889 img->height = height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7890 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7891 /* Maybe fill in the background field while we have ximg handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7892 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7893 /* Casting avoids a GCC warning on W32. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7894 IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7895 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7896 /* Put the image into the pixmap, then free the X image and its buffer. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7897 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7898 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7899 xfree (buf); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7900 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7901 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7902 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7903 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7904 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7905 #else /* HAVE_TIFF */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7906 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7907 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7908 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7909 tiff_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7910 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7911 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7912 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
7913 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
7914 return image_load_image_io (f, img, kUTTypeTIFF); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
7915 #else |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7916 return image_load_quicktime (f, img, kQTFileTypeTIFF); |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
7917 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7918 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7919 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7920 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7921 #endif /* !HAVE_TIFF */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7922 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7923 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7924 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7925 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7926 GIF |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7927 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7928 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7929 #if defined (HAVE_GIF) || defined (MAC_OS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7930 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7931 static int gif_image_p P_ ((Lisp_Object object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7932 static int gif_load P_ ((struct frame *f, struct image *img)); |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7933 static void gif_clear_image P_ ((struct frame *f, struct image *img)); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7934 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7935 /* The symbol `gif' identifying images of this type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7936 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7937 Lisp_Object Qgif; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7938 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7939 /* Indices of image specification fields in gif_format, below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7940 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7941 enum gif_keyword_index |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7942 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7943 GIF_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7944 GIF_DATA, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7945 GIF_FILE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7946 GIF_ASCENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7947 GIF_MARGIN, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7948 GIF_RELIEF, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7949 GIF_ALGORITHM, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7950 GIF_HEURISTIC_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7951 GIF_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7952 GIF_IMAGE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7953 GIF_BACKGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7954 GIF_LAST |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7955 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7956 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7957 /* Vector of image_keyword structures describing the format |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7958 of valid user-defined image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7959 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7960 static struct image_keyword gif_format[GIF_LAST] = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7961 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7962 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7963 {":data", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7964 {":file", IMAGE_STRING_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7965 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7966 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7967 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7968 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7969 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7970 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7971 {":image", IMAGE_NON_NEGATIVE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7972 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7973 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7974 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7975 /* Structure describing the image type `gif'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7976 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7977 static struct image_type gif_type = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7978 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7979 &Qgif, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7980 gif_image_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7981 gif_load, |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7982 gif_clear_image, |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7983 NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7984 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7985 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7986 /* Free X resources of GIF image IMG which is used on frame F. */ |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7987 |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7988 static void |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7989 gif_clear_image (f, img) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7990 struct frame *f; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7991 struct image *img; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7992 { |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7993 /* IMG->data.ptr_val may contain extension data. */ |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7994 img->data.lisp_val = Qnil; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7995 x_clear_image (f, img); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7996 } |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7997 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7998 /* Return non-zero if OBJECT is a valid GIF image specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7999 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8000 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8001 gif_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8002 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8003 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8004 struct image_keyword fmt[GIF_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8005 bcopy (gif_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8006 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8007 if (!parse_image_spec (object, fmt, GIF_LAST, Qgif)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8008 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8009 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8010 /* Must specify either the :data or :file keyword. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8011 return fmt[GIF_FILE].count + fmt[GIF_DATA].count == 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8012 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8013 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8014 #endif /* HAVE_GIF || MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8015 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8016 #ifdef HAVE_GIF |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8017 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8018 #if defined (HAVE_NTGUI) || defined (MAC_OS) |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8019 /* winuser.h might define DrawText to DrawTextA or DrawTextW. |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8020 Undefine before redefining to avoid a preprocessor warning. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8021 #ifdef DrawText |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8022 #undef DrawText |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8023 #endif |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8024 /* avoid conflict with QuickdrawText.h */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8025 #define DrawText gif_DrawText |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8026 #include <gif_lib.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8027 #undef DrawText |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8028 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8029 #else /* HAVE_NTGUI || MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8030 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8031 #include <gif_lib.h> |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8032 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8033 #endif /* HAVE_NTGUI || MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8034 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8035 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8036 #ifdef HAVE_NTGUI |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8037 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8038 /* GIF library details. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8039 DEF_IMGLIB_FN (DGifCloseFile); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8040 DEF_IMGLIB_FN (DGifSlurp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8041 DEF_IMGLIB_FN (DGifOpen); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8042 DEF_IMGLIB_FN (DGifOpenFileName); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8043 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8044 static int |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8045 init_gif_functions (Lisp_Object libraries) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8046 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8047 HMODULE library; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8048 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8049 if (!(library = w32_delayed_load (libraries, Qgif))) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8050 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8051 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8052 LOAD_IMGLIB_FN (library, DGifCloseFile); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8053 LOAD_IMGLIB_FN (library, DGifSlurp); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8054 LOAD_IMGLIB_FN (library, DGifOpen); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8055 LOAD_IMGLIB_FN (library, DGifOpenFileName); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8056 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8057 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8058 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8059 #else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8060 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8061 #define fn_DGifCloseFile DGifCloseFile |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8062 #define fn_DGifSlurp DGifSlurp |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8063 #define fn_DGifOpen DGifOpen |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8064 #define fn_DGifOpenFileName DGifOpenFileName |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8065 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8066 #endif /* HAVE_NTGUI */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8067 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8068 /* Reading a GIF image from memory |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8069 Based on the PNG memory stuff to a certain extent. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8070 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8071 typedef struct |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8072 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8073 unsigned char *bytes; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8074 size_t len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8075 int index; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8076 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8077 gif_memory_source; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8078 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8079 /* Make the current memory source available to gif_read_from_memory. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8080 It's done this way because not all versions of libungif support |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8081 a UserData field in the GifFileType structure. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8082 static gif_memory_source *current_gif_memory_src; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8083 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8084 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8085 gif_read_from_memory (file, buf, len) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8086 GifFileType *file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8087 GifByteType *buf; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8088 int len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8089 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8090 gif_memory_source *src = current_gif_memory_src; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8091 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8092 if (len > src->len - src->index) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8093 return -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8094 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8095 bcopy (src->bytes + src->index, buf, len); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8096 src->index += len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8097 return len; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8098 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8099 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8100 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8101 /* Load GIF image IMG for use on frame F. Value is non-zero if |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8102 successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8103 |
|
78788
c077ece08ff6
(our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
Glenn Morris <rgm@gnu.org>
parents:
78746
diff
changeset
|
8104 static int interlace_start[] = {0, 4, 2, 1}; |
|
c077ece08ff6
(our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
Glenn Morris <rgm@gnu.org>
parents:
78746
diff
changeset
|
8105 static int interlace_increment[] = {8, 8, 4, 2}; |
|
c077ece08ff6
(our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
Glenn Morris <rgm@gnu.org>
parents:
78746
diff
changeset
|
8106 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8107 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8108 gif_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8109 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8110 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8111 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8112 Lisp_Object file, specified_file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8113 Lisp_Object specified_data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8114 int rc, width, height, x, y, i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8115 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8116 ColorMapObject *gif_color_map; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8117 unsigned long pixel_colors[256]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8118 GifFileType *gif; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8119 struct gcpro gcpro1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8120 Lisp_Object image; |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8121 int ino, image_height, image_width; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8122 gif_memory_source memsrc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8123 unsigned char *raster; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8124 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8125 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8126 specified_data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8127 file = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8128 GCPRO1 (file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8129 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8130 if (NILP (specified_data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8131 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8132 file = x_find_image_file (specified_file); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8133 if (!STRINGP (file)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8134 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8135 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8136 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8137 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8138 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8139 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8140 /* Open the GIF file. Casting return value avoids a GCC warning |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8141 on W32. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8142 gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file)); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8143 if (gif == NULL) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8144 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8145 image_error ("Cannot open `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8146 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8147 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8148 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8149 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8150 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8151 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8152 /* Read from memory! */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8153 current_gif_memory_src = &memsrc; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8154 memsrc.bytes = SDATA (specified_data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8155 memsrc.len = SBYTES (specified_data); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8156 memsrc.index = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8157 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8158 /* Casting return value avoids a GCC warning on W32. */ |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8159 gif = (GifFileType *) fn_DGifOpen (&memsrc, gif_read_from_memory); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8160 if (!gif) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8161 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8162 image_error ("Cannot open memory source `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8163 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8164 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8165 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8166 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8167 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8168 /* Before reading entire contents, check the declared image size. */ |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8169 if (!check_image_size (f, gif->SWidth, gif->SHeight)) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8170 { |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8171 image_error ("Invalid image size", Qnil, Qnil); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8172 fn_DGifCloseFile (gif); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8173 UNGCPRO; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8174 return 0; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8175 } |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8176 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8177 /* Read entire contents. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8178 rc = fn_DGifSlurp (gif); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8179 if (rc == GIF_ERROR) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8180 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8181 image_error ("Error reading `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8182 fn_DGifCloseFile (gif); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8183 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8184 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8185 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8186 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8187 image = image_spec_value (img->spec, QCindex, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8188 ino = INTEGERP (image) ? XFASTINT (image) : 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8189 if (ino >= gif->ImageCount) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8190 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8191 image_error ("Invalid image number `%s' in image `%s'", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8192 image, img->spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8193 fn_DGifCloseFile (gif); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8194 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8195 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8196 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8197 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8198 img->corners[TOP_CORNER] = gif->SavedImages[ino].ImageDesc.Top; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8199 img->corners[LEFT_CORNER] = gif->SavedImages[ino].ImageDesc.Left; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8200 image_height = gif->SavedImages[ino].ImageDesc.Height; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8201 img->corners[BOT_CORNER] = img->corners[TOP_CORNER] + image_height; |
|
65723
b88d5090aa86
(gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents:
65250
diff
changeset
|
8202 image_width = gif->SavedImages[ino].ImageDesc.Width; |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8203 img->corners[RIGHT_CORNER] = img->corners[LEFT_CORNER] + image_width; |
|
65723
b88d5090aa86
(gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents:
65250
diff
changeset
|
8204 |
|
b88d5090aa86
(gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents:
65250
diff
changeset
|
8205 width = img->width = max (gif->SWidth, |
|
b88d5090aa86
(gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents:
65250
diff
changeset
|
8206 max (gif->Image.Left + gif->Image.Width, |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8207 img->corners[RIGHT_CORNER])); |
|
65723
b88d5090aa86
(gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents:
65250
diff
changeset
|
8208 height = img->height = max (gif->SHeight, |
|
b88d5090aa86
(gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents:
65250
diff
changeset
|
8209 max (gif->Image.Top + gif->Image.Height, |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8210 img->corners[BOT_CORNER])); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8211 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8212 if (!check_image_size (f, width, height)) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8213 { |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8214 image_error ("Invalid image size", Qnil, Qnil); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8215 fn_DGifCloseFile (gif); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8216 UNGCPRO; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8217 return 0; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8218 } |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8219 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8220 /* Create the X image and pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8221 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8222 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8223 fn_DGifCloseFile (gif); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8224 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8225 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8226 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8227 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8228 /* Allocate colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8229 gif_color_map = gif->SavedImages[ino].ImageDesc.ColorMap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8230 if (!gif_color_map) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8231 gif_color_map = gif->SColorMap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8232 init_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8233 bzero (pixel_colors, sizeof pixel_colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8234 |
|
78746
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
8235 if (gif_color_map) |
|
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
8236 for (i = 0; i < gif_color_map->ColorCount; ++i) |
|
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
8237 { |
|
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
8238 int r = gif_color_map->Colors[i].Red << 8; |
|
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
8239 int g = gif_color_map->Colors[i].Green << 8; |
|
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
8240 int b = gif_color_map->Colors[i].Blue << 8; |
|
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
8241 pixel_colors[i] = lookup_rgb_color (f, r, g, b); |
|
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
8242 } |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8243 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8244 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8245 img->colors = colors_in_color_table (&img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8246 free_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8247 #endif /* COLOR_TABLE_SUPPORT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8248 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8249 /* Clear the part of the screen image that are not covered by |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8250 the image from the GIF file. Full animated GIF support |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8251 requires more than can be done here (see the gif89 spec, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8252 disposal methods). Let's simply assume that the part |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8253 not covered by a sub-image is in the frame's background color. */ |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8254 for (y = 0; y < img->corners[TOP_CORNER]; ++y) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8255 for (x = 0; x < width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8256 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8257 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8258 for (y = img->corners[BOT_CORNER]; y < height; ++y) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8259 for (x = 0; x < width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8260 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8261 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8262 for (y = img->corners[TOP_CORNER]; y < img->corners[BOT_CORNER]; ++y) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8263 { |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8264 for (x = 0; x < img->corners[LEFT_CORNER]; ++x) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8265 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8266 for (x = img->corners[RIGHT_CORNER]; x < width; ++x) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8267 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8268 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8269 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8270 /* Read the GIF image into the X image. We use a local variable |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8271 `raster' here because RasterBits below is a char *, and invites |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8272 problems with bytes >= 0x80. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8273 raster = (unsigned char *) gif->SavedImages[ino].RasterBits; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8274 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8275 if (gif->SavedImages[ino].ImageDesc.Interlace) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8276 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8277 int pass; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8278 int row = interlace_start[0]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8279 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8280 pass = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8281 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8282 for (y = 0; y < image_height; y++) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8283 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8284 if (row >= image_height) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8285 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8286 row = interlace_start[++pass]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8287 while (row >= image_height) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8288 row = interlace_start[++pass]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8289 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8290 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8291 for (x = 0; x < image_width; x++) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8292 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8293 int i = raster[(y * image_width) + x]; |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8294 XPutPixel (ximg, x + img->corners[LEFT_CORNER], |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8295 row + img->corners[TOP_CORNER], pixel_colors[i]); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8296 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8297 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8298 row += interlace_increment[pass]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8299 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8300 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8301 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8302 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8303 for (y = 0; y < image_height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8304 for (x = 0; x < image_width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8305 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8306 int i = raster[y * image_width + x]; |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8307 XPutPixel (ximg, x + img->corners[LEFT_CORNER], |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8308 y + img->corners[TOP_CORNER], pixel_colors[i]); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8309 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8310 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8311 |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8312 /* Save GIF image extension data for `image-extension-data'. |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8313 Format is (count IMAGES FUNCTION "BYTES" ...). */ |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8314 img->data.lisp_val = Qnil; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8315 if (gif->SavedImages[ino].ExtensionBlockCount > 0) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8316 { |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8317 ExtensionBlock *ext = gif->SavedImages[ino].ExtensionBlocks; |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8318 for (i = 0; i < gif->SavedImages[ino].ExtensionBlockCount; i++, ext++) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8319 /* Append (... FUNCTION "BYTES") */ |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8320 img->data.lisp_val = Fcons (make_unibyte_string (ext->Bytes, ext->ByteCount), |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8321 Fcons (make_number (ext->Function), |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8322 img->data.lisp_val)); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8323 img->data.lisp_val = Fnreverse (img->data.lisp_val); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8324 } |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8325 if (gif->ImageCount > 1) |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8326 img->data.lisp_val = Fcons (Qcount, |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8327 Fcons (make_number (gif->ImageCount), |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8328 img->data.lisp_val)); |
|
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
8329 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8330 fn_DGifCloseFile (gif); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8331 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8332 /* Maybe fill in the background field while we have ximg handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8333 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8334 /* Casting avoids a GCC warning. */ |
|
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8335 IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8336 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8337 /* Put the image into the pixmap, then free the X image and its buffer. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8338 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8339 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8340 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8341 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8342 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8343 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8344 |
|
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
8345 #else /* !HAVE_GIF */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8346 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8347 #ifdef MAC_OS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8348 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8349 gif_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8350 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8351 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8352 { |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
8353 #if USE_MAC_IMAGE_IO |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
8354 return image_load_image_io (f, img, kUTTypeGIF); |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
8355 #else /* !USE_MAC_IMAGE_IO */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8356 Lisp_Object specified_file, file; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8357 Lisp_Object specified_data; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8358 OSErr err; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8359 Boolean graphic_p, movie_p, prefer_graphic_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8360 Handle dh = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8361 Movie movie = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8362 Lisp_Object image; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8363 Track track = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8364 Media media = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8365 long nsamples; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8366 Rect rect; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8367 Lisp_Object specified_bg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8368 XColor color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8369 RGBColor bg_color; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8370 int width, height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8371 XImagePtr ximg; |
|
70431
7c25b386a4c3
(Qduration) [MAC_OS]: New variable.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70168
diff
changeset
|
8372 TimeScale time_scale; |
|
7c25b386a4c3
(Qduration) [MAC_OS]: New variable.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70168
diff
changeset
|
8373 TimeValue time, duration; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8374 int ino; |
|
55412
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
8375 CGrafPtr old_port; |
|
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
8376 GDHandle old_gdh; |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8377 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8378 specified_file = image_spec_value (img->spec, QCfile, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8379 specified_data = image_spec_value (img->spec, QCdata, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8380 |
|
67454
939281029286
(init_image) [MAC_OS]: Don't call EnterMovies.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66994
diff
changeset
|
8381 /* Animated gifs use QuickTime Movie Toolbox. So initialize it here. */ |
|
939281029286
(init_image) [MAC_OS]: Don't call EnterMovies.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66994
diff
changeset
|
8382 EnterMovies (); |
|
939281029286
(init_image) [MAC_OS]: Don't call EnterMovies.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66994
diff
changeset
|
8383 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8384 if (NILP (specified_data)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8385 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8386 /* Read from a file */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8387 FSSpec fss; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8388 short refnum; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8389 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8390 err = find_image_fsspec (specified_file, &file, &fss); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8391 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8392 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8393 if (err == fnfErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8394 image_error ("Cannot find image file `%s'", specified_file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8395 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8396 goto open_error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8397 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8398 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8399 err = CanQuickTimeOpenFile (&fss, kQTFileTypeGIF, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8400 &graphic_p, &movie_p, &prefer_graphic_p, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8401 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8402 goto open_error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8403 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8404 if (!graphic_p && !movie_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8405 goto open_error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8406 if (prefer_graphic_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8407 return image_load_qt_1 (f, img, kQTFileTypeGIF, &fss, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8408 err = OpenMovieFile (&fss, &refnum, fsRdPerm); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8409 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8410 goto open_error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8411 err = NewMovieFromFile (&movie, refnum, NULL, NULL, 0, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8412 CloseMovieFile (refnum); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8413 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8414 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8415 image_error ("Error reading `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8416 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8417 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8418 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8419 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8420 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8421 /* Memory source! */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8422 Handle dref = NULL; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8423 long file_type_atom[3]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8424 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8425 err = PtrToHand (SDATA (specified_data), &dh, SBYTES (specified_data)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8426 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8427 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8428 image_error ("Cannot allocate data handle for `%s'", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8429 img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8430 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8431 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8432 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8433 file_type_atom[0] = EndianU32_NtoB (sizeof (long) * 3); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8434 file_type_atom[1] = EndianU32_NtoB (kDataRefExtensionMacOSFileType); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8435 file_type_atom[2] = EndianU32_NtoB (kQTFileTypeGIF); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8436 err = PtrToHand (&dh, &dref, sizeof (Handle)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8437 if (err == noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8438 /* no file name */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8439 err = PtrAndHand ("\p", dref, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8440 if (err == noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8441 err = PtrAndHand (file_type_atom, dref, sizeof (long) * 3); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8442 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8443 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8444 image_error ("Cannot allocate handle data ref for `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8445 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8446 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8447 err = CanQuickTimeOpenDataRef (dref, HandleDataHandlerSubType, &graphic_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8448 &movie_p, &prefer_graphic_p, 0); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8449 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8450 goto open_error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8451 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8452 if (!graphic_p && !movie_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8453 goto open_error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8454 if (prefer_graphic_p) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8455 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8456 int success_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8457 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8458 DisposeHandle (dref); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8459 success_p = image_load_qt_1 (f, img, kQTFileTypeGIF, NULL, dh); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8460 DisposeHandle (dh); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8461 return success_p; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8462 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8463 err = NewMovieFromDataRef (&movie, 0, NULL, dref, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8464 HandleDataHandlerSubType); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8465 DisposeHandle (dref); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8466 if (err != noErr) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8467 goto open_error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8468 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8469 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8470 image = image_spec_value (img->spec, QCindex, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8471 ino = INTEGERP (image) ? XFASTINT (image) : 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8472 track = GetMovieIndTrack (movie, 1); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8473 media = GetTrackMedia (track); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8474 nsamples = GetMediaSampleCount (media); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8475 if (ino >= nsamples) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8476 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8477 image_error ("Invalid image number `%s' in image `%s'", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8478 image, img->spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8479 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8480 } |
|
70431
7c25b386a4c3
(Qduration) [MAC_OS]: New variable.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70168
diff
changeset
|
8481 time_scale = GetMediaTimeScale (media); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8482 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8483 specified_bg = image_spec_value (img->spec, QCbackground, NULL); |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
8484 if (!STRINGP (specified_bg) |
|
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
8485 || !mac_defined_color (f, SDATA (specified_bg), &color, 0)) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8486 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8487 color.pixel = FRAME_BACKGROUND_PIXEL (f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8488 color.red = RED16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8489 color.green = GREEN16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8490 color.blue = BLUE16_FROM_ULONG (color.pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8491 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8492 GetMovieBox (movie, &rect); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8493 width = img->width = rect.right - rect.left; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8494 height = img->height = rect.bottom - rect.top; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8495 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8496 goto error; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8497 |
|
55412
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
8498 GetGWorld (&old_port, &old_gdh); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8499 SetGWorld (ximg, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8500 bg_color.red = color.red; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8501 bg_color.green = color.green; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8502 bg_color.blue = color.blue; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8503 RGBBackColor (&bg_color); |
|
55412
53a1a79a33f9
macterm.c (mac_check_for_quit_char): Adding BLOCK_INPUT
Steven Tamm <steventamm@mac.com>
parents:
55375
diff
changeset
|
8504 SetGWorld (old_port, old_gdh); |
|
58846
4d7444f1a64c
(our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE, init_image):
Richard M. Stallman <rms@gnu.org>
parents:
58752
diff
changeset
|
8505 SetMovieActive (movie, 1); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8506 SetMovieGWorld (movie, ximg, NULL); |
|
70431
7c25b386a4c3
(Qduration) [MAC_OS]: New variable.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70168
diff
changeset
|
8507 SampleNumToMediaTime (media, ino + 1, &time, &duration); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8508 SetMovieTimeValue (movie, time); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8509 MoviesTask (movie, 0L); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8510 DisposeTrackMedia (media); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8511 DisposeMovieTrack (track); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8512 DisposeMovie (movie); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8513 if (dh) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8514 DisposeHandle (dh); |
|
70431
7c25b386a4c3
(Qduration) [MAC_OS]: New variable.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70168
diff
changeset
|
8515 |
|
7c25b386a4c3
(Qduration) [MAC_OS]: New variable.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70168
diff
changeset
|
8516 /* Save GIF image extension data for `image-extension-data'. |
|
70560
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8517 Format is (count IMAGES 0xf9 GRAPHIC_CONTROL_EXTENSION_BLOCK). */ |
|
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8518 { |
|
70733
998a6aaa87bf
(gif_load): Allocate Lisp string first.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70560
diff
changeset
|
8519 Lisp_Object gce = make_uninit_string (4); |
|
70560
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8520 int centisec = ((float)duration / time_scale) * 100.0f + 0.5f; |
|
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8521 |
|
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8522 /* Fill the delay time field. */ |
|
70733
998a6aaa87bf
(gif_load): Allocate Lisp string first.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70560
diff
changeset
|
8523 SSET (gce, 1, centisec & 0xff); |
|
998a6aaa87bf
(gif_load): Allocate Lisp string first.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70560
diff
changeset
|
8524 SSET (gce, 2, (centisec >> 8) & 0xff); |
|
70560
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8525 /* We don't know about other fields. */ |
|
70733
998a6aaa87bf
(gif_load): Allocate Lisp string first.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70560
diff
changeset
|
8526 SSET (gce, 0, 0); |
|
998a6aaa87bf
(gif_load): Allocate Lisp string first.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70560
diff
changeset
|
8527 SSET (gce, 3, 0); |
|
70560
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8528 |
|
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8529 img->data.lisp_val = list4 (Qcount, make_number (nsamples), |
|
70733
998a6aaa87bf
(gif_load): Allocate Lisp string first.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70560
diff
changeset
|
8530 make_number (0xf9), gce); |
|
70560
de135c2adb2f
(Qduration) [MAC_OS]: Undo previous change.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70431
diff
changeset
|
8531 } |
|
70431
7c25b386a4c3
(Qduration) [MAC_OS]: New variable.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70168
diff
changeset
|
8532 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8533 /* Maybe fill in the background field while we have ximg handy. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8534 if (NILP (image_spec_value (img->spec, QCbackground, NULL))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8535 IMAGE_BACKGROUND (img, f, ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8536 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8537 /* Put the image into the pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8538 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8539 x_destroy_x_image (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8540 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8541 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8542 open_error: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8543 image_error ("Cannot open `%s'", file, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8544 error: |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8545 if (media) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8546 DisposeTrackMedia (media); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8547 if (track) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8548 DisposeMovieTrack (track); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8549 if (movie) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8550 DisposeMovie (movie); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8551 if (dh) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8552 DisposeHandle (dh); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8553 return 0; |
|
80545
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
8554 #endif /* !USE_MAC_IMAGE_IO */ |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8555 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8556 #endif /* MAC_OS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8557 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8558 #endif /* HAVE_GIF */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8559 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8560 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8561 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8562 /*********************************************************************** |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8563 SVG |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8564 ***********************************************************************/ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8565 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8566 #if defined (HAVE_RSVG) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8567 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8568 /* Function prototypes. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8569 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8570 static int svg_image_p P_ ((Lisp_Object object)); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8571 static int svg_load P_ ((struct frame *f, struct image *img)); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8572 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8573 static int svg_load_image P_ ((struct frame *, struct image *, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8574 unsigned char *, unsigned int)); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8575 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8576 /* The symbol `svg' identifying images of this type. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8577 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8578 Lisp_Object Qsvg; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8579 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8580 /* Indices of image specification fields in svg_format, below. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8581 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8582 enum svg_keyword_index |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8583 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8584 SVG_TYPE, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8585 SVG_DATA, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8586 SVG_FILE, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8587 SVG_ASCENT, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8588 SVG_MARGIN, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8589 SVG_RELIEF, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8590 SVG_ALGORITHM, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8591 SVG_HEURISTIC_MASK, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8592 SVG_MASK, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8593 SVG_BACKGROUND, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8594 SVG_LAST |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8595 }; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8596 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8597 /* Vector of image_keyword structures describing the format |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8598 of valid user-defined image specifications. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8599 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8600 static struct image_keyword svg_format[SVG_LAST] = |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8601 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8602 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8603 {":data", IMAGE_STRING_VALUE, 0}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8604 {":file", IMAGE_STRING_VALUE, 0}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8605 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8606 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8607 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8608 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8609 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8610 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8611 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8612 }; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8613 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8614 /* Structure describing the image type `svg'. Its the same type of |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8615 structure defined for all image formats, handled by emacs image |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8616 functions. See struct image_type in dispextern.h. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8617 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8618 static struct image_type svg_type = |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8619 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8620 /* An identifier showing that this is an image structure for the SVG format. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8621 &Qsvg, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8622 /* Handle to a function that can be used to identify a SVG file. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8623 svg_image_p, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8624 /* Handle to function used to load a SVG file. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8625 svg_load, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8626 /* Handle to function to free sresources for SVG. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8627 x_clear_image, |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8628 /* An internal field to link to the next image type in a list of |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8629 image types, will be filled in when registering the format. */ |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8630 NULL |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8631 }; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8632 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8633 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8634 /* Return non-zero if OBJECT is a valid SVG image specification. Do |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8635 this by calling parse_image_spec and supplying the keywords that |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8636 identify the SVG format. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8637 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8638 static int |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8639 svg_image_p (object) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8640 Lisp_Object object; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8641 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8642 struct image_keyword fmt[SVG_LAST]; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8643 bcopy (svg_format, fmt, sizeof fmt); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8644 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8645 if (!parse_image_spec (object, fmt, SVG_LAST, Qsvg)) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8646 return 0; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8647 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8648 /* Must specify either the :data or :file keyword. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8649 return fmt[SVG_FILE].count + fmt[SVG_DATA].count == 1; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8650 } |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8651 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8652 #include <librsvg/rsvg.h> |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8653 |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8654 #ifdef HAVE_NTGUI |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8655 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8656 /* SVG library functions. */ |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8657 DEF_IMGLIB_FN (rsvg_handle_new); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8658 DEF_IMGLIB_FN (rsvg_handle_set_size_callback); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8659 DEF_IMGLIB_FN (rsvg_handle_write); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8660 DEF_IMGLIB_FN (rsvg_handle_close); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8661 DEF_IMGLIB_FN (rsvg_handle_get_pixbuf); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8662 DEF_IMGLIB_FN (rsvg_handle_free); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8663 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8664 DEF_IMGLIB_FN (gdk_pixbuf_get_width); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8665 DEF_IMGLIB_FN (gdk_pixbuf_get_height); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8666 DEF_IMGLIB_FN (gdk_pixbuf_get_pixels); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8667 DEF_IMGLIB_FN (gdk_pixbuf_get_rowstride); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8668 DEF_IMGLIB_FN (gdk_pixbuf_get_colorspace); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8669 DEF_IMGLIB_FN (gdk_pixbuf_get_n_channels); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8670 DEF_IMGLIB_FN (gdk_pixbuf_get_has_alpha); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8671 DEF_IMGLIB_FN (gdk_pixbuf_get_bits_per_sample); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8672 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8673 DEF_IMGLIB_FN (g_type_init); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8674 DEF_IMGLIB_FN (g_object_unref); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8675 DEF_IMGLIB_FN (g_error_free); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8676 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8677 Lisp_Object Qgdk_pixbuf, Qglib; |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8678 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8679 static int |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8680 init_svg_functions (Lisp_Object libraries) |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8681 { |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8682 HMODULE library, gdklib, glib; |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8683 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8684 if (!(glib = w32_delayed_load (libraries, Qglib)) |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8685 || !(gdklib = w32_delayed_load (libraries, Qgdk_pixbuf)) |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8686 || !(library = w32_delayed_load (libraries, Qsvg))) |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8687 return 0; |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8688 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8689 LOAD_IMGLIB_FN (library, rsvg_handle_new); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8690 LOAD_IMGLIB_FN (library, rsvg_handle_set_size_callback); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8691 LOAD_IMGLIB_FN (library, rsvg_handle_write); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8692 LOAD_IMGLIB_FN (library, rsvg_handle_close); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8693 LOAD_IMGLIB_FN (library, rsvg_handle_get_pixbuf); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8694 LOAD_IMGLIB_FN (library, rsvg_handle_free); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8695 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8696 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_width); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8697 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_height); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8698 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_pixels); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8699 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_rowstride); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8700 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_colorspace); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8701 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_n_channels); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8702 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_has_alpha); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8703 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_bits_per_sample); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8704 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8705 LOAD_IMGLIB_FN (glib, g_type_init); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8706 LOAD_IMGLIB_FN (glib, g_object_unref); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8707 LOAD_IMGLIB_FN (glib, g_error_free); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8708 return 1; |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8709 } |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8710 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8711 #else |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8712 /* The following aliases for library functions allow dynamic loading |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8713 to be used on some platforms. */ |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8714 #define fn_rsvg_handle_new rsvg_handle_new |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8715 #define fn_rsvg_handle_set_size_callback rsvg_handle_set_size_callback |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8716 #define fn_rsvg_handle_write rsvg_handle_write |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8717 #define fn_rsvg_handle_close rsvg_handle_close |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8718 #define fn_rsvg_handle_get_pixbuf rsvg_handle_get_pixbuf |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8719 #define fn_rsvg_handle_free rsvg_handle_free |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8720 |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8721 #define fn_gdk_pixbuf_get_width gdk_pixbuf_get_width |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8722 #define fn_gdk_pixbuf_get_height gdk_pixbuf_get_height |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8723 #define fn_gdk_pixbuf_get_pixels gdk_pixbuf_get_pixels |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8724 #define fn_gdk_pixbuf_get_rowstride gdk_pixbuf_get_rowstride |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8725 #define fn_gdk_pixbuf_get_colorspace gdk_pixbuf_get_colorspace |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8726 #define fn_gdk_pixbuf_get_n_channels gdk_pixbuf_get_n_channels |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8727 #define fn_gdk_pixbuf_get_has_alpha gdk_pixbuf_get_has_alpha |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8728 #define fn_gdk_pixbuf_get_bits_per_sample gdk_pixbuf_get_bits_per_sample |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8729 |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8730 #define fn_g_type_init g_type_init |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8731 #define fn_g_object_unref g_object_unref |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8732 #define fn_g_error_free g_error_free |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8733 #endif /* !HAVE_NTGUI */ |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8734 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8735 /* Load SVG image IMG for use on frame F. Value is non-zero if |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8736 successful. this function will go into the svg_type structure, and |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8737 the prototype thus needs to be compatible with that structure. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8738 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8739 static int |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8740 svg_load (f, img) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8741 struct frame *f; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8742 struct image *img; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8743 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8744 int success_p = 0; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8745 Lisp_Object file_name; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8746 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8747 /* If IMG->spec specifies a file name, create a non-file spec from it. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8748 file_name = image_spec_value (img->spec, QCfile, NULL); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8749 if (STRINGP (file_name)) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8750 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8751 Lisp_Object file; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8752 unsigned char *contents; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8753 int size; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8754 struct gcpro gcpro1; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8755 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8756 file = x_find_image_file (file_name); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8757 GCPRO1 (file); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8758 if (!STRINGP (file)) |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8759 { |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8760 image_error ("Cannot find image file `%s'", file_name, Qnil); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8761 UNGCPRO; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8762 return 0; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8763 } |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8764 |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8765 /* Read the entire file into memory. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8766 contents = slurp_file (SDATA (file), &size); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8767 if (contents == NULL) |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8768 { |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8769 image_error ("Error loading SVG image `%s'", img->spec, Qnil); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8770 UNGCPRO; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8771 return 0; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8772 } |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8773 /* If the file was slurped into memory properly, parse it. */ |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8774 success_p = svg_load_image (f, img, contents, size); |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8775 xfree (contents); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8776 UNGCPRO; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8777 } |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8778 /* Else its not a file, its a lisp object. Load the image from a |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8779 lisp object rather than a file. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8780 else |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8781 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8782 Lisp_Object data; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8783 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8784 data = image_spec_value (img->spec, QCdata, NULL); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8785 success_p = svg_load_image (f, img, SDATA (data), SBYTES (data)); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8786 } |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8787 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8788 return success_p; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8789 } |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8790 |
|
85039
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8791 /* svg_load_image is a helper function for svg_load, which does the |
|
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8792 actual loading given contents and size, apart from frame and image |
|
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8793 structures, passed from svg_load. |
|
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8794 |
|
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8795 Uses librsvg to do most of the image processing. |
|
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8796 |
|
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8797 Returns non-zero when successful. */ |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8798 static int |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8799 svg_load_image (f, img, contents, size) |
|
85039
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8800 /* Pointer to emacs frame structure. */ |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8801 struct frame *f; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8802 /* Pointer to emacs image structure. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8803 struct image *img; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8804 /* String containing the SVG XML data to be parsed. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8805 unsigned char *contents; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8806 /* Size of data in bytes. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8807 unsigned int size; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8808 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8809 RsvgHandle *rsvg_handle; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8810 GError *error = NULL; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8811 GdkPixbuf *pixbuf; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8812 int width; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8813 int height; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8814 const guint8 *pixels; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8815 int rowstride; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8816 XImagePtr ximg; |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8817 Lisp_Object specified_bg; |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8818 XColor background; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8819 int x; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8820 int y; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8821 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8822 /* g_type_init is a glib function that must be called prior to using |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8823 gnome type library functions. */ |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8824 fn_g_type_init (); |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8825 /* Make a handle to a new rsvg object. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8826 rsvg_handle = fn_rsvg_handle_new (); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8827 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8828 /* Parse the contents argument and fill in the rsvg_handle. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8829 fn_rsvg_handle_write (rsvg_handle, contents, size, &error); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8830 if (error) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8831 goto rsvg_error; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8832 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8833 /* The parsing is complete, rsvg_handle is ready to used, close it |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8834 for further writes. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8835 fn_rsvg_handle_close (rsvg_handle, &error); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8836 if (error) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8837 goto rsvg_error; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8838 /* We can now get a valid pixel buffer from the svg file, if all |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8839 went ok. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8840 pixbuf = fn_rsvg_handle_get_pixbuf (rsvg_handle); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8841 eassert (pixbuf); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8842 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8843 /* Extract some meta data from the svg handle. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8844 width = fn_gdk_pixbuf_get_width (pixbuf); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8845 height = fn_gdk_pixbuf_get_height (pixbuf); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8846 pixels = fn_gdk_pixbuf_get_pixels (pixbuf); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8847 rowstride = fn_gdk_pixbuf_get_rowstride (pixbuf); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8848 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8849 /* Validate the svg meta data. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8850 eassert (fn_gdk_pixbuf_get_colorspace (pixbuf) == GDK_COLORSPACE_RGB); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8851 eassert (fn_gdk_pixbuf_get_n_channels (pixbuf) == 4); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8852 eassert (fn_gdk_pixbuf_get_has_alpha (pixbuf)); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8853 eassert (fn_gdk_pixbuf_get_bits_per_sample (pixbuf) == 8); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8854 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8855 /* Try to create a x pixmap to hold the svg pixmap. */ |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8856 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap)) |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8857 { |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8858 fn_g_object_unref (pixbuf); |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8859 return 0; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8860 } |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8861 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8862 init_color_table (); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8863 |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8864 /* Handle alpha channel by combining the image with a background |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8865 color. */ |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8866 specified_bg = image_spec_value (img->spec, QCbackground, NULL); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8867 if (STRINGP (specified_bg) |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8868 && x_defined_color (f, SDATA (specified_bg), &background, 0)) |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8869 { |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8870 background.red >>= 8; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8871 background.green >>= 8; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8872 background.blue >>= 8; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8873 } |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8874 else |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8875 { |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8876 #ifdef HAVE_X_WINDOWS |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8877 background.pixel = FRAME_BACKGROUND_PIXEL (f); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8878 x_query_color (f, &background); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8879 |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8880 /* SVG pixmaps specify transparency in the last byte, so right |
|
82820
2f1e57a528f0
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
82795
diff
changeset
|
8881 shift 8 bits to get rid of it, since emacs doesn't support |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8882 transparency. */ |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8883 background.red >>= 8; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8884 background.green >>= 8; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8885 background.blue >>= 8; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8886 #elif defined (MAC_OS) |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8887 background.pixel = FRAME_BACKGROUND_PIXEL (f); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8888 background.red = RED_FROM_ULONG (background.pixel); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8889 background.green = GREEN_FROM_ULONG (background.pixel); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8890 background.blue = BLUE_FROM_ULONG (background.pixel); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8891 #elif defined (HAVE_NTGUI) |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8892 background.pixel = FRAME_BACKGROUND_PIXEL (f); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8893 #if 0 /* W32 TODO : Colormap support. */ |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8894 x_query_color (f, &background); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8895 #endif |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8896 |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8897 /* SVG pixmaps specify transparency in the last byte, so right |
|
82820
2f1e57a528f0
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
82795
diff
changeset
|
8898 shift 8 bits to get rid of it, since emacs doesn't support |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8899 transparency. */ |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8900 background.red >>= 8; |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8901 background.green >>= 8; |
|
82820
2f1e57a528f0
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
82795
diff
changeset
|
8902 background.blue >>= 8; |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8903 #else /* not HAVE_X_WINDOWS && not MAC_OS*/ |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8904 #error FIXME |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8905 #endif |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8906 } |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8907 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8908 /* This loop handles opacity values, since Emacs assumes |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8909 non-transparent images. Each pixel must be "flattened" by |
|
85039
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8910 calculating the resulting color, given the transparency of the |
|
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8911 pixel, and the image background color. */ |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8912 for (y = 0; y < height; ++y) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8913 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8914 for (x = 0; x < width; ++x) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8915 { |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8916 unsigned red; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8917 unsigned green; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8918 unsigned blue; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8919 unsigned opacity; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8920 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8921 red = *pixels++; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8922 green = *pixels++; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8923 blue = *pixels++; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8924 opacity = *pixels++; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8925 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8926 red = ((red * opacity) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8927 + (background.red * ((1 << 8) - opacity))); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8928 green = ((green * opacity) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8929 + (background.green * ((1 << 8) - opacity))); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8930 blue = ((blue * opacity) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8931 + (background.blue * ((1 << 8) - opacity))); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8932 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8933 XPutPixel (ximg, x, y, lookup_rgb_color (f, red, green, blue)); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8934 } |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8935 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8936 pixels += rowstride - 4 * width; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8937 } |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8938 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8939 #ifdef COLOR_TABLE_SUPPORT |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8940 /* Remember colors allocated for this image. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8941 img->colors = colors_in_color_table (&img->ncolors); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8942 free_color_table (); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8943 #endif /* COLOR_TABLE_SUPPORT */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8944 |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8945 fn_g_object_unref (pixbuf); |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8946 |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8947 img->width = width; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8948 img->height = height; |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8949 |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8950 /* Maybe fill in the background field while we have ximg handy. |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8951 Casting avoids a GCC warning. */ |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8952 IMAGE_BACKGROUND (img, f, (XImagePtr_or_DC)ximg); |
|
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8953 |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8954 /* Put the image into the pixmap, then free the X image and its |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8955 buffer. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8956 x_put_x_image (f, ximg, img->pixmap, width, height); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8957 x_destroy_x_image (ximg); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8958 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8959 return 1; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8960 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8961 rsvg_error: |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8962 /* FIXME: Use error->message so the user knows what is the actual |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8963 problem with the image. */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8964 image_error ("Error parsing SVG image `%s'", img->spec, Qnil); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8965 fn_g_error_free (error); |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8966 return 0; |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8967 } |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8968 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8969 #endif /* defined (HAVE_RSVG) */ |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8970 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8971 |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8972 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8973 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8974 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8975 Ghostscript |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8976 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8977 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8978 #ifdef HAVE_X_WINDOWS |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8979 #define HAVE_GHOSTSCRIPT 1 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8980 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8981 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8982 /* The symbol `postscript' identifying images of this type. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8983 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8984 Lisp_Object Qpostscript; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8985 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8986 #ifdef HAVE_GHOSTSCRIPT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8987 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8988 static int gs_image_p P_ ((Lisp_Object object)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8989 static int gs_load P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8990 static void gs_clear_image P_ ((struct frame *f, struct image *img)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8991 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8992 /* Keyword symbols. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8993 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8994 Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8995 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8996 /* Indices of image specification fields in gs_format, below. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8997 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8998 enum gs_keyword_index |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8999 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9000 GS_TYPE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9001 GS_PT_WIDTH, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9002 GS_PT_HEIGHT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9003 GS_FILE, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9004 GS_LOADER, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9005 GS_BOUNDING_BOX, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9006 GS_ASCENT, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9007 GS_MARGIN, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9008 GS_RELIEF, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9009 GS_ALGORITHM, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9010 GS_HEURISTIC_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9011 GS_MASK, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9012 GS_BACKGROUND, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9013 GS_LAST |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9014 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9015 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9016 /* Vector of image_keyword structures describing the format |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9017 of valid user-defined image specifications. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9018 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9019 static struct image_keyword gs_format[GS_LAST] = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9020 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9021 {":type", IMAGE_SYMBOL_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9022 {":pt-width", IMAGE_POSITIVE_INTEGER_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9023 {":pt-height", IMAGE_POSITIVE_INTEGER_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9024 {":file", IMAGE_STRING_VALUE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9025 {":loader", IMAGE_FUNCTION_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9026 {":bounding-box", IMAGE_DONT_CHECK_VALUE_TYPE, 1}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9027 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9028 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9029 {":relief", IMAGE_INTEGER_VALUE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9030 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9031 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9032 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9033 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9034 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9035 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9036 /* Structure describing the image type `ghostscript'. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9037 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9038 static struct image_type gs_type = |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9039 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9040 &Qpostscript, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9041 gs_image_p, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9042 gs_load, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9043 gs_clear_image, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9044 NULL |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9045 }; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9046 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9047 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9048 /* Free X resources of Ghostscript image IMG which is used on frame F. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9049 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9050 static void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9051 gs_clear_image (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9052 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9053 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9054 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9055 /* IMG->data.ptr_val may contain a recorded colormap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9056 xfree (img->data.ptr_val); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9057 x_clear_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9058 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9059 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9060 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9061 /* Return non-zero if OBJECT is a valid Ghostscript image |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9062 specification. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9063 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9064 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9065 gs_image_p (object) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9066 Lisp_Object object; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9067 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9068 struct image_keyword fmt[GS_LAST]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9069 Lisp_Object tem; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9070 int i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9071 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9072 bcopy (gs_format, fmt, sizeof fmt); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9073 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9074 if (!parse_image_spec (object, fmt, GS_LAST, Qpostscript)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9075 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9076 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9077 /* Bounding box must be a list or vector containing 4 integers. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9078 tem = fmt[GS_BOUNDING_BOX].value; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9079 if (CONSP (tem)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9080 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9081 for (i = 0; i < 4; ++i, tem = XCDR (tem)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9082 if (!CONSP (tem) || !INTEGERP (XCAR (tem))) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9083 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9084 if (!NILP (tem)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9085 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9086 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9087 else if (VECTORP (tem)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9088 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9089 if (XVECTOR (tem)->size != 4) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9090 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9091 for (i = 0; i < 4; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9092 if (!INTEGERP (XVECTOR (tem)->contents[i])) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9093 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9094 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9095 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9096 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9097 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9098 return 1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9099 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9100 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9101 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9102 /* Load Ghostscript image IMG for use on frame F. Value is non-zero |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9103 if successful. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9104 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9105 static int |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9106 gs_load (f, img) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9107 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9108 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9109 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9110 char buffer[100]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9111 Lisp_Object window_and_pixmap_id = Qnil, loader, pt_height, pt_width; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9112 struct gcpro gcpro1, gcpro2; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9113 Lisp_Object frame; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9114 double in_width, in_height; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9115 Lisp_Object pixel_colors = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9116 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9117 /* Compute pixel size of pixmap needed from the given size in the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9118 image specification. Sizes in the specification are in pt. 1 pt |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9119 = 1/72 in, xdpi and ydpi are stored in the frame's X display |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9120 info. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9121 pt_width = image_spec_value (img->spec, QCpt_width, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9122 in_width = XFASTINT (pt_width) / 72.0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9123 img->width = in_width * FRAME_X_DISPLAY_INFO (f)->resx; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9124 pt_height = image_spec_value (img->spec, QCpt_height, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9125 in_height = XFASTINT (pt_height) / 72.0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9126 img->height = in_height * FRAME_X_DISPLAY_INFO (f)->resy; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9127 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9128 if (!check_image_size (f, img->width, img->height)) |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9129 { |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9130 image_error ("Invalid image size", Qnil, Qnil); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9131 return 0; |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9132 } |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9133 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9134 /* Create the pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9135 xassert (img->pixmap == NO_PIXMAP); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9136 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9137 /* Only W32 version did BLOCK_INPUT here. ++kfs */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9138 BLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9139 img->pixmap = XCreatePixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9140 img->width, img->height, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9141 DefaultDepthOfScreen (FRAME_X_SCREEN (f))); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9142 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9143 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9144 if (!img->pixmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9145 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9146 image_error ("Unable to create pixmap for `%s'", img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9147 return 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9148 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9149 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9150 /* Call the loader to fill the pixmap. It returns a process object |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9151 if successful. We do not record_unwind_protect here because |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9152 other places in redisplay like calling window scroll functions |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9153 don't either. Let the Lisp loader use `unwind-protect' instead. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9154 GCPRO2 (window_and_pixmap_id, pixel_colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9155 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9156 sprintf (buffer, "%lu %lu", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9157 (unsigned long) FRAME_X_WINDOW (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9158 (unsigned long) img->pixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9159 window_and_pixmap_id = build_string (buffer); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9160 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9161 sprintf (buffer, "%lu %lu", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9162 FRAME_FOREGROUND_PIXEL (f), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9163 FRAME_BACKGROUND_PIXEL (f)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9164 pixel_colors = build_string (buffer); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9165 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9166 XSETFRAME (frame, f); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9167 loader = image_spec_value (img->spec, QCloader, NULL); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9168 if (NILP (loader)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9169 loader = intern ("gs-load-image"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9170 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9171 img->data.lisp_val = call6 (loader, frame, img->spec, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9172 make_number (img->width), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9173 make_number (img->height), |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9174 window_and_pixmap_id, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9175 pixel_colors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9176 UNGCPRO; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9177 return PROCESSP (img->data.lisp_val); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9178 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9179 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9180 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9181 /* Kill the Ghostscript process that was started to fill PIXMAP on |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9182 frame F. Called from XTread_socket when receiving an event |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9183 telling Emacs that Ghostscript has finished drawing. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9184 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9185 void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9186 x_kill_gs_process (pixmap, f) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9187 Pixmap pixmap; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9188 struct frame *f; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9189 { |
|
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
9190 struct image_cache *c = FRAME_IMAGE_CACHE (f); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9191 int class, i; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9192 struct image *img; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9193 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9194 /* Find the image containing PIXMAP. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9195 for (i = 0; i < c->used; ++i) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9196 if (c->images[i]->pixmap == pixmap) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9197 break; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9198 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9199 /* Should someone in between have cleared the image cache, for |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9200 instance, give up. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9201 if (i == c->used) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9202 return; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9203 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9204 /* Kill the GS process. We should have found PIXMAP in the image |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9205 cache and its image should contain a process object. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9206 img = c->images[i]; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9207 xassert (PROCESSP (img->data.lisp_val)); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9208 Fkill_process (img->data.lisp_val, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9209 img->data.lisp_val = Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9210 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9211 #if defined (HAVE_X_WINDOWS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9212 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9213 /* On displays with a mutable colormap, figure out the colors |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9214 allocated for the image by looking at the pixels of an XImage for |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9215 img->pixmap. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9216 class = FRAME_X_VISUAL (f)->class; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9217 if (class != StaticColor && class != StaticGray && class != TrueColor) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9218 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9219 XImagePtr ximg; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9220 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9221 BLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9222 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9223 /* Try to get an XImage for img->pixmep. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9224 ximg = XGetImage (FRAME_X_DISPLAY (f), img->pixmap, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9225 0, 0, img->width, img->height, ~0, ZPixmap); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9226 if (ximg) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9227 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9228 int x, y; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9229 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9230 /* Initialize the color table. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9231 init_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9232 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9233 /* For each pixel of the image, look its color up in the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9234 color table. After having done so, the color table will |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9235 contain an entry for each color used by the image. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9236 for (y = 0; y < img->height; ++y) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9237 for (x = 0; x < img->width; ++x) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9238 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9239 unsigned long pixel = XGetPixel (ximg, x, y); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9240 lookup_pixel_color (f, pixel); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9241 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9242 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9243 /* Record colors in the image. Free color table and XImage. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9244 #ifdef COLOR_TABLE_SUPPORT |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9245 img->colors = colors_in_color_table (&img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9246 free_color_table (); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9247 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9248 XDestroyImage (ximg); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9249 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9250 #if 0 /* This doesn't seem to be the case. If we free the colors |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9251 here, we get a BadAccess later in x_clear_image when |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9252 freeing the colors. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9253 /* We have allocated colors once, but Ghostscript has also |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9254 allocated colors on behalf of us. So, to get the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9255 reference counts right, free them once. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9256 if (img->ncolors) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9257 x_free_colors (f, img->colors, img->ncolors); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9258 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9259 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9260 else |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9261 image_error ("Cannot get X image of `%s'; colors will not be freed", |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9262 img->spec, Qnil); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9263 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9264 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9265 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9266 #endif /* HAVE_X_WINDOWS */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9267 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9268 /* Now that we have the pixmap, compute mask and transform the |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9269 image if requested. */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9270 BLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9271 postprocess_image (f, img); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9272 UNBLOCK_INPUT; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9273 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9274 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9275 #endif /* HAVE_GHOSTSCRIPT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9276 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9277 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9278 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9279 Tests |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9280 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9281 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9282 #if GLYPH_DEBUG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9283 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9284 DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9285 doc: /* Value is non-nil if SPEC is a valid image specification. */) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9286 (spec) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9287 Lisp_Object spec; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9288 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9289 return valid_image_p (spec) ? Qt : Qnil; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9290 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9291 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9292 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9293 DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "") |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9294 (spec) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9295 Lisp_Object spec; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9296 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9297 int id = -1; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9298 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9299 if (valid_image_p (spec)) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9300 id = lookup_image (SELECTED_FRAME (), spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9301 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9302 debug_print (spec); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9303 return make_number (id); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9304 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9305 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9306 #endif /* GLYPH_DEBUG != 0 */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9307 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9308 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9309 /*********************************************************************** |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9310 Initialization |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9311 ***********************************************************************/ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9312 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9313 #ifdef HAVE_NTGUI |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9314 /* Image types that rely on external libraries are loaded dynamically |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9315 if the library is available. */ |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9316 #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \ |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9317 define_image_type (image_type, init_lib_fn (libraries)) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9318 #else |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9319 #define CHECK_LIB_AVAILABLE(image_type, init_lib_fn, libraries) \ |
|
58846
4d7444f1a64c
(our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE, init_image):
Richard M. Stallman <rms@gnu.org>
parents:
58752
diff
changeset
|
9320 define_image_type (image_type, 1) |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9321 #endif /* HAVE_NTGUI */ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9322 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9323 DEFUN ("init-image-library", Finit_image_library, Sinit_image_library, 2, 2, 0, |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9324 doc: /* Initialize image library implementing image type TYPE. |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9325 Return non-nil if TYPE is a supported image type. |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9326 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9327 Image types pbm and xbm are prebuilt; other types are loaded here. |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9328 Libraries to load are specified in alist LIBRARIES (usually, the value |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9329 of `image-library-alist', which see). */) |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9330 (type, libraries) |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9331 Lisp_Object type, libraries; |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9332 { |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9333 Lisp_Object tested; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9334 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9335 /* Don't try to reload the library. */ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9336 tested = Fassq (type, Vimage_type_cache); |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9337 if (CONSP (tested)) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9338 return XCDR (tested); |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9339 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9340 #if defined (HAVE_XPM) || defined (MAC_OS) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9341 if (EQ (type, Qxpm)) |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9342 return CHECK_LIB_AVAILABLE (&xpm_type, init_xpm_functions, libraries); |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9343 #endif |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9344 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9345 #if defined (HAVE_JPEG) || defined (MAC_OS) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9346 if (EQ (type, Qjpeg)) |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9347 return CHECK_LIB_AVAILABLE (&jpeg_type, init_jpeg_functions, libraries); |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9348 #endif |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9349 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9350 #if defined (HAVE_TIFF) || defined (MAC_OS) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9351 if (EQ (type, Qtiff)) |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9352 return CHECK_LIB_AVAILABLE (&tiff_type, init_tiff_functions, libraries); |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9353 #endif |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9354 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9355 #if defined (HAVE_GIF) || defined (MAC_OS) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9356 if (EQ (type, Qgif)) |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9357 return CHECK_LIB_AVAILABLE (&gif_type, init_gif_functions, libraries); |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9358 #endif |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9359 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9360 #if defined (HAVE_PNG) || defined (MAC_OS) |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9361 if (EQ (type, Qpng)) |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9362 return CHECK_LIB_AVAILABLE (&png_type, init_png_functions, libraries); |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9363 #endif |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9364 |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
9365 #if defined (HAVE_RSVG) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
9366 if (EQ (type, Qsvg)) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
9367 return CHECK_LIB_AVAILABLE (&svg_type, init_svg_functions, libraries); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
9368 #endif |
|
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
9369 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9370 #ifdef HAVE_GHOSTSCRIPT |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9371 if (EQ (type, Qpostscript)) |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9372 return CHECK_LIB_AVAILABLE (&gs_type, init_gs_functions, libraries); |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9373 #endif |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9374 |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9375 /* If the type is not recognized, avoid testing it ever again. */ |
|
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
9376 CACHE_IMAGE_TYPE (type, Qnil); |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9377 return Qnil; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9378 } |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9379 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9380 void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9381 syms_of_image () |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9382 { |
|
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9383 extern Lisp_Object Qrisky_local_variable; /* Syms_of_xdisp has already run. */ |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9384 |
|
64910
eef3e25f6aed
(syms_of_image): Init image_types here, and call define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
9385 /* Initialize this only once, since that's what we do with Vimage_types |
|
eef3e25f6aed
(syms_of_image): Init image_types here, and call define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
9386 and they are supposed to be in sync. Initializing here gives correct |
|
eef3e25f6aed
(syms_of_image): Init image_types here, and call define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
9387 operation on GNU/Linux of calling dump-emacs after loading some images. */ |
|
eef3e25f6aed
(syms_of_image): Init image_types here, and call define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
9388 image_types = NULL; |
|
eef3e25f6aed
(syms_of_image): Init image_types here, and call define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
9389 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9390 /* Must be defined now becase we're going to update it below, while |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9391 defining the supported image types. */ |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9392 DEFVAR_LISP ("image-types", &Vimage_types, |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9393 doc: /* List of potentially supported image types. |
|
78970
35f78a0b1e30
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78863
diff
changeset
|
9394 Each element of the list is a symbol for an image type, like 'jpeg or 'png. |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9395 To check whether it is really supported, use `image-type-available-p'. */); |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9396 Vimage_types = Qnil; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9397 |
|
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9398 DEFVAR_LISP ("image-library-alist", &Vimage_library_alist, |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9399 doc: /* Alist of image types vs external libraries needed to display them. |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9400 |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9401 Each element is a list (IMAGE-TYPE LIBRARY...), where the car is a symbol |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9402 representing a supported image type, and the rest are strings giving |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9403 alternate filenames for the corresponding external libraries. |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9404 |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9405 Emacs tries to load the libraries in the order they appear on the |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9406 list; if none is loaded, the running session of Emacs won't |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9407 support the image type. Types 'pbm and 'xbm don't need to be |
|
78692
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
9408 listed; they are always supported. */); |
|
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9409 Vimage_library_alist = Qnil; |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9410 Fput (intern ("image-library-alist"), Qrisky_local_variable, Qt); |
|
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
9411 |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9412 DEFVAR_LISP ("max-image-size", &Vmax_image_size, |
|
66208
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9413 doc: /* Maximum size of images. |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9414 Emacs will not load an image into memory if its pixel width or |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9415 pixel height exceeds this limit. |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9416 |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9417 If the value is an integer, it directly specifies the maximum |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9418 image height and width, measured in pixels. If it is a floating |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9419 point number, it specifies the maximum image height and width |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9420 as a ratio to the frame height and width. If the value is |
|
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
9421 non-numeric, there is no explicit limit on the size of images. */); |
|
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9422 Vmax_image_size = make_float (MAX_IMAGE_SIZE); |
|
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
9423 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9424 Vimage_type_cache = Qnil; |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9425 staticpro (&Vimage_type_cache); |
|
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9426 |
|
64967
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9427 Qpbm = intern ("pbm"); |
|
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9428 staticpro (&Qpbm); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9429 ADD_IMAGE_TYPE (Qpbm); |
|
64967
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9430 |
|
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9431 Qxbm = intern ("xbm"); |
|
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9432 staticpro (&Qxbm); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9433 ADD_IMAGE_TYPE (Qxbm); |
|
64967
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9434 |
|
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9435 define_image_type (&xbm_type, 1); |
|
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9436 define_image_type (&pbm_type, 1); |
|
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
9437 |
|
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
9438 Qcount = intern ("count"); |
|
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
9439 staticpro (&Qcount); |
|
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
9440 |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9441 QCascent = intern (":ascent"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9442 staticpro (&QCascent); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9443 QCmargin = intern (":margin"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9444 staticpro (&QCmargin); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9445 QCrelief = intern (":relief"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9446 staticpro (&QCrelief); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9447 QCconversion = intern (":conversion"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9448 staticpro (&QCconversion); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9449 QCcolor_symbols = intern (":color-symbols"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9450 staticpro (&QCcolor_symbols); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9451 QCheuristic_mask = intern (":heuristic-mask"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9452 staticpro (&QCheuristic_mask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9453 QCindex = intern (":index"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9454 staticpro (&QCindex); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9455 QCmatrix = intern (":matrix"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9456 staticpro (&QCmatrix); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9457 QCcolor_adjustment = intern (":color-adjustment"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9458 staticpro (&QCcolor_adjustment); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9459 QCmask = intern (":mask"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9460 staticpro (&QCmask); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9461 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9462 Qlaplace = intern ("laplace"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9463 staticpro (&Qlaplace); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9464 Qemboss = intern ("emboss"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9465 staticpro (&Qemboss); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9466 Qedge_detection = intern ("edge-detection"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9467 staticpro (&Qedge_detection); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9468 Qheuristic = intern ("heuristic"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9469 staticpro (&Qheuristic); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9470 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9471 Qpostscript = intern ("postscript"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9472 staticpro (&Qpostscript); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9473 #ifdef HAVE_GHOSTSCRIPT |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9474 ADD_IMAGE_TYPE (Qpostscript); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9475 QCloader = intern (":loader"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9476 staticpro (&QCloader); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9477 QCbounding_box = intern (":bounding-box"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9478 staticpro (&QCbounding_box); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9479 QCpt_width = intern (":pt-width"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9480 staticpro (&QCpt_width); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9481 QCpt_height = intern (":pt-height"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9482 staticpro (&QCpt_height); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9483 #endif /* HAVE_GHOSTSCRIPT */ |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9484 |
|
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
9485 #if defined (HAVE_XPM) || defined (MAC_OS) |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9486 Qxpm = intern ("xpm"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9487 staticpro (&Qxpm); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9488 ADD_IMAGE_TYPE (Qxpm); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9489 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9490 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9491 #if defined (HAVE_JPEG) || defined (MAC_OS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9492 Qjpeg = intern ("jpeg"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9493 staticpro (&Qjpeg); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9494 ADD_IMAGE_TYPE (Qjpeg); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9495 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9496 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9497 #if defined (HAVE_TIFF) || defined (MAC_OS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9498 Qtiff = intern ("tiff"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9499 staticpro (&Qtiff); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9500 ADD_IMAGE_TYPE (Qtiff); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9501 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9502 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9503 #if defined (HAVE_GIF) || defined (MAC_OS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9504 Qgif = intern ("gif"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9505 staticpro (&Qgif); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9506 ADD_IMAGE_TYPE (Qgif); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9507 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9508 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9509 #if defined (HAVE_PNG) || defined (MAC_OS) |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9510 Qpng = intern ("png"); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9511 staticpro (&Qpng); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9512 ADD_IMAGE_TYPE (Qpng); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9513 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9514 |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
9515 #if defined (HAVE_RSVG) |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
9516 Qsvg = intern ("svg"); |
|
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
9517 staticpro (&Qsvg); |
|
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9518 ADD_IMAGE_TYPE (Qsvg); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9519 #ifdef HAVE_NTGUI |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9520 Qgdk_pixbuf = intern ("gdk-pixbuf"); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9521 staticpro (&Qgdk_pixbuf); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9522 Qglib = intern ("glib"); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9523 staticpro (&Qglib); |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9524 #endif /* HAVE_NTGUI */ |
|
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
9525 #endif /* HAVE_RSVG */ |
|
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
9526 |
|
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
9527 defsubr (&Sinit_image_library); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9528 defsubr (&Sclear_image_cache); |
|
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
9529 defsubr (&Simage_refresh); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9530 defsubr (&Simage_size); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9531 defsubr (&Simage_mask_p); |
|
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
9532 defsubr (&Simage_extension_data); |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9533 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9534 #if GLYPH_DEBUG |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9535 defsubr (&Simagep); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9536 defsubr (&Slookup_image); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9537 #endif |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9538 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9539 DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9540 doc: /* Non-nil means always draw a cross over disabled images. |
|
78692
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
9541 Disabled images are those having a `:conversion disabled' property. |
|
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9542 A cross is always drawn on black & white displays. */); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9543 cross_disabled_images = 0; |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9544 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9545 DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9546 doc: /* List of directories to search for window system bitmap files. */); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9547 Vx_bitmap_file_path = decode_env_path ((char *) 0, PATH_BITMAPS); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9548 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9549 DEFVAR_LISP ("image-cache-eviction-delay", &Vimage_cache_eviction_delay, |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9550 doc: /* Time after which cached images are removed from the cache. |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9551 When an image has not been displayed this many seconds, remove it |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9552 from the image cache. Value must be an integer or nil with nil |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9553 meaning don't clear the cache. */); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9554 Vimage_cache_eviction_delay = make_number (30 * 60); |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9555 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9556 |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9557 void |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9558 init_image () |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9559 { |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9560 } |
|
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
9561 |
| 54348 | 9562 /* arch-tag: 123c2a5e-14a8-4c53-ab95-af47d7db49b9 |
| 9563 (do not change this comment) */ |
