Mercurial > emacs
annotate src/image.c @ 105266:c02e98221afe
Add placeholder for CEDET.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 28 Sep 2009 23:22:12 +0000 |
parents | 7690800317e8 |
children | 68dd71358159 |
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, |
100951 | 3 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
79759 | 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 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94934
diff
changeset
|
8 GNU Emacs is free software: you can redistribute it and/or modify |
54341
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 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94934
diff
changeset
|
10 the Free Software Foundation, either version 3 of the License, or |
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94934
diff
changeset
|
11 (at your option) any later version. |
54341
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 |
94963
8971ddf55736
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94934
diff
changeset
|
19 along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
20 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
21 #include <config.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
22 #include <stdio.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
23 #include <math.h> |
56065 | 24 #include <ctype.h> |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
25 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
26 #ifdef HAVE_UNISTD_H |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
27 #include <unistd.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
28 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
29 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
30 /* 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
|
31 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
32 #define XLIB_ILLEGAL_ACCESS |
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 #include "lisp.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
35 #include "frame.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
36 #include "window.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
37 #include "dispextern.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
38 #include "blockinput.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
39 #include "systime.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
40 #include <epaths.h> |
94934
669d4161a058
(image_ascent): Don't include "charset.h". Include
Kenichi Handa <handa@m17n.org>
parents:
94780
diff
changeset
|
41 #include "character.h" |
69771
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
42 #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
|
43 #include "termhooks.h" |
94934
669d4161a058
(image_ascent): Don't include "charset.h". Include
Kenichi Handa <handa@m17n.org>
parents:
94780
diff
changeset
|
44 #include "font.h" |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
45 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
46 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
47 #include "xterm.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
48 #include <sys/types.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
49 #include <sys/stat.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
50 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
51 #define COLOR_TABLE_SUPPORT 1 |
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 typedef struct x_bitmap_record Bitmap_Record; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
54 #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
|
55 #define NO_PIXMAP None |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
56 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
57 #define RGB_PIXEL_COLOR unsigned long |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
58 |
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
|
59 #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
|
60 #define PIX_MASK_DRAW 1 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
61 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
62 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
63 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
64 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
65 #include "w32term.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
66 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
67 /* W32_TODO : Color tables on W32. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
68 #undef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
69 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
70 typedef struct w32_bitmap_record Bitmap_Record; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
71 #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
|
72 #define NO_PIXMAP 0 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
73 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
74 #define RGB_PIXEL_COLOR COLORREF |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
75 |
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
|
76 #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
|
77 #define PIX_MASK_DRAW 1 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
78 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
79 #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
|
80 #define x_defined_color w32_defined_color |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
81 #define DefaultDepthOfScreen(screen) (one_w32_display_info.n_cbits) |
100845
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
82 |
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
83 /* Functions from w32term.c that depend on XColor (so can't go in w32term.h |
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
84 without modifying lots of files). */ |
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
85 extern void x_query_colors (struct frame *f, XColor *colors, int ncolors); |
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
86 extern void x_query_color (struct frame *f, XColor *color); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
87 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
88 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
89 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
90 #include "nsterm.h" |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
91 #include <sys/types.h> |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
92 #include <sys/stat.h> |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
93 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
94 #undef COLOR_TABLE_SUPPORT |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
95 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
96 typedef struct ns_bitmap_record Bitmap_Record; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
97 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
98 #define GET_PIXEL(ximg, x, y) XGetPixel(ximg, x, y) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
99 #define NO_PIXMAP 0 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
100 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
101 #define RGB_PIXEL_COLOR unsigned long |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
102 #define ZPixmap 0 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
103 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
104 #define PIX_MASK_RETAIN 0 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
105 #define PIX_MASK_DRAW 1 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
106 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
107 #define FRAME_X_VISUAL FRAME_NS_DISPLAY_INFO(f)->visual |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
108 #define x_defined_color(f, name, color_def, alloc) \ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
109 ns_defined_color (f, name, color_def, alloc, 0) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
110 #define FRAME_X_SCREEN(f) 0 |
96870
30f1368d9cf6
* term/ns-win.el: Rename ns- functions/variables to the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96763
diff
changeset
|
111 #define DefaultDepthOfScreen(screen) x_display_list->n_planes |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
112 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
113 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
114 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
115 /* Search path for bitmap files. */ |
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 Lisp_Object Vx_bitmap_file_path; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
118 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
119 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
120 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
|
121 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
|
122 Lisp_Object)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
123 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
124 static void init_color_table P_ ((void)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
125 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
|
126 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
127 static void free_color_table P_ ((void)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
128 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
|
129 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
|
130 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
131 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
132 /* 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
|
133 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
|
134 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
|
135 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
136 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
|
137 be used to indicate no bitmap. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
138 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
139 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
|
140 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
|
141 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
|
142 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
143 #ifdef MAC_OS |
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 XImagePtr |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
146 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
|
147 Display *display; /* not used */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
148 Pixmap pixmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
149 int x, y; /* not used */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
150 unsigned int width, height; /* not used */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
151 unsigned long plane_mask; /* not used */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
152 int format; /* not used */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
153 { |
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
|
154 #if !USE_MAC_IMAGE_IO |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
155 #if GLYPH_DEBUG |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
156 xassert (x == 0 && y == 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
157 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
158 Rect ri, rp; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
159 SetRect (&ri, 0, 0, width, height); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
160 xassert (EqualRect (&ri, GetPixBounds (GetGWorldPixMap (pixmap), &rp))); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
161 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
162 xassert (! (pixelsLocked & GetPixelsState (GetGWorldPixMap (pixmap)))); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
163 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
164 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
165 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
|
166 #endif |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
167 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
168 return pixmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
169 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
170 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
171 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
172 XPutPixel (ximage, x, y, pixel) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
173 XImagePtr ximage; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
174 int x, y; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
175 unsigned long pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
176 { |
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
|
177 #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
|
178 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
|
179 ((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
|
180 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
|
181 ((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
|
182 #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
|
183 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
|
184 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
|
185 |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
186 #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
|
187 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
|
188 { |
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
|
189 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
|
190 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
|
191 |
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
|
192 ((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
|
193 } |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
194 else |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
195 #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
|
196 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
|
197 { |
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
|
198 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
|
199 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
|
200 |
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
|
201 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
|
202 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
|
203 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
|
204 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
|
205 } |
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 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
|
207 { |
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 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
|
209 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
|
210 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
|
211 |
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 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
|
213 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
|
214 |
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
|
215 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
|
216 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
|
217 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
|
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 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
|
220 |
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 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
|
222 } |
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
|
223 #endif |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
224 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
225 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
226 static unsigned long |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
227 XGetPixel (ximage, x, y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
228 XImagePtr ximage; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
229 int x, y; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
230 { |
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
|
231 #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
|
232 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
|
233 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
|
234 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
|
235 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
|
236 #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
|
237 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
|
238 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
|
239 |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
240 #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
|
241 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
|
242 { |
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 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
|
244 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
|
245 |
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
|
246 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
|
247 } |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
248 else |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
249 #endif |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
250 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
|
251 { |
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
|
252 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
|
253 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
|
254 |
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
|
255 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
|
256 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
|
257 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
|
258 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
|
259 } |
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 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
|
261 { |
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 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
|
263 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
|
264 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
|
265 |
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 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
|
267 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
|
268 |
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
|
269 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
|
270 |
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
|
271 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
|
272 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
|
273 } |
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
|
274 #endif |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
275 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
276 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
277 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
278 XDestroyImage (ximg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
279 XImagePtr ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
280 { |
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
|
281 #if !USE_MAC_IMAGE_IO |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
282 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
|
283 #endif |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
284 } |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
285 |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
286 #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
|
287 #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
|
288 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
|
289 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
|
290 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
|
291 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
|
292 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
|
293 { |
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
294 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
|
295 } |
d4410031dce7
(PIX_MASK_DRAW, PIX_MASK_RETAIN) [USE_MAC_IMAGE_IO]:
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80382
diff
changeset
|
296 #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
|
297 |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
298 static CGImageRef |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
299 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
|
300 struct frame *f; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
301 struct image *img; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
302 { |
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
|
303 #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
|
304 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
|
305 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
|
306 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
|
307 |
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 (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
|
309 { |
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 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
|
311 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
|
312 |
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 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
|
314 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
|
315 { |
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 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
|
317 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
|
318 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
|
319 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
|
320 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
|
321 * 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
|
322 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
|
323 * 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
|
324 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
|
325 * 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
|
326 } |
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 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
|
328 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
|
329 } |
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 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
|
331 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
|
332 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
|
333 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
|
334 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
|
335 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
|
336 ximg->bytes_per_line, mac_cg_color_space_rgb, |
80616
3af78d9da472
(mac_create_cg_image_from_image, image_load_image_io)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80600
diff
changeset
|
337 ((img->mask ? kCGImageAlphaPremultipliedFirst |
3af78d9da472
(mac_create_cg_image_from_image, image_load_image_io)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80600
diff
changeset
|
338 : kCGImageAlphaNoneSkipFirst) |
3af78d9da472
(mac_create_cg_image_from_image, image_load_image_io)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80600
diff
changeset
|
339 | kCGBitmapByteOrder32Host), |
3af78d9da472
(mac_create_cg_image_from_image, image_load_image_io)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80600
diff
changeset
|
340 provider, NULL, 0, kCGRenderingIntentDefault); |
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
|
341 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
|
342 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
|
343 |
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 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
|
345 #else |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
346 Pixmap mask; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
347 CGImageRef result = NULL; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
348 |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
349 BLOCK_INPUT; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
350 if (img->mask) |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
351 mask = img->mask; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
352 else |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
353 { |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
354 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
|
355 img->width, img->height, 1); |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
356 if (mask) |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
357 { |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
358 CGrafPtr old_port; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
359 GDHandle old_gdh; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
360 Rect r; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
361 |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
362 GetGWorld (&old_port, &old_gdh); |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
363 SetGWorld (mask, NULL); |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
364 BackColor (blackColor); /* Don't mask. */ |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
365 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
|
366 EraseRect (&r); |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
367 SetGWorld (old_port, old_gdh); |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
368 } |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
369 } |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
370 if (mask) |
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 CreateCGImageFromPixMaps (GetGWorldPixMap (img->pixmap), |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
373 GetGWorldPixMap (mask), &result); |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
374 if (mask != img->mask) |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
375 XFreePixmap (FRAME_X_DISPLAY (f), mask); |
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 UNBLOCK_INPUT; |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
378 |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
379 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
|
380 #endif |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
381 } |
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
382 #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
|
383 #endif /* MAC_OS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
384 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
385 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
386 XImagePtr |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
387 XGetImage (Display *display, Pixmap pixmap, int x, int y, |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
388 unsigned int width, unsigned int height, |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
389 unsigned long plane_mask, int format) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
390 { |
96763
a27390a84360
change most cases of PENDING to TODO, some to FIXME or XXX
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
96675
diff
changeset
|
391 /* TODO: not sure what this function is supposed to do.. */ |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
392 ns_retain_object(pixmap); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
393 return pixmap; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
394 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
395 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
396 /* use with imgs created by ns_image_for_XPM */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
397 unsigned long |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
398 XGetPixel (XImagePtr ximage, int x, int y) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
399 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
400 return ns_get_pixel(ximage, x, y); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
401 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
402 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
403 /* use with imgs created by ns_image_for_XPM; alpha set to 1; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
404 pixel is assumed to be in form RGB */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
405 void |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
406 XPutPixel (XImagePtr ximage, int x, int y, unsigned long pixel) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
407 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
408 ns_put_pixel(ximage, x, y, pixel); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
409 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
410 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
411 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
412 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
413 /* 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
|
414 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
415 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
416 x_bitmap_height (f, id) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
417 FRAME_PTR f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
418 int id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
419 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
420 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
|
421 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
422 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
423 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
424 x_bitmap_width (f, id) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
425 FRAME_PTR f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
426 int id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
427 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
428 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
|
429 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
430 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
431 #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
|
432 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
433 x_bitmap_pixmap (f, id) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
434 FRAME_PTR f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
435 int id; |
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 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
|
438 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
439 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
440 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
441 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
442 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
443 x_bitmap_mask (f, id) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
444 FRAME_PTR f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
445 int id; |
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 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
|
448 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
449 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
450 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
451 /* 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
|
452 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
453 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
454 x_allocate_bitmap_record (f) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
455 FRAME_PTR f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
456 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
457 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
|
458 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
459 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
460 if (dpyinfo->bitmaps == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
461 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
462 dpyinfo->bitmaps_size = 10; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
463 dpyinfo->bitmaps |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
464 = (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
|
465 dpyinfo->bitmaps_last = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
466 return 1; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
469 if (dpyinfo->bitmaps_last < dpyinfo->bitmaps_size) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
470 return ++dpyinfo->bitmaps_last; |
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 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
|
473 if (dpyinfo->bitmaps[i].refcount == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
474 return i + 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
475 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
476 dpyinfo->bitmaps_size *= 2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
477 dpyinfo->bitmaps |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
478 = (Bitmap_Record *) xrealloc (dpyinfo->bitmaps, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
479 dpyinfo->bitmaps_size * sizeof (Bitmap_Record)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
480 return ++dpyinfo->bitmaps_last; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
481 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
482 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
483 /* 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
|
484 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
485 void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
486 x_reference_bitmap (f, id) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
487 FRAME_PTR f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
488 int id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
489 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
490 ++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
|
491 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
492 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
493 /* 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
|
494 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
495 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
496 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
|
497 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
498 char *bits; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
499 unsigned int width, height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
500 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
501 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
|
502 int id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
503 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
504 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
505 Pixmap bitmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
506 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
|
507 bits, width, height); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
508 if (! bitmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
509 return -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
510 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
511 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
512 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
513 Pixmap bitmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
514 bitmap = CreateBitmap (width, height, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
515 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
|
516 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
|
517 bits); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
518 if (! bitmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
519 return -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
520 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
521 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
522 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
523 void *bitmap = ns_image_from_XBM(bits, width, height); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
524 if (!bitmap) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
525 return -1; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
526 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
527 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
528 id = x_allocate_bitmap_record (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
529 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
530 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
531 dpyinfo->bitmaps[id - 1].img = bitmap; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
532 dpyinfo->bitmaps[id - 1].depth = 1; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
533 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
534 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
535 dpyinfo->bitmaps[id - 1].file = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
536 dpyinfo->bitmaps[id - 1].height = height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
537 dpyinfo->bitmaps[id - 1].width = width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
538 dpyinfo->bitmaps[id - 1].refcount = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
539 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
540 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
541 dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
542 dpyinfo->bitmaps[id - 1].have_mask = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
543 dpyinfo->bitmaps[id - 1].depth = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
544 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
545 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
546 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
547 dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
548 dpyinfo->bitmaps[id - 1].hinst = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
549 dpyinfo->bitmaps[id - 1].depth = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
550 #endif /* HAVE_NTGUI */ |
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 return id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
553 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
554 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
555 /* 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
|
556 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
557 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
558 x_create_bitmap_from_file (f, file) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
559 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
560 Lisp_Object file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
561 { |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
562 Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
563 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
564 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
565 return -1; /* W32_TODO : bitmap support */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
566 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
567 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
568 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
569 int id; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
570 void *bitmap = ns_image_from_file(file); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
571 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
572 if (!bitmap) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
573 return -1; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
574 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
575 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
576 id = x_allocate_bitmap_record (f); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
577 dpyinfo->bitmaps[id - 1].img = bitmap; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
578 dpyinfo->bitmaps[id - 1].refcount = 1; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
579 dpyinfo->bitmaps[id - 1].file = (char *) xmalloc (SBYTES (file) + 1); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
580 dpyinfo->bitmaps[id - 1].depth = 1; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
581 dpyinfo->bitmaps[id - 1].height = ns_image_width(bitmap); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
582 dpyinfo->bitmaps[id - 1].width = ns_image_height(bitmap); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
583 strcpy (dpyinfo->bitmaps[id - 1].file, SDATA (file)); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
584 return id; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
585 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
586 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
587 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
588 unsigned int width, height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
589 Pixmap bitmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
590 int xhot, yhot, result, id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
591 Lisp_Object found; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
592 int fd; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
593 char *filename; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
594 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
595 /* 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
|
596 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
|
597 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
598 if (dpyinfo->bitmaps[id].refcount |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
599 && dpyinfo->bitmaps[id].file |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
600 && !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
|
601 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
602 ++dpyinfo->bitmaps[id].refcount; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
603 return id + 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
604 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
605 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
606 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
607 /* 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
|
608 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
|
609 if (fd < 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
610 return -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
611 emacs_close (fd); |
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 filename = (char *) SDATA (found); |
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 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
|
616 filename, &width, &height, &bitmap, &xhot, &yhot); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
617 if (result != BitmapSuccess) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
618 return -1; |
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 id = x_allocate_bitmap_record (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
621 dpyinfo->bitmaps[id - 1].pixmap = bitmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
622 dpyinfo->bitmaps[id - 1].have_mask = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
623 dpyinfo->bitmaps[id - 1].refcount = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
624 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
|
625 dpyinfo->bitmaps[id - 1].depth = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
626 dpyinfo->bitmaps[id - 1].height = height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
627 dpyinfo->bitmaps[id - 1].width = width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
628 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
|
629 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
630 return id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
631 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
632 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
633 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
634 /* Free bitmap B. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
635 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
636 static void |
85095
4f61ded4a62e
(free_bitmap_record): Renamed from Free_Bitmap_Record.
Richard M. Stallman <rms@gnu.org>
parents:
85039
diff
changeset
|
637 free_bitmap_record (dpyinfo, bm) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
638 Display_Info *dpyinfo; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
639 Bitmap_Record *bm; |
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 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
642 XFreePixmap (dpyinfo->display, bm->pixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
643 if (bm->have_mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
644 XFreePixmap (dpyinfo->display, bm->mask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
645 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
646 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
647 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
648 DeleteObject (bm->pixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
649 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
650 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
651 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
652 ns_release_object(bm->img); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
653 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
654 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
655 if (bm->file) |
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 xfree (bm->file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
658 bm->file = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
659 } |
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 /* 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
|
663 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
664 void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
665 x_destroy_bitmap (f, id) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
666 FRAME_PTR f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
667 int id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
668 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
669 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
|
670 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
671 if (id > 0) |
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 Bitmap_Record *bm = &dpyinfo->bitmaps[id - 1]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
674 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
675 if (--bm->refcount == 0) |
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 BLOCK_INPUT; |
85095
4f61ded4a62e
(free_bitmap_record): Renamed from Free_Bitmap_Record.
Richard M. Stallman <rms@gnu.org>
parents:
85039
diff
changeset
|
678 free_bitmap_record (dpyinfo, bm); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
679 UNBLOCK_INPUT; |
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 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
684 /* 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
|
685 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
686 void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
687 x_destroy_all_bitmaps (dpyinfo) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
688 Display_Info *dpyinfo; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
689 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
690 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
691 Bitmap_Record *bm = dpyinfo->bitmaps; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
692 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
693 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
|
694 if (bm->refcount > 0) |
85095
4f61ded4a62e
(free_bitmap_record): Renamed from Free_Bitmap_Record.
Richard M. Stallman <rms@gnu.org>
parents:
85039
diff
changeset
|
695 free_bitmap_record (dpyinfo, bm); |
54341
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 dpyinfo->bitmaps_last = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
698 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
699 |
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 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
702 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
703 /* Useful functions defined in the section |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
704 `Image type independent image structures' below. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
705 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
706 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
|
707 int *corners, |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
708 unsigned long width, |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
709 unsigned long height)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
710 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
711 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
|
712 int depth, XImagePtr *ximg, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
713 Pixmap *pixmap)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
714 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
715 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
|
716 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
717 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
718 /* 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
|
719 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
|
720 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
721 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
722 x_create_bitmap_mask (f, id) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
723 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
724 int id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
725 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
726 Pixmap pixmap, mask; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
727 XImagePtr ximg, mask_img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
728 unsigned long width, height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
729 int result; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
730 unsigned long bg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
731 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
|
732 GC gc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
733 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
734 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
|
735 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
736 if (!(id > 0)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
737 return -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
738 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
739 pixmap = x_bitmap_pixmap (f, id); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
740 width = x_bitmap_width (f, id); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
741 height = x_bitmap_height (f, id); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
742 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
743 BLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
744 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
|
745 ~0, ZPixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
746 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
747 if (!ximg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
748 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
749 UNBLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
750 return -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
751 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
752 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
753 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
|
754 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
755 UNBLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
756 if (!result) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
757 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
758 XDestroyImage (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
759 return -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
760 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
761 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
762 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
|
763 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
764 for (y = 0; y < ximg->height; ++y) |
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 for (x = 0; x < ximg->width; ++x) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
767 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
768 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
|
769 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
|
770 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
|
771 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
|
772 if (XGetPixel (ximg, x, y) == bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
773 && XGetPixel (ximg, x, yp) == bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
774 && XGetPixel (ximg, x, ym) == bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
775 && XGetPixel (ximg, xp, y) == bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
776 && XGetPixel (ximg, xp, yp) == bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
777 && XGetPixel (ximg, xp, ym) == bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
778 && XGetPixel (ximg, xm, y) == bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
779 && XGetPixel (ximg, xm, yp) == bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
780 && XGetPixel (ximg, xm, ym) == bg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
781 XPutPixel (mask_img, x, y, 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
782 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
783 XPutPixel (mask_img, x, y, 1); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
787 xassert (interrupt_input_blocked); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
788 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
|
789 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
|
790 width, height); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
791 XFreeGC (FRAME_X_DISPLAY (f), gc); |
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 dpyinfo->bitmaps[id - 1].have_mask = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
794 dpyinfo->bitmaps[id - 1].mask = mask; |
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 XDestroyImage (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
797 x_destroy_x_image (mask_img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
798 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
799 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
800 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
801 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
802 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
803 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
804 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
805 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
806 Image types |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
807 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
808 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
809 /* 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
|
810 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
811 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
812 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
813 /* 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
|
814 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
|
815 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
816 static struct image_type *image_types; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
817 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
818 /* 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
|
819 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
820 Lisp_Object Vimage_types; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
821 |
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
822 /* 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
|
823 |
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
824 Lisp_Object Vimage_library_alist; |
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
825 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
826 /* Cache for delayed-loading image types. */ |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
827 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
828 static Lisp_Object Vimage_type_cache; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
829 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
830 /* 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
|
831 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
832 Lisp_Object Qxbm; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
833 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
834 /* Keywords. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
835 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
836 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
|
837 extern Lisp_Object QCdata, QCtype; |
54427 | 838 extern Lisp_Object Qcenter; |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
839 Lisp_Object QCascent, QCmargin, QCrelief, Qcount; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
840 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
841 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
842 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
843 /* Other symbols. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
844 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
845 Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
846 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
847 /* 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
|
848 if not displayed. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
849 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
850 Lisp_Object Vimage_cache_eviction_delay; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
851 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
852 /* Function prototypes. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
853 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
854 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
|
855 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
|
856 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
|
857 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
|
858 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
|
859 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
|
860 Lisp_Object)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
861 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
862 #define CACHE_IMAGE_TYPE(type, status) \ |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
863 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
|
864 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
865 #define ADD_IMAGE_TYPE(type) \ |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
866 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
|
867 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
868 /* 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
|
869 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
|
870 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
871 static Lisp_Object |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
872 define_image_type (type, loaded) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
873 struct image_type *type; |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
874 int loaded; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
875 { |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
876 Lisp_Object success; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
877 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
878 if (!loaded) |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
879 success = Qnil; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
880 else |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
881 { |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
882 /* 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
|
883 The initialized data segment is read-only. */ |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
884 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
|
885 bcopy (type, p, sizeof *p); |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
886 p->next = image_types; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
887 image_types = p; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
888 success = Qt; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
889 } |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
890 |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
891 CACHE_IMAGE_TYPE (*type->type, success); |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
892 return success; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
893 } |
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 /* 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
|
897 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
|
898 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
899 static INLINE struct image_type * |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
900 lookup_image_type (symbol) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
901 Lisp_Object symbol; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
902 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
903 struct image_type *type; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
904 |
56132
56c3ef9caeed
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Miles Bader <miles@gnu.org>
parents:
56104
diff
changeset
|
905 /* 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
|
906 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
|
907 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
|
908 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
909 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
|
910 if (EQ (symbol, *type->type)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
911 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
912 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
913 return type; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
914 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
915 |
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 /* 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
|
918 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
|
919 `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
|
920 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
|
921 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
|
922 image type. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
923 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
924 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
925 valid_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
926 Lisp_Object object; |
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 int valid_p = 0; |
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 if (IMAGEP (object)) |
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 Lisp_Object tem; |
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 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
|
935 if (EQ (XCAR (tem), QCtype)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
936 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
937 tem = XCDR (tem); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
938 if (CONSP (tem) && SYMBOLP (XCAR (tem))) |
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 struct image_type *type; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
941 type = lookup_image_type (XCAR (tem)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
942 if (type) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
943 valid_p = type->valid_p (object); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
946 break; |
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 return valid_p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
951 } |
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 /* 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
|
955 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
|
956 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
|
957 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
|
958 therefore simply displays a message. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
959 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
960 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
961 image_error (format, arg1, arg2) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
962 char *format; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
963 Lisp_Object arg1, arg2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
964 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
965 add_to_log (format, arg1, arg2); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
966 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
967 |
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 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
971 Image specifications |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
972 ***********************************************************************/ |
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 enum image_value_type |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
975 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
976 IMAGE_DONT_CHECK_VALUE_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
977 IMAGE_STRING_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
978 IMAGE_STRING_OR_NIL_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
979 IMAGE_SYMBOL_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
980 IMAGE_POSITIVE_INTEGER_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
981 IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
982 IMAGE_NON_NEGATIVE_INTEGER_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
983 IMAGE_ASCENT_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
984 IMAGE_INTEGER_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
985 IMAGE_FUNCTION_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
986 IMAGE_NUMBER_VALUE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
987 IMAGE_BOOL_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 /* Structure used when parsing image specifications. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
991 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
992 struct image_keyword |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
993 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
994 /* Name of keyword. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
995 char *name; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
996 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
997 /* The type of value allowed. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
998 enum image_value_type type; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
999 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1000 /* Non-zero means key must be present. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1001 int mandatory_p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1002 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1003 /* 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
|
1004 int count; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1005 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1006 /* The value that was found. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1007 Lisp_Object value; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1010 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1011 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
|
1012 int, Lisp_Object)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1013 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
|
1014 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1015 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1016 /* 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
|
1017 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
|
1018 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
|
1019 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
|
1020 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
|
1021 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1022 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1023 parse_image_spec (spec, keywords, nkeywords, type) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1024 Lisp_Object spec; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1025 struct image_keyword *keywords; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1026 int nkeywords; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1027 Lisp_Object type; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1028 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1029 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1030 Lisp_Object 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 if (!IMAGEP (spec)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1033 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1034 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1035 plist = XCDR (spec); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1036 while (CONSP (plist)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1037 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1038 Lisp_Object key, value; |
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 /* 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
|
1041 key = XCAR (plist); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1042 plist = XCDR (plist); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1043 if (!SYMBOLP (key)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1044 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1045 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1046 /* There must follow a value. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1047 if (!CONSP (plist)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1048 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1049 value = XCAR (plist); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1050 plist = XCDR (plist); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1051 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1052 /* 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
|
1053 for (i = 0; i < nkeywords; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1054 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
|
1055 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1056 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1057 if (i == nkeywords) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1058 continue; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1059 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1060 /* 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
|
1061 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
|
1062 keywords[i].value = value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1063 ++keywords[i].count; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1064 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1065 if (keywords[i].count > 1) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1066 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1067 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1068 /* Check type of value against allowed type. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1069 switch (keywords[i].type) |
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_STRING_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1072 if (!STRINGP (value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1073 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1074 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1075 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1076 case IMAGE_STRING_OR_NIL_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1077 if (!STRINGP (value) && !NILP (value)) |
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 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1080 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1081 case IMAGE_SYMBOL_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1082 if (!SYMBOLP (value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1083 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1084 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1085 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1086 case IMAGE_POSITIVE_INTEGER_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1087 if (!INTEGERP (value) || XINT (value) <= 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1088 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1089 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1090 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1091 case IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1092 if (INTEGERP (value) && XINT (value) >= 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1093 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1094 if (CONSP (value) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1095 && INTEGERP (XCAR (value)) && INTEGERP (XCDR (value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1096 && 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
|
1097 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1098 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1099 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1100 case IMAGE_ASCENT_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1101 if (SYMBOLP (value) && EQ (value, Qcenter)) |
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 else if (INTEGERP (value) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1104 && XINT (value) >= 0 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1105 && XINT (value) <= 100) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1106 break; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1109 case IMAGE_NON_NEGATIVE_INTEGER_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1110 if (!INTEGERP (value) || XINT (value) < 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1111 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1112 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1113 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1114 case IMAGE_DONT_CHECK_VALUE_TYPE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1115 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1116 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1117 case IMAGE_FUNCTION_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1118 value = indirect_function (value); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1119 if (SUBRP (value) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1120 || COMPILEDP (value) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1121 || (CONSP (value) && EQ (XCAR (value), Qlambda))) |
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 return 0; |
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 case IMAGE_NUMBER_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1126 if (!INTEGERP (value) && !FLOATP (value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1127 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1128 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1129 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1130 case IMAGE_INTEGER_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1131 if (!INTEGERP (value)) |
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 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1134 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1135 case IMAGE_BOOL_VALUE: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1136 if (!NILP (value) && !EQ (value, Qt)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1137 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1138 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1139 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1140 default: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1141 abort (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1142 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1143 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1144 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1145 if (EQ (key, QCtype) && !EQ (type, value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1146 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1147 } |
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 /* Check that all mandatory fields are present. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1150 for (i = 0; i < nkeywords; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1151 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
|
1152 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1153 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1154 return NILP (plist); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1155 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1158 /* 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
|
1159 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
|
1160 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
|
1161 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1162 static Lisp_Object |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1163 image_spec_value (spec, key, found) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1164 Lisp_Object spec, key; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1165 int *found; |
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 Lisp_Object tail; |
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 xassert (valid_image_p (spec)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1170 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1171 for (tail = XCDR (spec); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1172 CONSP (tail) && CONSP (XCDR (tail)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1173 tail = XCDR (XCDR (tail))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1174 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1175 if (EQ (XCAR (tail), key)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1176 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1177 if (found) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1178 *found = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1179 return XCAR (XCDR (tail)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1180 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1181 } |
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 if (found) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1184 *found = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1185 return Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1186 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1187 |
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 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
|
1190 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
|
1191 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
|
1192 size in canonical character units. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1193 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
|
1194 or omitted means use the selected frame. */) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1195 (spec, pixels, frame) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1196 Lisp_Object spec, pixels, frame; |
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 Lisp_Object 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 size = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1201 if (valid_image_p (spec)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1202 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1203 struct frame *f = check_x_frame (frame); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1204 int id = lookup_image (f, spec); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1205 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
|
1206 int width = img->width + 2 * img->hmargin; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1207 int height = img->height + 2 * img->vmargin; |
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 if (NILP (pixels)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1210 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
|
1211 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
|
1212 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1213 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
|
1214 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1215 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1216 error ("Invalid image specification"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1217 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1218 return size; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1221 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1222 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
|
1223 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
|
1224 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
|
1225 or omitted means use the selected frame. */) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1226 (spec, frame) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1227 Lisp_Object spec, frame; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1228 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1229 Lisp_Object mask; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1230 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1231 mask = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1232 if (valid_image_p (spec)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1233 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1234 struct frame *f = check_x_frame (frame); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1235 int id = lookup_image (f, spec); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1236 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
|
1237 if (img->mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1238 mask = Qt; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1239 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1240 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1241 error ("Invalid image specification"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1242 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1243 return mask; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1244 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1245 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1246 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
|
1247 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
|
1248 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
|
1249 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
|
1250 (spec, frame) |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1251 Lisp_Object spec, frame; |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1252 { |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1253 Lisp_Object ext; |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1254 |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1255 ext = Qnil; |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1256 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
|
1257 { |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1258 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
|
1259 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
|
1260 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
|
1261 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
|
1262 } |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1263 |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1264 return ext; |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1265 } |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1266 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1267 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1268 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1269 Image type independent image structures |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1270 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1271 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1272 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
|
1273 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
|
1274 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
|
1275 |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1276 #define MAX_IMAGE_SIZE 6.0 |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1277 Lisp_Object Vmax_image_size; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1278 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1279 /* 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
|
1280 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
|
1281 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1282 static struct image * |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1283 make_image (spec, hash) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1284 Lisp_Object spec; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1285 unsigned hash; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1286 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1287 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
|
1288 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
|
1289 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1290 xassert (valid_image_p (spec)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1291 bzero (img, sizeof *img); |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1292 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
|
1293 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
|
1294 xassert (img->type != NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1295 img->spec = spec; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1296 img->data.lisp_val = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1297 img->ascent = DEFAULT_IMAGE_ASCENT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1298 img->hash = hash; |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1299 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
|
1300 return img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1301 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1302 |
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 /* 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
|
1305 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1306 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1307 free_image (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1308 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1309 struct image *img; |
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 if (img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1312 { |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1313 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
|
1314 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1315 /* 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
|
1316 if (img->prev) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1317 img->prev->next = img->next; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1318 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1319 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
|
1320 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1321 if (img->next) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1322 img->next->prev = img->prev; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1323 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1324 c->images[img->id] = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1325 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1326 /* Free resources, then free IMG. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1327 img->type->free (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1328 xfree (img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1329 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1330 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1331 |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1332 /* 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
|
1333 otherwise, return 0. */ |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1334 |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1335 int |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1336 check_image_size (f, width, height) |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1337 struct frame *f; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1338 int width; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1339 int height; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1340 { |
66208
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1341 int w, h; |
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 if (width <= 0 || height <= 0) |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1344 return 0; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1345 |
66208
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1346 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
|
1347 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
|
1348 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
|
1349 { |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1350 if (f != NULL) |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1351 { |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1352 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
|
1353 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
|
1354 } |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1355 else |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1356 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
|
1357 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
|
1358 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
|
1359 } |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1360 else |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1361 return 1; |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1362 |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
1363 return (width <= w && height <= h); |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
1364 } |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1365 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1366 /* 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
|
1367 drawing an image. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1368 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1369 void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1370 prepare_image_for_display (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1371 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1372 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1373 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1374 EMACS_TIME t; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1375 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1376 /* 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
|
1377 EMACS_GET_TIME (t); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1378 img->timestamp = EMACS_SECS (t); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1379 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1380 /* 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
|
1381 type dependent loader function. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1382 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
|
1383 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
|
1384 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1385 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1386 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1387 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1388 /* 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
|
1389 drawn in face FACE. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1390 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1391 int |
55022
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1392 image_ascent (img, face, slice) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1393 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1394 struct face *face; |
55022
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1395 struct glyph_slice *slice; |
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1396 { |
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1397 int height; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1398 int ascent; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1399 |
55022
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1400 if (slice->height == img->height) |
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1401 height = img->height + img->vmargin; |
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1402 else if (slice->y == 0) |
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1403 height = slice->height + img->vmargin; |
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1404 else |
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1405 height = slice->height; |
dda0bae93c73
(image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents:
54920
diff
changeset
|
1406 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1407 if (img->ascent == CENTERED_IMAGE_ASCENT) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1408 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1409 if (face->font) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1410 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1411 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1412 /* W32 specific version. Why?. ++kfs */ |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
1413 ascent = height / 2 - (FONT_DESCENT (face->font) |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
1414 - FONT_BASE (face->font)) / 2; |
54341
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 /* 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
|
1417 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
|
1418 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
|
1419 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
|
1420 being top-heavy too. It also just generally looks better. */ |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1421 ascent = (height + FONT_BASE(face->font) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1422 - FONT_DESCENT(face->font) + 1) / 2; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1423 #endif /* HAVE_NTGUI */ |
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 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1426 ascent = height / 2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1427 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1428 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1429 ascent = (int) (height * img->ascent / 100.0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1430 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1431 return ascent; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1432 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1433 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1434 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1435 /* Image background colors. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1436 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1437 /* 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
|
1438 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
|
1439 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1440 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
|
1441 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
|
1442 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
|
1443 int *corners; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1444 unsigned long width, height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1445 { |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1446 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
|
1447 int i, best_count; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1448 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1449 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
|
1450 { |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1451 /* 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
|
1452 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
|
1453 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
|
1454 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
|
1455 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
|
1456 } |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1457 else |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1458 { |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1459 /* 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
|
1460 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
|
1461 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
|
1462 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
|
1463 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
|
1464 } |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1465 /* 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
|
1466 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
|
1467 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1468 int j, n; |
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 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
|
1471 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
|
1472 ++n; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1473 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1474 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
|
1475 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
|
1476 } |
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 return best; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1479 } |
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 /* Portability macros */ |
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 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1484 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1485 #define Destroy_Image(img_dc, prev) \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1486 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
|
1487 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1488 #define Free_Pixmap(display, pixmap) \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1489 DeleteObject (pixmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1490 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1491 #elif defined (HAVE_NS) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1492 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1493 #define Destroy_Image(ximg, dummy) \ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1494 ns_release_object(ximg) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1495 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1496 #define Free_Pixmap(display, pixmap) \ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1497 ns_release_object(pixmap) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1498 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1499 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1500 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1501 #define Destroy_Image(ximg, dummy) \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1502 XDestroyImage (ximg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1503 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1504 #define Free_Pixmap(display, pixmap) \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1505 XFreePixmap (display, pixmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1506 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
1507 #endif /* !HAVE_NTGUI && !HAVE_NS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1508 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1509 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1510 /* 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
|
1511 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
|
1512 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
|
1513 use for the heuristic. */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1514 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1515 RGB_PIXEL_COLOR |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1516 image_background (img, f, ximg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1517 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1518 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1519 XImagePtr_or_DC ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1520 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1521 if (! img->background_valid) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1522 /* 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
|
1523 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1524 int free_ximg = !ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1525 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1526 HGDIOBJ prev; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1527 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1528 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1529 if (free_ximg) |
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 #ifndef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1532 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
|
1533 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
|
1534 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1535 HDC frame_dc = get_frame_dc (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1536 ximg = CreateCompatibleDC (frame_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1537 release_frame_dc (f, frame_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1538 prev = SelectObject (ximg, img->pixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1539 #endif /* !HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1540 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1541 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1542 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
|
1543 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1544 if (free_ximg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1545 Destroy_Image (ximg, prev); |
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
1546 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1547 img->background_valid = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1548 } |
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 return img->background; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1551 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1552 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1553 /* 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
|
1554 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
|
1555 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
|
1556 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1557 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1558 image_background_transparent (img, f, mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1559 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1560 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1561 XImagePtr_or_DC mask; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1562 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1563 if (! img->background_transparent_valid) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1564 /* 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
|
1565 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1566 if (img->mask) |
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 int free_mask = !mask; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1569 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1570 HGDIOBJ prev; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1571 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1572 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1573 if (free_mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1574 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1575 #ifndef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1576 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
|
1577 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
|
1578 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1579 HDC frame_dc = get_frame_dc (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1580 mask = CreateCompatibleDC (frame_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1581 release_frame_dc (f, frame_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1582 prev = SelectObject (mask, img->mask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1583 #endif /* HAVE_NTGUI */ |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1586 img->background_transparent |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
1587 = (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
|
1588 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1589 if (free_mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1590 Destroy_Image (mask, prev); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1591 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1592 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1593 img->background_transparent = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1594 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1595 img->background_transparent_valid = 1; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1598 return img->background_transparent; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1599 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1600 |
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 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1603 Helper functions for X image types |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1604 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1605 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1606 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
|
1607 int, int)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1608 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
|
1609 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
|
1610 struct image *img, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1611 Lisp_Object color_name, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1612 unsigned long dflt)); |
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 /* 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
|
1616 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
|
1617 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
|
1618 the image, if any. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1619 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1620 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1621 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
|
1622 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1623 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1624 int pixmap_p, mask_p, colors_p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1625 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1626 if (pixmap_p && img->pixmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1627 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1628 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
|
1629 img->pixmap = NO_PIXMAP; |
99904
ba4876d944bc
Fix bug #1362. * image.c (x_clear_image_1): Do not free background under HAVE_NS, it is not an indexed color. * nsterm.m (free_indexed_color): Add argument checking. * nsfns.m: Move config.h to before system includes (advised by Dan N.).
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
98490
diff
changeset
|
1630 /* NOTE (HAVE_NS): background color is NOT an indexed color! */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1631 img->background_valid = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1632 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1633 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1634 if (mask_p && img->mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1635 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1636 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
|
1637 img->mask = NO_PIXMAP; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1638 img->background_transparent_valid = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1639 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1640 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1641 if (colors_p && img->ncolors) |
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 /* W32_TODO: color table support. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1644 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1645 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
|
1646 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1647 xfree (img->colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1648 img->colors = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1649 img->ncolors = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1650 } |
69511
65b669e90ff5
[MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69333
diff
changeset
|
1651 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1652 } |
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 /* 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
|
1655 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1656 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1657 x_clear_image (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1658 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1659 struct image *img; |
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 BLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1662 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
|
1663 UNBLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1664 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1665 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1666 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1667 /* 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
|
1668 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
|
1669 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
|
1670 color. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1671 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1672 static unsigned long |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1673 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
|
1674 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1675 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1676 Lisp_Object color_name; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1677 unsigned long dflt; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1678 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1679 XColor color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1680 unsigned long result; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1681 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1682 xassert (STRINGP (color_name)); |
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 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
|
1685 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1686 /* 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
|
1687 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
|
1688 ++img->ncolors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1689 img->colors = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1690 (unsigned long *) xrealloc (img->colors, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1691 img->ncolors * sizeof *img->colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1692 img->colors[img->ncolors - 1] = color.pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1693 result = color.pixel; |
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 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1696 result = dflt; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1697 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1698 return result; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1701 |
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 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1704 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 |
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1707 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
|
1708 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
|
1709 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
|
1710 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1711 /* 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
|
1712 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
|
1713 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1714 struct image_cache * |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1715 make_image_cache () |
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 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
|
1718 int size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1719 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1720 bzero (c, sizeof *c); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1721 c->size = 50; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1722 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
|
1723 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
|
1724 c->buckets = (struct image **) xmalloc (size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1725 bzero (c->buckets, size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1726 return c; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1727 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1728 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1729 |
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1730 /* 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
|
1731 image is found, return NULL. */ |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1732 static struct image * |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1733 search_image_cache (f, spec, hash) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1734 struct frame *f; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1735 Lisp_Object spec; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1736 unsigned hash; |
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 struct image *img; |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1739 struct image_cache *c = FRAME_IMAGE_CACHE (f); |
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1740 int i = hash % IMAGE_CACHE_BUCKETS_SIZE; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1741 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1742 if (!c) return NULL; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1743 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1744 /* 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
|
1745 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
|
1746 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
|
1747 images. |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1748 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1749 In fact, we could ignore the foreground color matching condition |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1750 for color images, or if the image spec specifies :foreground; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1751 similarly we could ignore the background color matching condition |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1752 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
|
1753 image spec specifies :background. However, the extra memory |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1754 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
|
1755 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1756 for (img = c->buckets[i]; img; img = img->next) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1757 if (img->hash == hash |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1758 && !NILP (Fequal (img->spec, spec)) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1759 && img->frame_foreground == FRAME_FOREGROUND_PIXEL (f) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1760 && img->frame_background == FRAME_BACKGROUND_PIXEL (f)) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1761 break; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1762 return img; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1763 } |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1764 |
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 /* 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
|
1767 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1768 static void |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1769 uncache_image (f, spec) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1770 struct frame *f; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1771 Lisp_Object spec; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1772 { |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1773 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
|
1774 if (img) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1775 free_image (f, img); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1776 } |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1777 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1778 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1779 /* 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
|
1780 caches. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1781 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1782 void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1783 free_image_cache (f) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1784 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1785 { |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1786 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
|
1787 if (c) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1788 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1789 int i; |
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 /* 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
|
1792 xassert (c->refcount == 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1793 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1794 for (i = 0; i < c->used; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1795 free_image (f, c->images[i]); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1796 xfree (c->images); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1797 xfree (c->buckets); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1798 xfree (c); |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1799 FRAME_IMAGE_CACHE (f) = NULL; |
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 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1802 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1803 |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1804 /* 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
|
1805 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
|
1806 displayed for some time. |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1807 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
|
1808 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
|
1809 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
|
1810 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
|
1811 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1812 void |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1813 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
|
1814 { |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1815 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
|
1816 |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1817 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
|
1818 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1819 EMACS_TIME t; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1820 unsigned long old; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1821 int i, nfreed; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1822 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1823 EMACS_GET_TIME (t); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1824 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
|
1825 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1826 /* 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
|
1827 while being in an inconsistent state. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1828 BLOCK_INPUT; |
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 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
|
1831 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1832 struct image *img = c->images[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1833 if (img != NULL |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1834 && (NILP (filter) ? img->timestamp < old |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1835 : (EQ (Qt, filter) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1836 || !NILP (Fmember (filter, img->dependencies))))) |
54341
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 free_image (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1839 ++nfreed; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1840 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1843 /* 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
|
1844 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
|
1845 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
|
1846 images freed above. So, clear these matrices. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1847 if (nfreed) |
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 Lisp_Object tail, frame; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1850 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1851 FOR_EACH_FRAME (tail, frame) |
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 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
|
1854 if (FRAME_IMAGE_CACHE (f) == c) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1855 clear_current_matrices (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1856 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1857 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1858 ++windows_or_buffers_changed; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1859 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1860 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1861 UNBLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1862 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1863 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1864 |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1865 void |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1866 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
|
1867 { |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1868 /* FIXME: We want to do |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1869 * struct terminal *t; |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1870 * 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
|
1871 * clear_image_cache (t, filter); */ |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1872 Lisp_Object tail, frame; |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1873 FOR_EACH_FRAME (tail, frame) |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
1874 if (FRAME_WINDOW_P (XFRAME (frame))) |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1875 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
|
1876 } |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1877 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1878 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
|
1879 0, 1, 0, |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1880 doc: /* Clear the image cache. |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1881 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
|
1882 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
|
1883 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
|
1884 which is then usually a filename. */) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1885 (filter) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1886 Lisp_Object filter; |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1887 { |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1888 if (!(EQ (filter, Qnil) || FRAMEP (filter))) |
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1889 clear_image_caches (filter); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1890 else |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
1891 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
|
1892 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1893 return Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1894 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1895 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1896 |
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1897 DEFUN ("image-refresh", Fimage_refresh, Simage_refresh, |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1898 1, 2, 0, |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1899 doc: /* Refresh the image with specification SPEC on frame FRAME. |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1900 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
|
1901 the current contents of that file. |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1902 FRAME nil or omitted means use the selected frame. |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1903 FRAME t means refresh the image on all frames. */) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1904 (spec, frame) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1905 Lisp_Object spec, frame; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1906 { |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1907 if (!valid_image_p (spec)) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1908 error ("Invalid image specification"); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1909 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1910 if (EQ (frame, Qt)) |
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 Lisp_Object tail; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1913 FOR_EACH_FRAME (tail, frame) |
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 struct frame *f = XFRAME (frame); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1916 if (FRAME_WINDOW_P (f)) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1917 uncache_image (f, spec); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1918 } |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1919 } |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1920 else |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1921 uncache_image (check_x_frame (frame), spec); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1922 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1923 return Qnil; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1924 } |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1925 |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
1926 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1927 /* 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
|
1928 by the image's specification, */ |
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 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1931 postprocess_image (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1932 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1933 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1934 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1935 /* Manipulation of the image's mask. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1936 if (img->pixmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1937 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1938 Lisp_Object conversion, spec; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1939 Lisp_Object mask; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1940 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1941 spec = img->spec; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1942 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1943 /* `:heuristic-mask t' |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1944 `:mask heuristic' |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1945 means build a mask heuristically. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1946 `:heuristic-mask (R G B)' |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1947 `:mask (heuristic (R G B))' |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1948 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
|
1949 image. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1950 `:mask nil' |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1951 means remove a mask, if any. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1952 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1953 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
|
1954 if (!NILP (mask)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1955 x_build_heuristic_mask (f, img, mask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1956 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1957 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1958 int found_p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1959 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1960 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
|
1961 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1962 if (EQ (mask, Qheuristic)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1963 x_build_heuristic_mask (f, img, Qt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1964 else if (CONSP (mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1965 && EQ (XCAR (mask), Qheuristic)) |
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 if (CONSP (XCDR (mask))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1968 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
|
1969 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1970 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
|
1971 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1972 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
|
1973 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1974 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
|
1975 img->mask = NO_PIXMAP; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1976 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1977 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1978 |
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 /* Should we apply an image transformation algorithm? */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1981 conversion = image_spec_value (spec, QCconversion, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1982 if (EQ (conversion, Qdisabled)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1983 x_disable_image (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1984 else if (EQ (conversion, Qlaplace)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1985 x_laplace (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1986 else if (EQ (conversion, Qemboss)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1987 x_emboss (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1988 else if (CONSP (conversion) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1989 && EQ (XCAR (conversion), Qedge_detection)) |
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 Lisp_Object tem; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1992 tem = XCDR (conversion); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1993 if (CONSP (tem)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1994 x_edge_detection (f, img, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1995 Fplist_get (tem, QCmatrix), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1996 Fplist_get (tem, QCcolor_adjustment)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1997 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1998 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
1999 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2000 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2001 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2002 /* 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
|
2003 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
|
2004 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2005 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2006 lookup_image (f, spec) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2007 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2008 Lisp_Object spec; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2009 { |
83436
f67e432d150c
Fix crash in lookup_image on termcap frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
67785
diff
changeset
|
2010 struct image_cache *c; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2011 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2012 unsigned hash; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2013 struct gcpro gcpro1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2014 EMACS_TIME now; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2015 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2016 /* 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
|
2017 specification. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2018 xassert (FRAME_WINDOW_P (f)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2019 xassert (valid_image_p (spec)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2020 |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2021 c = FRAME_IMAGE_CACHE (f); |
83436
f67e432d150c
Fix crash in lookup_image on termcap frames.
Karoly Lorentey <lorentey@elte.hu>
parents:
67785
diff
changeset
|
2022 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2023 GCPRO1 (spec); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2024 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2025 /* 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
|
2026 hash = sxhash (spec, 0); |
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
2027 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
|
2028 if (img && img->load_failed_p) |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2029 { |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2030 free_image (f, img); |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2031 img = NULL; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2032 } |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2033 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2034 /* 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
|
2035 if (img == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2036 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2037 extern Lisp_Object Qpostscript; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2038 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2039 BLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2040 img = make_image (spec, hash); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2041 cache_image (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2042 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
|
2043 img->frame_foreground = FRAME_FOREGROUND_PIXEL (f); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
2044 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
|
2045 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2046 /* 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
|
2047 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
|
2048 draw a rectangle for it. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2049 if (img->load_failed_p) |
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 Lisp_Object value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2052 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2053 value = image_spec_value (spec, QCwidth, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2054 img->width = (INTEGERP (value) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2055 ? XFASTINT (value) : DEFAULT_IMAGE_WIDTH); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2056 value = image_spec_value (spec, QCheight, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2057 img->height = (INTEGERP (value) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2058 ? XFASTINT (value) : DEFAULT_IMAGE_HEIGHT); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2059 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2060 else |
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 /* Handle image type independent image attributes |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2063 `:ascent ASCENT', `:margin MARGIN', `:relief RELIEF', |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2064 `:background COLOR'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2065 Lisp_Object ascent, margin, relief, bg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2066 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2067 ascent = image_spec_value (spec, QCascent, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2068 if (INTEGERP (ascent)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2069 img->ascent = XFASTINT (ascent); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2070 else if (EQ (ascent, Qcenter)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2071 img->ascent = CENTERED_IMAGE_ASCENT; |
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 margin = image_spec_value (spec, QCmargin, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2074 if (INTEGERP (margin) && XINT (margin) >= 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2075 img->vmargin = img->hmargin = XFASTINT (margin); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2076 else if (CONSP (margin) && INTEGERP (XCAR (margin)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2077 && INTEGERP (XCDR (margin))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2078 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2079 if (XINT (XCAR (margin)) > 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2080 img->hmargin = XFASTINT (XCAR (margin)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2081 if (XINT (XCDR (margin)) > 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2082 img->vmargin = XFASTINT (XCDR (margin)); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2085 relief = image_spec_value (spec, QCrelief, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2086 if (INTEGERP (relief)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2087 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2088 img->relief = XINT (relief); |
85254 | 2089 img->hmargin += eabs (img->relief); |
2090 img->vmargin += eabs (img->relief); | |
54341
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 if (! img->background_valid) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2094 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2095 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
|
2096 if (!NILP (bg)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2097 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2098 img->background |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2099 = x_alloc_image_color (f, img, bg, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2100 FRAME_BACKGROUND_PIXEL (f)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2101 img->background_valid = 1; |
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 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2104 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2105 /* 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
|
2106 don't have the image yet. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2107 if (!EQ (*img->type->type, Qpostscript)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2108 postprocess_image (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2109 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2110 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2111 UNBLOCK_INPUT; |
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 /* 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
|
2115 EMACS_GET_TIME (now); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2116 img->timestamp = EMACS_SECS (now); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2117 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2118 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2119 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2120 /* Value is the image id. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2121 return img->id; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2122 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2125 /* 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
|
2126 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2127 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2128 cache_image (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2129 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2130 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2131 { |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2132 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
|
2133 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2134 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2135 /* Find a free slot in c->images. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2136 for (i = 0; i < c->used; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2137 if (c->images[i] == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2138 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2139 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2140 /* 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
|
2141 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
|
2142 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2143 c->size *= 2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2144 c->images = (struct image **) xrealloc (c->images, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2145 c->size * sizeof *c->images); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2146 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2147 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2148 /* 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
|
2149 c->images[i] = img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2150 img->id = i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2151 if (i == c->used) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2152 ++c->used; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2153 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2154 /* 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
|
2155 i = img->hash % IMAGE_CACHE_BUCKETS_SIZE; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2156 img->next = c->buckets[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2157 if (img->next) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2158 img->next->prev = img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2159 img->prev = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2160 c->buckets[i] = img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2161 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2162 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2163 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2164 /* 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
|
2165 Lisp Objects in the image cache. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2166 |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2167 /* 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
|
2168 |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2169 static void |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2170 mark_image (img) |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2171 struct image *img; |
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 mark_object (img->spec); |
92150
1c088baa9d2d
Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
92110
diff
changeset
|
2174 mark_object (img->dependencies); |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2175 |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2176 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
|
2177 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
|
2178 } |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2179 |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2180 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2181 void |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2182 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
|
2183 { |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2184 if (c) |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2185 { |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2186 int i; |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2187 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
|
2188 if (c->images[i]) |
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
2189 mark_image (c->images[i]); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2190 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2191 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2194 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2195 /*********************************************************************** |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
2196 X / NS / W32 support code |
54341
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2199 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2200 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2201 /* 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
|
2202 #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
|
2203 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2204 /* 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
|
2205 #define LOAD_IMGLIB_FN(lib,func) { \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2206 fn_##func = (void *) GetProcAddress (lib, #func); \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2207 if (!fn_##func) return 0; \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2208 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2209 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2210 /* Load a DLL implementing an image type. |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2211 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
|
2212 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
|
2213 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
|
2214 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
|
2215 else the handle of the DLL. */ |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2216 static HMODULE |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2217 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
|
2218 { |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2219 HMODULE library = NULL; |
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 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
|
2222 { |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2223 Lisp_Object dlls = Fassq (type, libraries); |
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 if (CONSP (dlls)) |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2226 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
|
2227 { |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2228 CHECK_STRING_CAR (dlls); |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2229 if (library = LoadLibrary (SDATA (XCAR (dlls)))) |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2230 break; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2231 } |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2232 } |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2233 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2234 return library; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2235 } |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
2236 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2237 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2238 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2239 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
|
2240 XImagePtr *, Pixmap *)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2241 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
|
2242 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
|
2243 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2244 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2245 /* 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
|
2246 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
|
2247 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
|
2248 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
|
2249 occurs. Value is non-zero if successful. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2250 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2251 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
|
2252 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
|
2253 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2254 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2255 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
|
2256 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2257 int width, height, depth; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2258 XImagePtr *ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2259 Pixmap *pixmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2260 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2261 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2262 Display *display = FRAME_X_DISPLAY (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2263 Window window = FRAME_X_WINDOW (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2264 Screen *screen = FRAME_X_SCREEN (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2265 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2266 xassert (interrupt_input_blocked); |
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 if (depth <= 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2269 depth = DefaultDepthOfScreen (screen); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2270 *ximg = XCreateImage (display, DefaultVisualOfScreen (screen), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2271 depth, ZPixmap, 0, NULL, width, height, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2272 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
|
2273 if (*ximg == NULL) |
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 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
|
2276 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2277 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2278 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2279 /* Allocate image raster. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2280 (*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
|
2281 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2282 /* Allocate a pixmap of the same size. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2283 *pixmap = XCreatePixmap (display, window, width, height, depth); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2284 if (*pixmap == NO_PIXMAP) |
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 x_destroy_x_image (*ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2287 *ximg = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2288 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
|
2289 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2290 } |
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 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2293 #endif /* HAVE_X_WINDOWS */ |
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 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2296 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2297 BITMAPINFOHEADER *header; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2298 HDC hdc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2299 int scanline_width_bits; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2300 int remainder; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2301 int palette_colors = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2302 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2303 if (depth == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2304 depth = 24; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2305 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2306 if (depth != 1 && depth != 4 && depth != 8 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2307 && depth != 16 && depth != 24 && depth != 32) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2308 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2309 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
|
2310 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2311 } |
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 scanline_width_bits = width * depth; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2314 remainder = scanline_width_bits % 32; |
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 if (remainder) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2317 scanline_width_bits += 32 - remainder; |
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 /* 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
|
2320 /* BITMAPINFO structure already contains the first RGBQUAD. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2321 if (depth < 16) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2322 palette_colors = 1 << depth - 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2323 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2324 *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
|
2325 if (*ximg == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2326 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2327 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
|
2328 return 0; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2331 header = &((*ximg)->info.bmiHeader); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2332 bzero (&((*ximg)->info), sizeof (BITMAPINFO)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2333 header->biSize = sizeof (*header); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2334 header->biWidth = width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2335 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
|
2336 header->biPlanes = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2337 header->biBitCount = depth; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2338 header->biCompression = BI_RGB; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2339 header->biClrUsed = palette_colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2340 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2341 /* TODO: fill in palette. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2342 if (depth == 1) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2343 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2344 (*ximg)->info.bmiColors[0].rgbBlue = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2345 (*ximg)->info.bmiColors[0].rgbGreen = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2346 (*ximg)->info.bmiColors[0].rgbRed = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2347 (*ximg)->info.bmiColors[0].rgbReserved = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2348 (*ximg)->info.bmiColors[1].rgbBlue = 255; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2349 (*ximg)->info.bmiColors[1].rgbGreen = 255; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2350 (*ximg)->info.bmiColors[1].rgbRed = 255; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2351 (*ximg)->info.bmiColors[1].rgbReserved = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2352 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2353 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2354 hdc = get_frame_dc (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2355 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2356 /* 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
|
2357 and store its handle in *pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2358 *pixmap = CreateDIBSection (hdc, &((*ximg)->info), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2359 (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
|
2360 /* 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
|
2361 (void **)&((*ximg)->data), NULL, 0); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2362 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2363 /* Realize display palette and garbage all frames. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2364 release_frame_dc (f, hdc); |
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 if (*pixmap == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2367 { |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
2368 DWORD err = GetLastError (); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2369 Lisp_Object errcode; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2370 /* 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
|
2371 XSETINT (errcode, (int) err); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2372 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
|
2373 x_destroy_x_image (*ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2374 return 0; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2377 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2378 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2379 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2380 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2381 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2382 *pixmap = ns_image_for_XPM(width, height, depth); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2383 if (*pixmap == 0) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2384 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2385 *ximg = NULL; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2386 image_error ("Unable to allocate NSImage for XPM pixmap", Qnil, Qnil); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2387 return 0; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2388 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2389 *ximg = *pixmap; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2390 return 1; |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2391 #endif |
54341
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 */ |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2414 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2415 ns_release_object(ximg); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2416 #endif /* HAVE_NS */ |
54341
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 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2448 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2449 xassert (ximg == pixmap); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2450 ns_retain_object(ximg); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2451 #endif |
54341
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 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2456 File Handling |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2459 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
|
2460 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2461 |
82736
ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents:
82518
diff
changeset
|
2462 /* 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
|
2463 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
|
2464 found, or nil if not found. */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2465 |
54391
138155b7215e
(x_find_image_file): Make extern.
Kim F. Storm <storm@cua.dk>
parents:
54363
diff
changeset
|
2466 Lisp_Object |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2467 x_find_image_file (file) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2468 Lisp_Object file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2469 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2470 Lisp_Object file_found, search_path; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2471 struct gcpro gcpro1, gcpro2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2472 int fd; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2473 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2474 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
|
2475 /* 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
|
2476 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
|
2477 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
|
2478 Vdata_directory), |
ece5e5e6398e
(x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents:
82518
diff
changeset
|
2479 Vx_bitmap_file_path); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2480 GCPRO2 (file_found, search_path); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2481 |
83770 | 2482 /* 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
|
2483 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
|
2484 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2485 if (fd == -1) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2486 file_found = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2487 else |
69771
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2488 { |
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2489 file_found = ENCODE_FILE (file_found); |
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2490 close (fd); |
fd6d18b61fa7
Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents:
69511
diff
changeset
|
2491 } |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2492 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2493 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2494 return file_found; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2498 /* 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
|
2499 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
|
2500 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
|
2501 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2502 static unsigned char * |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2503 slurp_file (file, size) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2504 char *file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2505 int *size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2506 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2507 FILE *fp = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2508 unsigned char *buf = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2509 struct stat st; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2510 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2511 if (stat (file, &st) == 0 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2512 && (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
|
2513 && (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
|
2514 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
|
2515 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2516 *size = st.st_size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2517 fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2518 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2519 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2520 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2521 if (fp) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2522 fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2523 if (buf) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2524 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2525 xfree (buf); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2526 buf = NULL; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2530 return buf; |
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 |
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 XBM images |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2537 ***********************************************************************/ |
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 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
|
2540 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
|
2541 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
|
2542 unsigned char *, unsigned char *)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2543 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
|
2544 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
|
2545 unsigned char *, unsigned char *, |
104259
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
2546 int *, int *, unsigned char **, int)); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2547 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
|
2548 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2549 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2550 /* 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
|
2551 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2552 enum xbm_keyword_index |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2553 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2554 XBM_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2555 XBM_FILE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2556 XBM_WIDTH, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2557 XBM_HEIGHT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2558 XBM_DATA, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2559 XBM_FOREGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2560 XBM_BACKGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2561 XBM_ASCENT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2562 XBM_MARGIN, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2563 XBM_RELIEF, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2564 XBM_ALGORITHM, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2565 XBM_HEURISTIC_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2566 XBM_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2567 XBM_LAST |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2568 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2569 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2570 /* 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
|
2571 of valid XBM image specifications. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2572 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2573 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
|
2574 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2575 {":type", IMAGE_SYMBOL_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2576 {":file", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2577 {":width", IMAGE_POSITIVE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2578 {":height", IMAGE_POSITIVE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2579 {":data", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2580 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2581 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2582 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2583 {":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
|
2584 {":relief", IMAGE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2585 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2586 {":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
|
2587 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0} |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2588 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2589 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2590 /* Structure describing the image type XBM. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2591 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2592 static struct image_type xbm_type = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2593 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2594 &Qxbm, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2595 xbm_image_p, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2596 xbm_load, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2597 x_clear_image, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2598 NULL |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2599 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2600 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2601 /* Tokens returned from xbm_scan. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2602 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2603 enum xbm_token |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2604 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2605 XBM_TK_IDENT = 256, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2606 XBM_TK_NUMBER |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2607 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2608 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2609 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2610 /* 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
|
2611 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
|
2612 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
|
2613 entry `:type xbm.. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2614 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2615 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
|
2616 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
|
2617 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2618 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
|
2619 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
|
2620 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
|
2621 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2622 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
|
2623 have a size >= (WIDTH + 7) / 8 * HEIGHT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2624 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2625 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
|
2626 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2627 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
|
2628 bitmap. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2629 |
78970
35f78a0b1e30
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78863
diff
changeset
|
2630 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
|
2631 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
|
2632 XBM file. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2633 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2634 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
|
2635 `: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
|
2636 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
|
2637 displayed is used. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2638 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2639 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2640 xbm_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2641 Lisp_Object object; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2642 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2643 struct image_keyword kw[XBM_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2644 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2645 bcopy (xbm_format, kw, sizeof kw); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2646 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
|
2647 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2648 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2649 xassert (EQ (kw[XBM_TYPE].value, Qxbm)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2650 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2651 if (kw[XBM_FILE].count) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2652 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2653 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
|
2654 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2655 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2656 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
|
2657 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2658 /* In-memory XBM file. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2659 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
|
2660 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2661 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2662 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2663 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2664 Lisp_Object data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2665 int width, height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2666 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2667 /* 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
|
2668 if (!kw[XBM_WIDTH].count |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2669 || !kw[XBM_HEIGHT].count |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2670 || !kw[XBM_DATA].count) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2671 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2672 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2673 data = kw[XBM_DATA].value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2674 width = XFASTINT (kw[XBM_WIDTH].value); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2675 height = XFASTINT (kw[XBM_HEIGHT].value); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2676 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2677 /* 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
|
2678 data. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2679 if (VECTORP (data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2680 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2681 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2682 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2683 /* 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
|
2684 if (XVECTOR (data)->size < height) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2685 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2686 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2687 /* 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
|
2688 for one line of the image. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2689 for (i = 0; i < height; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2690 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2691 Lisp_Object elt = XVECTOR (data)->contents[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2692 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2693 if (STRINGP (elt)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2694 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2695 if (SCHARS (elt) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2696 < (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
|
2697 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2698 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2699 else if (BOOL_VECTOR_P (elt)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2700 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2701 if (XBOOL_VECTOR (elt)->size < width) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2702 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2703 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2704 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2705 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2706 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2707 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2708 else if (STRINGP (data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2709 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2710 if (SCHARS (data) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2711 < (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
|
2712 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2713 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2714 else if (BOOL_VECTOR_P (data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2715 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2716 if (XBOOL_VECTOR (data)->size < width * height) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2717 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2718 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2719 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2720 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2721 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2722 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2723 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2724 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2725 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2726 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2727 /* 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
|
2728 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
|
2729 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
|
2730 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
|
2731 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
|
2732 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2733 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2734 xbm_scan (s, end, sval, ival) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2735 unsigned char **s, *end; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2736 char *sval; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2737 int *ival; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2738 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2739 unsigned int c; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2740 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2741 loop: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2742 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2743 /* Skip white space. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2744 while (*s < end && (c = *(*s)++, isspace (c))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2745 ; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2746 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2747 if (*s >= end) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2748 c = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2749 else if (isdigit (c)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2750 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2751 int value = 0, digit; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2752 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2753 if (c == '0' && *s < end) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2754 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2755 c = *(*s)++; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2756 if (c == 'x' || c == 'X') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2757 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2758 while (*s < end) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2759 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2760 c = *(*s)++; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2761 if (isdigit (c)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2762 digit = c - '0'; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2763 else if (c >= 'a' && c <= 'f') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2764 digit = c - 'a' + 10; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2765 else if (c >= 'A' && c <= 'F') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2766 digit = c - 'A' + 10; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2767 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2768 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2769 value = 16 * value + digit; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2770 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2771 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2772 else if (isdigit (c)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2773 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2774 value = c - '0'; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2775 while (*s < end |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2776 && (c = *(*s)++, isdigit (c))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2777 value = 8 * value + c - '0'; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2778 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2779 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2780 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2781 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2782 value = c - '0'; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2783 while (*s < end |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2784 && (c = *(*s)++, isdigit (c))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2785 value = 10 * value + c - '0'; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2786 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2787 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2788 if (*s < end) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2789 *s = *s - 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2790 *ival = value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2791 c = XBM_TK_NUMBER; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2792 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2793 else if (isalpha (c) || c == '_') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2794 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2795 *sval++ = c; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2796 while (*s < end |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2797 && (c = *(*s)++, (isalnum (c) || c == '_'))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2798 *sval++ = c; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2799 *sval = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2800 if (*s < end) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2801 *s = *s - 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2802 c = XBM_TK_IDENT; |
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 else if (c == '/' && **s == '*') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2805 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2806 /* C-style comment. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2807 ++*s; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2808 while (**s && (**s != '*' || *(*s + 1) != '/')) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2809 ++*s; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2810 if (**s) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2811 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2812 *s += 2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2813 goto loop; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2814 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2815 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2816 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2817 return c; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2818 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2819 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2820 #ifdef HAVE_NTGUI |
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 /* 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
|
2823 static HBITMAP |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2824 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
|
2825 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2826 static unsigned char swap_nibble[16] |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2827 = { 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
|
2828 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
|
2829 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
|
2830 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
|
2831 int i, j, w1, w2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2832 unsigned char *bits, *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2833 HBITMAP bmp; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2834 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2835 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
|
2836 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
|
2837 bits = (unsigned char *) alloca (height * w2); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2838 bzero (bits, height * w2); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2839 for (i = 0; i < height; i++) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2840 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2841 p = bits + i*w2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2842 for (j = 0; j < w1; j++) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2843 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2844 /* 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
|
2845 unsigned char c = *data++; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2846 *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
|
2847 | (swap_nibble[(c>>4) & 0xf])); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2848 } |
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 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
|
2851 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2852 return bmp; |
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 |
78692
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
2855 static void |
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
2856 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
|
2857 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2858 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2859 COLORREF foreground, background; |
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 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
|
2862 HGDIOBJ old_prev, new_prev; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2863 HBITMAP new_pixmap; |
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 hdc = get_frame_dc (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2866 old_img_dc = CreateCompatibleDC (hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2867 new_img_dc = CreateCompatibleDC (hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2868 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
|
2869 release_frame_dc (f, hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2870 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
|
2871 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
|
2872 /* 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
|
2873 white = foreground. */ |
78036
3766144496c2
(convert_mono_to_color_image): Swap fore and background.
Jason Rumney <jasonr@gnu.org>
parents:
77929
diff
changeset
|
2874 SetTextColor (new_img_dc, background); |
3766144496c2
(convert_mono_to_color_image): Swap fore and background.
Jason Rumney <jasonr@gnu.org>
parents:
77929
diff
changeset
|
2875 SetBkColor (new_img_dc, foreground); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2876 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2877 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
|
2878 0, 0, SRCCOPY); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2879 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2880 SelectObject (old_img_dc, old_prev); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2881 SelectObject (new_img_dc, new_prev); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2882 DeleteDC (old_img_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2883 DeleteDC (new_img_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2884 DeleteObject (img->pixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2885 if (new_pixmap == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2886 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
|
2887 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2888 img->pixmap = new_pixmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2889 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2890 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2891 #define XBM_BIT_SHUFFLE(b) (~(b)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2892 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2893 #else |
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 #define XBM_BIT_SHUFFLE(b) (b) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2896 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2897 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2898 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2899 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2900 static void |
82820
2f1e57a528f0
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
82795
diff
changeset
|
2901 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
|
2902 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2903 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2904 char *data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2905 RGB_PIXEL_COLOR fg, bg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2906 int non_default_colors; |
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 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2909 img->pixmap |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2910 = 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
|
2911 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2912 /* 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
|
2913 if (non_default_colors) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2914 convert_mono_to_color_image (f, img, fg, bg); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2915 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2916 #elif defined (HAVE_NS) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2917 img->pixmap = ns_image_from_XBM(data, img->width, img->height); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2918 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2919 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2920 img->pixmap |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2921 = XCreatePixmapFromBitmapData (FRAME_X_DISPLAY (f), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2922 FRAME_X_WINDOW (f), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2923 data, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2924 img->width, img->height, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2925 fg, bg, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2926 DefaultDepthOfScreen (FRAME_X_SCREEN (f))); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
2927 #endif /* !HAVE_NTGUI && !HAVE_NS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2928 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2931 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2932 /* 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
|
2933 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
|
2934 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
|
2935 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
|
2936 Value is non-zero if successful. DATA null means just test if |
104259
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
2937 CONTENTS looks like an in-memory XBM file. If INHIBIT_IMAGE_ERROR |
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
2938 is non-zero, inhibit the call to image_error when the image size is |
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
2939 invalid (the bitmap remains unread). */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2940 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2941 static int |
104259
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
2942 xbm_read_bitmap_data (f, contents, end, width, height, data, inhibit_image_error) |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2943 struct frame *f; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2944 unsigned char *contents, *end; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2945 int *width, *height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2946 unsigned char **data; |
104259
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
2947 int inhibit_image_error; |
54341
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 unsigned char *s = contents; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2950 char buffer[BUFSIZ]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2951 int padding_p = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2952 int v10 = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2953 int bytes_per_line, i, nbytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2954 unsigned char *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2955 int value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2956 int LA1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2957 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2958 #define match() \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2959 LA1 = xbm_scan (&s, end, buffer, &value) |
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 #define expect(TOKEN) \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2962 if (LA1 != (TOKEN)) \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2963 goto failure; \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2964 else \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2965 match () |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2966 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2967 #define expect_ident(IDENT) \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2968 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
|
2969 match (); \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2970 else \ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2971 goto failure |
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 *width = *height = -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2974 if (data) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2975 *data = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2976 LA1 = xbm_scan (&s, end, buffer, &value); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2977 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2978 /* 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
|
2979 while (LA1 == '#') |
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 match (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2982 expect_ident ("define"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2983 expect (XBM_TK_IDENT); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2984 |
73346
ba22be0026c7
(xbm_read_bitmap_data): Delete extra semicolon.
Romain Francoise <romain@orebokech.com>
parents:
72539
diff
changeset
|
2985 if (LA1 == XBM_TK_NUMBER) |
54341
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 char *p = strrchr (buffer, '_'); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2988 p = p ? p + 1 : buffer; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2989 if (strcmp (p, "width") == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2990 *width = value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2991 else if (strcmp (p, "height") == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2992 *height = value; |
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 expect (XBM_TK_NUMBER); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2995 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
2996 |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
2997 if (!check_image_size (f, *width, *height)) |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
2998 { |
104259
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
2999 if (!inhibit_image_error) |
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
3000 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
3001 goto failure; |
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
3002 } |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3003 else if (data == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3004 goto success; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3005 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3006 /* Parse bits. Must start with `static'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3007 expect_ident ("static"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3008 if (LA1 == XBM_TK_IDENT) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3009 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3010 if (strcmp (buffer, "unsigned") == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3011 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3012 match (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3013 expect_ident ("char"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3014 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3015 else if (strcmp (buffer, "short") == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3016 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3017 match (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3018 v10 = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3019 if (*width % 16 && *width % 16 < 9) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3020 padding_p = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3021 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3022 else if (strcmp (buffer, "char") == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3023 match (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3024 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3025 goto failure; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3026 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3027 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3028 goto failure; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3029 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3030 expect (XBM_TK_IDENT); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3031 expect ('['); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3032 expect (']'); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3033 expect ('='); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3034 expect ('{'); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3035 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3036 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
|
3037 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
|
3038 p = *data = (unsigned char *) xmalloc (nbytes); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3039 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3040 if (v10) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3041 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3042 for (i = 0; i < nbytes; i += 2) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3043 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3044 int val = value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3045 expect (XBM_TK_NUMBER); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3046 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3047 *p++ = XBM_BIT_SHUFFLE (val); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3048 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
|
3049 *p++ = XBM_BIT_SHUFFLE (value >> 8); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3050 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3051 if (LA1 == ',' || LA1 == '}') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3052 match (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3053 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3054 goto failure; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3055 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3056 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3057 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3058 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3059 for (i = 0; i < nbytes; ++i) |
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 int val = value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3062 expect (XBM_TK_NUMBER); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3063 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3064 *p++ = XBM_BIT_SHUFFLE (val); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3065 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3066 if (LA1 == ',' || LA1 == '}') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3067 match (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3068 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3069 goto failure; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3070 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3071 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3072 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3073 success: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3074 return 1; |
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 failure: |
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 if (data && *data) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3079 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3080 xfree (*data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3081 *data = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3082 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3083 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3084 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3085 #undef match |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3086 #undef expect |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3087 #undef expect_ident |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3088 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3089 |
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 /* 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
|
3092 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
|
3093 successful. */ |
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 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3096 xbm_load_image (f, img, contents, end) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3097 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3098 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3099 unsigned char *contents, *end; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3100 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3101 int rc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3102 unsigned char *data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3103 int success_p = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3104 |
104259
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
3105 rc = xbm_read_bitmap_data (f, contents, end, &img->width, &img->height, |
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
3106 &data, 0); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3107 if (rc) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3108 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3109 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3110 unsigned long background = FRAME_BACKGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3111 int non_default_colors = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3112 Lisp_Object value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3113 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3114 xassert (img->width > 0 && img->height > 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3115 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3116 /* 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
|
3117 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
|
3118 if (!NILP (value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3119 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3120 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
|
3121 non_default_colors = 1; |
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 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
|
3124 if (!NILP (value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3125 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3126 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
|
3127 img->background = background; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3128 img->background_valid = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3129 non_default_colors = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3130 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3131 |
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
3132 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
|
3133 foreground, background, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3134 non_default_colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3135 xfree (data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3136 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3137 if (img->pixmap == NO_PIXMAP) |
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 x_clear_image (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3140 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
|
3141 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3142 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3143 success_p = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3144 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3145 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3146 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
|
3147 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3148 return success_p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3149 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3150 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3151 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3152 /* 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
|
3153 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3154 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3155 xbm_file_p (data) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3156 Lisp_Object data; |
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 int w, h; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3159 return (STRINGP (data) |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
3160 && xbm_read_bitmap_data (NULL, SDATA (data), |
104259
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
3161 (SDATA (data) + SBYTES (data)), |
a52366907b7a
* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents:
102392
diff
changeset
|
3162 &w, &h, NULL, 1)); |
54341
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3165 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3166 /* 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
|
3167 non-zero if successful. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3168 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3169 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3170 xbm_load (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3171 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3172 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3173 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3174 int success_p = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3175 Lisp_Object file_name; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3176 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3177 xassert (xbm_image_p (img->spec)); |
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 /* 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
|
3180 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
|
3181 if (STRINGP (file_name)) |
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 Lisp_Object file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3184 unsigned char *contents; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3185 int size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3186 struct gcpro gcpro1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3187 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3188 file = x_find_image_file (file_name); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3189 GCPRO1 (file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3190 if (!STRINGP (file)) |
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 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
|
3193 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3194 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3195 } |
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 contents = slurp_file (SDATA (file), &size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3198 if (contents == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3199 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3200 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
|
3201 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3202 return 0; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3205 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
|
3206 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3207 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3208 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3209 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3210 struct image_keyword fmt[XBM_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3211 Lisp_Object data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3212 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3213 unsigned long background = FRAME_BACKGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3214 int non_default_colors = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3215 char *bits; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3216 int parsed_p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3217 int in_memory_file_p = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3218 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3219 /* 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
|
3220 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
|
3221 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
|
3222 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3223 /* Parse the image specification. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3224 bcopy (xbm_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3225 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
|
3226 xassert (parsed_p); |
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 /* Get specified width, and height. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3229 if (!in_memory_file_p) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3230 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3231 img->width = XFASTINT (fmt[XBM_WIDTH].value); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3232 img->height = XFASTINT (fmt[XBM_HEIGHT].value); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3233 xassert (img->width > 0 && img->height > 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3234 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3235 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3236 /* 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
|
3237 if (fmt[XBM_FOREGROUND].count |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3238 && STRINGP (fmt[XBM_FOREGROUND].value)) |
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 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
|
3241 foreground); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3242 non_default_colors = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3243 } |
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 if (fmt[XBM_BACKGROUND].count |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3246 && STRINGP (fmt[XBM_BACKGROUND].value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3247 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3248 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
|
3249 background); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3250 non_default_colors = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3251 } |
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 if (in_memory_file_p) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3254 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
|
3255 (SDATA (data) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3256 + SBYTES (data))); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3257 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3258 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3259 if (VECTORP (data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3260 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3261 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3262 char *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3263 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
|
3264 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3265 p = bits = (char *) alloca (nbytes * img->height); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3266 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
|
3267 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3268 Lisp_Object line = XVECTOR (data)->contents[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3269 if (STRINGP (line)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3270 bcopy (SDATA (line), p, nbytes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3271 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3272 bcopy (XBOOL_VECTOR (line)->data, p, nbytes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3273 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3274 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3275 else if (STRINGP (data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3276 bits = SDATA (data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3277 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3278 bits = XBOOL_VECTOR (data)->data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3279 |
79528
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3280 #ifdef WINDOWSNT |
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3281 { |
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3282 char *invertedBits; |
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3283 int nbytes, i; |
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3284 /* 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
|
3285 invertedBits = bits; |
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3286 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
|
3287 * img->height; |
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3288 bits = (char *) alloca(nbytes); |
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3289 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
|
3290 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
|
3291 } |
558b3650d5dc
(xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents:
78970
diff
changeset
|
3292 #endif |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3293 /* Create the pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3294 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3295 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
|
3296 foreground, background, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3297 non_default_colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3298 if (img->pixmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3299 success_p = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3300 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3301 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3302 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
|
3303 img->spec, Qnil); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3304 x_clear_image (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3305 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3306 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3309 return success_p; |
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 |
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 XPM images |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3316 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3317 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
3318 #if defined (HAVE_XPM) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3319 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3320 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
|
3321 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
|
3322 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
|
3323 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
3324 #endif /* HAVE_XPM || HAVE_NS */ |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3325 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3326 #ifdef HAVE_XPM |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3327 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3328 /* 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
|
3329 #define FOR_MSW |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3330 /* 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
|
3331 /* 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
|
3332 #define XColor xpm_XColor |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3333 #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
|
3334 #define Display xpm_Display |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3335 #define PIXEL_ALREADY_TYPEDEFED |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3336 #include "X11/xpm.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3337 #undef FOR_MSW |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3338 #undef XColor |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3339 #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
|
3340 #undef Display |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3341 #undef PIXEL_ALREADY_TYPEDEFED |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3342 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3343 #include "X11/xpm.h" |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3344 #endif /* HAVE_NTGUI */ |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3345 #endif /* HAVE_XPM */ |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3346 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
3347 #if defined (HAVE_XPM) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3348 /* The symbol `xpm' identifying XPM-format images. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3349 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3350 Lisp_Object Qxpm; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3351 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3352 /* 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
|
3353 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3354 enum xpm_keyword_index |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3355 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3356 XPM_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3357 XPM_FILE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3358 XPM_DATA, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3359 XPM_ASCENT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3360 XPM_MARGIN, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3361 XPM_RELIEF, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3362 XPM_ALGORITHM, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3363 XPM_HEURISTIC_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3364 XPM_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3365 XPM_COLOR_SYMBOLS, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3366 XPM_BACKGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3367 XPM_LAST |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3370 /* 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
|
3371 of valid XPM image specifications. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3372 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3373 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
|
3374 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3375 {":type", IMAGE_SYMBOL_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3376 {":file", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3377 {":data", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3378 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3379 {":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
|
3380 {":relief", IMAGE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3381 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3382 {":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
|
3383 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3384 {":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
|
3385 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3386 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3387 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3388 /* Structure describing the image type XPM. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3389 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3390 static struct image_type xpm_type = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3391 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3392 &Qxpm, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3393 xpm_image_p, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3394 xpm_load, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3395 x_clear_image, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3396 NULL |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3397 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3398 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3399 #ifdef HAVE_X_WINDOWS |
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 /* 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
|
3402 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
|
3403 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
|
3404 lib. */ |
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 #if defined XpmAllocColor && defined XpmFreeColors && defined XpmColorClosure |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3407 #define ALLOC_XPM_COLORS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3408 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3409 #endif /* HAVE_X_WINDOWS */ |
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 #ifdef ALLOC_XPM_COLORS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3412 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3413 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
|
3414 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
|
3415 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
|
3416 static int xpm_color_bucket P_ ((char *)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3417 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
|
3418 XColor *, int)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3419 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3420 /* 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
|
3421 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
|
3422 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
|
3423 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
|
3424 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3425 struct xpm_cached_color |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3426 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3427 /* Next in collision chain. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3428 struct xpm_cached_color *next; |
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 /* Color definition (RGB and pixel color). */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3431 XColor color; |
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 /* Color name. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3434 char name[1]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3435 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3436 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3437 /* 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
|
3438 size. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3439 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3440 #define XPM_COLOR_CACHE_BUCKETS 1001 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3441 struct xpm_cached_color **xpm_color_cache; |
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 /* Initialize the color cache. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3444 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3445 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3446 xpm_init_color_cache (f, attrs) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3447 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3448 XpmAttributes *attrs; |
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 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
|
3451 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
|
3452 memset (xpm_color_cache, 0, nbytes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3453 init_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3454 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3455 if (attrs->valuemask & XpmColorSymbols) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3456 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3457 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3458 XColor color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3459 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3460 for (i = 0; i < attrs->numsymbols; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3461 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
|
3462 attrs->colorsymbols[i].value, &color)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3463 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3464 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
|
3465 color.blue); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3466 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
|
3467 } |
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 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3470 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3471 /* Free the color cache. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3472 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3473 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3474 xpm_free_color_cache () |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3475 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3476 struct xpm_cached_color *p, *next; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3477 int i; |
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 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
|
3480 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
|
3481 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3482 next = p->next; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3483 xfree (p); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3484 } |
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 xfree (xpm_color_cache); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3487 xpm_color_cache = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3488 free_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3489 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3490 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3491 /* 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
|
3492 cache. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3493 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3494 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3495 xpm_color_bucket (color_name) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3496 char *color_name; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3497 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3498 unsigned h = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3499 char *s; |
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 for (s = color_name; *s; ++s) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3502 h = (h << 2) ^ *s; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3503 return h %= XPM_COLOR_CACHE_BUCKETS; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3504 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3505 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3506 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3507 /* 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
|
3508 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
|
3509 entry added. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3510 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3511 static struct xpm_cached_color * |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3512 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
|
3513 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3514 char *color_name; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3515 XColor *color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3516 int bucket; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3517 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3518 size_t nbytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3519 struct xpm_cached_color *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3520 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3521 if (bucket < 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3522 bucket = xpm_color_bucket (color_name); |
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 nbytes = sizeof *p + strlen (color_name); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3525 p = (struct xpm_cached_color *) xmalloc (nbytes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3526 strcpy (p->name, color_name); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3527 p->color = *color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3528 p->next = xpm_color_cache[bucket]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3529 xpm_color_cache[bucket] = p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3530 return p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3531 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3532 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3533 /* 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
|
3534 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
|
3535 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
|
3536 allocation failed. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3537 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3538 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3539 xpm_lookup_color (f, color_name, color) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3540 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3541 char *color_name; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3542 XColor *color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3543 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3544 struct xpm_cached_color *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3545 int h = xpm_color_bucket (color_name); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3546 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3547 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
|
3548 if (strcmp (p->name, color_name) == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3549 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3550 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3551 if (p != NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3552 *color = p->color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3553 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
|
3554 color_name, color)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3555 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3556 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
|
3557 color->blue); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3558 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
|
3559 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3560 /* 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
|
3561 with transparency, and it's useful. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3562 else if (strcmp ("opaque", color_name) == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3563 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3564 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
|
3565 color->pixel = FRAME_FOREGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3566 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
|
3567 } |
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 return p != NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3570 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3571 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3572 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3573 /* 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
|
3574 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
|
3575 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
|
3576 if successful. */ |
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 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3579 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
|
3580 Display *dpy; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3581 Colormap cmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3582 char *color_name; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3583 XColor *color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3584 void *closure; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3585 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3586 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
|
3587 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3588 |
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 /* 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
|
3591 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
|
3592 non-zero if successful. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3593 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3594 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3595 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
|
3596 Display *dpy; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3597 Colormap cmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3598 Pixel *pixels; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3599 int npixels; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3600 void *closure; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3601 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3602 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3603 } |
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 #endif /* ALLOC_XPM_COLORS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3606 |
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 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3609 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3610 /* XPM library details. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3611 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3612 DEF_IMGLIB_FN (XpmFreeAttributes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3613 DEF_IMGLIB_FN (XpmCreateImageFromBuffer); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3614 DEF_IMGLIB_FN (XpmReadFileToImage); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3615 DEF_IMGLIB_FN (XImageFree); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3616 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3617 static int |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
3618 init_xpm_functions (Lisp_Object libraries) |
54341
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 HMODULE library; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3621 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
3622 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
|
3623 return 0; |
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 LOAD_IMGLIB_FN (library, XpmFreeAttributes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3626 LOAD_IMGLIB_FN (library, XpmCreateImageFromBuffer); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3627 LOAD_IMGLIB_FN (library, XpmReadFileToImage); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3628 LOAD_IMGLIB_FN (library, XImageFree); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3629 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3630 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3631 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3632 #endif /* HAVE_NTGUI */ |
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 /* 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
|
3636 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
|
3637 cdr are strings. */ |
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 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3640 xpm_valid_color_symbols_p (color_symbols) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3641 Lisp_Object color_symbols; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3642 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3643 while (CONSP (color_symbols)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3644 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3645 Lisp_Object sym = XCAR (color_symbols); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3646 if (!CONSP (sym) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3647 || !STRINGP (XCAR (sym)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3648 || !STRINGP (XCDR (sym))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3649 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3650 color_symbols = XCDR (color_symbols); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3651 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3652 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3653 return NILP (color_symbols); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3654 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3657 /* 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
|
3658 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3659 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3660 xpm_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3661 Lisp_Object object; |
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 struct image_keyword fmt[XPM_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3664 bcopy (xpm_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3665 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
|
3666 /* Either `:file' or `:data' must be present. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3667 && 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
|
3668 /* 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
|
3669 whose car and cdr are strings. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3670 && (fmt[XPM_COLOR_SYMBOLS].count == 0 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3671 || 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
|
3672 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3673 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
3674 #endif /* HAVE_XPM || HAVE_NS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3675 |
66919
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3676 #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
|
3677 int |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3678 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
|
3679 struct frame *f; |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3680 char **bits; |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3681 { |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3682 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
|
3683 int id, rc; |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3684 XpmAttributes attrs; |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3685 Pixmap bitmap, mask; |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3686 |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3687 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
|
3688 |
66924
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
3689 attrs.visual = FRAME_X_VISUAL (f); |
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
3690 attrs.colormap = FRAME_X_COLORMAP (f); |
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
3691 attrs.valuemask |= XpmVisual; |
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
3692 attrs.valuemask |= XpmColormap; |
53960d1c1f2f
initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents:
66919
diff
changeset
|
3693 |
66919
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3694 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
|
3695 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
|
3696 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
|
3697 { |
9d0a2cc054be
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents:
66924
diff
changeset
|
3698 XpmFreeAttributes (&attrs); |
9d0a2cc054be
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents:
66924
diff
changeset
|
3699 return -1; |
9d0a2cc054be
* image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents:
66924
diff
changeset
|
3700 } |
66919
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3701 |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3702 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
|
3703 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
|
3704 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
|
3705 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
|
3706 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
|
3707 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
|
3708 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
|
3709 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
|
3710 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
|
3711 |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3712 XpmFreeAttributes (&attrs); |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3713 return id; |
a9d1837b115c
* gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents:
66877
diff
changeset
|
3714 } |
66994 | 3715 #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
|
3716 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3717 /* 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
|
3718 non-zero if successful. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3719 |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3720 #ifdef HAVE_XPM |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3721 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3722 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3723 xpm_load (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3724 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3725 struct image *img; |
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 int rc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3728 XpmAttributes attrs; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3729 Lisp_Object specified_file, color_symbols; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3730 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3731 HDC hdc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3732 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
|
3733 #endif /* HAVE_NTGUI */ |
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 /* 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
|
3736 close colors. Return colors allocated. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3737 bzero (&attrs, sizeof attrs); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3738 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3739 #ifndef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3740 attrs.visual = FRAME_X_VISUAL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3741 attrs.colormap = FRAME_X_COLORMAP (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3742 attrs.valuemask |= XpmVisual; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3743 attrs.valuemask |= XpmColormap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3744 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3745 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3746 #ifdef ALLOC_XPM_COLORS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3747 /* 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
|
3748 failing color allocation more gracefully. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3749 attrs.color_closure = f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3750 attrs.alloc_color = xpm_alloc_color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3751 attrs.free_colors = xpm_free_colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3752 attrs.valuemask |= XpmAllocColor | XpmFreeColors | XpmColorClosure; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3753 #else /* not ALLOC_XPM_COLORS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3754 /* Let the XPM lib allocate colors. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3755 attrs.valuemask |= XpmReturnAllocPixels; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3756 #ifdef XpmAllocCloseColors |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3757 attrs.alloc_close_colors = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3758 attrs.valuemask |= XpmAllocCloseColors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3759 #else /* not XpmAllocCloseColors */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3760 attrs.closeness = 600; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3761 attrs.valuemask |= XpmCloseness; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3762 #endif /* not XpmAllocCloseColors */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3763 #endif /* ALLOC_XPM_COLORS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3764 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3765 /* 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
|
3766 these to `attrs'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3767 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
|
3768 if (CONSP (color_symbols)) |
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 Lisp_Object tail; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3771 XpmColorSymbol *xpm_syms; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3772 int i, size; |
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 attrs.valuemask |= XpmColorSymbols; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3775 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3776 /* Count number of symbols. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3777 attrs.numsymbols = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3778 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
|
3779 ++attrs.numsymbols; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3780 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3781 /* Allocate an XpmColorSymbol array. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3782 size = attrs.numsymbols * sizeof *xpm_syms; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3783 xpm_syms = (XpmColorSymbol *) alloca (size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3784 bzero (xpm_syms, size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3785 attrs.colorsymbols = xpm_syms; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3786 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3787 /* Fill the color symbol array. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3788 for (tail = color_symbols, i = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3789 CONSP (tail); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3790 ++i, tail = XCDR (tail)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3791 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3792 Lisp_Object name = XCAR (XCAR (tail)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3793 Lisp_Object color = XCDR (XCAR (tail)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3794 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
|
3795 strcpy (xpm_syms[i].name, SDATA (name)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3796 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
|
3797 strcpy (xpm_syms[i].value, SDATA (color)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3798 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3799 } |
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 /* 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
|
3802 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
|
3803 #ifdef ALLOC_XPM_COLORS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3804 xpm_init_color_cache (f, &attrs); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3805 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3806 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3807 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
|
3808 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3809 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3810 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3811 HDC frame_dc = get_frame_dc (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3812 hdc = CreateCompatibleDC (frame_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3813 release_frame_dc (f, frame_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3814 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3815 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3816 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3817 if (STRINGP (specified_file)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3818 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3819 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
|
3820 if (!STRINGP (file)) |
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 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
|
3823 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3824 } |
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 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3827 /* 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
|
3828 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
|
3829 rc = fn_XpmReadFileToImage (&hdc, SDATA (file), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3830 &xpm_image, &xpm_mask, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3831 &attrs); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3832 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3833 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
|
3834 SDATA (file), &img->pixmap, &img->mask, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3835 &attrs); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3836 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3837 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3838 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3839 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3840 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
|
3841 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3842 /* 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
|
3843 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
|
3844 rc = fn_XpmCreateImageFromBuffer (&hdc, SDATA (buffer), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3845 &xpm_image, &xpm_mask, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3846 &attrs); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3847 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3848 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
|
3849 SDATA (buffer), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3850 &img->pixmap, &img->mask, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3851 &attrs); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3852 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3853 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3854 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3855 if (rc == XpmSuccess) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3856 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3857 #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
|
3858 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
|
3859 #else /* not ALLOC_XPM_COLORS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3860 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3861 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3862 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3863 /* 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
|
3864 plus some duplicate attributes. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3865 if (xpm_image && xpm_image->bitmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3866 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3867 img->pixmap = xpm_image->bitmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3868 /* 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
|
3869 the bitmap, which is what we want. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3870 fn_XImageFree (xpm_image); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3871 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3872 if (xpm_mask && xpm_mask->bitmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3873 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3874 /* 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
|
3875 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
|
3876 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
|
3877 HGDIOBJ old_obj; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3878 old_obj = SelectObject (hdc, xpm_mask->bitmap); |
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 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
|
3881 SelectObject (hdc, old_obj); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3882 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3883 img->mask = xpm_mask->bitmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3884 fn_XImageFree (xpm_mask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3885 DeleteDC (hdc); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3888 DeleteDC (hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3889 #endif /* HAVE_NTGUI */ |
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 /* Remember allocated colors. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3892 img->ncolors = attrs.nalloc_pixels; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3893 img->colors = (unsigned long *) xmalloc (img->ncolors |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3894 * sizeof *img->colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3895 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
|
3896 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3897 img->colors[i] = attrs.alloc_pixels[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3898 #ifdef DEBUG_X_COLORS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3899 register_color (img->colors[i]); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3900 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3901 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3902 #endif /* not ALLOC_XPM_COLORS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3903 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3904 img->width = attrs.width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3905 img->height = attrs.height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3906 xassert (img->width > 0 && img->height > 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3907 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3908 /* 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
|
3909 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3910 fn_XpmFreeAttributes (&attrs); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3911 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3912 XpmFreeAttributes (&attrs); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3913 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3914 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3915 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3916 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3917 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3918 DeleteDC (hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3919 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3920 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3921 switch (rc) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3922 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3923 case XpmOpenFailed: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3924 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
|
3925 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3926 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3927 case XpmFileInvalid: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3928 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
|
3929 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3930 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3931 case XpmNoMemory: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3932 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
|
3933 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3934 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3935 case XpmColorFailed: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3936 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
|
3937 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3938 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3939 default: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3940 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
|
3941 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3942 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3943 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3944 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3945 #ifdef ALLOC_XPM_COLORS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3946 xpm_free_color_cache (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3947 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3948 return rc == XpmSuccess; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3949 } |
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 #endif /* HAVE_XPM */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
3952 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
3953 #if defined (HAVE_NS) && !defined (HAVE_XPM) |
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
3954 |
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
3955 /* XPM support functions for NS where libxpm is not available. |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3956 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
|
3957 |
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
|
3958 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
|
3959 const unsigned char **, int *)); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3960 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
|
3961 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
|
3962 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
|
3963 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
|
3964 int, Lisp_Object)); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3965 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
|
3966 const unsigned char *, int)); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3967 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
|
3968 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
|
3969 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
|
3970 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
|
3971 int, Lisp_Object)); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3972 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
|
3973 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
|
3974 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
|
3975 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
|
3976 const unsigned char *, const unsigned char *)); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3977 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3978 /* Tokens returned from xpm_scan. */ |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3979 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3980 enum xpm_token |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3981 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3982 XPM_TK_IDENT = 256, |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3983 XPM_TK_STRING, |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3984 XPM_TK_EOF |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3985 }; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3986 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3987 /* 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
|
3988 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
|
3989 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
|
3990 *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
|
3991 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
|
3992 length of the corresponding token, respectively. */ |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3993 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3994 static int |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3995 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
|
3996 const unsigned char **s, *end, **beg; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3997 int *len; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3998 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
3999 int c; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4000 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4001 while (*s < end) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4002 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4003 /* Skip white-space. */ |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4004 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
|
4005 ; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4006 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4007 /* 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
|
4008 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
|
4009 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
|
4010 { |
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
|
4011 *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
|
4012 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
|
4013 && (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
|
4014 ++*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
|
4015 *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
|
4016 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
|
4017 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4018 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
|
4019 { |
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
|
4020 *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
|
4021 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
|
4022 ++*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
|
4023 *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
|
4024 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
|
4025 ++*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
|
4026 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
|
4027 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4028 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
|
4029 { |
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
|
4030 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
|
4031 { |
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
|
4032 /* 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
|
4033 ++*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
|
4034 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
|
4035 { |
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
|
4036 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
|
4037 ; |
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
|
4038 } |
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
|
4039 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
|
4040 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
|
4041 ++*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
|
4042 } |
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
|
4043 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
|
4044 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
|
4045 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4046 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
|
4047 return c; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4048 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4049 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4050 return XPM_TK_EOF; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4051 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4052 |
78970
35f78a0b1e30
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
78863
diff
changeset
|
4053 /* 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
|
4054 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
|
4055 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
|
4056 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
|
4057 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
|
4058 hash table is used. */ |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4059 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4060 static Lisp_Object |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4061 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
|
4062 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
|
4063 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
|
4064 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4065 *put_func = xpm_put_color_table_v; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4066 *get_func = xpm_get_color_table_v; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4067 return Fmake_vector (make_number (256), Qnil); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4068 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4069 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4070 static void |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4071 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
|
4072 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
|
4073 const unsigned char *chars_start; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4074 int chars_len; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4075 Lisp_Object color; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4076 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4077 XVECTOR (color_table)->contents[*chars_start] = color; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4078 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4079 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4080 static Lisp_Object |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4081 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
|
4082 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
|
4083 const unsigned char *chars_start; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4084 int chars_len; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4085 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4086 return XVECTOR (color_table)->contents[*chars_start]; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4087 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4088 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4089 static Lisp_Object |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4090 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
|
4091 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
|
4092 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
|
4093 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4094 *put_func = xpm_put_color_table_h; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4095 *get_func = xpm_get_color_table_h; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4096 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
|
4097 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
|
4098 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
|
4099 Qnil, Qnil, Qnil); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4100 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4101 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4102 static void |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4103 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
|
4104 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
|
4105 const unsigned char *chars_start; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4106 int chars_len; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4107 Lisp_Object color; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4108 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4109 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
|
4110 unsigned hash_code; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4111 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
|
4112 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4113 hash_lookup (table, chars, &hash_code); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4114 hash_put (table, chars, color, hash_code); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4115 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4116 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4117 static Lisp_Object |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4118 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
|
4119 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
|
4120 const unsigned char *chars_start; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4121 int chars_len; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4122 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4123 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
|
4124 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
|
4125 NULL); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4126 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4127 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
|
4128 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4129 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4130 enum xpm_color_key { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4131 XPM_COLOR_KEY_S, |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4132 XPM_COLOR_KEY_M, |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4133 XPM_COLOR_KEY_G4, |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4134 XPM_COLOR_KEY_G, |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4135 XPM_COLOR_KEY_C |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4136 }; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4137 |
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
|
4138 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
|
4139 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4140 static int |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4141 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
|
4142 const char *s; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4143 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4144 int i; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4145 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4146 for (i = 0; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4147 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
|
4148 i++) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4149 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
|
4150 return i; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4151 return -1; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4152 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4153 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4154 static int |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4155 xpm_load_image (f, img, contents, end) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4156 struct frame *f; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4157 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
|
4158 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
|
4159 { |
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
|
4160 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
|
4161 unsigned char buffer[BUFSIZ]; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4162 int width, height, x, y; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4163 int num_colors, chars_per_pixel; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4164 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
|
4165 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
|
4166 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
|
4167 Lisp_Object frame, color_symbols, color_table; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4168 int best_key, have_mask = 0; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4169 XImagePtr ximg = NULL, mask_img = NULL; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4170 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4171 #define match() \ |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4172 LA1 = xpm_scan (&s, end, &beg, &len) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4173 |
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
|
4174 #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
|
4175 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
|
4176 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
|
4177 else \ |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4178 match () |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4179 |
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
|
4180 #define expect_ident(IDENT) \ |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4181 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
|
4182 && 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
|
4183 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
|
4184 else \ |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4185 goto failure |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4186 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4187 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
|
4188 goto failure; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4189 s += 9; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4190 match(); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4191 expect_ident ("static"); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4192 expect_ident ("char"); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4193 expect ('*'); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4194 expect (XPM_TK_IDENT); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4195 expect ('['); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4196 expect (']'); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4197 expect ('='); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4198 expect ('{'); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4199 expect (XPM_TK_STRING); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4200 if (len >= BUFSIZ) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4201 goto failure; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4202 memcpy (buffer, beg, len); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4203 buffer[len] = '\0'; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4204 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
|
4205 &num_colors, &chars_per_pixel) != 4 |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4206 || width <= 0 || height <= 0 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4207 || num_colors <= 0 || chars_per_pixel <= 0) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4208 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
|
4209 |
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4210 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
|
4211 { |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
4212 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
66430
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4213 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
|
4214 } |
2f521eba6f82
[MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
66208
diff
changeset
|
4215 |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4216 expect (','); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4217 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4218 XSETFRAME (frame, f); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4219 if (!NILP (Fxw_display_color_p (frame))) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4220 best_key = XPM_COLOR_KEY_C; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4221 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
|
4222 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
|
4223 ? 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
|
4224 else |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4225 best_key = XPM_COLOR_KEY_M; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4226 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4227 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
|
4228 if (chars_per_pixel == 1) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4229 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
|
4230 &get_color_table); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4231 else |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4232 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
|
4233 &get_color_table); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4234 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4235 while (num_colors-- > 0) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4236 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4237 unsigned char *color, *max_color; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4238 int key, next_key, max_key = 0; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4239 Lisp_Object symbol_color = Qnil, color_val; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4240 XColor cdef; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4241 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4242 expect (XPM_TK_STRING); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4243 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
|
4244 goto failure; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4245 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
|
4246 buffer[len - chars_per_pixel] = '\0'; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4247 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4248 str = strtok (buffer, " \t"); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4249 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
|
4250 goto failure; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4251 key = xpm_str_to_color_key (str); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4252 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
|
4253 goto failure; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4254 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
|
4255 { |
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
|
4256 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
|
4257 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
|
4258 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
|
4259 |
69958
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4260 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
|
4261 { |
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
|
4262 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
|
4263 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
|
4264 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
|
4265 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
|
4266 } |
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
|
4267 |
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
|
4268 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
|
4269 { |
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
|
4270 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
|
4271 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
|
4272 } |
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
|
4273 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
|
4274 { |
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
|
4275 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
|
4276 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
|
4277 } |
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
|
4278 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
|
4279 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4280 while (str); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4281 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4282 color_val = Qnil; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4283 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
|
4284 { |
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
|
4285 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
|
4286 |
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
|
4287 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
|
4288 { |
95213
93de3f6c1a6c
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
94963
diff
changeset
|
4289 if (xstrcasecmp (SDATA (XCDR (specified_color)), "None") == 0) |
69958
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4290 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
|
4291 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
|
4292 &cdef, 0)) |
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4293 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
|
4294 } |
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
|
4295 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4296 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
|
4297 { |
95213
93de3f6c1a6c
* dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents:
94963
diff
changeset
|
4298 if (xstrcasecmp (max_color, "None") == 0) |
69958
609c61a0071d
[MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
69771
diff
changeset
|
4299 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
|
4300 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
|
4301 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
|
4302 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4303 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
|
4304 (*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
|
4305 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4306 expect (','); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4307 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4308 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4309 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
|
4310 &ximg, &img->pixmap) |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4311 #ifndef HAVE_NS |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4312 || !x_create_x_image_and_pixmap (f, width, height, 1, |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4313 &mask_img, &img->mask) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4314 #endif |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4315 ) |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4316 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4317 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
|
4318 goto error; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4319 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4320 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4321 for (y = 0; y < height; y++) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4322 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4323 expect (XPM_TK_STRING); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4324 str = beg; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4325 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
|
4326 goto failure; |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4327 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
|
4328 { |
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
|
4329 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
|
4330 (*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
|
4331 |
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
|
4332 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
|
4333 (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
|
4334 : FRAME_FOREGROUND_PIXEL (f))); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4335 #ifndef HAVE_NS |
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
|
4336 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
|
4337 (!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
|
4338 : (have_mask = 1, PIX_MASK_RETAIN))); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4339 #else |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4340 if (EQ(color_val, Qt)) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4341 ns_set_alpha(ximg, x, y, 0); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4342 #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
|
4343 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4344 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
|
4345 expect (','); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4346 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4347 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4348 img->width = width; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4349 img->height = height; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4350 |
70147
37f988f09f67
[MAC_OS] (xpm_load_image): Fill in background field
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
70068
diff
changeset
|
4351 /* 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
|
4352 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
|
4353 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
|
4354 |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4355 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
|
4356 x_destroy_x_image (ximg); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4357 #ifndef HAVE_NS |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4358 if (have_mask) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4359 { |
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
|
4360 /* 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
|
4361 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
|
4362 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
|
4363 |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4364 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
|
4365 x_destroy_x_image (mask_img); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4366 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4367 else |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4368 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4369 x_destroy_x_image (mask_img); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4370 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
|
4371 img->mask = NO_PIXMAP; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4372 } |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4373 #endif |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4374 return 1; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4375 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4376 failure: |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4377 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
|
4378 error: |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4379 x_destroy_x_image (ximg); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4380 x_destroy_x_image (mask_img); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4381 x_clear_image (f, img); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4382 return 0; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4383 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4384 #undef match |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4385 #undef expect |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4386 #undef expect_ident |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4387 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4388 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4389 static int |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4390 xpm_load (f, img) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4391 struct frame *f; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4392 struct image *img; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4393 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4394 int success_p = 0; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4395 Lisp_Object file_name; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4396 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4397 /* 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
|
4398 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
|
4399 if (STRINGP (file_name)) |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4400 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4401 Lisp_Object file; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4402 unsigned char *contents; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4403 int size; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4404 struct gcpro gcpro1; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4405 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4406 file = x_find_image_file (file_name); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4407 GCPRO1 (file); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4408 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
|
4409 { |
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
|
4410 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
|
4411 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
|
4412 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
|
4413 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4414 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4415 contents = slurp_file (SDATA (file), &size); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4416 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
|
4417 { |
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
|
4418 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
|
4419 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
|
4420 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
|
4421 } |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4422 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4423 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
|
4424 xfree (contents); |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4425 UNGCPRO; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4426 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4427 else |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4428 { |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4429 Lisp_Object data; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4430 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4431 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
|
4432 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
|
4433 SDATA (data) + SBYTES (data)); |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4434 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4435 |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4436 return success_p; |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4437 } |
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4438 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
4439 #endif /* HAVE_NS && !HAVE_XPM */ |
55886
ae9227eb8392
Work around bugs/problems with MinGW builds of graphics libraries
Juanma Barranquero <lekktu@gmail.com>
parents:
55540
diff
changeset
|
4440 |
55540
30c03f9042b8
Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents:
55412
diff
changeset
|
4441 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4442 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4443 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4444 Color table |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4445 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4446 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4447 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4448 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4449 /* 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
|
4450 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4451 struct ct_color |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4452 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4453 int r, g, b; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4454 unsigned long pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4455 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4456 /* Next in color table collision list. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4457 struct ct_color *next; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4458 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4459 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4460 /* 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
|
4461 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4462 #define CT_SIZE 101 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4463 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4464 /* 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
|
4465 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4466 #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
|
4467 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4468 /* The color hash table. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4469 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4470 struct ct_color **ct_table; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4471 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4472 /* Number of entries in the color table. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4473 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4474 int ct_colors_allocated; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4475 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4476 /* Initialize the color table. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4477 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4478 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4479 init_color_table () |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4480 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4481 int size = CT_SIZE * sizeof (*ct_table); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4482 ct_table = (struct ct_color **) xmalloc (size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4483 bzero (ct_table, size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4484 ct_colors_allocated = 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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4487 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4488 /* Free memory associated with the color table. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4489 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4490 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4491 free_color_table () |
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 int i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4494 struct ct_color *p, *next; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4495 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4496 for (i = 0; i < CT_SIZE; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4497 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
|
4498 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4499 next = p->next; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4500 xfree (p); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4501 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4502 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4503 xfree (ct_table); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4504 ct_table = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4505 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4506 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4507 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4508 /* 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
|
4509 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
|
4510 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
|
4511 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
|
4512 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4513 static unsigned long |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4514 lookup_rgb_color (f, r, g, b) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4515 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4516 int r, g, b; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4517 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4518 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
|
4519 int i = hash % CT_SIZE; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4520 struct ct_color *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4521 Display_Info *dpyinfo; |
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 /* 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
|
4524 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
|
4525 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
|
4526 the Xlib spec, chapter 3.1. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4527 dpyinfo = FRAME_X_DISPLAY_INFO (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4528 if (dpyinfo->red_bits > 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4529 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4530 unsigned long pr, pg, pb; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4531 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4532 /* 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
|
4533 if (f->gamma) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4534 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4535 XColor color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4536 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
|
4537 gamma_correct (f, &color); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4538 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
|
4539 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4540 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4541 /* 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
|
4542 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
|
4543 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
|
4544 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
|
4545 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
|
4546 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
|
4547 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4548 /* Assemble the pixel color. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4549 return pr | pg | pb; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4550 } |
54920
38cb79e68369
(PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents:
54427
diff
changeset
|
4551 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4552 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
|
4553 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
|
4554 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4555 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4556 if (p == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4557 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4558 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4559 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4560 XColor color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4561 Colormap cmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4562 int rc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4563 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4564 color.red = r; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4565 color.green = g; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4566 color.blue = b; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4567 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4568 cmap = FRAME_X_COLORMAP (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4569 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
|
4570 if (rc) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4571 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4572 ++ct_colors_allocated; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4573 p = (struct ct_color *) xmalloc (sizeof *p); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4574 p->r = r; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4575 p->g = g; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4576 p->b = b; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4577 p->pixel = color.pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4578 p->next = ct_table[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4579 ct_table[i] = p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4580 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4581 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4582 return FRAME_FOREGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4583 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4584 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4585 COLORREF color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4586 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4587 color = PALETTERGB (r, g, b); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4588 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4589 color = RGB_TO_ULONG (r, g, b); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4590 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4591 ++ct_colors_allocated; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4592 p = (struct ct_color *) xmalloc (sizeof *p); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4593 p->r = r; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4594 p->g = g; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4595 p->b = b; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4596 p->pixel = color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4597 p->next = ct_table[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4598 ct_table[i] = p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4599 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4600 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4601 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4602 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4603 return p->pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4604 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4605 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4606 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4607 /* 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
|
4608 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
|
4609 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4610 static unsigned long |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4611 lookup_pixel_color (f, pixel) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4612 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4613 unsigned long pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4614 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4615 int i = pixel % CT_SIZE; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4616 struct ct_color *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4617 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4618 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
|
4619 if (p->pixel == pixel) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4620 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4621 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4622 if (p == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4623 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4624 XColor color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4625 Colormap cmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4626 int rc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4627 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4628 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4629 cmap = FRAME_X_COLORMAP (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4630 color.pixel = pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4631 x_query_color (f, &color); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4632 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
|
4633 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4634 BLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4635 cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4636 color.pixel = pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4637 XQueryColor (NULL, cmap, &color); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4638 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
|
4639 UNBLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4640 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4641 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4642 if (rc) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4643 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4644 ++ct_colors_allocated; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4645 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4646 p = (struct ct_color *) xmalloc (sizeof *p); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4647 p->r = color.red; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4648 p->g = color.green; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4649 p->b = color.blue; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4650 p->pixel = pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4651 p->next = ct_table[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4652 ct_table[i] = p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4653 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4654 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4655 return FRAME_FOREGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4656 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4657 return p->pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4658 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4659 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4660 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4661 /* 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
|
4662 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
|
4663 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4664 static unsigned long * |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4665 colors_in_color_table (n) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4666 int *n; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4667 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4668 int i, j; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4669 struct ct_color *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4670 unsigned long *colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4671 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4672 if (ct_colors_allocated == 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4673 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4674 *n = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4675 colors = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4676 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4677 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4678 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4679 colors = (unsigned long *) xmalloc (ct_colors_allocated |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4680 * sizeof *colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4681 *n = ct_colors_allocated; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4682 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4683 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
|
4684 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
|
4685 colors[j++] = p->pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4686 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4687 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4688 return colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4689 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4690 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4691 #else /* COLOR_TABLE_SUPPORT */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4692 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4693 static unsigned long |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4694 lookup_rgb_color (f, r, g, b) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4695 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4696 int r, g, b; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4697 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4698 unsigned long pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4699 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4700 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4701 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
|
4702 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4703 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4704 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4705 pixel = RGB_TO_ULONG (r >> 8, g >> 8, b >> 8); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4706 #endif /* HAVE_NS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4707 return pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4708 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4709 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4710 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4711 init_color_table () |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4712 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4713 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4714 #endif /* COLOR_TABLE_SUPPORT */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4715 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4716 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4717 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4718 Algorithms |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4719 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4720 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4721 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
|
4722 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
|
4723 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
|
4724 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4725 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4726 static void XPutPixel (XImagePtr , int, int, COLORREF); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4727 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4728 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4729 /* 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
|
4730 disabled'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4731 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4732 int cross_disabled_images; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4733 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4734 /* Edge detection matrices for different edge-detection |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4735 strategies. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4736 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4737 static int emboss_matrix[9] = { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4738 /* x - 1 x x + 1 */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4739 2, -1, 0, /* y - 1 */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4740 -1, 0, 1, /* y */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4741 0, 1, -2 /* y + 1 */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4742 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4743 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4744 static int laplace_matrix[9] = { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4745 /* x - 1 x x + 1 */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4746 1, 0, 0, /* y - 1 */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4747 0, 0, 0, /* y */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4748 0, 0, -1 /* y + 1 */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4749 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4750 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4751 /* 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
|
4752 are R, G, and B. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4753 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4754 #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
|
4755 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4756 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4757 /* 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
|
4758 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
|
4759 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
|
4760 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
|
4761 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
|
4762 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4763 static XColor * |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4764 x_to_xcolors (f, img, rgb_p) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4765 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4766 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4767 int rgb_p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4768 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4769 int x, y; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4770 XColor *colors, *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4771 XImagePtr_or_DC ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4772 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4773 HDC hdc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4774 HGDIOBJ prev; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4775 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4776 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4777 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
|
4778 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4779 #ifndef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4780 /* Get the X image IMG->pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4781 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
|
4782 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
|
4783 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4784 /* 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
|
4785 hdc = get_frame_dc (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4786 ximg = CreateCompatibleDC (hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4787 release_frame_dc (f, hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4788 prev = SelectObject (ximg, img->pixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4789 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4790 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4791 /* 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
|
4792 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
|
4793 p = colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4794 for (y = 0; y < img->height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4795 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4796 XColor *row = p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4797 |
100845
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
4798 #if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4799 for (x = 0; x < img->width; ++x, ++p) |
100845
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
4800 p->pixel = GET_PIXEL (ximg, x, y); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4801 if (rgb_p) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4802 x_query_colors (f, row, img->width); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4803 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4804 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4805 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4806 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
|
4807 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4808 /* W32_TODO: palette support needed here? */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4809 p->pixel = GET_PIXEL (ximg, x, y); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4810 if (rgb_p) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4811 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4812 p->red = RED16_FROM_ULONG (p->pixel); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4813 p->green = GREEN16_FROM_ULONG (p->pixel); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4814 p->blue = BLUE16_FROM_ULONG (p->pixel); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4815 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4816 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4817 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4818 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4819 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4820 Destroy_Image (ximg, prev); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4821 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4822 return colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4823 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4824 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4825 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4826 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4827 /* 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
|
4828 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
|
4829 stored in ximg->data. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4830 |
78692
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
4831 static void |
6e1f6f80e430
(syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents:
78450
diff
changeset
|
4832 XPutPixel (ximg, x, y, color) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4833 XImagePtr ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4834 int x, y; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4835 COLORREF color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4836 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4837 int width = ximg->info.bmiHeader.biWidth; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4838 int height = ximg->info.bmiHeader.biHeight; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4839 unsigned char * pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4840 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4841 /* True color images. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4842 if (ximg->info.bmiHeader.biBitCount == 24) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4843 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4844 int rowbytes = width * 3; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4845 /* 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
|
4846 if (rowbytes % 4) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4847 rowbytes += 4 - (rowbytes % 4); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4848 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4849 pixel = ximg->data + y * rowbytes + x * 3; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4850 /* Windows bitmaps are in BGR order. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4851 *pixel = GetBValue (color); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4852 *(pixel + 1) = GetGValue (color); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4853 *(pixel + 2) = GetRValue (color); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4854 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4855 /* Monochrome images. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4856 else if (ximg->info.bmiHeader.biBitCount == 1) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4857 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4858 int rowbytes = width / 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4859 /* 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
|
4860 if (rowbytes % 4) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4861 rowbytes += 4 - (rowbytes % 4); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4862 pixel = ximg->data + y * rowbytes + x / 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4863 /* Filter out palette info. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4864 if (color & 0x00ffffff) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4865 *pixel = *pixel | (1 << x % 8); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4866 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4867 *pixel = *pixel & ~(1 << x % 8); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4868 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4869 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4870 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
|
4871 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4872 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4873 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4874 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4875 /* 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
|
4876 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
|
4877 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
|
4878 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4879 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4880 x_from_xcolors (f, img, colors) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4881 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4882 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4883 XColor *colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4884 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4885 int x, y; |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
4886 XImagePtr oimg = NULL; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4887 Pixmap pixmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4888 XColor *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4889 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4890 init_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4891 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4892 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
|
4893 &oimg, &pixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4894 p = colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4895 for (y = 0; y < img->height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4896 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
|
4897 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4898 unsigned long pixel; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4899 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
|
4900 XPutPixel (oimg, x, y, pixel); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4901 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4902 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4903 xfree (colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4904 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
|
4905 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4906 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
|
4907 x_destroy_x_image (oimg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4908 img->pixmap = pixmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4909 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4910 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
|
4911 free_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4912 #endif /* COLOR_TABLE_SUPPORT */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4913 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4914 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4915 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4916 /* 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
|
4917 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4918 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
|
4919 matrix. See emboss_matrix for an example. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4920 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4921 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
|
4922 outgoing image. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4923 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4924 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4925 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
|
4926 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4927 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4928 int matrix[9], color_adjust; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4929 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4930 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
|
4931 XColor *new, *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4932 int x, y, i, sum; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4933 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4934 for (i = sum = 0; i < 9; ++i) |
85254 | 4935 sum += eabs (matrix[i]); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4936 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4937 #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
|
4938 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4939 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
|
4940 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4941 for (y = 0; y < img->height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4942 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4943 p = COLOR (new, 0, y); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4944 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
|
4945 p = COLOR (new, img->width - 1, y); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4946 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
|
4947 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4948 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4949 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
|
4950 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4951 p = COLOR (new, x, 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4952 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
|
4953 p = COLOR (new, x, img->height - 1); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4954 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
|
4955 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4956 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4957 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
|
4958 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4959 p = COLOR (new, 1, y); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4960 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4961 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
|
4962 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4963 int r, g, b, y1, x1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4964 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4965 r = g = b = i = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4966 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
|
4967 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
|
4968 if (matrix[i]) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4969 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4970 XColor *t = COLOR (colors, x1, y1); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4971 r += matrix[i] * t->red; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4972 g += matrix[i] * t->green; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4973 b += matrix[i] * t->blue; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4974 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4975 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4976 r = (r / sum + color_adjust) & 0xffff; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4977 g = (g / sum + color_adjust) & 0xffff; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4978 b = (b / sum + color_adjust) & 0xffff; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4979 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
|
4980 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4981 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4982 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4983 xfree (colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4984 x_from_xcolors (f, img, new); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4985 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4986 #undef COLOR |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4987 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4988 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4989 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4990 /* 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
|
4991 on frame F. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4992 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4993 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4994 x_emboss (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4995 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4996 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4997 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
4998 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
|
4999 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5000 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5001 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5002 /* 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
|
5003 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
|
5004 to draw disabled buttons, for example. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5005 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5006 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5007 x_laplace (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5008 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5009 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5010 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5011 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
|
5012 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5013 |
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 /* 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
|
5016 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
|
5017 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5018 MATRIX must be either |
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 - 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
|
5021 - a vector of at least 9 numbers |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5022 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5023 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
|
5024 number. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5025 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5026 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5027 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
|
5028 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5029 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5030 Lisp_Object matrix, color_adjust; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5031 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5032 int i = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5033 int trans[9]; |
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 if (CONSP (matrix)) |
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 for (i = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5038 i < 9 && CONSP (matrix) && NUMBERP (XCAR (matrix)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5039 ++i, matrix = XCDR (matrix)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5040 trans[i] = XFLOATINT (XCAR (matrix)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5041 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5042 else if (VECTORP (matrix) && ASIZE (matrix) >= 9) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5043 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5044 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
|
5045 trans[i] = XFLOATINT (AREF (matrix, i)); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5048 if (NILP (color_adjust)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5049 color_adjust = make_number (0xffff / 2); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5050 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5051 if (i == 9 && NUMBERP (color_adjust)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5052 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
|
5053 } |
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 /* 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
|
5057 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5058 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5059 x_disable_image (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5060 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5061 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5062 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5063 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
|
5064 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5065 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
|
5066 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5067 int n_planes = dpyinfo->n_planes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5068 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5069 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5070 if (n_planes >= 2) |
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 /* 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
|
5073 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
|
5074 we're using this method instead. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5075 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
|
5076 XColor *p, *end; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5077 const int h = 15000; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5078 const int l = 30000; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5079 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5080 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
|
5081 p < end; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5082 ++p) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5083 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5084 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
|
5085 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
|
5086 p->red = p->green = p->blue = i2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5087 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5088 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5089 x_from_xcolors (f, img, colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5090 } |
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 /* 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
|
5093 should. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5094 if (n_planes < 2 || cross_disabled_images) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5095 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5096 #ifndef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5097 Display *dpy = FRAME_X_DISPLAY (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5098 GC gc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5099 |
104573 | 5100 #ifndef HAVE_NS /* TODO: NS support, however this not needed for toolbars */ |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5101 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5102 #define MaskForeground(f) WHITE_PIX_DEFAULT (f) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5103 |
75153
fd0c738b5d49
(XDrawLine) [MAC_OS]: Remove macro.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73570
diff
changeset
|
5104 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
|
5105 XSetForeground (dpy, gc, BLACK_PIX_DEFAULT (f)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5106 XDrawLine (dpy, img->pixmap, gc, 0, 0, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5107 img->width - 1, img->height - 1); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5108 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
|
5109 img->width - 1, 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5110 XFreeGC (dpy, gc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5111 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5112 if (img->mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5113 { |
75153
fd0c738b5d49
(XDrawLine) [MAC_OS]: Remove macro.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
73570
diff
changeset
|
5114 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
|
5115 XSetForeground (dpy, gc, MaskForeground (f)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5116 XDrawLine (dpy, img->mask, gc, 0, 0, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5117 img->width - 1, img->height - 1); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5118 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
|
5119 img->width - 1, 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5120 XFreeGC (dpy, gc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5121 } |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5122 #endif /* !HAVE_NS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5123 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5124 HDC hdc, bmpdc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5125 HGDIOBJ prev; |
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 hdc = get_frame_dc (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5128 bmpdc = CreateCompatibleDC (hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5129 release_frame_dc (f, hdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5130 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5131 prev = SelectObject (bmpdc, img->pixmap); |
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 SetTextColor (bmpdc, BLACK_PIX_DEFAULT (f)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5134 MoveToEx (bmpdc, 0, 0, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5135 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
|
5136 MoveToEx (bmpdc, 0, img->height - 1, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5137 LineTo (bmpdc, img->width - 1, 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5138 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5139 if (img->mask) |
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 SelectObject (bmpdc, img->mask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5142 SetTextColor (bmpdc, WHITE_PIX_DEFAULT (f)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5143 MoveToEx (bmpdc, 0, 0, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5144 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
|
5145 MoveToEx (bmpdc, 0, img->height - 1, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5146 LineTo (bmpdc, img->width - 1, 0); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5147 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5148 SelectObject (bmpdc, prev); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5149 DeleteDC (bmpdc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5150 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5151 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5154 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5155 /* 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
|
5156 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
|
5157 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
|
5158 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
|
5159 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
|
5160 heuristically. Value is non-zero if successful. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5161 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5162 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5163 x_build_heuristic_mask (f, img, how) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5164 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5165 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5166 Lisp_Object how; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5167 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5168 XImagePtr_or_DC ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5169 #ifndef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5170 XImagePtr mask_img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5171 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5172 HDC frame_dc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5173 HGDIOBJ prev; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5174 char *mask_img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5175 int row_width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5176 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5177 int x, y, rc, use_img_background; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5178 unsigned long bg = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5179 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5180 if (img->mask) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5181 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5182 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
|
5183 img->mask = NO_PIXMAP; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5184 img->background_transparent_valid = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5185 } |
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 #ifndef HAVE_NTGUI |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5188 #ifndef HAVE_NS |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5189 /* 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
|
5190 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
|
5191 &mask_img, &img->mask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5192 if (!rc) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5193 return 0; |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5194 #endif /* !HAVE_NS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5195 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5196 /* Get the X image of IMG->pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5197 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
|
5198 img->width, img->height, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5199 ~0, ZPixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5200 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5201 /* Create the bit array serving as mask. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5202 row_width = (img->width + 7) / 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5203 mask_img = xmalloc (row_width * img->height); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5204 bzero (mask_img, row_width * img->height); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5205 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5206 /* 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
|
5207 frame_dc = get_frame_dc (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5208 ximg = CreateCompatibleDC (frame_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5209 release_frame_dc (f, frame_dc); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5210 prev = SelectObject (ximg, img->pixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5211 #endif /* HAVE_NTGUI */ |
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 /* 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
|
5214 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
|
5215 use_img_background = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5216 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5217 if (CONSP (how)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5218 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5219 int rgb[3], i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5220 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5221 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
|
5222 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5223 rgb[i] = XFASTINT (XCAR (how)) & 0xffff; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5224 how = XCDR (how); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5227 if (i == 3 && NILP (how)) |
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 char color_name[30]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5230 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
|
5231 bg = ( |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5232 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5233 0x00ffffff & /* Filter out palette info. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5234 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5235 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
|
5236 use_img_background = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5237 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5238 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5239 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5240 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
|
5241 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
|
5242 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5243 /* 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
|
5244 from the background color bg. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5245 #ifndef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5246 for (y = 0; y < img->height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5247 for (x = 0; x < img->width; ++x) |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5248 #ifndef HAVE_NS |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5249 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
|
5250 ? PIX_MASK_DRAW : PIX_MASK_RETAIN)); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5251 #else |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5252 if (XGetPixel (ximg, x, y) == bg) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5253 ns_set_alpha(ximg, x, y, 0); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5254 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5255 #ifndef HAVE_NS |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5256 /* 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
|
5257 image_background_transparent (img, f, mask_img); |
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 /* Put mask_img into img->mask. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5260 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
|
5261 x_destroy_x_image (mask_img); |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
5262 #endif /* !HAVE_NS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5263 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5264 for (y = 0; y < img->height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5265 for (x = 0; x < img->width; ++x) |
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 COLORREF p = GetPixel (ximg, x, y); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5268 if (p != bg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5269 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
|
5270 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5271 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5272 /* Create the mask image. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5273 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
|
5274 mask_img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5275 /* 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
|
5276 SelectObject (ximg, img->mask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5277 image_background_transparent (img, f, ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5278 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5279 /* 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
|
5280 xfree (mask_img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5281 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5282 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5283 Destroy_Image (ximg, prev); |
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 return 1; |
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 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5290 PBM (mono, gray, color) |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5293 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
|
5294 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
|
5295 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
|
5296 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5297 /* 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
|
5298 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5299 Lisp_Object Qpbm; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5300 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5301 /* 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
|
5302 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5303 enum pbm_keyword_index |
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 PBM_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5306 PBM_FILE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5307 PBM_DATA, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5308 PBM_ASCENT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5309 PBM_MARGIN, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5310 PBM_RELIEF, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5311 PBM_ALGORITHM, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5312 PBM_HEURISTIC_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5313 PBM_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5314 PBM_FOREGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5315 PBM_BACKGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5316 PBM_LAST |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5317 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5318 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5319 /* 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
|
5320 of valid user-defined image specifications. */ |
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 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
|
5323 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5324 {":type", IMAGE_SYMBOL_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5325 {":file", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5326 {":data", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5327 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5328 {":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
|
5329 {":relief", IMAGE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5330 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5331 {":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
|
5332 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5333 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5334 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5335 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5336 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5337 /* Structure describing the image type `pbm'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5338 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5339 static struct image_type pbm_type = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5340 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5341 &Qpbm, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5342 pbm_image_p, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5343 pbm_load, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5344 x_clear_image, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5345 NULL |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5346 }; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5349 /* 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
|
5350 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5351 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5352 pbm_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5353 Lisp_Object object; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5354 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5355 struct image_keyword fmt[PBM_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5356 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5357 bcopy (pbm_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5358 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5359 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
|
5360 return 0; |
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 /* Must specify either :data or :file. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5363 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
|
5364 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5365 |
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 /* 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
|
5368 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
|
5369 end of input. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5370 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5371 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5372 pbm_scan_number (s, end) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5373 unsigned char **s, *end; |
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 int c = 0, val = -1; |
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 while (*s < end) |
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 /* Skip white-space. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5380 while (*s < end && (c = *(*s)++, isspace (c))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5381 ; |
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 if (c == '#') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5384 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5385 /* Skip comment to end of line. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5386 while (*s < end && (c = *(*s)++, c != '\n')) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5387 ; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5388 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5389 else if (isdigit (c)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5390 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5391 /* Read decimal number. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5392 val = c - '0'; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5393 while (*s < end && (c = *(*s)++, isdigit (c))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5394 val = 10 * val + c - '0'; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5395 break; |
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 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5398 break; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5401 return val; |
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 |
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 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5406 #if 0 /* Unused. ++kfs */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5407 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5408 /* 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
|
5409 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
|
5410 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
|
5411 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5412 static char * |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5413 pbm_read_file (file, size) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5414 Lisp_Object file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5415 int *size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5416 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5417 FILE *fp = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5418 char *buf = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5419 struct stat st; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5420 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5421 if (stat (SDATA (file), &st) == 0 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5422 && (fp = fopen (SDATA (file), "rb")) != NULL |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5423 && (buf = (char *) xmalloc (st.st_size), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5424 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
|
5425 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5426 *size = st.st_size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5427 fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5428 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5429 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5430 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5431 if (fp) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5432 fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5433 if (buf) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5434 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5435 xfree (buf); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5436 buf = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5437 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5438 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5439 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5440 return buf; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5441 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5442 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5443 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5444 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5445 /* 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
|
5446 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5447 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5448 pbm_load (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5449 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5450 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5451 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5452 int raw_p, x, y; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5453 int width, height, max_color_idx = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5454 XImagePtr ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5455 Lisp_Object file, specified_file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5456 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
|
5457 struct gcpro gcpro1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5458 unsigned char *contents = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5459 unsigned char *end, *p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5460 int size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5461 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5462 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
|
5463 file = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5464 GCPRO1 (file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5465 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5466 if (STRINGP (specified_file)) |
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 file = x_find_image_file (specified_file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5469 if (!STRINGP (file)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5470 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5471 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
|
5472 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5473 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5474 } |
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 contents = slurp_file (SDATA (file), &size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5477 if (contents == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5478 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5479 image_error ("Error reading `%s'", file, Qnil); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5480 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5481 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5482 } |
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 p = contents; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5485 end = contents + size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5486 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5487 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5488 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5489 Lisp_Object data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5490 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
|
5491 p = SDATA (data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5492 end = p + SBYTES (data); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5495 /* Check magic number. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5496 if (end - p < 2 || *p++ != 'P') |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5497 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5498 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
|
5499 error: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5500 xfree (contents); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5501 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5502 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5503 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5504 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5505 switch (*p++) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5506 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5507 case '1': |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5508 raw_p = 0, type = PBM_MONO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5509 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5510 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5511 case '2': |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5512 raw_p = 0, type = PBM_GRAY; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5513 break; |
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 case '3': |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5516 raw_p = 0, type = PBM_COLOR; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5517 break; |
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 case '4': |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5520 raw_p = 1, type = PBM_MONO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5521 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5522 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5523 case '5': |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5524 raw_p = 1, type = PBM_GRAY; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5525 break; |
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 case '6': |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5528 raw_p = 1, type = PBM_COLOR; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5529 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5530 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5531 default: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5532 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
|
5533 goto error; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5536 /* Read width, height, maximum color-component. Characters |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5537 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
|
5538 width = pbm_scan_number (&p, end); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5539 height = pbm_scan_number (&p, end); |
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 if (type != PBM_MONO) |
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 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
|
5544 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
|
5545 { |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5546 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
|
5547 goto error; |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5548 } |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5549 } |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5550 |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5551 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
|
5552 { |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
5553 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5554 goto error; |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5555 } |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5556 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5557 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
|
5558 &ximg, &img->pixmap)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5559 goto error; |
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 /* Initialize the color hash table. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5562 init_color_table (); |
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 if (type == PBM_MONO) |
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 int c = 0, g; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5567 struct image_keyword fmt[PBM_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5568 unsigned long fg = FRAME_FOREGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5569 unsigned long bg = FRAME_BACKGROUND_PIXEL (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 /* Parse the image specification. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5572 bcopy (pbm_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5573 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
|
5574 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5575 /* 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
|
5576 if (fmt[PBM_FOREGROUND].count |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5577 && STRINGP (fmt[PBM_FOREGROUND].value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5578 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
|
5579 if (fmt[PBM_BACKGROUND].count |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5580 && STRINGP (fmt[PBM_BACKGROUND].value)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5581 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5582 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
|
5583 img->background = bg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5584 img->background_valid = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5585 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5586 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5587 for (y = 0; y < height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5588 for (x = 0; x < width; ++x) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5589 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5590 if (raw_p) |
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 if ((x & 7) == 0) |
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5593 { |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5594 if (p >= end) |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5595 { |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5596 x_destroy_x_image (ximg); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5597 x_clear_image (f, img); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5598 image_error ("Invalid image size in image `%s'", |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5599 img->spec, Qnil); |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5600 goto error; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5601 } |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5602 c = *p++; |
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
5603 } |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5604 g = c & 0x80; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5605 c <<= 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5606 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5607 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5608 g = pbm_scan_number (&p, end); |
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 XPutPixel (ximg, x, y, g ? fg : bg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5611 } |
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 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5614 { |
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5615 int expected_size = height * width; |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5616 if (max_color_idx > 255) |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5617 expected_size *= 2; |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5618 if (type == PBM_COLOR) |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5619 expected_size *= 3; |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5620 |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5621 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
|
5622 { |
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
5623 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
|
5624 x_clear_image (f, img); |
76550
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
5625 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
|
5626 img->spec, Qnil); |
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
5627 goto error; |
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
5628 } |
05fce28aea26
(pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents:
75348
diff
changeset
|
5629 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5630 for (y = 0; y < height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5631 for (x = 0; x < width; ++x) |
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 int r, g, b; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5634 |
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5635 if (type == PBM_GRAY && raw_p) |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5636 { |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5637 r = g = b = *p++; |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5638 if (max_color_idx > 255) |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5639 r = g = b = r * 256 + *p++; |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5640 } |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5641 else if (type == PBM_GRAY) |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5642 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
|
5643 else if (raw_p) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5644 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5645 r = *p++; |
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5646 if (max_color_idx > 255) |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5647 r = r * 256 + *p++; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5648 g = *p++; |
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5649 if (max_color_idx > 255) |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5650 g = g * 256 + *p++; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5651 b = *p++; |
80382
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5652 if (max_color_idx > 255) |
296f5c781a2b
(pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents:
79759
diff
changeset
|
5653 b = b * 256 + *p++; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5654 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5655 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5656 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5657 r = pbm_scan_number (&p, end); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5658 g = pbm_scan_number (&p, end); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5659 b = pbm_scan_number (&p, end); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5660 } |
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 if (r < 0 || g < 0 || b < 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5663 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5664 x_destroy_x_image (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5665 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
|
5666 img->spec, Qnil); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5667 goto error; |
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 /* 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
|
5671 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
|
5672 r = (double) r * 65535 / max_color_idx; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5673 g = (double) g * 65535 / max_color_idx; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5674 b = (double) b * 65535 / max_color_idx; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5675 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
|
5676 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5679 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5680 /* 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
|
5681 free the color table. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5682 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
|
5683 free_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5684 #endif /* COLOR_TABLE_SUPPORT */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5685 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5686 img->width = width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5687 img->height = height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5688 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5689 /* 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
|
5690 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5691 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
|
5692 /* 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
|
5693 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
|
5694 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5695 /* Put the image into a pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5696 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
|
5697 x_destroy_x_image (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5698 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5699 /* 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
|
5700 img->width = width; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5701 img->height = height; */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5702 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5703 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5704 xfree (contents); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5705 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5706 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5707 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5708 |
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 PNG |
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 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
5713 #if defined (HAVE_PNG) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5714 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5715 /* Function prototypes. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5716 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5717 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
|
5718 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
|
5719 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5720 /* 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
|
5721 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5722 Lisp_Object Qpng; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5723 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5724 /* 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
|
5725 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5726 enum png_keyword_index |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5727 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5728 PNG_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5729 PNG_DATA, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5730 PNG_FILE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5731 PNG_ASCENT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5732 PNG_MARGIN, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5733 PNG_RELIEF, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5734 PNG_ALGORITHM, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5735 PNG_HEURISTIC_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5736 PNG_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5737 PNG_BACKGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5738 PNG_LAST |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5739 }; |
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 /* 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
|
5742 of valid user-defined image specifications. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5743 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5744 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
|
5745 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5746 {":type", IMAGE_SYMBOL_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5747 {":data", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5748 {":file", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5749 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5750 {":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
|
5751 {":relief", IMAGE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5752 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5753 {":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
|
5754 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5755 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5756 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5757 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5758 /* Structure describing the image type `png'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5759 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5760 static struct image_type png_type = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5761 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5762 &Qpng, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5763 png_image_p, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5764 png_load, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5765 x_clear_image, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5766 NULL |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5767 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5768 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5769 /* 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
|
5770 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5771 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5772 png_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5773 Lisp_Object object; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5774 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5775 struct image_keyword fmt[PNG_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5776 bcopy (png_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5777 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5778 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
|
5779 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5780 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5781 /* 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
|
5782 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
|
5783 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5784 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
5785 #endif /* HAVE_PNG || HAVE_NS */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5786 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5787 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5788 #ifdef HAVE_PNG |
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 #if defined HAVE_LIBPNG_PNG_H |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5791 # include <libpng/png.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5792 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5793 # include <png.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5794 #endif |
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 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5797 /* PNG library details. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5798 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5799 DEF_IMGLIB_FN (png_get_io_ptr); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5800 DEF_IMGLIB_FN (png_check_sig); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5801 DEF_IMGLIB_FN (png_create_read_struct); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5802 DEF_IMGLIB_FN (png_create_info_struct); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5803 DEF_IMGLIB_FN (png_destroy_read_struct); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5804 DEF_IMGLIB_FN (png_set_read_fn); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5805 DEF_IMGLIB_FN (png_set_sig_bytes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5806 DEF_IMGLIB_FN (png_read_info); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5807 DEF_IMGLIB_FN (png_get_IHDR); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5808 DEF_IMGLIB_FN (png_get_valid); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5809 DEF_IMGLIB_FN (png_set_strip_16); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5810 DEF_IMGLIB_FN (png_set_expand); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5811 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
|
5812 DEF_IMGLIB_FN (png_set_background); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5813 DEF_IMGLIB_FN (png_get_bKGD); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5814 DEF_IMGLIB_FN (png_read_update_info); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5815 DEF_IMGLIB_FN (png_get_channels); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5816 DEF_IMGLIB_FN (png_get_rowbytes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5817 DEF_IMGLIB_FN (png_read_image); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5818 DEF_IMGLIB_FN (png_read_end); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5819 DEF_IMGLIB_FN (png_error); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5820 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5821 static int |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
5822 init_png_functions (Lisp_Object libraries) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5823 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5824 HMODULE library; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5825 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5826 /* Try loading libpng under probable names. */ |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
5827 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
|
5828 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5829 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5830 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
|
5831 LOAD_IMGLIB_FN (library, png_check_sig); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5832 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
|
5833 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
|
5834 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
|
5835 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
|
5836 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
|
5837 LOAD_IMGLIB_FN (library, png_read_info); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5838 LOAD_IMGLIB_FN (library, png_get_IHDR); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5839 LOAD_IMGLIB_FN (library, png_get_valid); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5840 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
|
5841 LOAD_IMGLIB_FN (library, png_set_expand); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5842 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
|
5843 LOAD_IMGLIB_FN (library, png_set_background); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5844 LOAD_IMGLIB_FN (library, png_get_bKGD); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5845 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
|
5846 LOAD_IMGLIB_FN (library, png_get_channels); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5847 LOAD_IMGLIB_FN (library, png_get_rowbytes); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5848 LOAD_IMGLIB_FN (library, png_read_image); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5849 LOAD_IMGLIB_FN (library, png_read_end); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5850 LOAD_IMGLIB_FN (library, png_error); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5851 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5852 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5853 #else |
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 #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
|
5856 #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
|
5857 #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
|
5858 #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
|
5859 #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
|
5860 #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
|
5861 #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
|
5862 #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
|
5863 #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
|
5864 #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
|
5865 #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
|
5866 #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
|
5867 #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
|
5868 #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
|
5869 #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
|
5870 #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
|
5871 #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
|
5872 #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
|
5873 #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
|
5874 #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
|
5875 #define fn_png_error png_error |
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 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5878 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5879 /* 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
|
5880 is initialized. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5881 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5882 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5883 my_png_error (png_ptr, msg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5884 png_struct *png_ptr; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5885 char *msg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5886 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5887 xassert (png_ptr != NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5888 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
|
5889 longjmp (png_ptr->jmpbuf, 1); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5892 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5893 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5894 my_png_warning (png_ptr, msg) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5895 png_struct *png_ptr; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5896 char *msg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5897 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5898 xassert (png_ptr != NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5899 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
|
5900 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5901 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5902 /* Memory source for PNG decoding. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5903 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5904 struct png_memory_storage |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5905 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5906 unsigned char *bytes; /* The data */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5907 size_t len; /* How big is it? */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5908 int index; /* Where are we? */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5909 }; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5912 /* 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
|
5913 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
|
5914 bytes from the input to DATA. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5915 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5916 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5917 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
|
5918 png_structp png_ptr; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5919 png_bytep data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5920 png_size_t length; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5921 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5922 struct png_memory_storage *tbr |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5923 = (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
|
5924 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5925 if (length > tbr->len - tbr->index) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5926 fn_png_error (png_ptr, "Read error"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5927 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5928 bcopy (tbr->bytes + tbr->index, data, length); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5929 tbr->index = tbr->index + length; |
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 |
55886
ae9227eb8392
Work around bugs/problems with MinGW builds of graphics libraries
Juanma Barranquero <lekktu@gmail.com>
parents:
55540
diff
changeset
|
5932 |
63684
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5933 /* 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
|
5934 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
|
5935 bytes from the input to DATA. */ |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5936 |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5937 static void |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5938 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
|
5939 png_structp png_ptr; |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5940 png_bytep data; |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5941 png_size_t length; |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5942 { |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5943 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
|
5944 |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5945 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
|
5946 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
|
5947 } |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5948 |
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
5949 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5950 /* 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
|
5951 successful. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5952 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5953 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5954 png_load (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5955 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5956 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5957 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5958 Lisp_Object file, specified_file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5959 Lisp_Object specified_data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5960 int x, y, i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5961 XImagePtr ximg, mask_img = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5962 struct gcpro gcpro1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5963 png_struct *png_ptr = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5964 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
|
5965 FILE *volatile fp = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5966 png_byte sig[8]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5967 png_byte * volatile pixels = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5968 png_byte ** volatile rows = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5969 png_uint_32 width, height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5970 int bit_depth, color_type, interlace_type; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5971 png_byte channels; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5972 png_uint_32 row_bytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5973 int transparent_p; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5974 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
|
5975 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5976 /* Find out what file to load. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5977 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
|
5978 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
|
5979 file = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5980 GCPRO1 (file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5981 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5982 if (NILP (specified_data)) |
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 file = x_find_image_file (specified_file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5985 if (!STRINGP (file)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5986 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5987 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
|
5988 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5989 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5990 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5991 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5992 /* Open the image file. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5993 fp = fopen (SDATA (file), "rb"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5994 if (!fp) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5995 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5996 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
|
5997 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5998 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
5999 } |
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 /* Check PNG signature. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6002 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
|
6003 || !fn_png_check_sig (sig, sizeof sig)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6004 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6005 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
|
6006 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6007 fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6008 return 0; |
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 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6012 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6013 /* Read from memory. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6014 tbr.bytes = SDATA (specified_data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6015 tbr.len = SBYTES (specified_data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6016 tbr.index = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6017 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6018 /* Check PNG signature. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6019 if (tbr.len < sizeof sig |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6020 || !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
|
6021 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6022 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
|
6023 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6024 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6025 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6026 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6027 /* Need to skip past the signature. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6028 tbr.bytes += sizeof (sig); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6029 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6030 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6031 /* 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
|
6032 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
|
6033 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
|
6034 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
|
6035 my_png_warning); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6036 if (!png_ptr) |
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 (fp) fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6039 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6040 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6041 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6042 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6043 /* 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
|
6044 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
|
6045 if (!info_ptr) |
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 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
|
6048 if (fp) fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6049 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6050 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6051 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6052 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6053 /* 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
|
6054 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
|
6055 if (!end_info) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6056 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6057 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
|
6058 if (fp) fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6059 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6060 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6061 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6062 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6063 /* 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
|
6064 detects an error. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6065 if (setjmp (png_ptr->jmpbuf)) |
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 error: |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6068 if (png_ptr) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6069 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
|
6070 xfree (pixels); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6071 xfree (rows); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6072 if (fp) fclose (fp); |
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 /* Read image info. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6078 if (!NILP (specified_data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6079 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
|
6080 else |
63684
c95dbbf82d19
(fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
63323
diff
changeset
|
6081 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
|
6082 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6083 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
|
6084 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
|
6085 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
|
6086 &interlace_type, NULL, NULL); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6087 |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6088 if (!check_image_size (f, width, height)) |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
6089 { |
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
6090 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
6091 goto error; |
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
6092 } |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6093 /* 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
|
6094 construct a clipping mask. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6095 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
|
6096 transparent_p = 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6097 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6098 transparent_p = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6099 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6100 /* 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
|
6101 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
|
6102 transform other formats into that format. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6103 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6104 /* Strip more than 8 bits per channel. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6105 if (bit_depth == 16) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6106 fn_png_set_strip_16 (png_ptr); |
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 /* 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
|
6109 if available. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6110 fn_png_set_expand (png_ptr); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6111 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6112 /* Convert grayscale images to RGB. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6113 if (color_type == PNG_COLOR_TYPE_GRAY |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6114 || color_type == PNG_COLOR_TYPE_GRAY_ALPHA) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6115 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
|
6116 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6117 /* 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
|
6118 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
|
6119 simple transparency, we prefer a clipping mask. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6120 if (!transparent_p) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6121 { |
83763
14a686983252
(png_load): Comment-out var only used in commented-out code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
83676
diff
changeset
|
6122 /* png_color_16 *image_bg; */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6123 Lisp_Object specified_bg |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6124 = image_spec_value (img->spec, QCbackground, NULL); |
80600
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6125 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
|
6126 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6127 if (STRINGP (specified_bg)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6128 /* The user specified `:background', use that. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6129 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6130 XColor color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6131 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
|
6132 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6133 png_color_16 user_bg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6134 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6135 bzero (&user_bg, sizeof user_bg); |
80600
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6136 user_bg.red = color.red >> shift; |
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6137 user_bg.green = color.green >> shift; |
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6138 user_bg.blue = color.blue >> shift; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6139 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6140 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
|
6141 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
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 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6144 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6145 { |
80600
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6146 /* We use the current frame background, ignoring any default |
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6147 background color set by the image. */ |
100845
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
6148 #if defined (HAVE_X_WINDOWS) || defined (HAVE_NTGUI) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6149 XColor color; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6150 png_color_16 frame_background; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6151 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6152 color.pixel = FRAME_BACKGROUND_PIXEL (f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6153 x_query_color (f, &color); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6154 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6155 bzero (&frame_background, sizeof frame_background); |
80600
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6156 frame_background.red = color.red >> shift; |
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6157 frame_background.green = color.green >> shift; |
43e764077e68
(png_load): Use correct bit-depth for setting background color.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
80554
diff
changeset
|
6158 frame_background.blue = color.blue >> shift; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6159 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6160 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6161 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
|
6162 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
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 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6165 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6166 /* Update info structure. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6167 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
|
6168 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6169 /* 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
|
6170 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
|
6171 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
|
6172 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
|
6173 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
|
6174 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
|
6175 xassert (channels == 3 || channels == 4); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6176 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6177 /* 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
|
6178 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
|
6179 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6180 /* Allocate memory for the image. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6181 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
|
6182 rows = (png_byte **) xmalloc (height * sizeof *rows); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6183 for (i = 0; i < height; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6184 rows[i] = pixels + i * row_bytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6185 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6186 /* Read the entire image. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6187 fn_png_read_image (png_ptr, rows); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6188 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
|
6189 if (fp) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6190 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6191 fclose (fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6192 fp = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6193 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6194 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6195 /* Create the X image and pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6196 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
|
6197 &img->pixmap)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6198 goto error; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6199 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6200 /* 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
|
6201 contains an alpha channel. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6202 if (channels == 4 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6203 && !transparent_p |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6204 && !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
|
6205 &mask_img, &img->mask)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6206 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6207 x_destroy_x_image (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6208 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
|
6209 img->pixmap = NO_PIXMAP; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6210 goto error; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6211 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6212 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6213 /* 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
|
6214 init_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6215 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6216 for (y = 0; y < height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6217 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6218 png_byte *p = rows[y]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6219 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6220 for (x = 0; x < width; ++x) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6221 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6222 unsigned r, g, b; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6223 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6224 r = *p++ << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6225 g = *p++ << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6226 b = *p++ << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6227 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
|
6228 /* 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
|
6229 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
|
6230 support binary transparency---fully transparent or fully |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6231 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
|
6232 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
|
6233 the image with a specified background color. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6234 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6235 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
|
6236 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
|
6237 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
|
6238 a new image for each possible background. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6239 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6240 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
|
6241 boolean transparency information. Otherwise I'm using |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6242 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
|
6243 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6244 if (channels == 4) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6245 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6246 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
|
6247 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
|
6248 ++p; |
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 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6252 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6253 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
|
6254 /* 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
|
6255 overrode it. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6256 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6257 png_color_16 *bg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6258 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
|
6259 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6260 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
|
6261 img->background_valid = 1; |
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 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6264 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6265 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6266 /* Remember colors allocated for this image. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6267 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
|
6268 free_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6269 #endif /* COLOR_TABLE_SUPPORT */ |
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 /* Clean up. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6272 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
|
6273 xfree (rows); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6274 xfree (pixels); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6275 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6276 img->width = width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6277 img->height = height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6278 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6279 /* 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
|
6280 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
|
6281 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
|
6282 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6283 /* 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
|
6284 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
|
6285 x_destroy_x_image (ximg); |
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 /* Same for the mask. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6288 if (mask_img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6289 { |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
6290 /* 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
|
6291 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
|
6292 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
|
6293 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6294 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
|
6295 x_destroy_x_image (mask_img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6296 } |
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 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6299 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6300 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6301 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6302 #else /* HAVE_PNG */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6303 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6304 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6305 static int |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6306 png_load (struct frame *f, struct image *img) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6307 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6308 return ns_load_image(f, img, |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6309 image_spec_value (img->spec, QCfile, NULL), |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6310 image_spec_value (img->spec, QCdata, NULL)); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6311 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6312 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6313 |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6314 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6315 #endif /* !HAVE_PNG */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6316 |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6319 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6320 JPEG |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6321 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6322 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
6323 #if defined (HAVE_JPEG) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6324 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6325 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
|
6326 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
|
6327 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6328 /* 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
|
6329 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6330 Lisp_Object Qjpeg; |
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 /* 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
|
6333 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6334 enum jpeg_keyword_index |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6335 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6336 JPEG_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6337 JPEG_DATA, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6338 JPEG_FILE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6339 JPEG_ASCENT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6340 JPEG_MARGIN, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6341 JPEG_RELIEF, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6342 JPEG_ALGORITHM, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6343 JPEG_HEURISTIC_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6344 JPEG_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6345 JPEG_BACKGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6346 JPEG_LAST |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6347 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6348 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6349 /* 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
|
6350 of valid user-defined image specifications. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6351 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6352 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
|
6353 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6354 {":type", IMAGE_SYMBOL_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6355 {":data", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6356 {":file", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6357 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6358 {":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
|
6359 {":relief", IMAGE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6360 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6361 {":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
|
6362 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6363 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6364 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6365 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6366 /* Structure describing the image type `jpeg'. */ |
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 static struct image_type jpeg_type = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6369 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6370 &Qjpeg, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6371 jpeg_image_p, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6372 jpeg_load, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6373 x_clear_image, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6374 NULL |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6375 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6376 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6377 /* 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
|
6378 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6379 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6380 jpeg_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6381 Lisp_Object object; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6382 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6383 struct image_keyword fmt[JPEG_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6384 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6385 bcopy (jpeg_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6386 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6387 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
|
6388 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6389 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6390 /* 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
|
6391 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
|
6392 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6393 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
6394 #endif /* HAVE_JPEG || HAVE_NS */ |
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 #ifdef HAVE_JPEG |
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 /* 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
|
6399 jconfig.h. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6400 #ifdef HAVE_STDLIB_H |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6401 #define HAVE_STDLIB_H_1 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6402 #undef HAVE_STDLIB_H |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6403 #endif /* HAVE_STLIB_H */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6404 |
59073
3501c078df60
(__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents:
58846
diff
changeset
|
6405 #if defined (HAVE_NTGUI) && !defined (__WIN32__) |
63112 | 6406 /* In older releases of the jpeg library, jpeglib.h will define boolean |
6407 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
|
6408 #define __WIN32__ 1 |
3501c078df60
(__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents:
58846
diff
changeset
|
6409 #endif |
3501c078df60
(__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents:
58846
diff
changeset
|
6410 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6411 #include <jpeglib.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6412 #include <jerror.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6413 #include <setjmp.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6414 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6415 #ifdef HAVE_STLIB_H_1 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6416 #define HAVE_STDLIB_H 1 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6417 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6418 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6419 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6420 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6421 /* JPEG library details. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6422 DEF_IMGLIB_FN (jpeg_CreateDecompress); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6423 DEF_IMGLIB_FN (jpeg_start_decompress); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6424 DEF_IMGLIB_FN (jpeg_finish_decompress); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6425 DEF_IMGLIB_FN (jpeg_destroy_decompress); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6426 DEF_IMGLIB_FN (jpeg_read_header); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6427 DEF_IMGLIB_FN (jpeg_read_scanlines); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6428 DEF_IMGLIB_FN (jpeg_std_error); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6429 DEF_IMGLIB_FN (jpeg_resync_to_restart); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6430 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6431 static int |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
6432 init_jpeg_functions (Lisp_Object libraries) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6433 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6434 HMODULE library; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6435 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
6436 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
|
6437 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6438 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6439 LOAD_IMGLIB_FN (library, jpeg_finish_decompress); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6440 LOAD_IMGLIB_FN (library, jpeg_read_scanlines); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6441 LOAD_IMGLIB_FN (library, jpeg_start_decompress); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6442 LOAD_IMGLIB_FN (library, jpeg_read_header); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6443 LOAD_IMGLIB_FN (library, jpeg_CreateDecompress); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6444 LOAD_IMGLIB_FN (library, jpeg_destroy_decompress); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6445 LOAD_IMGLIB_FN (library, jpeg_std_error); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6446 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
|
6447 return 1; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6450 /* 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
|
6451 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
|
6452 static boolean |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
6453 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
|
6454 j_decompress_ptr cinfo; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6455 int desired; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6456 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6457 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
|
6458 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6459 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6460 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6461 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6462 #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
|
6463 #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
|
6464 #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
|
6465 #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
|
6466 #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
|
6467 #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
|
6468 #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
|
6469 #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
|
6470 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6471 #endif /* HAVE_NTGUI */ |
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 struct my_jpeg_error_mgr |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6474 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6475 struct jpeg_error_mgr pub; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6476 jmp_buf setjmp_buffer; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6479 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6480 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6481 my_error_exit (cinfo) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6482 j_common_ptr cinfo; |
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 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
|
6485 longjmp (mgr->setjmp_buffer, 1); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6486 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6489 /* 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
|
6490 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
|
6491 libjpeg.doc from the JPEG lib distribution. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6492 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6493 static void |
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6494 our_common_init_source (cinfo) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6495 j_decompress_ptr cinfo; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6496 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6497 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6498 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6499 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6500 /* 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
|
6501 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
|
6502 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6503 static void |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6504 our_common_term_source (cinfo) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6505 j_decompress_ptr cinfo; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6506 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6507 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6508 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6509 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6510 /* 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
|
6511 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
|
6512 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
|
6513 |
78863
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
6514 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
|
6515 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6516 static boolean |
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6517 our_memory_fill_input_buffer (cinfo) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6518 j_decompress_ptr cinfo; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6519 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6520 /* Insert a fake EOI marker. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6521 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
|
6522 |
78863
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
6523 our_memory_buffer[0] = (JOCTET) 0xFF; |
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
6524 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
|
6525 |
abdfd1f5b491
(our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents:
78788
diff
changeset
|
6526 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
|
6527 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
|
6528 return 1; |
54341
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6531 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6532 /* 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
|
6533 is the JPEG data source manager. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6534 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6535 static void |
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6536 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
|
6537 j_decompress_ptr cinfo; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6538 long num_bytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6539 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6540 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
|
6541 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6542 if (src) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6543 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6544 if (num_bytes > src->bytes_in_buffer) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6545 ERREXIT (cinfo, JERR_INPUT_EOF); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6546 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6547 src->bytes_in_buffer -= num_bytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6548 src->next_input_byte += num_bytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6549 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6550 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6551 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6552 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6553 /* 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
|
6554 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
|
6555 reading the image. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6556 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6557 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6558 jpeg_memory_src (cinfo, data, len) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6559 j_decompress_ptr cinfo; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6560 JOCTET *data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6561 unsigned int len; |
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 struct jpeg_source_mgr *src; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6564 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6565 if (cinfo->src == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6566 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6567 /* First time for this JPEG object? */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6568 cinfo->src = (struct jpeg_source_mgr *) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6569 (*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
|
6570 sizeof (struct jpeg_source_mgr)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6571 src = (struct jpeg_source_mgr *) cinfo->src; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6572 src->next_input_byte = data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6573 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6574 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6575 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
|
6576 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
|
6577 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
|
6578 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
|
6579 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
|
6580 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
|
6581 src->bytes_in_buffer = len; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6582 src->next_input_byte = data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6583 } |
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 |
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6586 struct jpeg_stdio_mgr |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6587 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6588 struct jpeg_source_mgr mgr; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6589 boolean finished; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6590 FILE *file; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6591 JOCTET *buffer; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6592 }; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6593 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6594 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6595 /* 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
|
6596 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
|
6597 #define JPEG_STDIO_BUFFER_SIZE 8192 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6598 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6599 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6600 /* 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
|
6601 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
|
6602 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6603 static boolean |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6604 our_stdio_fill_input_buffer (cinfo) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6605 j_decompress_ptr cinfo; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6606 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6607 struct jpeg_stdio_mgr *src; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6608 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6609 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
|
6610 if (!src->finished) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6611 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6612 size_t bytes; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6613 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6614 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
|
6615 if (bytes > 0) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6616 src->mgr.bytes_in_buffer = bytes; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6617 else |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6618 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6619 WARNMS (cinfo, JWRN_JPEG_EOF); |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6620 src->finished = 1; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6621 src->buffer[0] = (JOCTET) 0xFF; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6622 src->buffer[1] = (JOCTET) JPEG_EOI; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6623 src->mgr.bytes_in_buffer = 2; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6624 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6625 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
|
6626 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6627 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6628 return 1; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6629 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6630 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6631 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6632 /* 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
|
6633 is the JPEG data source manager. */ |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6634 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6635 static void |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6636 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
|
6637 j_decompress_ptr cinfo; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6638 long num_bytes; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6639 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6640 struct jpeg_stdio_mgr *src; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6641 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
|
6642 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6643 while (num_bytes > 0 && !src->finished) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6644 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6645 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
|
6646 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6647 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
|
6648 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
|
6649 break; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6650 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6651 else |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6652 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6653 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
|
6654 src->mgr.bytes_in_buffer = 0; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6655 src->mgr.next_input_byte = NULL; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6656 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6657 our_stdio_fill_input_buffer (cinfo); |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6658 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6659 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6660 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6661 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6662 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6663 /* 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
|
6664 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
|
6665 reading the image. */ |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6666 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6667 static void |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6668 jpeg_file_src (cinfo, fp) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6669 j_decompress_ptr cinfo; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6670 FILE *fp; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6671 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6672 struct jpeg_stdio_mgr *src; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6673 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6674 if (cinfo->src != NULL) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6675 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
|
6676 else |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6677 { |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6678 /* First time for this JPEG object? */ |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6679 cinfo->src = (struct jpeg_source_mgr *) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6680 (*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
|
6681 sizeof (struct jpeg_stdio_mgr)); |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6682 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
|
6683 src->buffer = (JOCTET *) |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6684 (*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
|
6685 JPEG_STDIO_BUFFER_SIZE); |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6686 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6687 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6688 src->file = fp; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6689 src->finished = 0; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6690 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
|
6691 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
|
6692 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
|
6693 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
|
6694 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
|
6695 src->mgr.bytes_in_buffer = 0; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6696 src->mgr.next_input_byte = NULL; |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6697 } |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6698 |
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6699 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6700 /* 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
|
6701 from the JPEG lib. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6702 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6703 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6704 jpeg_load (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6705 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6706 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6707 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6708 struct jpeg_decompress_struct cinfo; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6709 struct my_jpeg_error_mgr mgr; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6710 Lisp_Object file, specified_file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6711 Lisp_Object specified_data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6712 FILE * volatile fp = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6713 JSAMPARRAY buffer; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6714 int row_stride, x, y; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6715 XImagePtr ximg = NULL; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6716 int rc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6717 unsigned long *colors; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6718 int width, height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6719 struct gcpro gcpro1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6720 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6721 /* Open the JPEG file. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6722 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
|
6723 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
|
6724 file = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6725 GCPRO1 (file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6726 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6727 if (NILP (specified_data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6728 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6729 file = x_find_image_file (specified_file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6730 if (!STRINGP (file)) |
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 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
|
6733 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6734 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6735 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6736 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6737 fp = fopen (SDATA (file), "rb"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6738 if (fp == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6739 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6740 image_error ("Cannot open `%s'", file, Qnil); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6741 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6742 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6743 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6746 /* 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
|
6747 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
|
6748 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
|
6749 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
|
6750 mgr.pub.error_exit = my_error_exit; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6751 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6752 if ((rc = setjmp (mgr.setjmp_buffer)) != 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6753 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6754 if (rc == 1) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6755 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6756 /* 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
|
6757 char buffer[JMSG_LENGTH_MAX]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6758 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
|
6759 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
|
6760 build_string (buffer)); |
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 /* 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
|
6764 if (fp) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6765 fclose ((FILE *) fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6766 fn_jpeg_destroy_decompress (&cinfo); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6767 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6768 /* 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
|
6769 x_destroy_x_image (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6770 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6771 /* Free pixmap and colors. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6772 x_clear_image (f, img); |
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 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6775 return 0; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6778 /* 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
|
6779 Read the JPEG image header. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6780 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
|
6781 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6782 if (NILP (specified_data)) |
66013
1de4729d29d6
(fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents:
65764
diff
changeset
|
6783 jpeg_file_src (&cinfo, (FILE *) fp); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6784 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6785 jpeg_memory_src (&cinfo, SDATA (specified_data), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6786 SBYTES (specified_data)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6787 |
58846
4d7444f1a64c
(our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE, init_image):
Richard M. Stallman <rms@gnu.org>
parents:
58752
diff
changeset
|
6788 fn_jpeg_read_header (&cinfo, 1); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6789 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6790 /* 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
|
6791 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
|
6792 cinfo.quantize_colors = 1; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6793 fn_jpeg_start_decompress (&cinfo); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6794 width = img->width = cinfo.output_width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6795 height = img->height = cinfo.output_height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6796 |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6797 if (!check_image_size (f, width, height)) |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6798 { |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
6799 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6800 longjmp (mgr.setjmp_buffer, 2); |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6801 } |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
6802 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6803 /* Create X image and pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6804 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
|
6805 longjmp (mgr.setjmp_buffer, 2); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6806 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6807 /* Allocate colors. When color quantization is used, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6808 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
|
6809 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
|
6810 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
|
6811 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
|
6812 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6813 int i, ir, ig, ib; |
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 if (cinfo.out_color_components > 2) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6816 ir = 0, ig = 1, ib = 2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6817 else if (cinfo.out_color_components > 1) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6818 ir = 0, ig = 1, ib = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6819 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6820 ir = 0, ig = 0, ib = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6821 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6822 /* 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
|
6823 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
|
6824 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
|
6825 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
|
6826 init_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6827 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
|
6828 * sizeof *colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6829 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6830 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
|
6831 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6832 /* 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
|
6833 in the range 0..0xffff. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6834 int r = cinfo.colormap[ir][i] << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6835 int g = cinfo.colormap[ig][i] << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6836 int b = cinfo.colormap[ib][i] << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6837 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
|
6838 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6839 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6840 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6841 /* Remember those colors actually allocated. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6842 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
|
6843 free_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6844 #endif /* COLOR_TABLE_SUPPORT */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6845 } |
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 /* Read pixels. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6848 row_stride = width * cinfo.output_components; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6849 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
|
6850 row_stride, 1); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6851 for (y = 0; y < height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6852 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6853 fn_jpeg_read_scanlines (&cinfo, buffer, 1); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6854 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
|
6855 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
|
6856 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6857 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6858 /* Clean up. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6859 fn_jpeg_finish_decompress (&cinfo); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6860 fn_jpeg_destroy_decompress (&cinfo); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6861 if (fp) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6862 fclose ((FILE *) fp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6863 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6864 /* 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
|
6865 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
|
6866 /* 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
|
6867 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
|
6868 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6869 /* Put the image into the pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6870 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
|
6871 x_destroy_x_image (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6872 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6873 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6874 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6875 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6876 #else /* HAVE_JPEG */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6877 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6878 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6879 static int |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6880 jpeg_load (struct frame *f, struct image *img) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6881 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6882 return ns_load_image(f, img, |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6883 image_spec_value (img->spec, QCfile, NULL), |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6884 image_spec_value (img->spec, QCdata, NULL)); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6885 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6886 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
6887 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6888 #endif /* !HAVE_JPEG */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6889 |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6892 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6893 TIFF |
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 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
6896 #if defined (HAVE_TIFF) || defined (HAVE_NS) |
54341
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 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
|
6899 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
|
6900 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6901 /* 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
|
6902 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6903 Lisp_Object Qtiff; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6904 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6905 /* 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
|
6906 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6907 enum tiff_keyword_index |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6908 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6909 TIFF_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6910 TIFF_DATA, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6911 TIFF_FILE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6912 TIFF_ASCENT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6913 TIFF_MARGIN, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6914 TIFF_RELIEF, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6915 TIFF_ALGORITHM, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6916 TIFF_HEURISTIC_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6917 TIFF_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6918 TIFF_BACKGROUND, |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
6919 TIFF_INDEX, |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6920 TIFF_LAST |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6923 /* 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
|
6924 of valid user-defined image specifications. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6925 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6926 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
|
6927 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6928 {":type", IMAGE_SYMBOL_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6929 {":data", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6930 {":file", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6931 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6932 {":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
|
6933 {":relief", IMAGE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6934 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6935 {":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
|
6936 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
6937 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}, |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
6938 {":index", IMAGE_NON_NEGATIVE_INTEGER_VALUE, 0} |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6939 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6940 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6941 /* Structure describing the image type `tiff'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6942 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6943 static struct image_type tiff_type = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6944 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6945 &Qtiff, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6946 tiff_image_p, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6947 tiff_load, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6948 x_clear_image, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6949 NULL |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6952 /* 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
|
6953 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6954 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6955 tiff_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6956 Lisp_Object object; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6957 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6958 struct image_keyword fmt[TIFF_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6959 bcopy (tiff_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6960 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6961 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
|
6962 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6963 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6964 /* 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
|
6965 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
|
6966 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6967 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
6968 #endif /* HAVE_TIFF || HAVE_NS */ |
54341
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 #ifdef HAVE_TIFF |
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 #include <tiffio.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6973 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6974 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6975 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6976 /* TIFF library details. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6977 DEF_IMGLIB_FN (TIFFSetErrorHandler); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6978 DEF_IMGLIB_FN (TIFFSetWarningHandler); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6979 DEF_IMGLIB_FN (TIFFOpen); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6980 DEF_IMGLIB_FN (TIFFClientOpen); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6981 DEF_IMGLIB_FN (TIFFGetField); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6982 DEF_IMGLIB_FN (TIFFReadRGBAImage); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6983 DEF_IMGLIB_FN (TIFFClose); |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
6984 DEF_IMGLIB_FN (TIFFSetDirectory); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6985 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6986 static int |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
6987 init_tiff_functions (Lisp_Object libraries) |
54341
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 HMODULE library; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6990 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
6991 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
|
6992 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6993 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6994 LOAD_IMGLIB_FN (library, TIFFSetErrorHandler); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6995 LOAD_IMGLIB_FN (library, TIFFSetWarningHandler); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6996 LOAD_IMGLIB_FN (library, TIFFOpen); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6997 LOAD_IMGLIB_FN (library, TIFFClientOpen); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6998 LOAD_IMGLIB_FN (library, TIFFGetField); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
6999 LOAD_IMGLIB_FN (library, TIFFReadRGBAImage); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7000 LOAD_IMGLIB_FN (library, TIFFClose); |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7001 LOAD_IMGLIB_FN (library, TIFFSetDirectory); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7002 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7003 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7004 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7005 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7006 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7007 #define fn_TIFFSetErrorHandler TIFFSetErrorHandler |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7008 #define fn_TIFFSetWarningHandler TIFFSetWarningHandler |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7009 #define fn_TIFFOpen TIFFOpen |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7010 #define fn_TIFFClientOpen TIFFClientOpen |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7011 #define fn_TIFFGetField TIFFGetField |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7012 #define fn_TIFFReadRGBAImage TIFFReadRGBAImage |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7013 #define fn_TIFFClose TIFFClose |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7014 #define fn_TIFFSetDirectory TIFFSetDirectory |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7015 #endif /* HAVE_NTGUI */ |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7018 /* 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
|
7019 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
|
7020 Blah. |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7021 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7022 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
|
7023 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
|
7024 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
|
7025 override. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7026 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7027 typedef struct |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7028 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7029 unsigned char *bytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7030 size_t len; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7031 int index; |
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 tiff_memory_source; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7034 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7035 static size_t |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7036 tiff_read_from_memory (data, buf, size) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7037 thandle_t data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7038 tdata_t buf; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7039 tsize_t size; |
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 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
|
7042 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7043 if (size > src->len - src->index) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7044 return (size_t) -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7045 bcopy (src->bytes + src->index, buf, size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7046 src->index += size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7047 return size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7048 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7049 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7050 static size_t |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7051 tiff_write_from_memory (data, buf, size) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7052 thandle_t data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7053 tdata_t buf; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7054 tsize_t size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7055 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7056 return (size_t) -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7057 } |
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 static toff_t |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7060 tiff_seek_in_memory (data, off, whence) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7061 thandle_t data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7062 toff_t off; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7063 int whence; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7064 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7065 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
|
7066 int idx; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7067 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7068 switch (whence) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7069 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7070 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
|
7071 idx = off; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7072 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7073 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7074 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
|
7075 idx = src->len + off; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7076 break; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7077 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7078 case SEEK_CUR: /* Go from current position. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7079 idx = src->index + off; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7080 break; |
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 default: /* Invalid `whence'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7083 return -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7084 } |
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 if (idx > src->len || idx < 0) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7087 return -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 src->index = idx; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7090 return src->index; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7091 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7092 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7093 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7094 tiff_close_memory (data) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7095 thandle_t data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7096 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7097 /* NOOP */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7098 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7099 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7100 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7101 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7102 tiff_mmap_memory (data, pbase, psize) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7103 thandle_t data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7104 tdata_t *pbase; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7105 toff_t *psize; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7106 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7107 /* It is already _IN_ memory. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7108 return 0; |
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 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7112 tiff_unmap_memory (data, base, size) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7113 thandle_t data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7114 tdata_t base; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7115 toff_t size; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7116 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7117 /* We don't need to do this. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7118 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7119 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7120 static toff_t |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7121 tiff_size_of_memory (data) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7122 thandle_t data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7123 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7124 return ((tiff_memory_source *) data)->len; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7125 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7126 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7127 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7128 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7129 tiff_error_handler (title, format, ap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7130 const char *title, *format; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7131 va_list ap; |
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 char buf[512]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7134 int len; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7135 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7136 len = sprintf (buf, "TIFF error: %s ", title); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7137 vsprintf (buf + len, format, ap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7138 add_to_log (buf, Qnil, Qnil); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7139 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7140 |
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 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7143 tiff_warning_handler (title, format, ap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7144 const char *title, *format; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7145 va_list ap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7146 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7147 char buf[512]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7148 int len; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7149 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7150 len = sprintf (buf, "TIFF warning: %s ", title); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7151 vsprintf (buf + len, format, ap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7152 add_to_log (buf, Qnil, Qnil); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7156 /* 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
|
7157 successful. */ |
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 int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7160 tiff_load (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7161 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7162 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7163 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7164 Lisp_Object file, specified_file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7165 Lisp_Object specified_data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7166 TIFF *tiff; |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7167 int width, height, x, y, count; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7168 uint32 *buf; |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7169 int rc, rc2; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7170 XImagePtr ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7171 struct gcpro gcpro1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7172 tiff_memory_source memsrc; |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7173 Lisp_Object image; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7174 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7175 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
|
7176 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
|
7177 file = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7178 GCPRO1 (file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7179 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7180 fn_TIFFSetErrorHandler (tiff_error_handler); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7181 fn_TIFFSetWarningHandler (tiff_warning_handler); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7182 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7183 if (NILP (specified_data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7184 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7185 /* Read from a file */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7186 file = x_find_image_file (specified_file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7187 if (!STRINGP (file)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7188 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7189 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
|
7190 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7191 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7192 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7193 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7194 /* 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
|
7195 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
|
7196 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
|
7197 if (tiff == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7198 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7199 image_error ("Cannot open `%s'", file, Qnil); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7200 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7201 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7202 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7203 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7204 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7205 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7206 /* Memory source! */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7207 memsrc.bytes = SDATA (specified_data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7208 memsrc.len = SBYTES (specified_data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7209 memsrc.index = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7210 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7211 /* 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
|
7212 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
|
7213 (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
|
7214 (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
|
7215 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
|
7216 tiff_close_memory, |
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7217 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
|
7218 tiff_mmap_memory, |
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7219 tiff_unmap_memory); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7220 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7221 if (!tiff) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7222 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7223 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
|
7224 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7225 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7226 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7227 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7228 |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7229 image = image_spec_value (img->spec, QCindex, NULL); |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7230 if (INTEGERP (image)) |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7231 { |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7232 int ino = XFASTINT (image); |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7233 if (!fn_TIFFSetDirectory (tiff, ino)) |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7234 { |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7235 image_error ("Invalid image number `%s' in image `%s'", |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7236 image, img->spec); |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7237 fn_TIFFClose (tiff); |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7238 UNGCPRO; |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7239 return 0; |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7240 } |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7241 } |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7242 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7243 /* 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
|
7244 of width x height 32-bit values. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7245 fn_TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &width); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7246 fn_TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &height); |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7247 |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7248 if (!check_image_size (f, width, height)) |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7249 { |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
7250 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7251 fn_TIFFClose (tiff); |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7252 UNGCPRO; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7253 return 0; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7254 } |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7255 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7256 buf = (uint32 *) xmalloc (width * height * sizeof *buf); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7257 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7258 rc = fn_TIFFReadRGBAImage (tiff, width, height, buf, 0); |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7259 |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7260 /* Count the number of images in the file. */ |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7261 for (count = 1, rc2 = 1; rc2; count++) |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7262 rc2 = fn_TIFFSetDirectory (tiff, count); |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7263 |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7264 if (count > 1) |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7265 img->data.lisp_val = Fcons (Qcount, |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7266 Fcons (make_number (count), |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7267 img->data.lisp_val)); |
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7268 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7269 fn_TIFFClose (tiff); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7270 if (!rc) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7271 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7272 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
|
7273 xfree (buf); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7274 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7275 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7276 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7277 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7278 /* Create the X image and pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7279 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
|
7280 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7281 xfree (buf); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7282 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7283 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7284 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7285 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7286 /* Initialize the color table. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7287 init_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7288 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7289 /* 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
|
7290 for (y = 0; y < height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7291 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7292 uint32 *row = buf + y * width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7293 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7294 for (x = 0; x < width; ++x) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7295 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7296 uint32 abgr = row[x]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7297 int r = TIFFGetR (abgr) << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7298 int g = TIFFGetG (abgr) << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7299 int b = TIFFGetB (abgr) << 8; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7300 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
|
7301 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7302 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7303 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7304 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7305 /* 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
|
7306 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
|
7307 free_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7308 #endif /* COLOR_TABLE_SUPPORT */ |
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 img->width = width; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7311 img->height = height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7312 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7313 /* 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
|
7314 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
|
7315 /* 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
|
7316 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
|
7317 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7318 /* 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
|
7319 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
|
7320 x_destroy_x_image (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7321 xfree (buf); |
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 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7324 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7325 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7326 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7327 #else /* HAVE_TIFF */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7328 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7329 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7330 static int |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7331 tiff_load (struct frame *f, struct image *img) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7332 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7333 return ns_load_image(f, img, |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7334 image_spec_value (img->spec, QCfile, NULL), |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7335 image_spec_value (img->spec, QCdata, NULL)); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7336 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7337 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7338 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7339 #endif /* !HAVE_TIFF */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7340 |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7343 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7344 GIF |
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 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
7347 #if defined (HAVE_GIF) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7348 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7349 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
|
7350 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
|
7351 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
|
7352 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7353 /* 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
|
7354 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7355 Lisp_Object Qgif; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7356 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7357 /* 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
|
7358 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7359 enum gif_keyword_index |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7360 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7361 GIF_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7362 GIF_DATA, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7363 GIF_FILE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7364 GIF_ASCENT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7365 GIF_MARGIN, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7366 GIF_RELIEF, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7367 GIF_ALGORITHM, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7368 GIF_HEURISTIC_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7369 GIF_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7370 GIF_IMAGE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7371 GIF_BACKGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7372 GIF_LAST |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7373 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7374 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7375 /* 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
|
7376 of valid user-defined image specifications. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7377 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7378 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
|
7379 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7380 {":type", IMAGE_SYMBOL_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7381 {":data", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7382 {":file", IMAGE_STRING_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7383 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7384 {":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
|
7385 {":relief", IMAGE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7386 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7387 {":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
|
7388 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
97635
eb8c3a9e1565
(enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents:
97043
diff
changeset
|
7389 {":index", IMAGE_NON_NEGATIVE_INTEGER_VALUE, 0}, |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7390 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7393 /* Structure describing the image type `gif'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7394 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7395 static struct image_type gif_type = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7396 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7397 &Qgif, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7398 gif_image_p, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7399 gif_load, |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7400 gif_clear_image, |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7401 NULL |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7402 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7403 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7404 /* 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
|
7405 |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7406 static void |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7407 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
|
7408 struct frame *f; |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7409 struct image *img; |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7410 { |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7411 /* 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
|
7412 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
|
7413 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
|
7414 } |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7415 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7416 /* 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
|
7417 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7418 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7419 gif_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7420 Lisp_Object object; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7421 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7422 struct image_keyword fmt[GIF_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7423 bcopy (gif_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7424 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7425 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
|
7426 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7427 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7428 /* 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
|
7429 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
|
7430 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7431 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
7432 #endif /* HAVE_GIF */ |
54341
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 #ifdef HAVE_GIF |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7435 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
7436 #if defined (HAVE_NTGUI) |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7437 /* 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
|
7438 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
|
7439 #ifdef DrawText |
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7440 #undef DrawText |
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7441 #endif |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7442 /* avoid conflict with QuickdrawText.h */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7443 #define DrawText gif_DrawText |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7444 #include <gif_lib.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7445 #undef DrawText |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7446 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
7447 #else /* HAVE_NTGUI */ |
54341
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 #include <gif_lib.h> |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7450 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
7451 #endif /* HAVE_NTGUI */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7452 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7453 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7454 #ifdef HAVE_NTGUI |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7455 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7456 /* GIF library details. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7457 DEF_IMGLIB_FN (DGifCloseFile); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7458 DEF_IMGLIB_FN (DGifSlurp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7459 DEF_IMGLIB_FN (DGifOpen); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7460 DEF_IMGLIB_FN (DGifOpenFileName); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7461 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7462 static int |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
7463 init_gif_functions (Lisp_Object libraries) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7464 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7465 HMODULE library; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7466 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
7467 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
|
7468 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7469 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7470 LOAD_IMGLIB_FN (library, DGifCloseFile); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7471 LOAD_IMGLIB_FN (library, DGifSlurp); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7472 LOAD_IMGLIB_FN (library, DGifOpen); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7473 LOAD_IMGLIB_FN (library, DGifOpenFileName); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7474 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7475 } |
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 #else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7478 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7479 #define fn_DGifCloseFile DGifCloseFile |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7480 #define fn_DGifSlurp DGifSlurp |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7481 #define fn_DGifOpen DGifOpen |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7482 #define fn_DGifOpenFileName DGifOpenFileName |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7483 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7484 #endif /* HAVE_NTGUI */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7485 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7486 /* Reading a GIF image from memory |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7487 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
|
7488 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7489 typedef struct |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7490 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7491 unsigned char *bytes; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7492 size_t len; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7493 int index; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7494 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7495 gif_memory_source; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7496 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7497 /* 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
|
7498 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
|
7499 a UserData field in the GifFileType structure. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7500 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
|
7501 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7502 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7503 gif_read_from_memory (file, buf, len) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7504 GifFileType *file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7505 GifByteType *buf; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7506 int len; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7507 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7508 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
|
7509 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7510 if (len > src->len - src->index) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7511 return -1; |
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 bcopy (src->bytes + src->index, buf, len); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7514 src->index += len; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7515 return len; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7518 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7519 /* 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
|
7520 successful. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7521 |
78788
c077ece08ff6
(our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
Glenn Morris <rgm@gnu.org>
parents:
78746
diff
changeset
|
7522 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
|
7523 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
|
7524 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7525 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7526 gif_load (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7527 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7528 struct image *img; |
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 Lisp_Object file, specified_file; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7531 Lisp_Object specified_data; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7532 int rc, width, height, x, y, i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7533 XImagePtr ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7534 ColorMapObject *gif_color_map; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7535 unsigned long pixel_colors[256]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7536 GifFileType *gif; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7537 struct gcpro gcpro1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7538 Lisp_Object image; |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7539 int ino, image_height, image_width; |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7540 gif_memory_source memsrc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7541 unsigned char *raster; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7542 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7543 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
|
7544 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
|
7545 file = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7546 GCPRO1 (file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7547 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7548 if (NILP (specified_data)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7549 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7550 file = x_find_image_file (specified_file); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7551 if (!STRINGP (file)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7552 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7553 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
|
7554 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7555 return 0; |
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 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7558 /* 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
|
7559 on W32. */ |
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7560 gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file)); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7561 if (gif == NULL) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7562 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7563 image_error ("Cannot open `%s'", file, Qnil); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7564 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7565 return 0; |
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 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7568 else |
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 /* Read from memory! */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7571 current_gif_memory_src = &memsrc; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7572 memsrc.bytes = SDATA (specified_data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7573 memsrc.len = SBYTES (specified_data); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7574 memsrc.index = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7575 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7576 /* 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
|
7577 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
|
7578 if (!gif) |
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 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
|
7581 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7582 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7583 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7584 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7585 |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7586 /* 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
|
7587 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
|
7588 { |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
7589 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7590 fn_DGifCloseFile (gif); |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7591 UNGCPRO; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7592 return 0; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7593 } |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7594 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7595 /* Read entire contents. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7596 rc = fn_DGifSlurp (gif); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7597 if (rc == GIF_ERROR) |
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 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
|
7600 fn_DGifCloseFile (gif); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7601 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7602 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7603 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7604 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7605 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
|
7606 ino = INTEGERP (image) ? XFASTINT (image) : 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7607 if (ino >= gif->ImageCount) |
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 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
|
7610 image, img->spec); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7611 fn_DGifCloseFile (gif); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7612 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7613 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7614 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7615 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7616 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
|
7617 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
|
7618 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
|
7619 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
|
7620 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
|
7621 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
|
7622 |
b88d5090aa86
(gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents:
65250
diff
changeset
|
7623 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
|
7624 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
|
7625 img->corners[RIGHT_CORNER])); |
65723
b88d5090aa86
(gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents:
65250
diff
changeset
|
7626 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
|
7627 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
|
7628 img->corners[BOT_CORNER])); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7629 |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7630 if (!check_image_size (f, width, height)) |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7631 { |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
7632 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7633 fn_DGifCloseFile (gif); |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7634 UNGCPRO; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7635 return 0; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7636 } |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
7637 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7638 /* Create the X image and pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7639 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
|
7640 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7641 fn_DGifCloseFile (gif); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7642 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7643 return 0; |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7646 /* Allocate colors. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7647 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
|
7648 if (!gif_color_map) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7649 gif_color_map = gif->SColorMap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7650 init_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7651 bzero (pixel_colors, sizeof pixel_colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7652 |
78746
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
7653 if (gif_color_map) |
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
7654 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
|
7655 { |
8090732dfc6d
(gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
78692
diff
changeset
|
7656 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
|
7657 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
|
7658 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
|
7659 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
|
7660 } |
54341
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 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7663 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
|
7664 free_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7665 #endif /* COLOR_TABLE_SUPPORT */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7666 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7667 /* 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
|
7668 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
|
7669 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
|
7670 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
|
7671 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
|
7672 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
|
7673 for (x = 0; x < width; ++x) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7674 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
|
7675 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7676 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
|
7677 for (x = 0; x < width; ++x) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7678 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
|
7679 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7680 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
|
7681 { |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7682 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
|
7683 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
|
7684 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
|
7685 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
|
7686 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7687 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7688 /* 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
|
7689 `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
|
7690 problems with bytes >= 0x80. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7691 raster = (unsigned char *) gif->SavedImages[ino].RasterBits; |
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 if (gif->SavedImages[ino].ImageDesc.Interlace) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7694 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7695 int pass; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7696 int row = interlace_start[0]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7697 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7698 pass = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7699 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7700 for (y = 0; y < image_height; y++) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7701 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7702 if (row >= image_height) |
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 row = interlace_start[++pass]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7705 while (row >= image_height) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7706 row = interlace_start[++pass]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7707 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7708 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7709 for (x = 0; x < image_width; x++) |
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 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
|
7712 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
|
7713 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
|
7714 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7715 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7716 row += interlace_increment[pass]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7717 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7718 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7719 else |
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 for (y = 0; y < image_height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7722 for (x = 0; x < image_width; ++x) |
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 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
|
7725 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
|
7726 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
|
7727 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7728 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7729 |
70168
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7730 /* 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
|
7731 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
|
7732 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
|
7733 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
|
7734 { |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7735 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
|
7736 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
|
7737 /* Append (... FUNCTION "BYTES") */ |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7738 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
|
7739 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
|
7740 img->data.lisp_val)); |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7741 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
|
7742 } |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7743 if (gif->ImageCount > 1) |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7744 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
|
7745 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
|
7746 img->data.lisp_val)); |
60bff6b0c656
(four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents:
70147
diff
changeset
|
7747 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7748 fn_DGifCloseFile (gif); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7749 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7750 /* 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
|
7751 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
|
7752 /* 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
|
7753 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
|
7754 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7755 /* 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
|
7756 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
|
7757 x_destroy_x_image (ximg); |
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 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7760 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7761 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7762 |
63323
ccf928f0383c
(x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents:
63112
diff
changeset
|
7763 #else /* !HAVE_GIF */ |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7764 |
96675
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7765 #ifdef HAVE_NS |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7766 static int |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7767 gif_load (struct frame *f, struct image *img) |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7768 { |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7769 return ns_load_image(f, img, |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7770 image_spec_value (img->spec, QCfile, NULL), |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7771 image_spec_value (img->spec, QCdata, NULL)); |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7772 } |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7773 #endif /* HAVE_NS */ |
d45acf0c8d23
merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
95213
diff
changeset
|
7774 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7775 #endif /* HAVE_GIF */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7776 |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
7779 /*********************************************************************** |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7780 SVG |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7781 ***********************************************************************/ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7782 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7783 #if defined (HAVE_RSVG) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7784 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7785 /* Function prototypes. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7786 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7787 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
|
7788 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
|
7789 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7790 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
|
7791 unsigned char *, unsigned int)); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7792 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7793 /* The symbol `svg' identifying images of this type. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7794 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7795 Lisp_Object Qsvg; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7796 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7797 /* 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
|
7798 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7799 enum svg_keyword_index |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7800 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7801 SVG_TYPE, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7802 SVG_DATA, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7803 SVG_FILE, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7804 SVG_ASCENT, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7805 SVG_MARGIN, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7806 SVG_RELIEF, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7807 SVG_ALGORITHM, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7808 SVG_HEURISTIC_MASK, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7809 SVG_MASK, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7810 SVG_BACKGROUND, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7811 SVG_LAST |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7812 }; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7813 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7814 /* Vector of image_keyword structures describing the format |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7815 of valid user-defined image specifications. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7816 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7817 static struct image_keyword svg_format[SVG_LAST] = |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7818 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7819 {":type", IMAGE_SYMBOL_VALUE, 1}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7820 {":data", IMAGE_STRING_VALUE, 0}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7821 {":file", IMAGE_STRING_VALUE, 0}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7822 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7823 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7824 {":relief", IMAGE_INTEGER_VALUE, 0}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7825 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7826 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7827 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7828 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7829 }; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7830 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7831 /* 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
|
7832 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
|
7833 functions. See struct image_type in dispextern.h. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7834 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7835 static struct image_type svg_type = |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7836 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7837 /* 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
|
7838 &Qsvg, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7839 /* 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
|
7840 svg_image_p, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7841 /* 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
|
7842 svg_load, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7843 /* Handle to function to free sresources for SVG. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7844 x_clear_image, |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7845 /* 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
|
7846 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
|
7847 NULL |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7848 }; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7849 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7850 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7851 /* 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
|
7852 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
|
7853 identify the SVG format. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7854 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7855 static int |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7856 svg_image_p (object) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7857 Lisp_Object object; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7858 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7859 struct image_keyword fmt[SVG_LAST]; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7860 bcopy (svg_format, fmt, sizeof fmt); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7861 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7862 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
|
7863 return 0; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7864 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7865 /* Must specify either the :data or :file keyword. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7866 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
|
7867 } |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7868 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7869 #include <librsvg/rsvg.h> |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7870 |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7871 #ifdef HAVE_NTGUI |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7872 |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7873 /* SVG library functions. */ |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7874 DEF_IMGLIB_FN (rsvg_handle_new); |
97012
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
7875 DEF_IMGLIB_FN (rsvg_handle_get_dimensions); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7876 DEF_IMGLIB_FN (rsvg_handle_write); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7877 DEF_IMGLIB_FN (rsvg_handle_close); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7878 DEF_IMGLIB_FN (rsvg_handle_get_pixbuf); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7879 DEF_IMGLIB_FN (rsvg_handle_free); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7880 |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7881 DEF_IMGLIB_FN (gdk_pixbuf_get_width); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7882 DEF_IMGLIB_FN (gdk_pixbuf_get_height); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7883 DEF_IMGLIB_FN (gdk_pixbuf_get_pixels); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7884 DEF_IMGLIB_FN (gdk_pixbuf_get_rowstride); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7885 DEF_IMGLIB_FN (gdk_pixbuf_get_colorspace); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7886 DEF_IMGLIB_FN (gdk_pixbuf_get_n_channels); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7887 DEF_IMGLIB_FN (gdk_pixbuf_get_has_alpha); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7888 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
|
7889 |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7890 DEF_IMGLIB_FN (g_type_init); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7891 DEF_IMGLIB_FN (g_object_unref); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7892 DEF_IMGLIB_FN (g_error_free); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7893 |
100826 | 7894 Lisp_Object Qgdk_pixbuf, Qglib, Qgobject; |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7895 |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7896 static int |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7897 init_svg_functions (Lisp_Object libraries) |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7898 { |
100826 | 7899 HMODULE library, gdklib, glib, gobject; |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7900 |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7901 if (!(glib = w32_delayed_load (libraries, Qglib)) |
100826 | 7902 || !(gobject = w32_delayed_load (libraries, Qgobject)) |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7903 || !(gdklib = w32_delayed_load (libraries, Qgdk_pixbuf)) |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7904 || !(library = w32_delayed_load (libraries, Qsvg))) |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7905 return 0; |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7906 |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7907 LOAD_IMGLIB_FN (library, rsvg_handle_new); |
97012
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
7908 LOAD_IMGLIB_FN (library, rsvg_handle_get_dimensions); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7909 LOAD_IMGLIB_FN (library, rsvg_handle_write); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7910 LOAD_IMGLIB_FN (library, rsvg_handle_close); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7911 LOAD_IMGLIB_FN (library, rsvg_handle_get_pixbuf); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7912 LOAD_IMGLIB_FN (library, rsvg_handle_free); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7913 |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7914 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_width); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7915 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_height); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7916 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_pixels); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7917 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_rowstride); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7918 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_colorspace); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7919 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
|
7920 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
|
7921 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
|
7922 |
100826 | 7923 LOAD_IMGLIB_FN (gobject, g_type_init); |
7924 LOAD_IMGLIB_FN (gobject, g_object_unref); | |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7925 LOAD_IMGLIB_FN (glib, g_error_free); |
100826 | 7926 |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7927 return 1; |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7928 } |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7929 |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7930 #else |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7931 /* 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
|
7932 to be used on some platforms. */ |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7933 #define fn_rsvg_handle_new rsvg_handle_new |
97012
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
7934 #define fn_rsvg_handle_get_dimensions rsvg_handle_get_dimensions |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7935 #define fn_rsvg_handle_write rsvg_handle_write |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7936 #define fn_rsvg_handle_close rsvg_handle_close |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7937 #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
|
7938 #define fn_rsvg_handle_free rsvg_handle_free |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7939 |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7940 #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
|
7941 #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
|
7942 #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
|
7943 #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
|
7944 #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
|
7945 #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
|
7946 #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
|
7947 #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
|
7948 |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7949 #define fn_g_type_init g_type_init |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7950 #define fn_g_object_unref g_object_unref |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7951 #define fn_g_error_free g_error_free |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
7952 #endif /* !HAVE_NTGUI */ |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7953 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7954 /* 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
|
7955 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
|
7956 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
|
7957 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7958 static int |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7959 svg_load (f, img) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7960 struct frame *f; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7961 struct image *img; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7962 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7963 int success_p = 0; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7964 Lisp_Object file_name; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7965 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7966 /* 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
|
7967 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
|
7968 if (STRINGP (file_name)) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7969 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7970 Lisp_Object file; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7971 unsigned char *contents; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7972 int size; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7973 struct gcpro gcpro1; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7974 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7975 file = x_find_image_file (file_name); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7976 GCPRO1 (file); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7977 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
|
7978 { |
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
7979 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
|
7980 UNGCPRO; |
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
7981 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
|
7982 } |
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
7983 |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7984 /* Read the entire file into memory. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7985 contents = slurp_file (SDATA (file), &size); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7986 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
|
7987 { |
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
7988 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
|
7989 UNGCPRO; |
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
7990 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
|
7991 } |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7992 /* 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
|
7993 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
|
7994 xfree (contents); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7995 UNGCPRO; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7996 } |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7997 /* 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
|
7998 lisp object rather than a file. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
7999 else |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8000 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8001 Lisp_Object data; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8002 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8003 data = image_spec_value (img->spec, QCdata, NULL); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8004 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
|
8005 } |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8006 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8007 return success_p; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8008 } |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8009 |
85039
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8010 /* 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
|
8011 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
|
8012 structures, passed from svg_load. |
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8013 |
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8014 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
|
8015 |
50b33e26718b
(syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
84561
diff
changeset
|
8016 Returns non-zero when successful. */ |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8017 static int |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8018 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
|
8019 /* Pointer to emacs frame structure. */ |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8020 struct frame *f; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8021 /* Pointer to emacs image structure. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8022 struct image *img; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8023 /* 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
|
8024 unsigned char *contents; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8025 /* Size of data in bytes. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8026 unsigned int size; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8027 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8028 RsvgHandle *rsvg_handle; |
97012
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8029 RsvgDimensionData dimension_data; |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8030 GError *error = NULL; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8031 GdkPixbuf *pixbuf; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8032 int width; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8033 int height; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8034 const guint8 *pixels; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8035 int rowstride; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8036 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
|
8037 Lisp_Object specified_bg; |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8038 XColor background; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8039 int x; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8040 int y; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8041 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8042 /* 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
|
8043 gnome type library functions. */ |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8044 fn_g_type_init (); |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8045 /* Make a handle to a new rsvg object. */ |
100845
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
8046 rsvg_handle = (RsvgHandle *) fn_rsvg_handle_new (); |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8047 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8048 /* 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
|
8049 fn_rsvg_handle_write (rsvg_handle, contents, size, &error); |
97012
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8050 if (error) goto rsvg_error; |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8051 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8052 /* 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
|
8053 for further writes. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8054 fn_rsvg_handle_close (rsvg_handle, &error); |
97012
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8055 if (error) goto rsvg_error; |
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8056 |
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8057 fn_rsvg_handle_get_dimensions (rsvg_handle, &dimension_data); |
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8058 if (! check_image_size (f, dimension_data.width, dimension_data.height)) |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
8059 { |
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
8060 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
8061 goto rsvg_error; |
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
8062 } |
97007
2b861be36de9
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
97003
diff
changeset
|
8063 |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8064 /* 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
|
8065 went ok. */ |
100845
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
8066 pixbuf = (GdkPixbuf *) fn_rsvg_handle_get_pixbuf (rsvg_handle); |
97012
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8067 if (!pixbuf) goto rsvg_error; |
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8068 fn_g_object_unref (rsvg_handle); |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8069 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8070 /* Extract some meta data from the svg handle. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8071 width = fn_gdk_pixbuf_get_width (pixbuf); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8072 height = fn_gdk_pixbuf_get_height (pixbuf); |
100845
58017ff34d94
* w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents:
100826
diff
changeset
|
8073 pixels = (const guint8 *) fn_gdk_pixbuf_get_pixels (pixbuf); |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8074 rowstride = fn_gdk_pixbuf_get_rowstride (pixbuf); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8075 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8076 /* Validate the svg meta data. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8077 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
|
8078 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
|
8079 eassert (fn_gdk_pixbuf_get_has_alpha (pixbuf)); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8080 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
|
8081 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8082 /* 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
|
8083 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
|
8084 { |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8085 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
|
8086 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
|
8087 } |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8088 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8089 init_color_table (); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8090 |
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8091 /* 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
|
8092 color. */ |
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8093 specified_bg = image_spec_value (img->spec, QCbackground, NULL); |
101838
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8094 if (!STRINGP (specified_bg) |
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8095 || !x_defined_color (f, SDATA (specified_bg), &background, 0)) |
101638
b6df48c94ca5
* image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
100951
diff
changeset
|
8096 { |
b6df48c94ca5
* image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
100951
diff
changeset
|
8097 #ifndef HAVE_NS |
b6df48c94ca5
* image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
100951
diff
changeset
|
8098 background.pixel = FRAME_BACKGROUND_PIXEL (f); |
b6df48c94ca5
* image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
100951
diff
changeset
|
8099 x_query_color (f, &background); |
b6df48c94ca5
* image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
100951
diff
changeset
|
8100 #else |
b6df48c94ca5
* image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
100951
diff
changeset
|
8101 ns_query_color(FRAME_BACKGROUND_COLOR (f), &background, 1); |
b6df48c94ca5
* image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
100951
diff
changeset
|
8102 #endif |
b6df48c94ca5
* image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents:
100951
diff
changeset
|
8103 } |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8104 |
101838
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8105 /* SVG pixmaps specify transparency in the last byte, so right |
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8106 shift 8 bits to get rid of it, since emacs doesn't support |
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8107 transparency. */ |
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8108 background.red >>= 8; |
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8109 background.green >>= 8; |
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8110 background.blue >>= 8; |
a4a5037b3040
(svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents:
101638
diff
changeset
|
8111 |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8112 /* This loop handles opacity values, since Emacs assumes |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8113 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
|
8114 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
|
8115 pixel, and the image background color. */ |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8116 for (y = 0; y < height; ++y) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8117 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8118 for (x = 0; x < width; ++x) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8119 { |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8120 unsigned red; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8121 unsigned green; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8122 unsigned blue; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8123 unsigned opacity; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8124 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8125 red = *pixels++; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8126 green = *pixels++; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8127 blue = *pixels++; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8128 opacity = *pixels++; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8129 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8130 red = ((red * opacity) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8131 + (background.red * ((1 << 8) - opacity))); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8132 green = ((green * opacity) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8133 + (background.green * ((1 << 8) - opacity))); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8134 blue = ((blue * opacity) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8135 + (background.blue * ((1 << 8) - opacity))); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8136 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8137 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
|
8138 } |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8139 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8140 pixels += rowstride - 4 * width; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8141 } |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8142 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8143 #ifdef COLOR_TABLE_SUPPORT |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8144 /* Remember colors allocated for this image. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8145 img->colors = colors_in_color_table (&img->ncolors); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8146 free_color_table (); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8147 #endif /* COLOR_TABLE_SUPPORT */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8148 |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8149 fn_g_object_unref (pixbuf); |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8150 |
82781
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8151 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
|
8152 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
|
8153 |
916a16bcfda2
(svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents:
82736
diff
changeset
|
8154 /* 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
|
8155 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
|
8156 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
|
8157 |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8158 /* 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
|
8159 buffer. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8160 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
|
8161 x_destroy_x_image (ximg); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8162 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8163 return 1; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8164 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8165 rsvg_error: |
97012
c5f36ea75cba
(svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents:
97007
diff
changeset
|
8166 fn_g_object_unref (rsvg_handle); |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8167 /* 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
|
8168 problem with the image. */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8169 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
|
8170 fn_g_error_free (error); |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8171 return 0; |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8172 } |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8173 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8174 #endif /* defined (HAVE_RSVG) */ |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8175 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8176 |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8177 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8178 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8179 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8180 Ghostscript |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8181 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8182 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8183 #ifdef HAVE_X_WINDOWS |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8184 #define HAVE_GHOSTSCRIPT 1 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8185 #endif /* HAVE_X_WINDOWS */ |
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 /* 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
|
8188 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8189 Lisp_Object Qpostscript; |
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 #ifdef HAVE_GHOSTSCRIPT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8192 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8193 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
|
8194 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
|
8195 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
|
8196 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8197 /* Keyword symbols. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8198 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8199 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
|
8200 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8201 /* 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
|
8202 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8203 enum gs_keyword_index |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8204 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8205 GS_TYPE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8206 GS_PT_WIDTH, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8207 GS_PT_HEIGHT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8208 GS_FILE, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8209 GS_LOADER, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8210 GS_BOUNDING_BOX, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8211 GS_ASCENT, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8212 GS_MARGIN, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8213 GS_RELIEF, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8214 GS_ALGORITHM, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8215 GS_HEURISTIC_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8216 GS_MASK, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8217 GS_BACKGROUND, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8218 GS_LAST |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8219 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8220 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8221 /* 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
|
8222 of valid user-defined image specifications. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8223 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8224 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
|
8225 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8226 {":type", IMAGE_SYMBOL_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8227 {":pt-width", IMAGE_POSITIVE_INTEGER_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8228 {":pt-height", IMAGE_POSITIVE_INTEGER_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8229 {":file", IMAGE_STRING_VALUE, 1}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8230 {":loader", IMAGE_FUNCTION_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8231 {":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
|
8232 {":ascent", IMAGE_ASCENT_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8233 {":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
|
8234 {":relief", IMAGE_INTEGER_VALUE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8235 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8236 {":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
|
8237 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8238 {":background", IMAGE_STRING_OR_NIL_VALUE, 0} |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8239 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8240 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8241 /* Structure describing the image type `ghostscript'. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8242 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8243 static struct image_type gs_type = |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8244 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8245 &Qpostscript, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8246 gs_image_p, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8247 gs_load, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8248 gs_clear_image, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8249 NULL |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8250 }; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8251 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8252 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8253 /* 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
|
8254 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8255 static void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8256 gs_clear_image (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8257 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8258 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8259 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8260 /* 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
|
8261 xfree (img->data.ptr_val); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8262 x_clear_image (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8263 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8264 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8265 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8266 /* 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
|
8267 specification. */ |
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 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8270 gs_image_p (object) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8271 Lisp_Object object; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8272 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8273 struct image_keyword fmt[GS_LAST]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8274 Lisp_Object tem; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8275 int i; |
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 bcopy (gs_format, fmt, sizeof fmt); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8278 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8279 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
|
8280 return 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 /* 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
|
8283 tem = fmt[GS_BOUNDING_BOX].value; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8284 if (CONSP (tem)) |
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 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
|
8287 if (!CONSP (tem) || !INTEGERP (XCAR (tem))) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8288 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8289 if (!NILP (tem)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8290 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8291 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8292 else if (VECTORP (tem)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8293 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8294 if (XVECTOR (tem)->size != 4) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8295 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8296 for (i = 0; i < 4; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8297 if (!INTEGERP (XVECTOR (tem)->contents[i])) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8298 return 0; |
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 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8301 return 0; |
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 return 1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8304 } |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8307 /* 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
|
8308 if successful. */ |
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 static int |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8311 gs_load (f, img) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8312 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8313 struct image *img; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8314 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8315 char buffer[100]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8316 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
|
8317 struct gcpro gcpro1, gcpro2; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8318 Lisp_Object frame; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8319 double in_width, in_height; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8320 Lisp_Object pixel_colors = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8321 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8322 /* 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
|
8323 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
|
8324 = 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
|
8325 info. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8326 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
|
8327 in_width = XFASTINT (pt_width) / 72.0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8328 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
|
8329 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
|
8330 in_height = XFASTINT (pt_height) / 72.0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8331 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
|
8332 |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8333 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
|
8334 { |
102392
689fbe81edc4
(xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents:
101838
diff
changeset
|
8335 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil); |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8336 return 0; |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8337 } |
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8338 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8339 /* Create the pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8340 xassert (img->pixmap == NO_PIXMAP); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8341 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8342 /* 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
|
8343 BLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8344 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
|
8345 img->width, img->height, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8346 DefaultDepthOfScreen (FRAME_X_SCREEN (f))); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8347 UNBLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8348 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8349 if (!img->pixmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8350 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8351 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
|
8352 return 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8353 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8354 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8355 /* 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
|
8356 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
|
8357 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
|
8358 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
|
8359 GCPRO2 (window_and_pixmap_id, pixel_colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8360 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8361 sprintf (buffer, "%lu %lu", |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8362 (unsigned long) FRAME_X_WINDOW (f), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8363 (unsigned long) img->pixmap); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8364 window_and_pixmap_id = build_string (buffer); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8365 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8366 sprintf (buffer, "%lu %lu", |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8367 FRAME_FOREGROUND_PIXEL (f), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8368 FRAME_BACKGROUND_PIXEL (f)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8369 pixel_colors = build_string (buffer); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8370 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8371 XSETFRAME (frame, f); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8372 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
|
8373 if (NILP (loader)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8374 loader = intern ("gs-load-image"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8375 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8376 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
|
8377 make_number (img->width), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8378 make_number (img->height), |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8379 window_and_pixmap_id, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8380 pixel_colors); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8381 UNGCPRO; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8382 return PROCESSP (img->data.lisp_val); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8383 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8384 |
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 /* 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
|
8387 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
|
8388 telling Emacs that Ghostscript has finished drawing. */ |
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 void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8391 x_kill_gs_process (pixmap, f) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8392 Pixmap pixmap; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8393 struct frame *f; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8394 { |
92109
4d9fc08769fa
Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
87649
diff
changeset
|
8395 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
|
8396 int class, i; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8397 struct image *img; |
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 /* Find the image containing PIXMAP. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8400 for (i = 0; i < c->used; ++i) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8401 if (c->images[i]->pixmap == pixmap) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8402 break; |
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 /* 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
|
8405 instance, give up. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8406 if (i == c->used) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8407 return; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8408 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8409 /* 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
|
8410 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
|
8411 img = c->images[i]; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8412 xassert (PROCESSP (img->data.lisp_val)); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8413 Fkill_process (img->data.lisp_val, Qnil); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8414 img->data.lisp_val = Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8415 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8416 #if defined (HAVE_X_WINDOWS) |
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 /* 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
|
8419 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
|
8420 img->pixmap. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8421 class = FRAME_X_VISUAL (f)->class; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8422 if (class != StaticColor && class != StaticGray && class != TrueColor) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8423 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8424 XImagePtr ximg; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8425 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8426 BLOCK_INPUT; |
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 /* 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
|
8429 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
|
8430 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
|
8431 if (ximg) |
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 int x, y; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8434 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8435 /* Initialize the color table. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8436 init_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8437 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8438 /* 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
|
8439 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
|
8440 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
|
8441 for (y = 0; y < img->height; ++y) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8442 for (x = 0; x < img->width; ++x) |
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 unsigned long pixel = XGetPixel (ximg, x, y); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8445 lookup_pixel_color (f, pixel); |
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 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8448 /* 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
|
8449 #ifdef COLOR_TABLE_SUPPORT |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8450 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
|
8451 free_color_table (); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8452 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8453 XDestroyImage (ximg); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8454 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8455 #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
|
8456 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
|
8457 freeing the colors. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8458 /* 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
|
8459 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
|
8460 reference counts right, free them once. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8461 if (img->ncolors) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8462 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
|
8463 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8464 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8465 else |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8466 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
|
8467 img->spec, Qnil); |
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 UNBLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8470 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8471 #endif /* HAVE_X_WINDOWS */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8472 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8473 /* 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
|
8474 image if requested. */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8475 BLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8476 postprocess_image (f, img); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8477 UNBLOCK_INPUT; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8478 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8479 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8480 #endif /* HAVE_GHOSTSCRIPT */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8481 |
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 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8484 Tests |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8485 ***********************************************************************/ |
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 #if GLYPH_DEBUG |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8488 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8489 DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0, |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8490 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
|
8491 (spec) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8492 Lisp_Object spec; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8493 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8494 return valid_image_p (spec) ? Qt : Qnil; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8495 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8496 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8497 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8498 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
|
8499 (spec) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8500 Lisp_Object spec; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8501 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8502 int id = -1; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8503 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8504 if (valid_image_p (spec)) |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8505 id = lookup_image (SELECTED_FRAME (), spec); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8506 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8507 debug_print (spec); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8508 return make_number (id); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8509 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8510 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8511 #endif /* GLYPH_DEBUG != 0 */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8512 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8513 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8514 /*********************************************************************** |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8515 Initialization |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8516 ***********************************************************************/ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8517 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8518 #ifdef HAVE_NTGUI |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8519 /* 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
|
8520 if the library is available. */ |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8521 #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
|
8522 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
|
8523 #else |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8524 #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
|
8525 define_image_type (image_type, 1) |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8526 #endif /* HAVE_NTGUI */ |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8527 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8528 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
|
8529 doc: /* Initialize image library implementing image type TYPE. |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8530 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
|
8531 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8532 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
|
8533 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
|
8534 of `image-library-alist', which see). */) |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8535 (type, libraries) |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8536 Lisp_Object type, libraries; |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8537 { |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8538 Lisp_Object tested; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8539 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8540 /* Don't try to reload the library. */ |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8541 tested = Fassq (type, Vimage_type_cache); |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8542 if (CONSP (tested)) |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8543 return XCDR (tested); |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8544 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8545 #if defined (HAVE_XPM) || defined (HAVE_NS) |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8546 if (EQ (type, Qxpm)) |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8547 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
|
8548 #endif |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8549 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8550 #if defined (HAVE_JPEG) || defined (HAVE_NS) |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8551 if (EQ (type, Qjpeg)) |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8552 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
|
8553 #endif |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8554 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8555 #if defined (HAVE_TIFF) || defined (HAVE_NS) |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8556 if (EQ (type, Qtiff)) |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8557 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
|
8558 #endif |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8559 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8560 #if defined (HAVE_GIF) || defined (HAVE_NS) |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8561 if (EQ (type, Qgif)) |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8562 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
|
8563 #endif |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8564 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8565 #if defined (HAVE_PNG) || defined (HAVE_NS) |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8566 if (EQ (type, Qpng)) |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8567 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
|
8568 #endif |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8569 |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8570 #if defined (HAVE_RSVG) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8571 if (EQ (type, Qsvg)) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8572 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
|
8573 #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
|
8574 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8575 #ifdef HAVE_GHOSTSCRIPT |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8576 if (EQ (type, Qpostscript)) |
56288
7acb38a05354
(CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents:
56132
diff
changeset
|
8577 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
|
8578 #endif |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8579 |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8580 /* 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
|
8581 CACHE_IMAGE_TYPE (type, Qnil); |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8582 return Qnil; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8583 } |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8584 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8585 void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8586 syms_of_image () |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8587 { |
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
8588 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
|
8589 |
64910
eef3e25f6aed
(syms_of_image): Init image_types here, and call define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64770
diff
changeset
|
8590 /* 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
|
8591 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
|
8592 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
|
8593 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
|
8594 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8595 /* 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
|
8596 defining the supported image types. */ |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8597 DEFVAR_LISP ("image-types", &Vimage_types, |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8598 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
|
8599 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
|
8600 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
|
8601 Vimage_types = Qnil; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8602 |
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
8603 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
|
8604 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
|
8605 |
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
8606 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
|
8607 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
|
8608 alternate filenames for the corresponding external libraries. |
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
8609 |
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
8610 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
|
8611 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
|
8612 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
|
8613 listed; they are always supported. */); |
62815
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
8614 Vimage_library_alist = Qnil; |
94db1d097527
(Vimage_library_alist): Moved from image.el.
Juanma Barranquero <lekktu@gmail.com>
parents:
62561
diff
changeset
|
8615 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
|
8616 |
66195
ad1acaef1abb
* image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents:
66013
diff
changeset
|
8617 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
|
8618 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
|
8619 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
|
8620 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
|
8621 |
5414bd89ffde
(check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents:
66195
diff
changeset
|
8622 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
|
8623 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
|
8624 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
|
8625 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
|
8626 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
|
8627 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
|
8628 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8629 Vimage_type_cache = Qnil; |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8630 staticpro (&Vimage_type_cache); |
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8631 |
64967
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
8632 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
|
8633 staticpro (&Qpbm); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8634 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
|
8635 |
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
8636 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
|
8637 staticpro (&Qxbm); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8638 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
|
8639 |
30b17a96bd90
(syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents:
64910
diff
changeset
|
8640 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
|
8641 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
|
8642 |
85710
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
8643 Qcount = intern ("count"); |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
8644 staticpro (&Qcount); |
beb909dfc54d
Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85254
diff
changeset
|
8645 |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8646 QCascent = intern (":ascent"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8647 staticpro (&QCascent); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8648 QCmargin = intern (":margin"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8649 staticpro (&QCmargin); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8650 QCrelief = intern (":relief"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8651 staticpro (&QCrelief); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8652 QCconversion = intern (":conversion"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8653 staticpro (&QCconversion); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8654 QCcolor_symbols = intern (":color-symbols"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8655 staticpro (&QCcolor_symbols); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8656 QCheuristic_mask = intern (":heuristic-mask"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8657 staticpro (&QCheuristic_mask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8658 QCindex = intern (":index"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8659 staticpro (&QCindex); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8660 QCmatrix = intern (":matrix"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8661 staticpro (&QCmatrix); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8662 QCcolor_adjustment = intern (":color-adjustment"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8663 staticpro (&QCcolor_adjustment); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8664 QCmask = intern (":mask"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8665 staticpro (&QCmask); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8666 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8667 Qlaplace = intern ("laplace"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8668 staticpro (&Qlaplace); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8669 Qemboss = intern ("emboss"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8670 staticpro (&Qemboss); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8671 Qedge_detection = intern ("edge-detection"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8672 staticpro (&Qedge_detection); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8673 Qheuristic = intern ("heuristic"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8674 staticpro (&Qheuristic); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8675 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8676 Qpostscript = intern ("postscript"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8677 staticpro (&Qpostscript); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8678 #ifdef HAVE_GHOSTSCRIPT |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8679 ADD_IMAGE_TYPE (Qpostscript); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8680 QCloader = intern (":loader"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8681 staticpro (&QCloader); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8682 QCbounding_box = intern (":bounding-box"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8683 staticpro (&QCbounding_box); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8684 QCpt_width = intern (":pt-width"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8685 staticpro (&QCpt_width); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8686 QCpt_height = intern (":pt-height"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8687 staticpro (&QCpt_height); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8688 #endif /* HAVE_GHOSTSCRIPT */ |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8689 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8690 #if defined (HAVE_XPM) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8691 Qxpm = intern ("xpm"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8692 staticpro (&Qxpm); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8693 ADD_IMAGE_TYPE (Qxpm); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8694 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8695 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8696 #if defined (HAVE_JPEG) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8697 Qjpeg = intern ("jpeg"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8698 staticpro (&Qjpeg); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8699 ADD_IMAGE_TYPE (Qjpeg); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8700 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8701 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8702 #if defined (HAVE_TIFF) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8703 Qtiff = intern ("tiff"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8704 staticpro (&Qtiff); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8705 ADD_IMAGE_TYPE (Qtiff); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8706 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8707 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8708 #if defined (HAVE_GIF) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8709 Qgif = intern ("gif"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8710 staticpro (&Qgif); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8711 ADD_IMAGE_TYPE (Qgif); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8712 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8713 |
97043
9592c50233ab
Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
97034
diff
changeset
|
8714 #if defined (HAVE_PNG) || defined (HAVE_NS) |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8715 Qpng = intern ("png"); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8716 staticpro (&Qpng); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8717 ADD_IMAGE_TYPE (Qpng); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8718 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8719 |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8720 #if defined (HAVE_RSVG) |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8721 Qsvg = intern ("svg"); |
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8722 staticpro (&Qsvg); |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8723 ADD_IMAGE_TYPE (Qsvg); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8724 #ifdef HAVE_NTGUI |
100826 | 8725 /* Other libraries used directly by svg code. */ |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8726 Qgdk_pixbuf = intern ("gdk-pixbuf"); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8727 staticpro (&Qgdk_pixbuf); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8728 Qglib = intern ("glib"); |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8729 staticpro (&Qglib); |
100826 | 8730 Qgobject = intern ("gobject"); |
8731 staticpro (&Qgobject); | |
82795
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8732 #endif /* HAVE_NTGUI */ |
bf61b6631aba
[HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents:
82781
diff
changeset
|
8733 #endif /* HAVE_RSVG */ |
82518
b6db95f12a9d
Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents:
82318
diff
changeset
|
8734 |
56104
a450e67752ed
(Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents:
56065
diff
changeset
|
8735 defsubr (&Sinit_image_library); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8736 defsubr (&Sclear_image_cache); |
78450
69b18f59a998
Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents:
78260
diff
changeset
|
8737 defsubr (&Simage_refresh); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8738 defsubr (&Simage_size); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8739 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
|
8740 defsubr (&Simage_extension_data); |
54341
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8741 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8742 #if GLYPH_DEBUG |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8743 defsubr (&Simagep); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8744 defsubr (&Slookup_image); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8745 #endif |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8746 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8747 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
|
8748 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
|
8749 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
|
8750 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
|
8751 cross_disabled_images = 0; |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8752 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8753 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
|
8754 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
|
8755 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
|
8756 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8757 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
|
8758 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
|
8759 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
|
8760 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
|
8761 meaning don't clear the cache. */); |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8762 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
|
8763 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8764 |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8765 void |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8766 init_image () |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8767 { |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8768 } |
80dfe07a1d65
New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff
changeset
|
8769 |
54348 | 8770 /* arch-tag: 123c2a5e-14a8-4c53-ab95-af47d7db49b9 |
8771 (do not change this comment) */ |