annotate src/image.c @ 112438:11f1b4757236

* image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash when calling XpmCreatePixmapFromData.
author Paul Eggert <eggert@cs.ucla.edu>
date Sat, 22 Jan 2011 20:33:12 -0800
parents 9de5a68b57e1
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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,
112152
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
3 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
4 2011 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
022411ad6751 Include <ctype.h>.
Andreas Schwab <schwab@suse.de>
parents: 55886
diff changeset
24 #include <ctype.h>
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
25 #include <unistd.h>
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
26
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104573
diff changeset
27 #ifdef HAVE_PNG
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104573
diff changeset
28 #if defined HAVE_LIBPNG_PNG_H
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104573
diff changeset
29 # include <libpng/png.h>
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104573
diff changeset
30 #else
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104573
diff changeset
31 # include <png.h>
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104573
diff changeset
32 #endif
106975
62f86ca36527 Use png_sig_cmp to allow linking with libpng 1.4.0.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
33 #endif
105669
68dd71358159 * alloc.c: Do not define struct catchtag.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 104573
diff changeset
34
105678
d46b7a138955 * fns.c: Remove code for unsupported system: MAC_OS.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
35 #include <setjmp.h>
d46b7a138955 * fns.c: Remove code for unsupported system: MAC_OS.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105669
diff changeset
36
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
37 /* 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
38
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
39 #define XLIB_ILLEGAL_ACCESS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
40
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
41 #include "lisp.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
42 #include "frame.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
43 #include "window.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
44 #include "dispextern.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
45 #include "blockinput.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
46 #include "systime.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
47 #include <epaths.h>
94934
669d4161a058 (image_ascent): Don't include "charset.h". Include
Kenichi Handa <handa@m17n.org>
parents: 94780
diff changeset
48 #include "character.h"
69771
fd6d18b61fa7 Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents: 69511
diff changeset
49 #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
50 #include "termhooks.h"
94934
669d4161a058 (image_ascent): Don't include "charset.h". Include
Kenichi Handa <handa@m17n.org>
parents: 94780
diff changeset
51 #include "font.h"
54341
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 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
54 #include "xterm.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
55 #include <sys/types.h>
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
56 #include <sys/stat.h>
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
57
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
58 #define COLOR_TABLE_SUPPORT 1
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
59
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
60 typedef struct x_bitmap_record Bitmap_Record;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
61 #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
62 #define NO_PIXMAP None
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 #define RGB_PIXEL_COLOR unsigned long
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
65
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
66 #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
67 #define PIX_MASK_DRAW 1
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
68 #endif /* HAVE_X_WINDOWS */
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
71 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
72 #include "w32term.h"
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 /* W32_TODO : Color tables on W32. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
75 #undef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
76
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
77 typedef struct w32_bitmap_record Bitmap_Record;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
78 #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
79 #define NO_PIXMAP 0
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
80
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
81 #define RGB_PIXEL_COLOR COLORREF
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
82
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
83 #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
84 #define PIX_MASK_DRAW 1
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
85
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
86 #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
87 #define x_defined_color w32_defined_color
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
88 #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
89
58017ff34d94 * w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents: 100826
diff changeset
90 /* 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
91 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
92 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
93 extern void x_query_color (struct frame *f, XColor *color);
112088
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
94
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
95 /* Version of libpng that we were compiled with, or -1 if no PNG
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
96 support was compiled in. This is tested by w32-win.el to correctly
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
97 set up the alist used to search for PNG libraries. */
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
98 Lisp_Object Qlibpng_version;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
99 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
100
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
101 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
102 #include "nsterm.h"
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
103 #include <sys/types.h>
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
104 #include <sys/stat.h>
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
105
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
106 #undef COLOR_TABLE_SUPPORT
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
107
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
108 typedef struct ns_bitmap_record Bitmap_Record;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
109
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
110 #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
111 #define NO_PIXMAP 0
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
112
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
113 #define RGB_PIXEL_COLOR unsigned long
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
114 #define ZPixmap 0
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
115
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
116 #define PIX_MASK_RETAIN 0
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
117 #define PIX_MASK_DRAW 1
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
118
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
119 #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
120 #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
121 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
122 #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
123 #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
124 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
125
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
126
109668
d9a022ec322c Remove extern declarations in .c files, .h files have them.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109653
diff changeset
127 /* The symbol `postscript' identifying images of this type. */
d9a022ec322c Remove extern declarations in .c files, .h files have them.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109653
diff changeset
128
d9a022ec322c Remove extern declarations in .c files, .h files have them.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109653
diff changeset
129 Lisp_Object Qpostscript;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
130
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
131 static void x_disable_image (struct frame *, struct image *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
132 static void x_edge_detection (struct frame *, struct image *, Lisp_Object,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
133 Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
134
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
135 static void init_color_table (void);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
136 static unsigned long lookup_rgb_color (struct frame *f, int r, int g, int b);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
137 #ifdef COLOR_TABLE_SUPPORT
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
138 static void free_color_table (void);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
139 static unsigned long *colors_in_color_table (int *n);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
140 static unsigned long lookup_pixel_color (struct frame *f, unsigned long p);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
141 #endif
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 /* 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
144 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
145 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
146
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
147 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
148 be used to indicate no bitmap.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
149
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
150 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
151 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
152 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
153
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
154 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
155 XImagePtr
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
156 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
157 unsigned int width, unsigned int height,
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
158 unsigned long plane_mask, int format)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
159 {
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
160 /* TODO: not sure what this function is supposed to do.. */
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
161 ns_retain_object (pixmap);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
162 return pixmap;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
163 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
164
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
165 /* 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
166 unsigned long
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
167 XGetPixel (XImagePtr ximage, int x, int y)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
168 {
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
169 return ns_get_pixel (ximage, x, y);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
170 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
171
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
172 /* 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
173 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
174 void
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
175 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
176 {
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
177 ns_put_pixel (ximage, x, y, pixel);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
178 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
179 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
180
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
181
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
182 /* 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
183
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
184 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
185 x_bitmap_height (FRAME_PTR f, int id)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
186 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
187 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
188 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
189
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
190 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
191 x_bitmap_width (FRAME_PTR f, int id)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
192 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
193 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
194 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
195
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
196 #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
197 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
198 x_bitmap_pixmap (FRAME_PTR f, int id)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
199 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
200 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
201 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
202 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
203
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
204 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
205 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
206 x_bitmap_mask (FRAME_PTR f, int id)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
207 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
208 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
209 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
210 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
211
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
212 /* 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
213
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
214 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
215 x_allocate_bitmap_record (FRAME_PTR f)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
216 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
217 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
218 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
219
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
220 if (dpyinfo->bitmaps == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
221 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
222 dpyinfo->bitmaps_size = 10;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
223 dpyinfo->bitmaps
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
224 = (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
225 dpyinfo->bitmaps_last = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
226 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
227 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
228
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
229 if (dpyinfo->bitmaps_last < dpyinfo->bitmaps_size)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
230 return ++dpyinfo->bitmaps_last;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
231
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
232 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
233 if (dpyinfo->bitmaps[i].refcount == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
234 return i + 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
235
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
236 dpyinfo->bitmaps_size *= 2;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
237 dpyinfo->bitmaps
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
238 = (Bitmap_Record *) xrealloc (dpyinfo->bitmaps,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
239 dpyinfo->bitmaps_size * sizeof (Bitmap_Record));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
240 return ++dpyinfo->bitmaps_last;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
241 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
242
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
243 /* 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
244
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
245 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
246 x_reference_bitmap (FRAME_PTR f, int id)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
247 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
248 ++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
249 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
250
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
251 /* 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
252
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
253 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
254 x_create_bitmap_from_data (struct frame *f, char *bits, unsigned int width, unsigned int height)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
255 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
256 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
257 int id;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
258
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
259 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
260 Pixmap bitmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
261 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
262 bits, width, height);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
263 if (! bitmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
264 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
265 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
266
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
267 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
268 Pixmap bitmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
269 bitmap = CreateBitmap (width, height,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
270 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
271 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
272 bits);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
273 if (! bitmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
274 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
275 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
276
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
277 #ifdef HAVE_NS
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
278 void *bitmap = ns_image_from_XBM (bits, width, height);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
279 if (!bitmap)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
280 return -1;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
281 #endif
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
282
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
283 id = x_allocate_bitmap_record (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
284
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
285 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
286 dpyinfo->bitmaps[id - 1].img = bitmap;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
287 dpyinfo->bitmaps[id - 1].depth = 1;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
288 #endif
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
289
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
290 dpyinfo->bitmaps[id - 1].file = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
291 dpyinfo->bitmaps[id - 1].height = height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
292 dpyinfo->bitmaps[id - 1].width = width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
293 dpyinfo->bitmaps[id - 1].refcount = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
294
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
295 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
296 dpyinfo->bitmaps[id - 1].pixmap = bitmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
297 dpyinfo->bitmaps[id - 1].have_mask = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
298 dpyinfo->bitmaps[id - 1].depth = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
299 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
300
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
301 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
302 dpyinfo->bitmaps[id - 1].pixmap = bitmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
303 dpyinfo->bitmaps[id - 1].hinst = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
304 dpyinfo->bitmaps[id - 1].depth = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
305 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
306
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
307 return id;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
308 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
309
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
310 /* 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
311
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
312 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
313 x_create_bitmap_from_file (struct frame *f, Lisp_Object file)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
314 {
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
315 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
316
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
317 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
318 return -1; /* W32_TODO : bitmap support */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
319 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
320
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
321 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
322 int id;
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
323 void *bitmap = ns_image_from_file (file);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
324
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
325 if (!bitmap)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
326 return -1;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
327
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
328
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
329 id = x_allocate_bitmap_record (f);
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
330 dpyinfo->bitmaps[id - 1].img = bitmap;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
331 dpyinfo->bitmaps[id - 1].refcount = 1;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
332 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
333 dpyinfo->bitmaps[id - 1].depth = 1;
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
334 dpyinfo->bitmaps[id - 1].height = ns_image_width (bitmap);
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
335 dpyinfo->bitmaps[id - 1].width = ns_image_height (bitmap);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
336 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
337 return id;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
338 #endif
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
339
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
340 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
341 unsigned int width, height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
342 Pixmap bitmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
343 int xhot, yhot, result, id;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
344 Lisp_Object found;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
345 int fd;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
346 char *filename;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
347
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
348 /* 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
349 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
350 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
351 if (dpyinfo->bitmaps[id].refcount
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
352 && dpyinfo->bitmaps[id].file
112434
9de5a68b57e1 Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents: 112364
diff changeset
353 && !strcmp (dpyinfo->bitmaps[id].file, SSDATA (file)))
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
354 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
355 ++dpyinfo->bitmaps[id].refcount;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
356 return id + 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
357 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
358 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
359
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
360 /* 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
361 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
362 if (fd < 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
363 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
364 emacs_close (fd);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
365
112434
9de5a68b57e1 Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h.
Paul Eggert <eggert@cs.ucla.edu>
parents: 112364
diff changeset
366 filename = SSDATA (found);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
367
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
368 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
369 filename, &width, &height, &bitmap, &xhot, &yhot);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
370 if (result != BitmapSuccess)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
371 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
372
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
373 id = x_allocate_bitmap_record (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
374 dpyinfo->bitmaps[id - 1].pixmap = bitmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
375 dpyinfo->bitmaps[id - 1].have_mask = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
376 dpyinfo->bitmaps[id - 1].refcount = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
377 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
378 dpyinfo->bitmaps[id - 1].depth = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
379 dpyinfo->bitmaps[id - 1].height = height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
380 dpyinfo->bitmaps[id - 1].width = width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
381 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
382
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
383 return id;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
384 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
385 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
386
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
387 /* Free bitmap B. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
388
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
389 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
390 free_bitmap_record (Display_Info *dpyinfo, Bitmap_Record *bm)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
391 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
392 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
393 XFreePixmap (dpyinfo->display, bm->pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
394 if (bm->have_mask)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
395 XFreePixmap (dpyinfo->display, bm->mask);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
396 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
397
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
398 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
399 DeleteObject (bm->pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
400 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
401
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
402 #ifdef HAVE_NS
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
403 ns_release_object (bm->img);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
404 #endif
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
405
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
406 if (bm->file)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
407 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
408 xfree (bm->file);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
409 bm->file = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
410 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
411 }
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 /* 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
414
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
415 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
416 x_destroy_bitmap (FRAME_PTR f, int id)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
417 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
418 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
419
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
420 if (id > 0)
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 Bitmap_Record *bm = &dpyinfo->bitmaps[id - 1];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
423
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
424 if (--bm->refcount == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
425 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
426 BLOCK_INPUT;
85095
4f61ded4a62e (free_bitmap_record): Renamed from Free_Bitmap_Record.
Richard M. Stallman <rms@gnu.org>
parents: 85039
diff changeset
427 free_bitmap_record (dpyinfo, bm);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
428 UNBLOCK_INPUT;
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 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
432
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
433 /* 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
434
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
435 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
436 x_destroy_all_bitmaps (Display_Info *dpyinfo)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
437 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
438 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
439 Bitmap_Record *bm = dpyinfo->bitmaps;
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 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
442 if (bm->refcount > 0)
85095
4f61ded4a62e (free_bitmap_record): Renamed from Free_Bitmap_Record.
Richard M. Stallman <rms@gnu.org>
parents: 85039
diff changeset
443 free_bitmap_record (dpyinfo, bm);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
444
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
445 dpyinfo->bitmaps_last = 0;
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
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 #ifdef HAVE_X_WINDOWS
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 /* Useful functions defined in the section
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
452 `Image type independent image structures' below. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
453
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
454 static unsigned long four_corners_best (XImagePtr ximg,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
455 int *corners,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
456 unsigned long width,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
457 unsigned long height);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
458
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
459 static int x_create_x_image_and_pixmap (struct frame *f, int width, int height,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
460 int depth, XImagePtr *ximg,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
461 Pixmap *pixmap);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
462
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
463 static void x_destroy_x_image (XImagePtr ximg);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
464
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
465
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
466 /* 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
467 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
468
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
469 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
470 x_create_bitmap_mask (struct frame *f, int id)
54341
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 Pixmap pixmap, mask;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
473 XImagePtr ximg, mask_img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
474 unsigned long width, height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
475 int result;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
476 unsigned long bg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
477 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
478 GC gc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
479
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
480 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
481
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
482 if (!(id > 0))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
483 return -1;
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 pixmap = x_bitmap_pixmap (f, id);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
486 width = x_bitmap_width (f, id);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
487 height = x_bitmap_height (f, id);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
488
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
489 BLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
490 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
491 ~0, ZPixmap);
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 if (!ximg)
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 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
496 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
497 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
498
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
499 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
500
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
501 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
502 if (!result)
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 XDestroyImage (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
505 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
506 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
507
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
508 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
509
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
510 for (y = 0; y < ximg->height; ++y)
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 for (x = 0; x < ximg->width; ++x)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
513 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
514 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
515 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
516 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
517 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
518 if (XGetPixel (ximg, x, y) == bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
519 && XGetPixel (ximg, x, yp) == bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
520 && XGetPixel (ximg, x, ym) == bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
521 && XGetPixel (ximg, xp, y) == bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
522 && XGetPixel (ximg, xp, yp) == bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
523 && XGetPixel (ximg, xp, ym) == bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
524 && XGetPixel (ximg, xm, y) == bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
525 && XGetPixel (ximg, xm, yp) == bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
526 && XGetPixel (ximg, xm, ym) == bg)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
527 XPutPixel (mask_img, x, y, 0);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
528 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
529 XPutPixel (mask_img, x, y, 1);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
530 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
531 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
532
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
533 xassert (interrupt_input_blocked);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
534 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
535 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
536 width, height);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
537 XFreeGC (FRAME_X_DISPLAY (f), gc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
538
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
539 dpyinfo->bitmaps[id - 1].have_mask = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
540 dpyinfo->bitmaps[id - 1].mask = mask;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
541
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
542 XDestroyImage (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
543 x_destroy_x_image (mask_img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
544
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
545 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
546 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
547
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
548 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
549
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
550
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 Image types
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 /* 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
556
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
557 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
558
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
559 /* 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
560 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
561
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
562 static struct image_type *image_types;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
563
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
564 /* Cache for delayed-loading image types. */
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
565
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
566 static Lisp_Object Vimage_type_cache;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
567
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
568 /* 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
569
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
570 Lisp_Object Qxbm;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
571
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
572 /* Keywords. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
573
107719
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
574 Lisp_Object QCascent, QCmargin, QCrelief, Qcount, Qextension_data;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
575 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
576 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask, QCgeometry, QCcrop, QCrotation;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
577
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
578 /* Other symbols. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
579
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
580 Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
581
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
582 /* Function prototypes. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
583
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
584 static Lisp_Object define_image_type (struct image_type *type, int loaded);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
585 static struct image_type *lookup_image_type (Lisp_Object symbol);
109717
8949aad5e992 Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109668
diff changeset
586 static void image_error (const char *format, Lisp_Object, Lisp_Object);
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
587 static void x_laplace (struct frame *, struct image *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
588 static void x_emboss (struct frame *, struct image *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
589 static int x_build_heuristic_mask (struct frame *, struct image *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
590 Lisp_Object);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
591
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
592 #define CACHE_IMAGE_TYPE(type, status) \
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
593 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
594
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
595 #define ADD_IMAGE_TYPE(type) \
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
596 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
597
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
598 /* 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
599 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
600
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
601 static Lisp_Object
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
602 define_image_type (struct image_type *type, int loaded)
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
603 {
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
604 Lisp_Object success;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
605
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
606 if (!loaded)
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
607 success = Qnil;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
608 else
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
609 {
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
610 /* 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
611 The initialized data segment is read-only. */
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
612 struct image_type *p = (struct image_type *) xmalloc (sizeof *p);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
613 memcpy (p, type, sizeof *p);
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
614 p->next = image_types;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
615 image_types = p;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
616 success = Qt;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
617 }
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
618
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
619 CACHE_IMAGE_TYPE (*type->type, success);
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
620 return success;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
621 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
622
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
623
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
624 /* 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
625 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
626
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
627 static INLINE struct image_type *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
628 lookup_image_type (Lisp_Object symbol)
54341
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 struct image_type *type;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
631
56132
56c3ef9caeed Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Miles Bader <miles@gnu.org>
parents: 56104
diff changeset
632 /* We must initialize the image-type if it hasn't been already. */
110967
188673195616 Rename `image-library-alist' to `dynamic-library-alist'.
Juanma Barranquero <lekktu@gmail.com>
parents: 110678
diff changeset
633 if (NILP (Finit_image_library (symbol, Vdynamic_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
634 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
635
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
636 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
637 if (EQ (symbol, *type->type))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
638 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
639
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
640 return type;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
641 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
642
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
643
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
644 /* 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
645 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
646 `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
647 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
648 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
649 image type. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
650
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
651 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
652 valid_image_p (Lisp_Object object)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
653 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
654 int valid_p = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
655
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
656 if (IMAGEP (object))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
657 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
658 Lisp_Object tem;
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 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
661 if (EQ (XCAR (tem), QCtype))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
662 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
663 tem = XCDR (tem);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
664 if (CONSP (tem) && SYMBOLP (XCAR (tem)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
665 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
666 struct image_type *type;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
667 type = lookup_image_type (XCAR (tem));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
668 if (type)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
669 valid_p = type->valid_p (object);
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
672 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
673 }
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
676 return valid_p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
677 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
678
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
679
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
680 /* 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
681 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
682 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
683 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
684 therefore simply displays a message. */
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 static void
109717
8949aad5e992 Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109668
diff changeset
687 image_error (const char *format, Lisp_Object arg1, Lisp_Object arg2)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
688 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
689 add_to_log (format, arg1, arg2);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
690 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
691
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
694 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
695 Image specifications
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
696 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
697
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
698 enum image_value_type
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 IMAGE_DONT_CHECK_VALUE_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
701 IMAGE_STRING_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
702 IMAGE_STRING_OR_NIL_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
703 IMAGE_SYMBOL_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
704 IMAGE_POSITIVE_INTEGER_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
705 IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
706 IMAGE_NON_NEGATIVE_INTEGER_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
707 IMAGE_ASCENT_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
708 IMAGE_INTEGER_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
709 IMAGE_FUNCTION_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
710 IMAGE_NUMBER_VALUE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
711 IMAGE_BOOL_VALUE
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
712 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
713
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
714 /* Structure used when parsing image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
715
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
716 struct image_keyword
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 /* Name of keyword. */
109717
8949aad5e992 Use const char* instead of char*.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109668
diff changeset
719 const char *name;
54341
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 /* The type of value allowed. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
722 enum image_value_type type;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
723
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
724 /* Non-zero means key must be present. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
725 int mandatory_p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
726
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
727 /* 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
728 int count;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
729
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
730 /* The value that was found. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
731 Lisp_Object value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
732 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
733
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
734
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
735 static int parse_image_spec (Lisp_Object, struct image_keyword *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
736 int, Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
737 static Lisp_Object image_spec_value (Lisp_Object, Lisp_Object, int *);
54341
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
740 /* 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
741 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
742 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
743 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
744 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
745
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
746 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
747 parse_image_spec (Lisp_Object spec, struct image_keyword *keywords,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
748 int nkeywords, Lisp_Object type)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
749 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
750 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
751 Lisp_Object plist;
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 if (!IMAGEP (spec))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
754 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
755
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
756 plist = XCDR (spec);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
757 while (CONSP (plist))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
758 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
759 Lisp_Object key, value;
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 /* 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
762 key = XCAR (plist);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
763 plist = XCDR (plist);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
764 if (!SYMBOLP (key))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
765 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
766
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
767 /* There must follow a value. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
768 if (!CONSP (plist))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
769 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
770 value = XCAR (plist);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
771 plist = XCDR (plist);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
772
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
773 /* 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
774 for (i = 0; i < nkeywords; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
775 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
776 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
777
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
778 if (i == nkeywords)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
779 continue;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
780
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
781 /* 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
782 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
783 keywords[i].value = value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
784 ++keywords[i].count;
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 if (keywords[i].count > 1)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
787 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
788
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
789 /* Check type of value against allowed type. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
790 switch (keywords[i].type)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
791 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
792 case IMAGE_STRING_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
793 if (!STRINGP (value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
794 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
795 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
796
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
797 case IMAGE_STRING_OR_NIL_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
798 if (!STRINGP (value) && !NILP (value))
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 break;
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 case IMAGE_SYMBOL_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
803 if (!SYMBOLP (value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
804 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
805 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
806
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
807 case IMAGE_POSITIVE_INTEGER_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
808 if (!INTEGERP (value) || XINT (value) <= 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
809 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
810 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
811
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
812 case IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
813 if (INTEGERP (value) && XINT (value) >= 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
814 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
815 if (CONSP (value)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
816 && INTEGERP (XCAR (value)) && INTEGERP (XCDR (value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
817 && 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
818 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
819 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
820
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
821 case IMAGE_ASCENT_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
822 if (SYMBOLP (value) && EQ (value, Qcenter))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
823 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
824 else if (INTEGERP (value)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
825 && XINT (value) >= 0
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
826 && XINT (value) <= 100)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
827 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
828 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
829
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
830 case IMAGE_NON_NEGATIVE_INTEGER_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
831 if (!INTEGERP (value) || XINT (value) < 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
832 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
833 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
834
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
835 case IMAGE_DONT_CHECK_VALUE_TYPE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
836 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
837
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
838 case IMAGE_FUNCTION_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
839 value = indirect_function (value);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
840 if (SUBRP (value)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
841 || COMPILEDP (value)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
842 || (CONSP (value) && EQ (XCAR (value), Qlambda)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
843 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
844 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
845
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
846 case IMAGE_NUMBER_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
847 if (!INTEGERP (value) && !FLOATP (value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
848 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
849 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
850
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
851 case IMAGE_INTEGER_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
852 if (!INTEGERP (value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
853 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
854 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
855
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
856 case IMAGE_BOOL_VALUE:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
857 if (!NILP (value) && !EQ (value, Qt))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
858 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
859 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
860
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
861 default:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
862 abort ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
863 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
864 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
865
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
866 if (EQ (key, QCtype) && !EQ (type, value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
867 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
868 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
869
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
870 /* Check that all mandatory fields are present. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
871 for (i = 0; i < nkeywords; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
872 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
873 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
874
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
875 return NILP (plist);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
876 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
877
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
878
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
879 /* 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
880 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
881 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
882
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
883 static Lisp_Object
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
884 image_spec_value (Lisp_Object spec, Lisp_Object key, int *found)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
885 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
886 Lisp_Object tail;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
887
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
888 xassert (valid_image_p (spec));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
889
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
890 for (tail = XCDR (spec);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
891 CONSP (tail) && CONSP (XCDR (tail));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
892 tail = XCDR (XCDR (tail)))
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 if (EQ (XCAR (tail), key))
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 if (found)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
897 *found = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
898 return XCAR (XCDR (tail));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
899 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
900 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
901
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
902 if (found)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
903 *found = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
904 return Qnil;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
905 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
906
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
907
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
908 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
909 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
910 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
911 size in canonical character units.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
912 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
913 or omitted means use the selected frame. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
914 (Lisp_Object spec, Lisp_Object pixels, Lisp_Object frame)
54341
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 Lisp_Object size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
917
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
918 size = Qnil;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
919 if (valid_image_p (spec))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
920 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
921 struct frame *f = check_x_frame (frame);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
922 int id = lookup_image (f, spec);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
923 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
924 int width = img->width + 2 * img->hmargin;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
925 int height = img->height + 2 * img->vmargin;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
926
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
927 if (NILP (pixels))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
928 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
929 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
930 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
931 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
932 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
933 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
934 error ("Invalid image specification");
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
935
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
936 return size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
937 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
938
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 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
941 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
942 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
943 or omitted means use the selected frame. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
944 (Lisp_Object spec, Lisp_Object frame)
54341
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 Lisp_Object mask;
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 mask = Qnil;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
949 if (valid_image_p (spec))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
950 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
951 struct frame *f = check_x_frame (frame);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
952 int id = lookup_image (f, spec);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
953 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
954 if (img->mask)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
955 mask = Qt;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
956 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
957 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
958 error ("Invalid image specification");
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 return mask;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
961 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
962
107719
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
963 DEFUN ("image-metadata", Fimage_metadata, Simage_metadata, 1, 2, 0,
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
964 doc: /* Return metadata for image SPEC.
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
965 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
966 or omitted means use the selected frame. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
967 (Lisp_Object spec, Lisp_Object frame)
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
968 {
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
969 Lisp_Object ext;
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
970
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
971 ext = Qnil;
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
972 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
973 {
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
974 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
975 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
976 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
977 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
978 }
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
979
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
980 return ext;
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
981 }
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
982
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
983
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
984 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
985 Image type independent image structures
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
986 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
987
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
988 static struct image *make_image (Lisp_Object spec, unsigned hash);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
989 static void free_image (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
990 static int check_image_size (struct frame *f, int width, int height);
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
991
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
992 #define MAX_IMAGE_SIZE 6.0
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
993 /* 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
994 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
995
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
996 static struct image *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
997 make_image (Lisp_Object spec, unsigned int hash)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
998 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
999 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
1000 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
1001
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1002 xassert (valid_image_p (spec));
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
1003 memset (img, 0, sizeof *img);
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1004 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
1005 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
1006 xassert (img->type != NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1007 img->spec = spec;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1008 img->data.lisp_val = Qnil;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1009 img->ascent = DEFAULT_IMAGE_ASCENT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1010 img->hash = hash;
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1011 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
1012 return img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1013 }
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 /* 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
1017
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1018 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1019 free_image (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1020 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1021 if (img)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1022 {
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1023 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
1024
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1025 /* 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
1026 if (img->prev)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1027 img->prev->next = img->next;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1028 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1029 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
1030
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1031 if (img->next)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1032 img->next->prev = img->prev;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1033
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1034 c->images[img->id] = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1035
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1036 /* Free resources, then free IMG. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1037 img->type->free (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1038 xfree (img);
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 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1041
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1042 /* 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
1043 otherwise, return 0. */
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1044
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1045 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1046 check_image_size (struct frame *f, int width, int height)
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1047 {
66208
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1048 int w, h;
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1049
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1050 if (width <= 0 || height <= 0)
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1051 return 0;
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1052
66208
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1053 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
1054 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
1055 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
1056 {
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1057 if (f != NULL)
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1058 {
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1059 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
1060 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
1061 }
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1062 else
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1063 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
1064 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
1065 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
1066 }
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1067 else
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1068 return 1;
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1069
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
1070 return (width <= w && height <= h);
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1071 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1072
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1073 /* 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
1074 drawing an image. */
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 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1077 prepare_image_for_display (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1078 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1079 EMACS_TIME t;
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 /* 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
1082 EMACS_GET_TIME (t);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1083 img->timestamp = EMACS_SECS (t);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1084
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1085 /* 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
1086 type dependent loader function. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1087 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
1088 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
1089
54341
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1092
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1093 /* 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
1094 drawn in face FACE. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1095
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1096 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1097 image_ascent (struct image *img, struct face *face, struct glyph_slice *slice)
55022
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1098 {
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1099 int height;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1100 int ascent;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1101
55022
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1102 if (slice->height == img->height)
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1103 height = img->height + img->vmargin;
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1104 else if (slice->y == 0)
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1105 height = slice->height + img->vmargin;
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1106 else
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1107 height = slice->height;
dda0bae93c73 (image_ascent): Add slice arg; calculate ascent for
Kim F. Storm <storm@cua.dk>
parents: 54920
diff changeset
1108
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1109 if (img->ascent == CENTERED_IMAGE_ASCENT)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1110 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1111 if (face->font)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1112 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1113 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1114 /* W32 specific version. Why?. ++kfs */
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
1115 ascent = height / 2 - (FONT_DESCENT (face->font)
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
1116 - FONT_BASE (face->font)) / 2;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1117 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1118 /* 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
1119 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
1120 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
1121 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
1122 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
1123 ascent = (height + FONT_BASE(face->font)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
1124 - FONT_DESCENT(face->font) + 1) / 2;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1125 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1126 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1127 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1128 ascent = height / 2;
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 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1131 ascent = (int) (height * img->ascent / 100.0);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1132
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1133 return ascent;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1136
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1137 /* Image background colors. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1138
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1139 /* 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
1140 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
1141
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1142 static RGB_PIXEL_COLOR
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1143 four_corners_best (XImagePtr_or_DC ximg, int *corners,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1144 unsigned long width, unsigned long height)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1145 {
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1146 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
1147 int i, best_count;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1148
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1149 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
1150 {
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1151 /* 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
1152 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
1153 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
1154 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
1155 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
1156 }
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1157 else
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1158 {
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1159 /* 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
1160 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
1161 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
1162 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
1163 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
1164 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1165 /* 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
1166 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
1167 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1168 int j, n;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1169
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1170 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
1171 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
1172 ++n;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1173
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1174 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
1175 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
1176 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1177
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1178 return best;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1179 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1180
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1181 /* Portability macros */
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 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1184
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1185 #define Destroy_Image(img_dc, prev) \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1186 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
1187
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1188 #define Free_Pixmap(display, pixmap) \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1189 DeleteObject (pixmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1190
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
1191 #elif defined (HAVE_NS)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
1192
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
1193 #define Destroy_Image(ximg, dummy) \
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
1194 ns_release_object (ximg)
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
1195
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
1196 #define Free_Pixmap(display, pixmap) \
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
1197 ns_release_object (pixmap)
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
1198
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1199 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1200
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1201 #define Destroy_Image(ximg, dummy) \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1202 XDestroyImage (ximg)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1203
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1204 #define Free_Pixmap(display, pixmap) \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1205 XFreePixmap (display, pixmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1206
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
1207 #endif /* !HAVE_NTGUI && !HAVE_NS */
54341
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1210 /* 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
1211 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
1212 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
1213 use for the heuristic. */
54341
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 RGB_PIXEL_COLOR
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1216 image_background (struct image *img, struct frame *f, XImagePtr_or_DC ximg)
54341
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 if (! img->background_valid)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1219 /* 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
1220 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1221 int free_ximg = !ximg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1222 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1223 HGDIOBJ prev;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1224 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1225
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1226 if (free_ximg)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1227 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1228 #ifndef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1229 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
1230 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
1231 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1232 HDC frame_dc = get_frame_dc (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1233 ximg = CreateCompatibleDC (frame_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1234 release_frame_dc (f, frame_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1235 prev = SelectObject (ximg, img->pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1236 #endif /* !HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1237 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1238
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1239 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
1240
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1241 if (free_ximg)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1242 Destroy_Image (ximg, prev);
54920
38cb79e68369 (PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents: 54427
diff changeset
1243
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1244 img->background_valid = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1245 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1246
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1247 return img->background;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1248 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1249
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1250 /* 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
1251 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
1252 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
1253
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1254 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1255 image_background_transparent (struct image *img, struct frame *f, XImagePtr_or_DC mask)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1256 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1257 if (! img->background_transparent_valid)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1258 /* 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
1259 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1260 if (img->mask)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1261 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1262 int free_mask = !mask;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1263 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1264 HGDIOBJ prev;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1265 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1266
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1267 if (free_mask)
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 #ifndef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1270 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
1271 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
1272 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1273 HDC frame_dc = get_frame_dc (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1274 mask = CreateCompatibleDC (frame_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1275 release_frame_dc (f, frame_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1276 prev = SelectObject (mask, img->mask);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1277 #endif /* HAVE_NTGUI */
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1280 img->background_transparent
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
1281 = (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
1282
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1283 if (free_mask)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1284 Destroy_Image (mask, prev);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1285 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1286 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1287 img->background_transparent = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1288
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1289 img->background_transparent_valid = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1290 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1291
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1292 return img->background_transparent;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1293 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1294
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1295
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1296 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1297 Helper functions for X image types
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1298 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1299
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1300 static void x_clear_image_1 (struct frame *, struct image *, int,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1301 int, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1302 static void x_clear_image (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1303 static unsigned long x_alloc_image_color (struct frame *f,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1304 struct image *img,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1305 Lisp_Object color_name,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1306 unsigned long dflt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1307
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1308
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1309 /* 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
1310 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
1311 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
1312 the image, if any. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1313
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1314 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1315 x_clear_image_1 (struct frame *f, struct image *img, int pixmap_p, int mask_p,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1316 int colors_p)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1317 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1318 if (pixmap_p && img->pixmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1319 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1320 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
1321 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
1322 /* 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
1323 img->background_valid = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1324 }
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 if (mask_p && img->mask)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1327 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1328 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
1329 img->mask = NO_PIXMAP;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1330 img->background_transparent_valid = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1331 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1332
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1333 if (colors_p && img->ncolors)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1334 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1335 /* W32_TODO: color table support. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1336 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1337 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
1338 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1339 xfree (img->colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1340 img->colors = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1341 img->ncolors = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1342 }
69511
65b669e90ff5 [MAC_OS] (XPutPixel, XGetPixel)
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 69333
diff changeset
1343
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1344 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1345
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1346 /* 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
1347
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1348 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1349 x_clear_image (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1350 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1351 BLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1352 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
1353 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1354 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1355
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1356
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1357 /* 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
1358 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
1359 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
1360 color. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1361
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1362 static unsigned long
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1363 x_alloc_image_color (struct frame *f, struct image *img, Lisp_Object color_name,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1364 unsigned long dflt)
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 XColor color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1367 unsigned long result;
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 xassert (STRINGP (color_name));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1370
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1371 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
1372 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1373 /* 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
1374 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
1375 ++img->ncolors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1376 img->colors =
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1377 (unsigned long *) xrealloc (img->colors,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1378 img->ncolors * sizeof *img->colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1379 img->colors[img->ncolors - 1] = color.pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1380 result = color.pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1381 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1382 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1383 result = dflt;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1384
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1385 return result;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1389
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 Image Cache
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1392 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1393
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1394 static struct image *search_image_cache (struct frame *, Lisp_Object, unsigned);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1395 static void cache_image (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1396 static void postprocess_image (struct frame *, struct image *);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1397
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1398 /* 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
1399 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
1400
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1401 struct image_cache *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1402 make_image_cache (void)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1403 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1404 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
1405 int size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1406
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
1407 memset (c, 0, sizeof *c);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1408 c->size = 50;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1409 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
1410 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
1411 c->buckets = (struct image **) xmalloc (size);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
1412 memset (c->buckets, 0, size);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1413 return c;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1414 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1415
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1416
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1417 /* 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
1418 image is found, return NULL. */
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1419 static struct image *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1420 search_image_cache (struct frame *f, Lisp_Object spec, unsigned int hash)
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1421 {
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1422 struct image *img;
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1423 struct image_cache *c = FRAME_IMAGE_CACHE (f);
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1424 int i = hash % IMAGE_CACHE_BUCKETS_SIZE;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1425
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1426 if (!c) return NULL;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1427
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1428 /* 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
1429 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
1430 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
1431 images.
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1432
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1433 In fact, we could ignore the foreground color matching condition
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1434 for color images, or if the image spec specifies :foreground;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1435 similarly we could ignore the background color matching condition
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1436 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
1437 image spec specifies :background. However, the extra memory
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1438 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
1439
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1440 for (img = c->buckets[i]; img; img = img->next)
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1441 if (img->hash == hash
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1442 && !NILP (Fequal (img->spec, spec))
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1443 && img->frame_foreground == FRAME_FOREGROUND_PIXEL (f)
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1444 && img->frame_background == FRAME_BACKGROUND_PIXEL (f))
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1445 break;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1446 return img;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1447 }
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1448
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1449
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1450 /* 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
1451
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1452 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1453 uncache_image (struct frame *f, Lisp_Object spec)
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1454 {
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1455 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
1456 if (img)
111372
0792cbcb42ed Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
Chong Yidong <cyd@stupidchicken.com>
parents: 109248
diff changeset
1457 {
0792cbcb42ed Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
Chong Yidong <cyd@stupidchicken.com>
parents: 109248
diff changeset
1458 free_image (f, img);
0792cbcb42ed Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
Chong Yidong <cyd@stupidchicken.com>
parents: 109248
diff changeset
1459 /* As display glyphs may still be referring to the image ID, we
0792cbcb42ed Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
Chong Yidong <cyd@stupidchicken.com>
parents: 109248
diff changeset
1460 must garbage the frame (Bug#6426). */
0792cbcb42ed Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
Chong Yidong <cyd@stupidchicken.com>
parents: 109248
diff changeset
1461 SET_FRAME_GARBAGED (f);
0792cbcb42ed Fix the fix for Bug#6426 (Bug#7210), avoiding frame garbaging loop.
Chong Yidong <cyd@stupidchicken.com>
parents: 109248
diff changeset
1462 }
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1463 }
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1464
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1465
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1466 /* 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
1467 caches. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1468
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1469 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1470 free_image_cache (struct frame *f)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1471 {
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1472 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
1473 if (c)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1474 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1475 int i;
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 /* 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
1478 xassert (c->refcount == 0);
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 for (i = 0; i < c->used; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1481 free_image (f, c->images[i]);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1482 xfree (c->images);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1483 xfree (c->buckets);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1484 xfree (c);
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1485 FRAME_IMAGE_CACHE (f) = NULL;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1486 }
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1489
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1490 /* 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
1491 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
1492 displayed for some time.
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1493 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
1494 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
1495 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
1496 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
1497
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1498 void
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1499 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
1500 {
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1501 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
1502
108741
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1503 if (c)
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1504 {
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1505 int i, nfreed = 0;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1506
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1507 /* 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
1508 while being in an inconsistent state. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1509 BLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1510
108741
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1511 if (!NILP (filter))
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1512 {
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1513 /* Filter image cache. */
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1514 for (i = 0; i < c->used; ++i)
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1515 {
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1516 struct image *img = c->images[i];
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1517 if (img && (EQ (Qt, filter)
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1518 || !NILP (Fmember (filter, img->dependencies))))
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1519 {
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1520 free_image (f, img);
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1521 ++nfreed;
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1522 }
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1523 }
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1524 }
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1525 else if (INTEGERP (Vimage_cache_eviction_delay))
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1526 {
108741
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1527 /* Free cache based on timestamp. */
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1528 EMACS_TIME t;
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1529 unsigned long old;
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1530 int delay, nimages = 0;
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1531
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1532 for (i = 0; i < c->used; ++i)
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1533 if (c->images[i])
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1534 nimages++;
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1535
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1536 /* If the number of cached images has grown unusually large,
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1537 decrease the cache eviction delay (Bug#6230). */
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1538 delay = XFASTINT (Vimage_cache_eviction_delay);
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1539 if (nimages > 40)
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1540 delay = max (1, 1600 * delay / (nimages*nimages));
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1541
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1542 EMACS_GET_TIME (t);
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1543 old = EMACS_SECS (t) - delay;
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1544
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1545 for (i = 0; i < c->used; ++i)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1546 {
108741
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1547 struct image *img = c->images[i];
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1548 if (img && img->timestamp < old)
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1549 {
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1550 free_image (f, img);
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1551 ++nfreed;
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
1552 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1553 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1554 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1555
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1556 /* 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
1557 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
1558 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
1559 images freed above. So, clear these matrices. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1560 if (nfreed)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1561 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1562 Lisp_Object tail, frame;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1563
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1564 FOR_EACH_FRAME (tail, frame)
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 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
1567 if (FRAME_IMAGE_CACHE (f) == c)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1568 clear_current_matrices (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1569 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1570
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1571 ++windows_or_buffers_changed;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1574 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1575 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1576 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1577
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1578 void
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1579 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
1580 {
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1581 /* FIXME: We want to do
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1582 * struct terminal *t;
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1583 * 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
1584 * clear_image_cache (t, filter); */
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1585 Lisp_Object tail, frame;
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1586 FOR_EACH_FRAME (tail, frame)
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1587 if (FRAME_WINDOW_P (XFRAME (frame)))
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1588 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
1589 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1590
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1591 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
1592 0, 1, 0,
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1593 doc: /* Clear the image cache.
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1594 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
1595 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
1596 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
1597 which is then usually a filename. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1598 (Lisp_Object filter)
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1599 {
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1600 if (!(EQ (filter, Qnil) || FRAMEP (filter)))
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1601 clear_image_caches (filter);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1602 else
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1603 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
1604
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1605 return Qnil;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1606 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1607
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1608
108746
24d486687f54 Rename image-refresh to image-flush.
Chong Yidong <cyd@stupidchicken.com>
parents: 108741
diff changeset
1609 DEFUN ("image-flush", Fimage_flush, Simage_flush,
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1610 1, 2, 0,
108746
24d486687f54 Rename image-refresh to image-flush.
Chong Yidong <cyd@stupidchicken.com>
parents: 108741
diff changeset
1611 doc: /* Fush the image with specification SPEC on frame FRAME.
109875
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
1612 This removes the image from the Emacs image cache. If SPEC specifies
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
1613 an image file, the next redisplay of this image will read from the
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
1614 current contents of that file.
108746
24d486687f54 Rename image-refresh to image-flush.
Chong Yidong <cyd@stupidchicken.com>
parents: 108741
diff changeset
1615
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1616 FRAME nil or omitted means use the selected frame.
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1617 FRAME t means refresh the image on all frames. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
1618 (Lisp_Object spec, Lisp_Object frame)
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1619 {
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1620 if (!valid_image_p (spec))
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1621 error ("Invalid image specification");
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1622
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1623 if (EQ (frame, Qt))
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1624 {
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1625 Lisp_Object tail;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1626 FOR_EACH_FRAME (tail, frame)
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1627 {
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1628 struct frame *f = XFRAME (frame);
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1629 if (FRAME_WINDOW_P (f))
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1630 uncache_image (f, spec);
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1631 }
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1632 }
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1633 else
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1634 uncache_image (check_x_frame (frame), spec);
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1635
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1636 return Qnil;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1637 }
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1638
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1639
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1640 /* 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
1641 by the image's specification, */
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 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1644 postprocess_image (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1645 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1646 /* Manipulation of the image's mask. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1647 if (img->pixmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1648 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1649 Lisp_Object conversion, spec;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1650 Lisp_Object mask;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1651
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1652 spec = img->spec;
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 /* `:heuristic-mask t'
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1655 `:mask heuristic'
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1656 means build a mask heuristically.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1657 `:heuristic-mask (R G B)'
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1658 `:mask (heuristic (R G B))'
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1659 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
1660 image.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1661 `:mask nil'
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1662 means remove a mask, if any. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1663
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1664 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
1665 if (!NILP (mask))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1666 x_build_heuristic_mask (f, img, mask);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1667 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1668 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1669 int found_p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1670
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1671 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
1672
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1673 if (EQ (mask, Qheuristic))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1674 x_build_heuristic_mask (f, img, Qt);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1675 else if (CONSP (mask)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1676 && EQ (XCAR (mask), Qheuristic))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1677 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1678 if (CONSP (XCDR (mask)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1679 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
1680 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1681 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
1682 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1683 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
1684 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1685 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
1686 img->mask = NO_PIXMAP;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1687 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1688 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1689
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1690
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1691 /* Should we apply an image transformation algorithm? */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1692 conversion = image_spec_value (spec, QCconversion, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1693 if (EQ (conversion, Qdisabled))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1694 x_disable_image (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1695 else if (EQ (conversion, Qlaplace))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1696 x_laplace (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1697 else if (EQ (conversion, Qemboss))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1698 x_emboss (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1699 else if (CONSP (conversion)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1700 && EQ (XCAR (conversion), Qedge_detection))
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 Lisp_Object tem;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1703 tem = XCDR (conversion);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1704 if (CONSP (tem))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1705 x_edge_detection (f, img,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1706 Fplist_get (tem, QCmatrix),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1707 Fplist_get (tem, QCcolor_adjustment));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1708 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1709 }
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1712
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1713 /* 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
1714 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
1715
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1716 int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1717 lookup_image (struct frame *f, Lisp_Object spec)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1718 {
83436
f67e432d150c Fix crash in lookup_image on termcap frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 67785
diff changeset
1719 struct image_cache *c;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1720 struct image *img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1721 unsigned hash;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1722 EMACS_TIME now;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1723
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1724 /* 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
1725 specification. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1726 xassert (FRAME_WINDOW_P (f));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1727 xassert (valid_image_p (spec));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1728
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1729 c = FRAME_IMAGE_CACHE (f);
83436
f67e432d150c Fix crash in lookup_image on termcap frames.
Karoly Lorentey <lorentey@elte.hu>
parents: 67785
diff changeset
1730
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1731 /* 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
1732 hash = sxhash (spec, 0);
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1733 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
1734 if (img && img->load_failed_p)
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1735 {
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1736 free_image (f, img);
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1737 img = NULL;
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1738 }
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
1739
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1740 /* 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
1741 if (img == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1742 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1743 BLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1744 img = make_image (spec, hash);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1745 cache_image (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1746 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
1747 img->frame_foreground = FRAME_FOREGROUND_PIXEL (f);
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
1748 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
1749
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1750 /* 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
1751 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
1752 draw a rectangle for it. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1753 if (img->load_failed_p)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1754 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1755 Lisp_Object value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1756
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1757 value = image_spec_value (spec, QCwidth, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1758 img->width = (INTEGERP (value)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1759 ? XFASTINT (value) : DEFAULT_IMAGE_WIDTH);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1760 value = image_spec_value (spec, QCheight, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1761 img->height = (INTEGERP (value)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1762 ? XFASTINT (value) : DEFAULT_IMAGE_HEIGHT);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1763 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1764 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1765 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1766 /* Handle image type independent image attributes
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1767 `:ascent ASCENT', `:margin MARGIN', `:relief RELIEF',
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1768 `:background COLOR'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1769 Lisp_Object ascent, margin, relief, bg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1770
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1771 ascent = image_spec_value (spec, QCascent, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1772 if (INTEGERP (ascent))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1773 img->ascent = XFASTINT (ascent);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1774 else if (EQ (ascent, Qcenter))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1775 img->ascent = CENTERED_IMAGE_ASCENT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1776
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1777 margin = image_spec_value (spec, QCmargin, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1778 if (INTEGERP (margin) && XINT (margin) >= 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1779 img->vmargin = img->hmargin = XFASTINT (margin);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1780 else if (CONSP (margin) && INTEGERP (XCAR (margin))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1781 && INTEGERP (XCDR (margin)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1782 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1783 if (XINT (XCAR (margin)) > 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1784 img->hmargin = XFASTINT (XCAR (margin));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1785 if (XINT (XCDR (margin)) > 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1786 img->vmargin = XFASTINT (XCDR (margin));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1787 }
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 relief = image_spec_value (spec, QCrelief, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1790 if (INTEGERP (relief))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1791 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1792 img->relief = XINT (relief);
85254
8004c957b946 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85118
diff changeset
1793 img->hmargin += eabs (img->relief);
8004c957b946 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85118
diff changeset
1794 img->vmargin += eabs (img->relief);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1795 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1796
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1797 if (! img->background_valid)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1798 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1799 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
1800 if (!NILP (bg))
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 img->background
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1803 = x_alloc_image_color (f, img, bg,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1804 FRAME_BACKGROUND_PIXEL (f));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1805 img->background_valid = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1806 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1807 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1808
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1809 /* 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
1810 don't have the image yet. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1811 if (!EQ (*img->type->type, Qpostscript))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1812 postprocess_image (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1813 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1814
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1815 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1816 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1817
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1818 /* 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
1819 EMACS_GET_TIME (now);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1820 img->timestamp = EMACS_SECS (now);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1821
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1822 /* Value is the image id. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1823 return img->id;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1824 }
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1827 /* 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
1828
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1829 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1830 cache_image (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1831 {
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1832 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
1833 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1834
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1835 /* Find a free slot in c->images. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1836 for (i = 0; i < c->used; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1837 if (c->images[i] == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1838 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1839
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1840 /* 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
1841 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
1842 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1843 c->size *= 2;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1844 c->images = (struct image **) xrealloc (c->images,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1845 c->size * sizeof *c->images);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1846 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1847
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1848 /* 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
1849 c->images[i] = img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1850 img->id = i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1851 if (i == c->used)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1852 ++c->used;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1853
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1854 /* 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
1855 i = img->hash % IMAGE_CACHE_BUCKETS_SIZE;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1856 img->next = c->buckets[i];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1857 if (img->next)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1858 img->next->prev = img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1859 img->prev = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1860 c->buckets[i] = img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1861 }
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 /* 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
1865 Lisp Objects in the image cache. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1866
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1867 /* 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
1868
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1869 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1870 mark_image (struct image *img)
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1871 {
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1872 mark_object (img->spec);
92150
1c088baa9d2d Allow fine-grained image-cache flushing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 92110
diff changeset
1873 mark_object (img->dependencies);
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1874
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1875 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
1876 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
1877 }
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1878
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1879
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1880 void
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1881 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
1882 {
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1883 if (c)
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1884 {
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1885 int i;
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1886 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
1887 if (c->images[i])
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
1888 mark_image (c->images[i]);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1889 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1890 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1891
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1894 /***********************************************************************
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
1895 X / NS / W32 support code
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1896 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1897
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1898 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1899
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1900 /* Macro for defining functions that will be loaded from image DLLs. */
110973
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
1901 #define DEF_IMGLIB_FN(func,args) int (FAR CDECL *fn_##func)args
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1902
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1903 /* 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
1904 #define LOAD_IMGLIB_FN(lib,func) { \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1905 fn_##func = (void *) GetProcAddress (lib, #func); \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1906 if (!fn_##func) return 0; \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1907 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1908
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1909 /* Load a DLL implementing an image type.
110967
188673195616 Rename `image-library-alist' to `dynamic-library-alist'.
Juanma Barranquero <lekktu@gmail.com>
parents: 110678
diff changeset
1910 The argument LIBRARIES is usually the variable
188673195616 Rename `image-library-alist' to `dynamic-library-alist'.
Juanma Barranquero <lekktu@gmail.com>
parents: 110678
diff changeset
1911 `dynamic-library-alist', which associates a symbol, identifying
188673195616 Rename `image-library-alist' to `dynamic-library-alist'.
Juanma Barranquero <lekktu@gmail.com>
parents: 110678
diff changeset
1912 an external DLL library, to a list of possible filenames.
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1913 The function returns NULL if no library could be loaded for
110967
188673195616 Rename `image-library-alist' to `dynamic-library-alist'.
Juanma Barranquero <lekktu@gmail.com>
parents: 110678
diff changeset
1914 the given symbol, or if the library was previously loaded;
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1915 else the handle of the DLL. */
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1916 static HMODULE
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1917 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
1918 {
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1919 HMODULE library = NULL;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1920
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1921 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
1922 {
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1923 Lisp_Object dlls = Fassq (type, libraries);
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1924
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1925 if (CONSP (dlls))
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1926 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
1927 {
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1928 CHECK_STRING_CAR (dlls);
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1929 if (library = LoadLibrary (SDATA (XCAR (dlls))))
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1930 break;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1931 }
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1932 }
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1933
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1934 return library;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1935 }
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
1936
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1937 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1938
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1939 static int x_create_x_image_and_pixmap (struct frame *, int, int, int,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1940 XImagePtr *, Pixmap *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1941 static void x_destroy_x_image (XImagePtr);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
1942 static void x_put_x_image (struct frame *, XImagePtr, Pixmap, int, int);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1943
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1944
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1945 /* 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
1946 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
1947 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
1948 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
1949 occurs. Value is non-zero if successful.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1950
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1951 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
1952 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
1953
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1954 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1955 x_create_x_image_and_pixmap (struct frame *f, int width, int height, int depth,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
1956 XImagePtr *ximg, Pixmap *pixmap)
54341
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 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1959 Display *display = FRAME_X_DISPLAY (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1960 Window window = FRAME_X_WINDOW (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1961 Screen *screen = FRAME_X_SCREEN (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1962
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1963 xassert (interrupt_input_blocked);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1964
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1965 if (depth <= 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1966 depth = DefaultDepthOfScreen (screen);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1967 *ximg = XCreateImage (display, DefaultVisualOfScreen (screen),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1968 depth, ZPixmap, 0, NULL, width, height,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1969 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
1970 if (*ximg == NULL)
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 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
1973 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1974 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1975
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1976 /* Allocate image raster. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1977 (*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
1978
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1979 /* Allocate a pixmap of the same size. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1980 *pixmap = XCreatePixmap (display, window, width, height, depth);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1981 if (*pixmap == NO_PIXMAP)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1982 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1983 x_destroy_x_image (*ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1984 *ximg = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1985 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
1986 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1987 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1988
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1989 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1990 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1991
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1992 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1993
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1994 BITMAPINFOHEADER *header;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1995 HDC hdc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1996 int scanline_width_bits;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1997 int remainder;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
1998 int palette_colors = 0;
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 if (depth == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2001 depth = 24;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2002
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2003 if (depth != 1 && depth != 4 && depth != 8
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2004 && depth != 16 && depth != 24 && depth != 32)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2005 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2006 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
2007 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2008 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2009
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2010 scanline_width_bits = width * depth;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2011 remainder = scanline_width_bits % 32;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2012
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2013 if (remainder)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2014 scanline_width_bits += 32 - remainder;
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 /* 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
2017 /* BITMAPINFO structure already contains the first RGBQUAD. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2018 if (depth < 16)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2019 palette_colors = 1 << depth - 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2020
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2021 *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
2022 if (*ximg == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2023 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2024 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
2025 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2026 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2027
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2028 header = &(*ximg)->info.bmiHeader;
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2029 memset (&(*ximg)->info, 0, sizeof (BITMAPINFO));
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2030 header->biSize = sizeof (*header);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2031 header->biWidth = width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2032 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
2033 header->biPlanes = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2034 header->biBitCount = depth;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2035 header->biCompression = BI_RGB;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2036 header->biClrUsed = palette_colors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2037
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2038 /* TODO: fill in palette. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2039 if (depth == 1)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2040 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2041 (*ximg)->info.bmiColors[0].rgbBlue = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2042 (*ximg)->info.bmiColors[0].rgbGreen = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2043 (*ximg)->info.bmiColors[0].rgbRed = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2044 (*ximg)->info.bmiColors[0].rgbReserved = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2045 (*ximg)->info.bmiColors[1].rgbBlue = 255;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2046 (*ximg)->info.bmiColors[1].rgbGreen = 255;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2047 (*ximg)->info.bmiColors[1].rgbRed = 255;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2048 (*ximg)->info.bmiColors[1].rgbReserved = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2049 }
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 hdc = get_frame_dc (f);
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 /* 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
2054 and store its handle in *pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2055 *pixmap = CreateDIBSection (hdc, &((*ximg)->info),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2056 (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
2057 /* 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
2058 (void **)&((*ximg)->data), NULL, 0);
54341
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 /* Realize display palette and garbage all frames. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2061 release_frame_dc (f, hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2062
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2063 if (*pixmap == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2064 {
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
2065 DWORD err = GetLastError ();
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2066 Lisp_Object errcode;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2067 /* 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
2068 XSETINT (errcode, (int) err);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2069 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
2070 x_destroy_x_image (*ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2071 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2072 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2073
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2074 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2075
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2076 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2077
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2078 #ifdef HAVE_NS
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
2079 *pixmap = ns_image_for_XPM (width, height, depth);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2080 if (*pixmap == 0)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2081 {
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2082 *ximg = NULL;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2083 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
2084 return 0;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2085 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2086 *ximg = *pixmap;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2087 return 1;
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2088 #endif
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2089 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2090
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 /* Destroy XImage XIMG. Free XIMG->data. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2093
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2094 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2095 x_destroy_x_image (XImagePtr ximg)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2096 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2097 xassert (interrupt_input_blocked);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2098 if (ximg)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2099 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2100 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2101 xfree (ximg->data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2102 ximg->data = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2103 XDestroyImage (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2104 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2105 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2106 /* Data will be freed by DestroyObject. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2107 ximg->data = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2108 xfree (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2109 #endif /* HAVE_NTGUI */
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2110 #ifdef HAVE_NS
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
2111 ns_release_object (ximg);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2112 #endif /* HAVE_NS */
54341
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 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2115
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2116
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2117 /* 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
2118 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
2119
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2120 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2121 x_put_x_image (struct frame *f, XImagePtr ximg, Pixmap pixmap, int width, int height)
54341
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 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2124 GC gc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2125
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2126 xassert (interrupt_input_blocked);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2127 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
2128 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
2129 XFreeGC (FRAME_X_DISPLAY (f), gc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2130 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2131
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2132 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2133 #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
2134 HDC hdc = get_frame_dc (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2135 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
2136 release_frame_dc (f, hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2137 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2138 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2139
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2140 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2141 xassert (ximg == pixmap);
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
2142 ns_retain_object (ximg);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2143 #endif
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2144 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2145
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 File Handling
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2149 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2150
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2151 static unsigned char *slurp_file (char *, int *);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2152
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2153
82736
ece5e5e6398e (x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents: 82518
diff changeset
2154 /* 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
2155 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
2156 found, or nil if not found. */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2157
54391
138155b7215e (x_find_image_file): Make extern.
Kim F. Storm <storm@cua.dk>
parents: 54363
diff changeset
2158 Lisp_Object
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2159 x_find_image_file (Lisp_Object file)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2160 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2161 Lisp_Object file_found, search_path;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2162 int fd;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2163
82736
ece5e5e6398e (x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents: 82518
diff changeset
2164 /* 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
2165 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
2166 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
2167 Vdata_directory),
ece5e5e6398e (x_find_image_file): Search in etc/images/ rather than etc/.
Glenn Morris <rgm@gnu.org>
parents: 82518
diff changeset
2168 Vx_bitmap_file_path);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2169
83770
9109a293afb7 Comment.
Glenn Morris <rgm@gnu.org>
parents: 83763
diff changeset
2170 /* 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
2171 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
2172
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2173 if (fd == -1)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2174 file_found = Qnil;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2175 else
69771
fd6d18b61fa7 Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents: 69511
diff changeset
2176 {
fd6d18b61fa7 Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents: 69511
diff changeset
2177 file_found = ENCODE_FILE (file_found);
fd6d18b61fa7 Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents: 69511
diff changeset
2178 close (fd);
fd6d18b61fa7 Include "charset.h" and "coding.h".
Kenichi Handa <handa@m17n.org>
parents: 69511
diff changeset
2179 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2180
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2181 return file_found;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2182 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2183
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2184
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2185 /* 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
2186 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
2187 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
2188
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2189 static unsigned char *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2190 slurp_file (char *file, int *size)
54341
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 FILE *fp = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2193 unsigned char *buf = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2194 struct stat st;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2195
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2196 if (stat (file, &st) == 0
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2197 && (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
2198 && (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
2199 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
2200 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2201 *size = st.st_size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2202 fclose (fp);
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 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2205 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2206 if (fp)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2207 fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2208 if (buf)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2209 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2210 xfree (buf);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2211 buf = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2212 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2213 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2214
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2215 return buf;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2216 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2217
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2218
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2219
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2220 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2221 XBM images
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2222 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2223
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2224 static int xbm_scan (unsigned char **, unsigned char *, char *, int *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2225 static int xbm_load (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2226 static int xbm_load_image (struct frame *f, struct image *img,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2227 unsigned char *, unsigned char *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2228 static int xbm_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2229 static int xbm_read_bitmap_data (struct frame *f,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2230 unsigned char *, unsigned char *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2231 int *, int *, unsigned char **, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2232 static int xbm_file_p (Lisp_Object);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2233
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2234
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2235 /* 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
2236
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2237 enum xbm_keyword_index
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 XBM_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2240 XBM_FILE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2241 XBM_WIDTH,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2242 XBM_HEIGHT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2243 XBM_DATA,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2244 XBM_FOREGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2245 XBM_BACKGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2246 XBM_ASCENT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2247 XBM_MARGIN,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2248 XBM_RELIEF,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2249 XBM_ALGORITHM,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2250 XBM_HEURISTIC_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2251 XBM_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2252 XBM_LAST
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2255 /* 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
2256 of valid XBM image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2257
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
2258 static const struct image_keyword xbm_format[XBM_LAST] =
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2259 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2260 {":type", IMAGE_SYMBOL_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2261 {":file", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2262 {":width", IMAGE_POSITIVE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2263 {":height", IMAGE_POSITIVE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2264 {":data", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2265 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2266 {":background", IMAGE_STRING_OR_NIL_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2267 {":ascent", IMAGE_ASCENT_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2268 {":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
2269 {":relief", IMAGE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2270 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2271 {":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
2272 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2273 };
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 /* Structure describing the image type XBM. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2276
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2277 static struct image_type xbm_type =
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 &Qxbm,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2280 xbm_image_p,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2281 xbm_load,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2282 x_clear_image,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2283 NULL
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2284 };
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 /* Tokens returned from xbm_scan. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2287
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2288 enum xbm_token
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2289 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2290 XBM_TK_IDENT = 256,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2291 XBM_TK_NUMBER
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2292 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2293
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 /* 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
2296 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
2297 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
2298 entry `:type xbm..
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2299
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2300 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
2301 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
2302
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2303 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
2304 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
2305 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
2306
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2307 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
2308 have a size >= (WIDTH + 7) / 8 * HEIGHT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2309
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2310 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
2311
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2312 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
2313 bitmap.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2314
78970
35f78a0b1e30 (syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 78863
diff changeset
2315 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
2316 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
2317 XBM file.
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 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
2320 `: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
2321 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
2322 displayed is used. */
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 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2325 xbm_image_p (Lisp_Object object)
54341
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 struct image_keyword kw[XBM_LAST];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2328
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2329 memcpy (kw, xbm_format, sizeof kw);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2330 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
2331 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2332
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2333 xassert (EQ (kw[XBM_TYPE].value, Qxbm));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2334
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2335 if (kw[XBM_FILE].count)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2336 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2337 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
2338 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2339 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2340 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
2341 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2342 /* In-memory XBM file. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2343 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
2344 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2345 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2346 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2347 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2348 Lisp_Object data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2349 int width, height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2350
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2351 /* 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
2352 if (!kw[XBM_WIDTH].count
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2353 || !kw[XBM_HEIGHT].count
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2354 || !kw[XBM_DATA].count)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2355 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2356
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2357 data = kw[XBM_DATA].value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2358 width = XFASTINT (kw[XBM_WIDTH].value);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2359 height = XFASTINT (kw[XBM_HEIGHT].value);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2360
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2361 /* 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
2362 data. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2363 if (VECTORP (data))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2364 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2365 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2366
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2367 /* 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
2368 if (XVECTOR (data)->size < height)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2369 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2370
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2371 /* 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
2372 for one line of the image. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2373 for (i = 0; i < height; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2374 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2375 Lisp_Object elt = XVECTOR (data)->contents[i];
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 if (STRINGP (elt))
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 if (SCHARS (elt)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2380 < (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
2381 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2382 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2383 else if (BOOL_VECTOR_P (elt))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2384 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2385 if (XBOOL_VECTOR (elt)->size < width)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2386 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2387 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2388 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2389 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2390 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2391 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2392 else if (STRINGP (data))
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 if (SCHARS (data)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2395 < (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
2396 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2397 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2398 else if (BOOL_VECTOR_P (data))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2399 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2400 if (XBOOL_VECTOR (data)->size < width * height)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2401 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2402 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2403 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2404 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2405 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2406
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2407 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2408 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2409
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2410
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2411 /* 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
2412 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
2413 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
2414 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
2415 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
2416
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2417 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2418 xbm_scan (unsigned char **s, unsigned char *end, char *sval, int *ival)
54341
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 unsigned int c;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2421
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2422 loop:
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 /* Skip white space. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2425 while (*s < end && (c = *(*s)++, isspace (c)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2426 ;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2427
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2428 if (*s >= end)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2429 c = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2430 else if (isdigit (c))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2431 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2432 int value = 0, digit;
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 if (c == '0' && *s < end)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2435 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2436 c = *(*s)++;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2437 if (c == 'x' || c == 'X')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2438 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2439 while (*s < end)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2440 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2441 c = *(*s)++;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2442 if (isdigit (c))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2443 digit = c - '0';
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2444 else if (c >= 'a' && c <= 'f')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2445 digit = c - 'a' + 10;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2446 else if (c >= 'A' && c <= 'F')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2447 digit = c - 'A' + 10;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2448 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2449 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2450 value = 16 * value + digit;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2451 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2452 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2453 else if (isdigit (c))
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 value = c - '0';
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2456 while (*s < end
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2457 && (c = *(*s)++, isdigit (c)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2458 value = 8 * value + c - '0';
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2459 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2460 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2461 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2462 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2463 value = c - '0';
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2464 while (*s < end
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2465 && (c = *(*s)++, isdigit (c)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2466 value = 10 * value + c - '0';
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2467 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2468
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2469 if (*s < end)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2470 *s = *s - 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2471 *ival = value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2472 c = XBM_TK_NUMBER;
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 else if (isalpha (c) || c == '_')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2475 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2476 *sval++ = c;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2477 while (*s < end
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2478 && (c = *(*s)++, (isalnum (c) || c == '_')))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2479 *sval++ = c;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2480 *sval = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2481 if (*s < end)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2482 *s = *s - 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2483 c = XBM_TK_IDENT;
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 else if (c == '/' && **s == '*')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2486 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2487 /* C-style comment. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2488 ++*s;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2489 while (**s && (**s != '*' || *(*s + 1) != '/'))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2490 ++*s;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2491 if (**s)
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 *s += 2;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2494 goto loop;
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 return c;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2499 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2500
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2501 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2502
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2503 /* 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
2504 static HBITMAP
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2505 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
2506 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2507 static unsigned char swap_nibble[16]
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2508 = { 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
2509 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
2510 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
2511 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
2512 int i, j, w1, w2;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2513 unsigned char *bits, *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2514 HBITMAP bmp;
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 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
2517 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
2518 bits = (unsigned char *) alloca (height * w2);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2519 memset (bits, 0, height * w2);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2520 for (i = 0; i < height; i++)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2521 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2522 p = bits + i*w2;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2523 for (j = 0; j < w1; j++)
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 /* 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
2526 unsigned char c = *data++;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2527 *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
2528 | (swap_nibble[(c>>4) & 0xf]));
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 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2531 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
2532
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2533 return bmp;
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
78692
6e1f6f80e430 (syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 78450
diff changeset
2536 static void
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109302
diff changeset
2537 convert_mono_to_color_image (struct frame *f, struct image *img,
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109302
diff changeset
2538 COLORREF foreground, COLORREF background)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2539 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2540 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
2541 HGDIOBJ old_prev, new_prev;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2542 HBITMAP new_pixmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2543
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2544 hdc = get_frame_dc (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2545 old_img_dc = CreateCompatibleDC (hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2546 new_img_dc = CreateCompatibleDC (hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2547 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
2548 release_frame_dc (f, hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2549 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
2550 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
2551 /* 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
2552 white = foreground. */
78036
3766144496c2 (convert_mono_to_color_image): Swap fore and background.
Jason Rumney <jasonr@gnu.org>
parents: 77929
diff changeset
2553 SetTextColor (new_img_dc, background);
3766144496c2 (convert_mono_to_color_image): Swap fore and background.
Jason Rumney <jasonr@gnu.org>
parents: 77929
diff changeset
2554 SetBkColor (new_img_dc, foreground);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2555
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2556 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
2557 0, 0, SRCCOPY);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2558
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2559 SelectObject (old_img_dc, old_prev);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2560 SelectObject (new_img_dc, new_prev);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2561 DeleteDC (old_img_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2562 DeleteDC (new_img_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2563 DeleteObject (img->pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2564 if (new_pixmap == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2565 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
2566 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2567 img->pixmap = new_pixmap;
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 #define XBM_BIT_SHUFFLE(b) (~(b))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2571
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2572 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2573
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2574 #define XBM_BIT_SHUFFLE(b) (b)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2575
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2576 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2577
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2578
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2579 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2580 Create_Pixmap_From_Bitmap_Data (struct frame *f, struct image *img, char *data,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2581 RGB_PIXEL_COLOR fg, RGB_PIXEL_COLOR bg,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2582 int non_default_colors)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2583 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2584 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2585 img->pixmap
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2586 = 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
2587
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2588 /* 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
2589 if (non_default_colors)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2590 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
2591
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2592 #elif defined (HAVE_NS)
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
2593 img->pixmap = ns_image_from_XBM (data, img->width, img->height);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2594
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2595 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2596 img->pixmap
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2597 = XCreatePixmapFromBitmapData (FRAME_X_DISPLAY (f),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2598 FRAME_X_WINDOW (f),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2599 data,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2600 img->width, img->height,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2601 fg, bg,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2602 DefaultDepthOfScreen (FRAME_X_SCREEN (f)));
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
2603 #endif /* !HAVE_NTGUI && !HAVE_NS */
54341
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2606
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 /* 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
2609 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
2610 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
2611 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
2612 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
2613 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
2614 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
2615 invalid (the bitmap remains unread). */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2616
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2617 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2618 xbm_read_bitmap_data (struct frame *f, unsigned char *contents, unsigned char *end,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2619 int *width, int *height, unsigned char **data,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2620 int inhibit_image_error)
54341
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 unsigned char *s = contents;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2623 char buffer[BUFSIZ];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2624 int padding_p = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2625 int v10 = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2626 int bytes_per_line, i, nbytes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2627 unsigned char *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2628 int value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2629 int LA1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2630
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2631 #define match() \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2632 LA1 = xbm_scan (&s, end, buffer, &value)
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 #define expect(TOKEN) \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2635 if (LA1 != (TOKEN)) \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2636 goto failure; \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2637 else \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2638 match ()
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2639
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2640 #define expect_ident(IDENT) \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2641 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
2642 match (); \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2643 else \
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2644 goto failure
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2645
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2646 *width = *height = -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2647 if (data)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2648 *data = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2649 LA1 = xbm_scan (&s, end, buffer, &value);
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 /* 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
2652 while (LA1 == '#')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2653 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2654 match ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2655 expect_ident ("define");
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2656 expect (XBM_TK_IDENT);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2657
73346
ba22be0026c7 (xbm_read_bitmap_data): Delete extra semicolon.
Romain Francoise <romain@orebokech.com>
parents: 72539
diff changeset
2658 if (LA1 == XBM_TK_NUMBER)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2659 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2660 char *p = strrchr (buffer, '_');
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2661 p = p ? p + 1 : buffer;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2662 if (strcmp (p, "width") == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2663 *width = value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2664 else if (strcmp (p, "height") == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2665 *height = value;
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 expect (XBM_TK_NUMBER);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2668 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2669
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
2670 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
2671 {
104259
a52366907b7a * image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents: 102392
diff changeset
2672 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
2673 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
2674 goto failure;
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
2675 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2676 else if (data == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2677 goto success;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2678
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2679 /* Parse bits. Must start with `static'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2680 expect_ident ("static");
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2681 if (LA1 == XBM_TK_IDENT)
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 if (strcmp (buffer, "unsigned") == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2684 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2685 match ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2686 expect_ident ("char");
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2687 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2688 else if (strcmp (buffer, "short") == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2689 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2690 match ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2691 v10 = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2692 if (*width % 16 && *width % 16 < 9)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2693 padding_p = 1;
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 else if (strcmp (buffer, "char") == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2696 match ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2697 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2698 goto failure;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2699 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2700 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2701 goto failure;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2702
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2703 expect (XBM_TK_IDENT);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2704 expect ('[');
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2705 expect (']');
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2706 expect ('=');
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2707 expect ('{');
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2708
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2709 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
2710 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
2711 p = *data = (unsigned char *) xmalloc (nbytes);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2712
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2713 if (v10)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2714 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2715 for (i = 0; i < nbytes; i += 2)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2716 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2717 int val = value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2718 expect (XBM_TK_NUMBER);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2719
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2720 *p++ = XBM_BIT_SHUFFLE (val);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2721 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
2722 *p++ = XBM_BIT_SHUFFLE (value >> 8);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2723
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2724 if (LA1 == ',' || LA1 == '}')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2725 match ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2726 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2727 goto failure;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2728 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2729 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2730 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2731 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2732 for (i = 0; i < nbytes; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2733 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2734 int val = value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2735 expect (XBM_TK_NUMBER);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2736
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2737 *p++ = XBM_BIT_SHUFFLE (val);
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 if (LA1 == ',' || LA1 == '}')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2740 match ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2741 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2742 goto failure;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2743 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2744 }
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 success:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2747 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2748
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2749 failure:
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 if (data && *data)
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 xfree (*data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2754 *data = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2755 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2756 return 0;
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 #undef match
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2759 #undef expect
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2760 #undef expect_ident
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2761 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2762
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2763
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2764 /* 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
2765 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
2766 successful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2767
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2768 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2769 xbm_load_image (struct frame *f, struct image *img, unsigned char *contents,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2770 unsigned char *end)
54341
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 int rc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2773 unsigned char *data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2774 int success_p = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2775
104259
a52366907b7a * image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
Chong Yidong <cyd@stupidchicken.com>
parents: 102392
diff changeset
2776 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
2777 &data, 0);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2778 if (rc)
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 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2781 unsigned long background = FRAME_BACKGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2782 int non_default_colors = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2783 Lisp_Object value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2784
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2785 xassert (img->width > 0 && img->height > 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 /* 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
2788 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
2789 if (!NILP (value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2790 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2791 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
2792 non_default_colors = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2793 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2794 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
2795 if (!NILP (value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2796 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2797 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
2798 img->background = background;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2799 img->background_valid = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2800 non_default_colors = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2801 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2802
54920
38cb79e68369 (PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents: 54427
diff changeset
2803 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
2804 foreground, background,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2805 non_default_colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2806 xfree (data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2807
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2808 if (img->pixmap == NO_PIXMAP)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2809 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2810 x_clear_image (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2811 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
2812 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2813 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2814 success_p = 1;
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 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2817 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
2818
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2819 return success_p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2820 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2821
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2822
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2823 /* 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
2824
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2825 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2826 xbm_file_p (Lisp_Object data)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2827 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2828 int w, h;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2829 return (STRINGP (data)
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
2830 && 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
2831 (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
2832 &w, &h, NULL, 1));
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2833 }
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2836 /* 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
2837 non-zero if successful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2838
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2839 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
2840 xbm_load (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2841 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2842 int success_p = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2843 Lisp_Object file_name;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2844
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2845 xassert (xbm_image_p (img->spec));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2846
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2847 /* 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
2848 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
2849 if (STRINGP (file_name))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2850 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2851 Lisp_Object file;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2852 unsigned char *contents;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2853 int size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2854
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2855 file = x_find_image_file (file_name);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2856 if (!STRINGP (file))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2857 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2858 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
2859 return 0;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2862 contents = slurp_file (SDATA (file), &size);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2863 if (contents == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2864 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2865 image_error ("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
2866 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2867 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2868
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2869 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
2870 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2871 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2872 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2873 struct image_keyword fmt[XBM_LAST];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2874 Lisp_Object data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2875 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2876 unsigned long background = FRAME_BACKGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2877 int non_default_colors = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2878 char *bits;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2879 int parsed_p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2880 int in_memory_file_p = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2881
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2882 /* 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
2883 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
2884 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
2885
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2886 /* Parse the image specification. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2887 memcpy (fmt, xbm_format, sizeof fmt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2888 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
2889 xassert (parsed_p);
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 /* Get specified width, and height. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2892 if (!in_memory_file_p)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2893 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2894 img->width = XFASTINT (fmt[XBM_WIDTH].value);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2895 img->height = XFASTINT (fmt[XBM_HEIGHT].value);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2896 xassert (img->width > 0 && img->height > 0);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2897 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2898
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2899 /* 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
2900 if (fmt[XBM_FOREGROUND].count
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2901 && STRINGP (fmt[XBM_FOREGROUND].value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2902 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2903 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
2904 foreground);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2905 non_default_colors = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2906 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2907
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2908 if (fmt[XBM_BACKGROUND].count
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2909 && STRINGP (fmt[XBM_BACKGROUND].value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2910 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2911 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
2912 background);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2913 non_default_colors = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2914 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2915
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2916 if (in_memory_file_p)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2917 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
2918 (SDATA (data)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2919 + SBYTES (data)));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2920 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2921 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2922 if (VECTORP (data))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2923 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2924 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2925 char *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2926 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
2927
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2928 p = bits = (char *) alloca (nbytes * img->height);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2929 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
2930 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2931 Lisp_Object line = XVECTOR (data)->contents[i];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2932 if (STRINGP (line))
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2933 memcpy (p, SDATA (line), nbytes);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2934 else
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
2935 memcpy (p, XBOOL_VECTOR (line)->data, nbytes);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2936 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2937 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2938 else if (STRINGP (data))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2939 bits = SDATA (data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2940 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2941 bits = XBOOL_VECTOR (data)->data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2942
79528
558b3650d5dc (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents: 78970
diff changeset
2943 #ifdef WINDOWSNT
558b3650d5dc (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents: 78970
diff changeset
2944 {
558b3650d5dc (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents: 78970
diff changeset
2945 char *invertedBits;
558b3650d5dc (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents: 78970
diff changeset
2946 int nbytes, i;
558b3650d5dc (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents: 78970
diff changeset
2947 /* 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
2948 invertedBits = bits;
106975
62f86ca36527 Use png_sig_cmp to allow linking with libpng 1.4.0.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
2949 nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR
79528
558b3650d5dc (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents: 78970
diff changeset
2950 * img->height;
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
2951 bits = (char *) alloca (nbytes);
79528
558b3650d5dc (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents: 78970
diff changeset
2952 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
2953 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
2954 }
558b3650d5dc (xbm_load) [WINDOWSNT]: Shuffle the bits of directly specified XBMs.
Jason Rumney <jasonr@gnu.org>
parents: 78970
diff changeset
2955 #endif
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2956 /* Create the pixmap. */
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 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
2959 foreground, background,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2960 non_default_colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2961 if (img->pixmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2962 success_p = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2963 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2964 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2965 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
2966 img->spec, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2967 x_clear_image (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2968 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2969 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2970 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2971
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2972 return success_p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2973 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2974
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2975
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2976
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 XPM images
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2979 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2980
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
2981 #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
2982
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2983 static int xpm_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2984 static int xpm_load (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
2985 static int xpm_valid_color_symbols_p (Lisp_Object);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2986
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
2987 #endif /* HAVE_XPM || HAVE_NS */
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
2988
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
2989 #ifdef HAVE_XPM
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2990 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2991 /* 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
2992 #define FOR_MSW
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2993 /* 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
2994 /* 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
2995 #define XColor xpm_XColor
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2996 #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
2997 #define Display xpm_Display
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2998 #define PIXEL_ALREADY_TYPEDEFED
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
2999 #include "X11/xpm.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3000 #undef FOR_MSW
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3001 #undef XColor
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3002 #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
3003 #undef Display
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3004 #undef PIXEL_ALREADY_TYPEDEFED
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3005 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3006 #include "X11/xpm.h"
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3007 #endif /* HAVE_NTGUI */
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3008 #endif /* HAVE_XPM */
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3009
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
3010 #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
3011 /* The symbol `xpm' identifying XPM-format images. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3012
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3013 Lisp_Object Qxpm;
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 /* 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
3016
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3017 enum xpm_keyword_index
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3018 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3019 XPM_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3020 XPM_FILE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3021 XPM_DATA,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3022 XPM_ASCENT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3023 XPM_MARGIN,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3024 XPM_RELIEF,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3025 XPM_ALGORITHM,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3026 XPM_HEURISTIC_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3027 XPM_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3028 XPM_COLOR_SYMBOLS,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3029 XPM_BACKGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3030 XPM_LAST
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3031 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3032
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3033 /* 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
3034 of valid XPM image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3035
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
3036 static const struct image_keyword xpm_format[XPM_LAST] =
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3037 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3038 {":type", IMAGE_SYMBOL_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3039 {":file", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3040 {":data", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3041 {":ascent", IMAGE_ASCENT_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3042 {":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
3043 {":relief", IMAGE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3044 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3045 {":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
3046 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3047 {":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
3048 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3049 };
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 /* Structure describing the image type XPM. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3052
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3053 static struct image_type xpm_type =
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3054 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3055 &Qxpm,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3056 xpm_image_p,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3057 xpm_load,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3058 x_clear_image,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3059 NULL
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3060 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3061
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3062 #ifdef HAVE_X_WINDOWS
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 /* 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
3065 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
3066 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
3067 lib. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3068
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3069 #if defined XpmAllocColor && defined XpmFreeColors && defined XpmColorClosure
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3070 #define ALLOC_XPM_COLORS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3071 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3072 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3073
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3074 #ifdef ALLOC_XPM_COLORS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3075
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3076 static void xpm_init_color_cache (struct frame *, XpmAttributes *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3077 static void xpm_free_color_cache (void);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3078 static int xpm_lookup_color (struct frame *, char *, XColor *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3079 static int xpm_color_bucket (char *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3080 static struct xpm_cached_color *xpm_cache_color (struct frame *, char *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3081 XColor *, int);
54341
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 /* 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
3084 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
3085 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
3086 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
3087
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3088 struct xpm_cached_color
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 /* Next in collision chain. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3091 struct xpm_cached_color *next;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3092
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3093 /* Color definition (RGB and pixel color). */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3094 XColor color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3095
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3096 /* Color name. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3097 char name[1];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3098 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3099
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3100 /* 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
3101 size. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3102
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3103 #define XPM_COLOR_CACHE_BUCKETS 1001
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3104 struct xpm_cached_color **xpm_color_cache;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3105
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3106 /* Initialize the color cache. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3107
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3108 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3109 xpm_init_color_cache (struct frame *f, XpmAttributes *attrs)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3110 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3111 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
3112 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
3113 memset (xpm_color_cache, 0, nbytes);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3114 init_color_table ();
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 if (attrs->valuemask & XpmColorSymbols)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3117 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3118 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3119 XColor color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3120
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3121 for (i = 0; i < attrs->numsymbols; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3122 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
3123 attrs->colorsymbols[i].value, &color))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3124 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3125 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
3126 color.blue);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3127 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
3128 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3129 }
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3132 /* Free the color cache. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3133
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3134 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3135 xpm_free_color_cache (void)
54341
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 struct xpm_cached_color *p, *next;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3138 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3139
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3140 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
3141 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
3142 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3143 next = p->next;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3144 xfree (p);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3145 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3146
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3147 xfree (xpm_color_cache);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3148 xpm_color_cache = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3149 free_color_table ();
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 /* 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
3153 cache. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3154
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3155 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3156 xpm_color_bucket (char *color_name)
54341
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 unsigned h = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3159 char *s;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3160
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3161 for (s = color_name; *s; ++s)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3162 h = (h << 2) ^ *s;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3163 return h %= XPM_COLOR_CACHE_BUCKETS;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3167 /* 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
3168 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
3169 entry added. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3170
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3171 static struct xpm_cached_color *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3172 xpm_cache_color (struct frame *f, char *color_name, XColor *color, int bucket)
54341
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 size_t nbytes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3175 struct xpm_cached_color *p;
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 if (bucket < 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3178 bucket = xpm_color_bucket (color_name);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3179
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3180 nbytes = sizeof *p + strlen (color_name);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3181 p = (struct xpm_cached_color *) xmalloc (nbytes);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3182 strcpy (p->name, color_name);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3183 p->color = *color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3184 p->next = xpm_color_cache[bucket];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3185 xpm_color_cache[bucket] = p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3186 return p;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3189 /* 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
3190 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
3191 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
3192 allocation failed. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3193
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3194 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3195 xpm_lookup_color (struct frame *f, char *color_name, XColor *color)
54341
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 struct xpm_cached_color *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3198 int h = xpm_color_bucket (color_name);
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 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
3201 if (strcmp (p->name, color_name) == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3202 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3203
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3204 if (p != NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3205 *color = p->color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3206 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
3207 color_name, color))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3208 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3209 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
3210 color->blue);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3211 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
3212 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3213 /* 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
3214 with transparency, and it's useful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3215 else if (strcmp ("opaque", color_name) == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3216 {
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
3217 memset (color, 0, sizeof (XColor)); /* Is this necessary/correct? */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3218 color->pixel = FRAME_FOREGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3219 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
3220 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3221
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3222 return p != NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3223 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3224
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3225
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3226 /* 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
3227 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
3228 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
3229 if successful. */
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 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3232 xpm_alloc_color (Display *dpy, Colormap cmap, char *color_name, XColor *color,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3233 void *closure)
54341
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 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
3236 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3237
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3238
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3239 /* 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
3240 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
3241 non-zero if successful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3242
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3243 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3244 xpm_free_colors (Display *dpy, Colormap cmap, Pixel *pixels, int npixels, void *closure)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3245 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3246 return 1;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3249 #endif /* ALLOC_XPM_COLORS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3250
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3251
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3252 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3253
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3254 /* XPM library details. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3255
110973
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
3256 DEF_IMGLIB_FN (XpmFreeAttributes, (XpmAttributes *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
3257 DEF_IMGLIB_FN (XpmCreateImageFromBuffer, (Display *, char *, xpm_XImage **,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
3258 xpm_XImage **, XpmAttributes *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
3259 DEF_IMGLIB_FN (XpmReadFileToImage, (Display *, char *, xpm_XImage **,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
3260 xpm_XImage **, XpmAttributes *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
3261 DEF_IMGLIB_FN (XImageFree, (xpm_XImage *));
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3262
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3263 static int
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
3264 init_xpm_functions (Lisp_Object libraries)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3265 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3266 HMODULE library;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3267
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
3268 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
3269 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3270
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3271 LOAD_IMGLIB_FN (library, XpmFreeAttributes);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3272 LOAD_IMGLIB_FN (library, XpmCreateImageFromBuffer);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3273 LOAD_IMGLIB_FN (library, XpmReadFileToImage);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3274 LOAD_IMGLIB_FN (library, XImageFree);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3275 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3276 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3277
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3278 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3279
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3280
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3281 /* 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
3282 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
3283 cdr are strings. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3284
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3285 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3286 xpm_valid_color_symbols_p (Lisp_Object color_symbols)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3287 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3288 while (CONSP (color_symbols))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3289 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3290 Lisp_Object sym = XCAR (color_symbols);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3291 if (!CONSP (sym)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3292 || !STRINGP (XCAR (sym))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3293 || !STRINGP (XCDR (sym)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3294 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3295 color_symbols = XCDR (color_symbols);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3296 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3297
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3298 return NILP (color_symbols);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3299 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3300
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 /* 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
3303
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3304 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3305 xpm_image_p (Lisp_Object object)
54341
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 struct image_keyword fmt[XPM_LAST];
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
3308 memcpy (fmt, xpm_format, sizeof fmt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3309 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
3310 /* Either `:file' or `:data' must be present. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3311 && 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
3312 /* 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
3313 whose car and cdr are strings. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3314 && (fmt[XPM_COLOR_SYMBOLS].count == 0
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3315 || 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
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 #endif /* HAVE_XPM || HAVE_NS */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3319
66919
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3320 #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
3321 int
111997
a5a188ddc758 Minor clean up to silence some gcc warnings.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111449
diff changeset
3322 x_create_bitmap_from_xpm_data (struct frame *f, const char **bits)
66919
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3323 {
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3324 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
3325 int id, rc;
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3326 XpmAttributes attrs;
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3327 Pixmap bitmap, mask;
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3328
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
3329 memset (&attrs, 0, sizeof attrs);
66919
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3330
66924
53960d1c1f2f initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents: 66919
diff changeset
3331 attrs.visual = FRAME_X_VISUAL (f);
53960d1c1f2f initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents: 66919
diff changeset
3332 attrs.colormap = FRAME_X_COLORMAP (f);
53960d1c1f2f initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents: 66919
diff changeset
3333 attrs.valuemask |= XpmVisual;
53960d1c1f2f initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents: 66919
diff changeset
3334 attrs.valuemask |= XpmColormap;
53960d1c1f2f initialize XpmAttributes
Chong Yidong <cyd@stupidchicken.com>
parents: 66919
diff changeset
3335
66919
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3336 rc = XpmCreatePixmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
112438
11f1b4757236 * image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash
Paul Eggert <eggert@cs.ucla.edu>
parents: 112434
diff changeset
3337 (char **) bits, &bitmap, &mask, &attrs);
66919
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3338 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
3339 {
9d0a2cc054be * image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents: 66924
diff changeset
3340 XpmFreeAttributes (&attrs);
9d0a2cc054be * image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents: 66924
diff changeset
3341 return -1;
9d0a2cc054be * image.c (x_create_bitmap_from_xpm_data): Free attributes on
Chong Yidong <cyd@stupidchicken.com>
parents: 66924
diff changeset
3342 }
66919
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3343
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3344 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
3345 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
3346 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
3347 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
3348 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
3349 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
3350 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
3351 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
3352 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
3353
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3354 XpmFreeAttributes (&attrs);
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3355 return id;
a9d1837b115c * gnu.h (gnu_bits): Xpm version of the new Emacs icon.
Chong Yidong <cyd@stupidchicken.com>
parents: 66877
diff changeset
3356 }
66994
f7e79cfcfc4f Fix typo.
Chong Yidong <cyd@stupidchicken.com>
parents: 66984
diff changeset
3357 #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
3358
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3359 /* 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
3360 non-zero if successful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3361
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3362 #ifdef HAVE_XPM
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3363
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3364 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
3365 xpm_load (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3366 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3367 int rc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3368 XpmAttributes attrs;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3369 Lisp_Object specified_file, color_symbols;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3370 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3371 HDC hdc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3372 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
3373 #endif /* HAVE_NTGUI */
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 /* 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
3376 close colors. Return colors allocated. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
3377 memset (&attrs, 0, sizeof attrs);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3378
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3379 #ifndef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3380 attrs.visual = FRAME_X_VISUAL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3381 attrs.colormap = FRAME_X_COLORMAP (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3382 attrs.valuemask |= XpmVisual;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3383 attrs.valuemask |= XpmColormap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3384 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3385
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3386 #ifdef ALLOC_XPM_COLORS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3387 /* 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
3388 failing color allocation more gracefully. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3389 attrs.color_closure = f;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3390 attrs.alloc_color = xpm_alloc_color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3391 attrs.free_colors = xpm_free_colors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3392 attrs.valuemask |= XpmAllocColor | XpmFreeColors | XpmColorClosure;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3393 #else /* not ALLOC_XPM_COLORS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3394 /* Let the XPM lib allocate colors. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3395 attrs.valuemask |= XpmReturnAllocPixels;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3396 #ifdef XpmAllocCloseColors
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3397 attrs.alloc_close_colors = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3398 attrs.valuemask |= XpmAllocCloseColors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3399 #else /* not XpmAllocCloseColors */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3400 attrs.closeness = 600;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3401 attrs.valuemask |= XpmCloseness;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3402 #endif /* not XpmAllocCloseColors */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3403 #endif /* ALLOC_XPM_COLORS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3404
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3405 /* 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
3406 these to `attrs'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3407 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
3408 if (CONSP (color_symbols))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3409 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3410 Lisp_Object tail;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3411 XpmColorSymbol *xpm_syms;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3412 int i, size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3413
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3414 attrs.valuemask |= XpmColorSymbols;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3415
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3416 /* Count number of symbols. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3417 attrs.numsymbols = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3418 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
3419 ++attrs.numsymbols;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3420
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3421 /* Allocate an XpmColorSymbol array. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3422 size = attrs.numsymbols * sizeof *xpm_syms;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3423 xpm_syms = (XpmColorSymbol *) alloca (size);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
3424 memset (xpm_syms, 0, size);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3425 attrs.colorsymbols = xpm_syms;
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 /* Fill the color symbol array. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3428 for (tail = color_symbols, i = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3429 CONSP (tail);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3430 ++i, tail = XCDR (tail))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3431 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3432 Lisp_Object name;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3433 Lisp_Object color;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3434
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3435 if (!CONSP (XCAR (tail)))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3436 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3437 xpm_syms[i].name = "";
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3438 xpm_syms[i].value = "";
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3439 continue;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3440 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3441 name = XCAR (XCAR (tail));
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3442 color = XCDR (XCAR (tail));
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3443 if (STRINGP (name))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3444 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3445 xpm_syms[i].name = (char *) alloca (SCHARS (name) + 1);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3446 strcpy (xpm_syms[i].name, SDATA (name));
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3447 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3448 else
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3449 xpm_syms[i].name = "";
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3450 if (STRINGP (color))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3451 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3452 xpm_syms[i].value = (char *) alloca (SCHARS (color) + 1);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3453 strcpy (xpm_syms[i].value, SDATA (color));
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3454 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3455 else
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3456 xpm_syms[i].value = "";
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3457 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3458 }
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 /* 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
3461 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
3462 #ifdef ALLOC_XPM_COLORS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3463 xpm_init_color_cache (f, &attrs);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3464 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3465
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3466 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
3467
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3468 #ifdef HAVE_NTGUI
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 HDC frame_dc = get_frame_dc (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3471 hdc = CreateCompatibleDC (frame_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3472 release_frame_dc (f, frame_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3473 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3474 #endif /* HAVE_NTGUI */
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 if (STRINGP (specified_file))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3477 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3478 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
3479 if (!STRINGP (file))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3480 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3481 image_error ("Cannot find image file `%s'", specified_file, Qnil);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3482 #ifdef ALLOC_XPM_COLORS
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3483 xpm_free_color_cache ();
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3484 #endif
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3485 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3486 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3487
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3488 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3489 /* 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
3490 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
3491 rc = fn_XpmReadFileToImage (&hdc, SDATA (file),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3492 &xpm_image, &xpm_mask,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3493 &attrs);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3494 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3495 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
3496 SDATA (file), &img->pixmap, &img->mask,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3497 &attrs);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3498 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3499 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3500 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3501 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3502 Lisp_Object buffer = image_spec_value (img->spec, QCdata, NULL);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3503 if (!STRINGP (buffer))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3504 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3505 image_error ("Invalid image data `%s'", buffer, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3506 #ifdef ALLOC_XPM_COLORS
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3507 xpm_free_color_cache ();
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3508 #endif
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3509 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
3510 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3511 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3512 /* 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
3513 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
3514 rc = fn_XpmCreateImageFromBuffer (&hdc, SDATA (buffer),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3515 &xpm_image, &xpm_mask,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3516 &attrs);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3517 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3518 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
3519 SDATA (buffer),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3520 &img->pixmap, &img->mask,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3521 &attrs);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3522 #endif /* HAVE_NTGUI */
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3525 if (rc == XpmSuccess)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3526 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3527 #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
3528 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
3529 #else /* not ALLOC_XPM_COLORS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3530 int i;
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 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3533 /* 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
3534 plus some duplicate attributes. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3535 if (xpm_image && xpm_image->bitmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3536 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3537 img->pixmap = xpm_image->bitmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3538 /* 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
3539 the bitmap, which is what we want. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3540 fn_XImageFree (xpm_image);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3541 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3542 if (xpm_mask && xpm_mask->bitmap)
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 /* 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
3545 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
3546 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
3547 HGDIOBJ old_obj;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3548 old_obj = SelectObject (hdc, xpm_mask->bitmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3549
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3550 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
3551 SelectObject (hdc, old_obj);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3552
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3553 img->mask = xpm_mask->bitmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3554 fn_XImageFree (xpm_mask);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3555 DeleteDC (hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3556 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3557
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3558 DeleteDC (hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3559 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3560
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3561 /* Remember allocated colors. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3562 img->ncolors = attrs.nalloc_pixels;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3563 img->colors = (unsigned long *) xmalloc (img->ncolors
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3564 * sizeof *img->colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3565 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
3566 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3567 img->colors[i] = attrs.alloc_pixels[i];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3568 #ifdef DEBUG_X_COLORS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3569 register_color (img->colors[i]);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3570 #endif
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 #endif /* not ALLOC_XPM_COLORS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3573
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3574 img->width = attrs.width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3575 img->height = attrs.height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3576 xassert (img->width > 0 && img->height > 0);
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 /* 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
3579 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3580 fn_XpmFreeAttributes (&attrs);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3581 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3582 XpmFreeAttributes (&attrs);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3583 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3584 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3585 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3586 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3587 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3588 DeleteDC (hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3589 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3590
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3591 switch (rc)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3592 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3593 case XpmOpenFailed:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3594 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
3595 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3596
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3597 case XpmFileInvalid:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3598 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
3599 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3600
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3601 case XpmNoMemory:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3602 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
3603 break;
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 case XpmColorFailed:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3606 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
3607 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3608
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3609 default:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3610 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
3611 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3612 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3613 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3614
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3615 #ifdef ALLOC_XPM_COLORS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3616 xpm_free_color_cache ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3617 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3618 return rc == XpmSuccess;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3621 #endif /* HAVE_XPM */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
3622
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
3623 #if defined (HAVE_NS) && !defined (HAVE_XPM)
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
3624
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
3625 /* 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
3626 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
3627
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3628 static int xpm_scan (const unsigned char **, const unsigned char *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3629 const unsigned char **, int *);
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3630 static Lisp_Object xpm_make_color_table_v
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3631 (void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object),
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3632 Lisp_Object (**) (Lisp_Object, const unsigned char *, int));
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3633 static void xpm_put_color_table_v (Lisp_Object, const unsigned char *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3634 int, Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3635 static Lisp_Object xpm_get_color_table_v (Lisp_Object,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3636 const unsigned char *, int);
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3637 static Lisp_Object xpm_make_color_table_h
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3638 (void (**) (Lisp_Object, const unsigned char *, int, Lisp_Object),
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3639 Lisp_Object (**) (Lisp_Object, const unsigned char *, int));
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3640 static void xpm_put_color_table_h (Lisp_Object, const unsigned char *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3641 int, Lisp_Object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3642 static Lisp_Object xpm_get_color_table_h (Lisp_Object,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3643 const unsigned char *, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3644 static int xpm_str_to_color_key (const char *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3645 static int xpm_load_image (struct frame *, struct image *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
3646 const unsigned char *, const unsigned char *);
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3647
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3648 /* Tokens returned from xpm_scan. */
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3649
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3650 enum xpm_token
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3651 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3652 XPM_TK_IDENT = 256,
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3653 XPM_TK_STRING,
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3654 XPM_TK_EOF
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3655 };
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3656
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3657 /* 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
3658 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
3659 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
3660 *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
3661 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
3662 length of the corresponding token, respectively. */
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3663
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3664 static int
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3665 xpm_scan (const unsigned char **s,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3666 const unsigned char *end,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3667 const unsigned char **beg,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3668 int *len)
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3669 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3670 int c;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3671
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3672 while (*s < end)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3673 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3674 /* Skip white-space. */
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3675 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
3676 ;
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3677
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3678 /* 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
3679 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
3680 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
3681 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3682 *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
3683 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
3684 && (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
3685 ++*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
3686 *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
3687 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
3688 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3689 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
3690 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3691 *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
3692 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
3693 ++*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
3694 *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
3695 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
3696 ++*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
3697 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
3698 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3699 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
3700 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3701 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
3702 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3703 /* 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
3704 ++*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
3705 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
3706 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3707 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
3708 ;
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3709 }
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3710 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
3711 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
3712 ++*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
3713 }
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3714 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
3715 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
3716 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3717 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
3718 return c;
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3719 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3720
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3721 return XPM_TK_EOF;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3722 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3723
78970
35f78a0b1e30 (syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 78863
diff changeset
3724 /* 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
3725 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
3726 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
3727 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
3728 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
3729 hash table is used. */
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3730
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3731 static Lisp_Object
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3732 xpm_make_color_table_v (void (**put_func) (Lisp_Object,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3733 const unsigned char *,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3734 int,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3735 Lisp_Object),
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3736 Lisp_Object (**get_func) (Lisp_Object,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3737 const unsigned char *,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3738 int))
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3739 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3740 *put_func = xpm_put_color_table_v;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3741 *get_func = xpm_get_color_table_v;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3742 return Fmake_vector (make_number (256), Qnil);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3743 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3744
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3745 static void
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3746 xpm_put_color_table_v (Lisp_Object color_table,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3747 const unsigned char *chars_start,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3748 int chars_len,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3749 Lisp_Object color)
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3750 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3751 XVECTOR (color_table)->contents[*chars_start] = color;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3752 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3753
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3754 static Lisp_Object
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3755 xpm_get_color_table_v (Lisp_Object color_table,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3756 const unsigned char *chars_start,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3757 int chars_len)
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3758 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3759 return XVECTOR (color_table)->contents[*chars_start];
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3760 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3761
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3762 static Lisp_Object
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3763 xpm_make_color_table_h (void (**put_func) (Lisp_Object,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3764 const unsigned char *,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3765 int,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3766 Lisp_Object),
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3767 Lisp_Object (**get_func) (Lisp_Object,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3768 const unsigned char *,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3769 int))
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3770 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3771 *put_func = xpm_put_color_table_h;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3772 *get_func = xpm_get_color_table_h;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3773 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
3774 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
3775 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
3776 Qnil, Qnil, Qnil);
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3777 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3778
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3779 static void
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3780 xpm_put_color_table_h (Lisp_Object color_table,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3781 const unsigned char *chars_start,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3782 int chars_len,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3783 Lisp_Object color)
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3784 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3785 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
3786 unsigned hash_code;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3787 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
3788
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3789 hash_lookup (table, chars, &hash_code);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3790 hash_put (table, chars, color, hash_code);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3791 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3792
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3793 static Lisp_Object
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3794 xpm_get_color_table_h (Lisp_Object color_table,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3795 const unsigned char *chars_start,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3796 int chars_len)
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3797 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3798 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
3799 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
3800 NULL);
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3801
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3802 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
3803 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3804
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3805 enum xpm_color_key {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3806 XPM_COLOR_KEY_S,
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3807 XPM_COLOR_KEY_M,
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3808 XPM_COLOR_KEY_G4,
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3809 XPM_COLOR_KEY_G,
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3810 XPM_COLOR_KEY_C
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3811 };
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3812
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
3813 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
3814
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3815 static int
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3816 xpm_str_to_color_key (const char *s)
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3817 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3818 int i;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3819
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3820 for (i = 0;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3821 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
3822 i++)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3823 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
3824 return i;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3825 return -1;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3826 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3827
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3828 static int
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3829 xpm_load_image (struct frame *f,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3830 struct image *img,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3831 const unsigned char *contents,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
3832 const unsigned char *end)
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
3833 {
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
3834 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
3835 unsigned char buffer[BUFSIZ];
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3836 int width, height, x, y;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3837 int num_colors, chars_per_pixel;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3838 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
3839 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
3840 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
3841 Lisp_Object frame, color_symbols, color_table;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3842 int best_key, have_mask = 0;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3843 XImagePtr ximg = NULL, mask_img = NULL;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3844
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3845 #define match() \
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3846 LA1 = xpm_scan (&s, end, &beg, &len)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3847
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
3848 #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
3849 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
3850 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
3851 else \
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3852 match ()
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3853
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
3854 #define expect_ident(IDENT) \
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3855 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
3856 && 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
3857 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
3858 else \
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3859 goto failure
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3860
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3861 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
3862 goto failure;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3863 s += 9;
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
3864 match ();
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3865 expect_ident ("static");
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3866 expect_ident ("char");
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3867 expect ('*');
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3868 expect (XPM_TK_IDENT);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3869 expect ('[');
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3870 expect (']');
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3871 expect ('=');
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3872 expect ('{');
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3873 expect (XPM_TK_STRING);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3874 if (len >= BUFSIZ)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3875 goto failure;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3876 memcpy (buffer, beg, len);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3877 buffer[len] = '\0';
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3878 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
3879 &num_colors, &chars_per_pixel) != 4
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3880 || width <= 0 || height <= 0
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3881 || num_colors <= 0 || chars_per_pixel <= 0)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3882 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
3883
2f521eba6f82 [MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 66208
diff changeset
3884 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
3885 {
102392
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
3886 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
3887 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
3888 }
2f521eba6f82 [MAC_OS] (image_load_qt_1): Check image size.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 66208
diff changeset
3889
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3890 expect (',');
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3891
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3892 XSETFRAME (frame, f);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3893 if (!NILP (Fxw_display_color_p (frame)))
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3894 best_key = XPM_COLOR_KEY_C;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3895 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
3896 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
3897 ? 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
3898 else
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3899 best_key = XPM_COLOR_KEY_M;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3900
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3901 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
3902 if (chars_per_pixel == 1)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3903 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
3904 &get_color_table);
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3905 else
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3906 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
3907 &get_color_table);
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3908
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3909 while (num_colors-- > 0)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3910 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3911 unsigned char *color, *max_color;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3912 int key, next_key, max_key = 0;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3913 Lisp_Object symbol_color = Qnil, color_val;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3914 XColor cdef;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3915
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3916 expect (XPM_TK_STRING);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3917 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
3918 goto failure;
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3919 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
3920 buffer[len - chars_per_pixel] = '\0';
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3921
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3922 str = strtok (buffer, " \t");
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3923 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
3924 goto failure;
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3925 key = xpm_str_to_color_key (str);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3926 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
3927 goto failure;
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3928 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
3929 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3930 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
3931 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
3932 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
3933
69958
609c61a0071d [MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 69771
diff changeset
3934 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
3935 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3936 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
3937 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
3938 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
3939 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
3940 }
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3941
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3942 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
3943 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3944 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
3945 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
3946 }
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3947 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
3948 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3949 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
3950 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
3951 }
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3952 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
3953 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3954 while (str);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3955
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3956 color_val = Qnil;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3957 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
3958 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3959 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
3960
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
3961 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
3962 {
95213
93de3f6c1a6c * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 94963
diff changeset
3963 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
3964 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
3965 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
3966 &cdef, 0))
609c61a0071d [MAC_OS] (xpm_load_image): Add parentheses around
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 69771
diff changeset
3967 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
3968 }
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
3969 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3970 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
3971 {
95213
93de3f6c1a6c * dispextern.h, xfaces.c (xstrcasecmp): Renamed from xstricmp.
Jason Rumney <jasonr@gnu.org>
parents: 94963
diff changeset
3972 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
3973 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
3974 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
3975 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
3976 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3977 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
3978 (*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
3979
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3980 expect (',');
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
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3983 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
3984 &ximg, &img->pixmap)
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
3985 #ifndef HAVE_NS
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3986 || !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
3987 &mask_img, &img->mask)
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
3988 #endif
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
3989 )
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3990 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3991 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
3992 goto error;
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
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3995 for (y = 0; y < height; y++)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3996 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3997 expect (XPM_TK_STRING);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3998 str = beg;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
3999 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
4000 goto failure;
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4001 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
4002 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
4003 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
4004 (*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
4005
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
4006 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
4007 (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
4008 : FRAME_FOREGROUND_PIXEL (f)));
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4009 #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
4010 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
4011 (!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
4012 : (have_mask = 1, PIX_MASK_RETAIN)));
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4013 #else
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
4014 if (EQ (color_val, Qt))
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
4015 ns_set_alpha (ximg, x, y, 0);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4016 #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
4017 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4018 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
4019 expect (',');
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4020 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4021
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4022 img->width = width;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4023 img->height = height;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4024
70147
37f988f09f67 [MAC_OS] (xpm_load_image): Fill in background field
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 70068
diff changeset
4025 /* 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
4026 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
4027 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
4028
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4029 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
4030 x_destroy_x_image (ximg);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4031 #ifndef HAVE_NS
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4032 if (have_mask)
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4033 {
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
4034 /* 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
4035 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
4036 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
4037
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4038 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
4039 x_destroy_x_image (mask_img);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4040 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4041 else
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4042 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4043 x_destroy_x_image (mask_img);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4044 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
4045 img->mask = NO_PIXMAP;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4046 }
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4047 #endif
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4048 return 1;
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 failure:
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4051 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
4052 error:
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4053 x_destroy_x_image (ximg);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4054 x_destroy_x_image (mask_img);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4055 x_clear_image (f, img);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4056 return 0;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4057
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4058 #undef match
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4059 #undef expect
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4060 #undef expect_ident
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4061 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4062
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4063 static int
109653
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
4064 xpm_load (struct frame *f,
9cfca8c9fb07 Fix missing prototypes for HAVE_NS (caused crash) and vrious warnings.
Jan D <jan.h.d@swipnet.se>
parents: 109573
diff changeset
4065 struct image *img)
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4066 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4067 int success_p = 0;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4068 Lisp_Object file_name;
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 /* 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
4071 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
4072 if (STRINGP (file_name))
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4073 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4074 Lisp_Object file;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4075 unsigned char *contents;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4076 int size;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4077
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4078 file = x_find_image_file (file_name);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4079 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
4080 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
4081 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
4082 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
4083 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4084
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4085 contents = slurp_file (SDATA (file), &size);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4086 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
4087 {
8105f38368d5 (PIX_MASK_DRAW, PIX_MASK_RETAIN): Remove argument. All uses changed.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 64967
diff changeset
4088 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
4089 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
4090 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4091
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4092 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
4093 xfree (contents);
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4094 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4095 else
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4096 {
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4097 Lisp_Object data;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4098
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4099 data = image_spec_value (img->spec, QCdata, NULL);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
4100 if (!STRINGP (data))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
4101 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
4102 image_error ("Invalid image data `%s'", data, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
4103 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
4104 }
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4105 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
4106 SDATA (data) + SBYTES (data));
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4107 }
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 return success_p;
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4110 }
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4111
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
4112 #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
4113
55540
30c03f9042b8 Support XPM on Carbon Emacs. Does not
Steven Tamm <steventamm@mac.com>
parents: 55412
diff changeset
4114
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4115
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4116 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4117 Color table
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4118 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4119
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4120 #ifdef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4121
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4122 /* 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
4123
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4124 struct ct_color
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4125 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4126 int r, g, b;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4127 unsigned long pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4128
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4129 /* Next in color table collision list. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4130 struct ct_color *next;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4131 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4132
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4133 /* 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
4134
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4135 #define CT_SIZE 101
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4136
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4137 /* 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
4138
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4139 #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
4140
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4141 /* The color hash table. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4142
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4143 struct ct_color **ct_table;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4144
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4145 /* Number of entries in the color table. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4146
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4147 int ct_colors_allocated;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4148
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4149 /* Initialize the color table. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4150
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4151 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4152 init_color_table (void)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4153 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4154 int size = CT_SIZE * sizeof (*ct_table);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4155 ct_table = (struct ct_color **) xmalloc (size);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4156 memset (ct_table, 0, size);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4157 ct_colors_allocated = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4158 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4159
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4160
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4161 /* Free memory associated with the color table. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4162
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4163 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4164 free_color_table (void)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4165 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4166 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4167 struct ct_color *p, *next;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4168
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4169 for (i = 0; i < CT_SIZE; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4170 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
4171 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4172 next = p->next;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4173 xfree (p);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4174 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4175
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4176 xfree (ct_table);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4177 ct_table = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4178 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4179
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4180
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4181 /* 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
4182 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
4183 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
4184 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
4185
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4186 static unsigned long
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4187 lookup_rgb_color (struct frame *f, int r, int g, int b)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4188 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4189 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
4190 int i = hash % CT_SIZE;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4191 struct ct_color *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4192 Display_Info *dpyinfo;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4193
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4194 /* 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
4195 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
4196 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
4197 the Xlib spec, chapter 3.1. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4198 dpyinfo = FRAME_X_DISPLAY_INFO (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4199 if (dpyinfo->red_bits > 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4200 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4201 unsigned long pr, pg, pb;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4202
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4203 /* 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
4204 if (f->gamma)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4205 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4206 XColor color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4207 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
4208 gamma_correct (f, &color);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4209 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
4210 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4211
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4212 /* 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
4213 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
4214 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
4215 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
4216 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
4217 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
4218
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4219 /* Assemble the pixel color. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4220 return pr | pg | pb;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4221 }
54920
38cb79e68369 (PNG_BG_COLOR_SHIFT): Remove.
Kim F. Storm <storm@cua.dk>
parents: 54427
diff changeset
4222
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4223 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
4224 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
4225 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4226
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4227 if (p == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4228 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4229
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4230 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4231 XColor color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4232 Colormap cmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4233 int rc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4234
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4235 color.red = r;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4236 color.green = g;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4237 color.blue = b;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4238
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4239 cmap = FRAME_X_COLORMAP (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4240 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
4241 if (rc)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4242 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4243 ++ct_colors_allocated;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4244 p = (struct ct_color *) xmalloc (sizeof *p);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4245 p->r = r;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4246 p->g = g;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4247 p->b = b;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4248 p->pixel = color.pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4249 p->next = ct_table[i];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4250 ct_table[i] = p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4251 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4252 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4253 return FRAME_FOREGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4254
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4255 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4256 COLORREF color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4257 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4258 color = PALETTERGB (r, g, b);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4259 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4260 color = RGB_TO_ULONG (r, g, b);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4261 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4262 ++ct_colors_allocated;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4263 p = (struct ct_color *) xmalloc (sizeof *p);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4264 p->r = r;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4265 p->g = g;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4266 p->b = b;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4267 p->pixel = color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4268 p->next = ct_table[i];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4269 ct_table[i] = p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4270 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4271
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4272 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4273
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4274 return p->pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4275 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4276
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4277
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4278 /* 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
4279 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
4280
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4281 static unsigned long
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4282 lookup_pixel_color (struct frame *f, unsigned long pixel)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4283 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4284 int i = pixel % CT_SIZE;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4285 struct ct_color *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4286
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4287 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
4288 if (p->pixel == pixel)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4289 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4290
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4291 if (p == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4292 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4293 XColor color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4294 Colormap cmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4295 int rc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4296
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4297 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4298 cmap = FRAME_X_COLORMAP (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4299 color.pixel = pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4300 x_query_color (f, &color);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4301 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
4302 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4303 BLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4304 cmap = DefaultColormapOfScreen (FRAME_X_SCREEN (f));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4305 color.pixel = pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4306 XQueryColor (NULL, cmap, &color);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4307 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
4308 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4309 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4310
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4311 if (rc)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4312 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4313 ++ct_colors_allocated;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4314
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4315 p = (struct ct_color *) xmalloc (sizeof *p);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4316 p->r = color.red;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4317 p->g = color.green;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4318 p->b = color.blue;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4319 p->pixel = pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4320 p->next = ct_table[i];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4321 ct_table[i] = p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4322 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4323 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4324 return FRAME_FOREGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4325 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4326 return p->pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4327 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4328
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4329
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4330 /* 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
4331 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
4332
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4333 static unsigned long *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4334 colors_in_color_table (int *n)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4335 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4336 int i, j;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4337 struct ct_color *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4338 unsigned long *colors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4339
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4340 if (ct_colors_allocated == 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4341 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4342 *n = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4343 colors = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4344 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4345 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4346 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4347 colors = (unsigned long *) xmalloc (ct_colors_allocated
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4348 * sizeof *colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4349 *n = ct_colors_allocated;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4350
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4351 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
4352 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
4353 colors[j++] = p->pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4354 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4355
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4356 return colors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4357 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4358
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4359 #else /* COLOR_TABLE_SUPPORT */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4360
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4361 static unsigned long
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109302
diff changeset
4362 lookup_rgb_color (struct frame *f, int r, int g, int b)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4363 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4364 unsigned long pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4365
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4366 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4367 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
4368 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4369
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4370 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4371 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
4372 #endif /* HAVE_NS */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4373 return pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4374 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4375
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4376 static void
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109302
diff changeset
4377 init_color_table (void)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4378 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4379 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4380 #endif /* COLOR_TABLE_SUPPORT */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4381
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4382
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4383 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4384 Algorithms
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4385 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4386
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
4387 static XColor *x_to_xcolors (struct frame *, struct image *, int);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
4388 static void x_from_xcolors (struct frame *, struct image *, XColor *);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
4389 static void x_detect_edges (struct frame *, struct image *, int[9], int);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4390
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4391 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4392 static void XPutPixel (XImagePtr , int, int, COLORREF);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4393 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4394
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4395 /* Edge detection matrices for different edge-detection
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4396 strategies. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4397
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4398 static int emboss_matrix[9] = {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4399 /* x - 1 x x + 1 */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4400 2, -1, 0, /* y - 1 */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4401 -1, 0, 1, /* y */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4402 0, 1, -2 /* y + 1 */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4403 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4404
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4405 static int laplace_matrix[9] = {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4406 /* x - 1 x x + 1 */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4407 1, 0, 0, /* y - 1 */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4408 0, 0, 0, /* y */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4409 0, 0, -1 /* y + 1 */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4410 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4411
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4412 /* 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
4413 are R, G, and B. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4414
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4415 #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
4416
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4417
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4418 /* 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
4419 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
4420 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
4421 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
4422 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
4423
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4424 static XColor *
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4425 x_to_xcolors (struct frame *f, struct image *img, int rgb_p)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4426 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4427 int x, y;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4428 XColor *colors, *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4429 XImagePtr_or_DC ximg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4430 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4431 HDC hdc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4432 HGDIOBJ prev;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4433 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4434
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4435 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
4436
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4437 #ifndef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4438 /* Get the X image IMG->pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4439 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
4440 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
4441 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4442 /* 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
4443 hdc = get_frame_dc (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4444 ximg = CreateCompatibleDC (hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4445 release_frame_dc (f, hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4446 prev = SelectObject (ximg, img->pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4447 #endif /* HAVE_NTGUI */
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 /* 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
4450 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
4451 p = colors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4452 for (y = 0; y < img->height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4453 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4454 XColor *row = p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4455
100845
58017ff34d94 * w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents: 100826
diff changeset
4456 #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
4457 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
4458 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
4459 if (rgb_p)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4460 x_query_colors (f, row, img->width);
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 #else
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 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
4465 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4466 /* W32_TODO: palette support needed here? */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4467 p->pixel = GET_PIXEL (ximg, x, y);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4468 if (rgb_p)
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 p->red = RED16_FROM_ULONG (p->pixel);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4471 p->green = GREEN16_FROM_ULONG (p->pixel);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4472 p->blue = BLUE16_FROM_ULONG (p->pixel);
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 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4475 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4476 }
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 Destroy_Image (ximg, prev);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4479
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4480 return colors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4481 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4482
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4483 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4484
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4485 /* 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
4486 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
4487 stored in ximg->data. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4488
78692
6e1f6f80e430 (syms_of_image) <image-library-alist, cross-disabled-images>: Doc fixes.
Juanma Barranquero <lekktu@gmail.com>
parents: 78450
diff changeset
4489 static void
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109302
diff changeset
4490 XPutPixel (XImagePtr ximg, int x, int y, COLORREF color)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4491 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4492 int width = ximg->info.bmiHeader.biWidth;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4493 int height = ximg->info.bmiHeader.biHeight;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4494 unsigned char * pixel;
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 /* True color images. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4497 if (ximg->info.bmiHeader.biBitCount == 24)
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 int rowbytes = width * 3;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4500 /* 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
4501 if (rowbytes % 4)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4502 rowbytes += 4 - (rowbytes % 4);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4503
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4504 pixel = ximg->data + y * rowbytes + x * 3;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4505 /* Windows bitmaps are in BGR order. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4506 *pixel = GetBValue (color);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4507 *(pixel + 1) = GetGValue (color);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4508 *(pixel + 2) = GetRValue (color);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4509 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4510 /* Monochrome images. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4511 else if (ximg->info.bmiHeader.biBitCount == 1)
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 int rowbytes = width / 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4514 /* 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
4515 if (rowbytes % 4)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4516 rowbytes += 4 - (rowbytes % 4);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4517 pixel = ximg->data + y * rowbytes + x / 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4518 /* Filter out palette info. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4519 if (color & 0x00ffffff)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4520 *pixel = *pixel | (1 << x % 8);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4521 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4522 *pixel = *pixel & ~(1 << x % 8);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4523 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4524 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4525 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
4526 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4527
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4528 #endif /* HAVE_NTGUI */
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 /* 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
4531 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
4532 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
4533
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4534 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4535 x_from_xcolors (struct frame *f, struct image *img, XColor *colors)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4536 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4537 int x, y;
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4538 XImagePtr oimg = NULL;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4539 Pixmap pixmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4540 XColor *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4541
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4542 init_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4543
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4544 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
4545 &oimg, &pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4546 p = colors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4547 for (y = 0; y < img->height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4548 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
4549 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4550 unsigned long pixel;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4551 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
4552 XPutPixel (oimg, x, y, pixel);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4553 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4554
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4555 xfree (colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4556 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
4557
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4558 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
4559 x_destroy_x_image (oimg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4560 img->pixmap = pixmap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4561 #ifdef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4562 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
4563 free_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4564 #endif /* COLOR_TABLE_SUPPORT */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4565 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4566
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 /* 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
4569
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4570 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
4571 matrix. See emboss_matrix for an example.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4572
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4573 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
4574 outgoing image. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4575
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4576 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4577 x_detect_edges (struct frame *f, struct image *img, int *matrix, int color_adjust)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4578 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4579 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
4580 XColor *new, *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4581 int x, y, i, sum;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4582
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4583 for (i = sum = 0; i < 9; ++i)
85254
8004c957b946 Replace `abs' with `eabs'.
Eli Zaretskii <eliz@gnu.org>
parents: 85118
diff changeset
4584 sum += eabs (matrix[i]);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4585
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4586 #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
4587
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4588 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
4589
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4590 for (y = 0; y < img->height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4591 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4592 p = COLOR (new, 0, y);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4593 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
4594 p = COLOR (new, img->width - 1, y);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4595 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
4596 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4597
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4598 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
4599 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4600 p = COLOR (new, x, 0);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4601 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
4602 p = COLOR (new, x, img->height - 1);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4603 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
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 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
4607 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4608 p = COLOR (new, 1, y);
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 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
4611 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4612 int r, g, b, y1, x1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4613
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4614 r = g = b = i = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4615 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
4616 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
4617 if (matrix[i])
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4618 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4619 XColor *t = COLOR (colors, x1, y1);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4620 r += matrix[i] * t->red;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4621 g += matrix[i] * t->green;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4622 b += matrix[i] * t->blue;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4625 r = (r / sum + color_adjust) & 0xffff;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4626 g = (g / sum + color_adjust) & 0xffff;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4627 b = (b / sum + color_adjust) & 0xffff;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4628 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
4629 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4630 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4631
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4632 xfree (colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4633 x_from_xcolors (f, img, new);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4634
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4635 #undef COLOR
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4636 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4637
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4638
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4639 /* 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
4640 on frame F. */
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 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4643 x_emboss (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4644 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4645 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
4646 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4647
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4648
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4649 /* 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
4650 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
4651 to draw disabled buttons, for example. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4652
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4653 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4654 x_laplace (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4655 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4656 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
4657 }
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 /* 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
4661 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
4662
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4663 MATRIX must be either
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4664
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4665 - 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
4666 - a vector of at least 9 numbers
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 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
4669 number. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4670
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4671 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4672 x_edge_detection (struct frame *f, struct image *img, Lisp_Object matrix,
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4673 Lisp_Object color_adjust)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4674 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4675 int i = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4676 int trans[9];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4677
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4678 if (CONSP (matrix))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4679 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4680 for (i = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4681 i < 9 && CONSP (matrix) && NUMBERP (XCAR (matrix));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4682 ++i, matrix = XCDR (matrix))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4683 trans[i] = XFLOATINT (XCAR (matrix));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4684 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4685 else if (VECTORP (matrix) && ASIZE (matrix) >= 9)
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 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
4688 trans[i] = XFLOATINT (AREF (matrix, i));
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 if (NILP (color_adjust))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4692 color_adjust = make_number (0xffff / 2);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4693
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4694 if (i == 9 && NUMBERP (color_adjust))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4695 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
4696 }
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4699 /* 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
4700
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4701 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4702 x_disable_image (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4703 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4704 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
4705 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4706 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
4707 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4708 int n_planes = dpyinfo->n_planes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4709 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4710
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4711 if (n_planes >= 2)
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 /* 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
4714 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
4715 we're using this method instead. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4716 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
4717 XColor *p, *end;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4718 const int h = 15000;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4719 const int l = 30000;
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 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
4722 p < end;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4723 ++p)
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 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
4726 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
4727 p->red = p->green = p->blue = i2;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4730 x_from_xcolors (f, img, colors);
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4733 /* 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
4734 should. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4735 if (n_planes < 2 || cross_disabled_images)
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 #ifndef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4738 Display *dpy = FRAME_X_DISPLAY (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4739 GC gc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4740
104573
7690800317e8 joakim at verona.se
Glenn Morris <rgm@gnu.org>
parents: 104259
diff changeset
4741 #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
4742
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4743 #define MaskForeground(f) WHITE_PIX_DEFAULT (f)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4744
75153
fd0c738b5d49 (XDrawLine) [MAC_OS]: Remove macro.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73570
diff changeset
4745 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
4746 XSetForeground (dpy, gc, BLACK_PIX_DEFAULT (f));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4747 XDrawLine (dpy, img->pixmap, gc, 0, 0,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4748 img->width - 1, img->height - 1);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4749 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
4750 img->width - 1, 0);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4751 XFreeGC (dpy, gc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4752
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4753 if (img->mask)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4754 {
75153
fd0c738b5d49 (XDrawLine) [MAC_OS]: Remove macro.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 73570
diff changeset
4755 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
4756 XSetForeground (dpy, gc, MaskForeground (f));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4757 XDrawLine (dpy, img->mask, gc, 0, 0,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4758 img->width - 1, img->height - 1);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4759 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
4760 img->width - 1, 0);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4761 XFreeGC (dpy, gc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4762 }
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4763 #endif /* !HAVE_NS */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4764 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4765 HDC hdc, bmpdc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4766 HGDIOBJ prev;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4767
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4768 hdc = get_frame_dc (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4769 bmpdc = CreateCompatibleDC (hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4770 release_frame_dc (f, hdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4771
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4772 prev = SelectObject (bmpdc, img->pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4773
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4774 SetTextColor (bmpdc, BLACK_PIX_DEFAULT (f));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4775 MoveToEx (bmpdc, 0, 0, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4776 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
4777 MoveToEx (bmpdc, 0, img->height - 1, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4778 LineTo (bmpdc, img->width - 1, 0);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4779
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4780 if (img->mask)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4781 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4782 SelectObject (bmpdc, img->mask);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4783 SetTextColor (bmpdc, WHITE_PIX_DEFAULT (f));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4784 MoveToEx (bmpdc, 0, 0, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4785 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
4786 MoveToEx (bmpdc, 0, img->height - 1, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4787 LineTo (bmpdc, img->width - 1, 0);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4788 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4789 SelectObject (bmpdc, prev);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4790 DeleteDC (bmpdc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4791 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4792 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4793 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4794
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 /* 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
4797 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
4798 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
4799 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
4800 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
4801 heuristically. Value is non-zero if successful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4802
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4803 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4804 x_build_heuristic_mask (struct frame *f, struct image *img, Lisp_Object how)
54341
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 XImagePtr_or_DC ximg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4807 #ifndef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4808 XImagePtr mask_img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4809 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4810 HDC frame_dc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4811 HGDIOBJ prev;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4812 char *mask_img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4813 int row_width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4814 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4815 int x, y, rc, use_img_background;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4816 unsigned long bg = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4817
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4818 if (img->mask)
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 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
4821 img->mask = NO_PIXMAP;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4822 img->background_transparent_valid = 0;
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 #ifndef HAVE_NTGUI
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4826 #ifndef HAVE_NS
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4827 /* 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
4828 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
4829 &mask_img, &img->mask);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4830 if (!rc)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4831 return 0;
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4832 #endif /* !HAVE_NS */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4833
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4834 /* Get the X image of IMG->pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4835 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
4836 img->width, img->height,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4837 ~0, ZPixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4838 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4839 /* Create the bit array serving as mask. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4840 row_width = (img->width + 7) / 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4841 mask_img = xmalloc (row_width * img->height);
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4842 memset (mask_img, 0, row_width * img->height);
54341
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 /* 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
4845 frame_dc = get_frame_dc (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4846 ximg = CreateCompatibleDC (frame_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4847 release_frame_dc (f, frame_dc);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4848 prev = SelectObject (ximg, img->pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4849 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4850
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4851 /* 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
4852 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
4853 use_img_background = 1;
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 if (CONSP (how))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4856 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4857 int rgb[3], i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4858
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4859 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
4860 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4861 rgb[i] = XFASTINT (XCAR (how)) & 0xffff;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4862 how = XCDR (how);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4863 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4864
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4865 if (i == 3 && NILP (how))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4866 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4867 char color_name[30];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4868 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
4869 bg = (
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4870 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4871 0x00ffffff & /* Filter out palette info. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4872 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4873 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
4874 use_img_background = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4875 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4876 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4877
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4878 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
4879 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
4880
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4881 /* 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
4882 from the background color bg. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4883 #ifndef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4884 for (y = 0; y < img->height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4885 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
4886 #ifndef HAVE_NS
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4887 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
4888 ? PIX_MASK_DRAW : PIX_MASK_RETAIN));
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4889 #else
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4890 if (XGetPixel (ximg, x, y) == bg)
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
4891 ns_set_alpha (ximg, x, y, 0);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4892 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4893 #ifndef HAVE_NS
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4894 /* 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
4895 image_background_transparent (img, f, mask_img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4896
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4897 /* Put mask_img into img->mask. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4898 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
4899 x_destroy_x_image (mask_img);
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
4900 #endif /* !HAVE_NS */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4901 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4902 for (y = 0; y < img->height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4903 for (x = 0; x < img->width; ++x)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4904 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4905 COLORREF p = GetPixel (ximg, x, y);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4906 if (p != bg)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4907 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
4908 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4909
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4910 /* Create the mask image. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4911 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
4912 mask_img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4913 /* 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
4914 SelectObject (ximg, img->mask);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4915 image_background_transparent (img, f, ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4916
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4917 /* 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
4918 xfree (mask_img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4919 #endif /* HAVE_NTGUI */
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 Destroy_Image (ximg, prev);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4922
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4923 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4924 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4925
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4926
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4927 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4928 PBM (mono, gray, color)
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
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
4931 static int pbm_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
4932 static int pbm_load (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
4933 static int pbm_scan_number (unsigned char **, unsigned char *);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4934
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4935 /* 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
4936
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4937 Lisp_Object Qpbm;
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 /* 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
4940
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4941 enum pbm_keyword_index
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 PBM_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4944 PBM_FILE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4945 PBM_DATA,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4946 PBM_ASCENT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4947 PBM_MARGIN,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4948 PBM_RELIEF,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4949 PBM_ALGORITHM,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4950 PBM_HEURISTIC_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4951 PBM_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4952 PBM_FOREGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4953 PBM_BACKGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4954 PBM_LAST
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 /* 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
4958 of valid user-defined image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4959
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
4960 static const struct image_keyword pbm_format[PBM_LAST] =
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4961 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4962 {":type", IMAGE_SYMBOL_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4963 {":file", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4964 {":data", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4965 {":ascent", IMAGE_ASCENT_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4966 {":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
4967 {":relief", IMAGE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4968 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4969 {":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
4970 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4971 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4972 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4973 };
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 /* Structure describing the image type `pbm'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4976
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4977 static struct image_type pbm_type =
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4978 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4979 &Qpbm,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4980 pbm_image_p,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4981 pbm_load,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4982 x_clear_image,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4983 NULL
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4984 };
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4987 /* 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
4988
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4989 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
4990 pbm_image_p (Lisp_Object object)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4991 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4992 struct image_keyword fmt[PBM_LAST];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4993
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
4994 memcpy (fmt, pbm_format, sizeof fmt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4995
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4996 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
4997 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4998
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
4999 /* Must specify either :data or :file. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5000 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
5001 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5002
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5003
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5004 /* 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
5005 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
5006 end of input. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5007
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5008 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5009 pbm_scan_number (unsigned char **s, unsigned char *end)
54341
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 int c = 0, val = -1;
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 while (*s < end)
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 /* Skip white-space. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5016 while (*s < end && (c = *(*s)++, isspace (c)))
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5019 if (c == '#')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5020 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5021 /* Skip comment to end of line. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5022 while (*s < end && (c = *(*s)++, c != '\n'))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5023 ;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5024 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5025 else if (isdigit (c))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5026 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5027 /* Read decimal number. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5028 val = c - '0';
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5029 while (*s < end && (c = *(*s)++, isdigit (c)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5030 val = 10 * val + c - '0';
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5031 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5032 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5033 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5034 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5035 }
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 return val;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5038 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5039
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5040
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5041 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5042 #if 0 /* Unused. ++kfs */
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 /* 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
5045 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
5046 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
5047
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5048 static char *
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5049 pbm_read_file (file, size)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5050 Lisp_Object file;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5051 int *size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5052 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5053 FILE *fp = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5054 char *buf = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5055 struct stat st;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5056
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5057 if (stat (SDATA (file), &st) == 0
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5058 && (fp = fopen (SDATA (file), "rb")) != NULL
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5059 && (buf = (char *) xmalloc (st.st_size),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5060 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
5061 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5062 *size = st.st_size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5063 fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5064 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5065 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5066 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5067 if (fp)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5068 fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5069 if (buf)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5070 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5071 xfree (buf);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5072 buf = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5073 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5074 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5075
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5076 return buf;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5077 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5078 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5079 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5080
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5081 /* 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
5082
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5083 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5084 pbm_load (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5085 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5086 int raw_p, x, y;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5087 int width, height, max_color_idx = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5088 XImagePtr ximg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5089 Lisp_Object file, specified_file;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5090 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
5091 unsigned char *contents = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5092 unsigned char *end, *p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5093 int size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5094
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5095 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
5096
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5097 if (STRINGP (specified_file))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5098 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5099 file = x_find_image_file (specified_file);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5100 if (!STRINGP (file))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5101 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5102 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
5103 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5104 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5105
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5106 contents = slurp_file (SDATA (file), &size);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5107 if (contents == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5108 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5109 image_error ("Error reading `%s'", file, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5110 return 0;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5113 p = contents;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5114 end = contents + size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5115 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5116 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5117 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5118 Lisp_Object data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5119 data = image_spec_value (img->spec, QCdata, NULL);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5120 if (!STRINGP (data))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5121 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5122 image_error ("Invalid image data `%s'", data, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5123 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5124 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5125 p = SDATA (data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5126 end = p + SBYTES (data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5127 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5128
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5129 /* Check magic number. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5130 if (end - p < 2 || *p++ != 'P')
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5131 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5132 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
5133 error:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5134 xfree (contents);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5135 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5136 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5137
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5138 switch (*p++)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5139 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5140 case '1':
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5141 raw_p = 0, type = PBM_MONO;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5142 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5143
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5144 case '2':
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5145 raw_p = 0, type = PBM_GRAY;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5146 break;
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 case '3':
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5149 raw_p = 0, type = PBM_COLOR;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5150 break;
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 case '4':
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5153 raw_p = 1, type = PBM_MONO;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5154 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5155
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5156 case '5':
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5157 raw_p = 1, type = PBM_GRAY;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5158 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5159
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5160 case '6':
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5161 raw_p = 1, type = PBM_COLOR;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5162 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5163
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5164 default:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5165 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
5166 goto error;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5169 /* Read width, height, maximum color-component. Characters
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5170 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
5171 width = pbm_scan_number (&p, end);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5172 height = pbm_scan_number (&p, end);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5173
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5174 if (type != PBM_MONO)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5175 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5176 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
5177 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
5178 {
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5179 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
5180 goto error;
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5181 }
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5182 }
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5183
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5184 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
5185 {
102392
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
5186 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
5187 goto error;
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5188 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5189
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5190 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
5191 &ximg, &img->pixmap))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5192 goto error;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5193
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5194 /* Initialize the color hash table. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5195 init_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5196
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5197 if (type == PBM_MONO)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5198 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5199 int c = 0, g;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5200 struct image_keyword fmt[PBM_LAST];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5201 unsigned long fg = FRAME_FOREGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5202 unsigned long bg = FRAME_BACKGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5203
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5204 /* Parse the image specification. */
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5205 memcpy (fmt, pbm_format, sizeof fmt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5206 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
5207
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5208 /* 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
5209 if (fmt[PBM_FOREGROUND].count
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5210 && STRINGP (fmt[PBM_FOREGROUND].value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5211 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
5212 if (fmt[PBM_BACKGROUND].count
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5213 && STRINGP (fmt[PBM_BACKGROUND].value))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5214 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5215 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
5216 img->background = bg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5217 img->background_valid = 1;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5220 for (y = 0; y < height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5221 for (x = 0; x < width; ++x)
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 if (raw_p)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5224 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5225 if ((x & 7) == 0)
78450
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5226 {
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5227 if (p >= end)
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5228 {
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5229 x_destroy_x_image (ximg);
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5230 x_clear_image (f, img);
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5231 image_error ("Invalid image size in image `%s'",
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5232 img->spec, Qnil);
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5233 goto error;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5234 }
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5235 c = *p++;
69b18f59a998 Sync to trunk version.
Chong Yidong <cyd@stupidchicken.com>
parents: 78260
diff changeset
5236 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5237 g = c & 0x80;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5238 c <<= 1;
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 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5241 g = pbm_scan_number (&p, end);
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 XPutPixel (ximg, x, y, g ? fg : bg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5244 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5245 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5246 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5247 {
80382
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5248 int expected_size = height * width;
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5249 if (max_color_idx > 255)
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5250 expected_size *= 2;
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5251 if (type == PBM_COLOR)
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5252 expected_size *= 3;
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5253
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5254 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
5255 {
05fce28aea26 (pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
5256 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
5257 x_clear_image (f, img);
76550
05fce28aea26 (pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
5258 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
5259 img->spec, Qnil);
05fce28aea26 (pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
5260 goto error;
05fce28aea26 (pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
5261 }
05fce28aea26 (pbm_load): Signal error for invalid image size.
Chong Yidong <cyd@stupidchicken.com>
parents: 75348
diff changeset
5262
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5263 for (y = 0; y < height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5264 for (x = 0; x < width; ++x)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5265 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5266 int r, g, b;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5267
80382
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5268 if (type == PBM_GRAY && raw_p)
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5269 {
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5270 r = g = b = *p++;
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5271 if (max_color_idx > 255)
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5272 r = g = b = r * 256 + *p++;
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5273 }
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5274 else if (type == PBM_GRAY)
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5275 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
5276 else if (raw_p)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5277 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5278 r = *p++;
80382
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5279 if (max_color_idx > 255)
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5280 r = r * 256 + *p++;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5281 g = *p++;
80382
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5282 if (max_color_idx > 255)
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5283 g = g * 256 + *p++;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5284 b = *p++;
80382
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5285 if (max_color_idx > 255)
296f5c781a2b (pbm_load): Allow color values up to 65535.
Jason Rumney <jasonr@gnu.org>
parents: 79759
diff changeset
5286 b = b * 256 + *p++;
54341
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 else
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 r = pbm_scan_number (&p, end);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5291 g = pbm_scan_number (&p, end);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5292 b = pbm_scan_number (&p, end);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5293 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5294
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5295 if (r < 0 || g < 0 || b < 0)
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 x_destroy_x_image (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5298 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
5299 img->spec, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5300 goto error;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5301 }
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 /* 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
5304 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
5305 r = (double) r * 65535 / max_color_idx;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5306 g = (double) g * 65535 / max_color_idx;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5307 b = (double) b * 65535 / max_color_idx;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5308 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
5309 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5310 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5311
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5312 #ifdef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5313 /* 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
5314 free the color table. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5315 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
5316 free_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5317 #endif /* COLOR_TABLE_SUPPORT */
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 img->width = width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5320 img->height = height;
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 /* 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
5323
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5324 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
5325 /* 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
5326 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
5327
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5328 /* Put the image into a pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5329 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
5330 x_destroy_x_image (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5331
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5332 /* 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
5333 img->width = width;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5334 img->height = height; */
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 xfree (contents);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5337 return 1;
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
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 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5342 PNG
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5343 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5344
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
5345 #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
5346
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5347 /* Function prototypes. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5348
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
5349 static int png_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
5350 static int png_load (struct frame *f, struct image *img);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5351
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5352 /* 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
5353
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5354 Lisp_Object Qpng;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5355
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5356 /* 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
5357
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5358 enum png_keyword_index
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5359 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5360 PNG_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5361 PNG_DATA,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5362 PNG_FILE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5363 PNG_ASCENT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5364 PNG_MARGIN,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5365 PNG_RELIEF,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5366 PNG_ALGORITHM,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5367 PNG_HEURISTIC_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5368 PNG_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5369 PNG_BACKGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5370 PNG_LAST
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5371 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5372
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5373 /* 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
5374 of valid user-defined image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5375
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
5376 static const struct image_keyword png_format[PNG_LAST] =
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5377 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5378 {":type", IMAGE_SYMBOL_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5379 {":data", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5380 {":file", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5381 {":ascent", IMAGE_ASCENT_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5382 {":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
5383 {":relief", IMAGE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5384 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5385 {":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
5386 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5387 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5390 /* Structure describing the image type `png'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5391
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5392 static struct image_type png_type =
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5393 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5394 &Qpng,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5395 png_image_p,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5396 png_load,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5397 x_clear_image,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5398 NULL
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 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
5402
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5403 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5404 png_image_p (Lisp_Object object)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5405 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5406 struct image_keyword fmt[PNG_LAST];
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5407 memcpy (fmt, png_format, sizeof fmt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5408
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5409 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
5410 return 0;
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 /* 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
5413 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
5414 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5415
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
5416 #endif /* HAVE_PNG || HAVE_NS */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5417
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5418
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5419 #ifdef HAVE_PNG
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 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5422 /* PNG library details. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5423
110973
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5424 DEF_IMGLIB_FN (png_get_io_ptr, (png_structp));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5425 DEF_IMGLIB_FN (png_sig_cmp, (png_bytep, png_size_t, png_size_t));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5426 DEF_IMGLIB_FN (png_create_read_struct, (png_const_charp, png_voidp,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5427 png_error_ptr, png_error_ptr));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5428 DEF_IMGLIB_FN (png_create_info_struct, (png_structp));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5429 DEF_IMGLIB_FN (png_destroy_read_struct, (png_structpp, png_infopp, png_infopp));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5430 DEF_IMGLIB_FN (png_set_read_fn, (png_structp, png_voidp, png_rw_ptr));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5431 DEF_IMGLIB_FN (png_set_sig_bytes, (png_structp, int));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5432 DEF_IMGLIB_FN (png_read_info, (png_structp, png_infop));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5433 DEF_IMGLIB_FN (png_get_IHDR, (png_structp, png_infop,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5434 png_uint_32 *, png_uint_32 *,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5435 int *, int *, int *, int *, int *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5436 DEF_IMGLIB_FN (png_get_valid, (png_structp, png_infop, png_uint_32));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5437 DEF_IMGLIB_FN (png_set_strip_16, (png_structp));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5438 DEF_IMGLIB_FN (png_set_expand, (png_structp));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5439 DEF_IMGLIB_FN (png_set_gray_to_rgb, (png_structp));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5440 DEF_IMGLIB_FN (png_set_background, (png_structp, png_color_16p,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5441 int, int, double));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5442 DEF_IMGLIB_FN (png_get_bKGD, (png_structp, png_infop, png_color_16p *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5443 DEF_IMGLIB_FN (png_read_update_info, (png_structp, png_infop));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5444 DEF_IMGLIB_FN (png_get_channels, (png_structp, png_infop));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5445 DEF_IMGLIB_FN (png_get_rowbytes, (png_structp, png_infop));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5446 DEF_IMGLIB_FN (png_read_image, (png_structp, png_bytepp));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5447 DEF_IMGLIB_FN (png_read_end, (png_structp, png_infop));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
5448 DEF_IMGLIB_FN (png_error, (png_structp, png_const_charp));
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5449
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5450 static int
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
5451 init_png_functions (Lisp_Object libraries)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5452 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5453 HMODULE library;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5454
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5455 /* Try loading libpng under probable names. */
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
5456 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
5457 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5458
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5459 LOAD_IMGLIB_FN (library, png_get_io_ptr);
106975
62f86ca36527 Use png_sig_cmp to allow linking with libpng 1.4.0.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
5460 LOAD_IMGLIB_FN (library, png_sig_cmp);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5461 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
5462 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
5463 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
5464 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
5465 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
5466 LOAD_IMGLIB_FN (library, png_read_info);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5467 LOAD_IMGLIB_FN (library, png_get_IHDR);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5468 LOAD_IMGLIB_FN (library, png_get_valid);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5469 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
5470 LOAD_IMGLIB_FN (library, png_set_expand);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5471 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
5472 LOAD_IMGLIB_FN (library, png_set_background);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5473 LOAD_IMGLIB_FN (library, png_get_bKGD);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5474 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
5475 LOAD_IMGLIB_FN (library, png_get_channels);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5476 LOAD_IMGLIB_FN (library, png_get_rowbytes);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5477 LOAD_IMGLIB_FN (library, png_read_image);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5478 LOAD_IMGLIB_FN (library, png_read_end);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5479 LOAD_IMGLIB_FN (library, png_error);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5480 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5481 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5482 #else
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 #define fn_png_get_io_ptr png_get_io_ptr
106975
62f86ca36527 Use png_sig_cmp to allow linking with libpng 1.4.0.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
5485 #define fn_png_sig_cmp png_sig_cmp
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5486 #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
5487 #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
5488 #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
5489 #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
5490 #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
5491 #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
5492 #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
5493 #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
5494 #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
5495 #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
5496 #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
5497 #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
5498 #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
5499 #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
5500 #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
5501 #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
5502 #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
5503 #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
5504 #define fn_png_error png_error
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5505
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5506 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5507
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5508 /* 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
5509 is initialized. */
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 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5512 my_png_error (png_struct *png_ptr, const char *msg)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5513 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5514 xassert (png_ptr != NULL);
112088
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
5515 /* Avoid compiler warning about deprecated direct access to
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
5516 png_ptr's fields in libpng versions 1.4.x. */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5517 image_error ("PNG error: %s", build_string (msg), Qnil);
112226
3fd4ea7be3a2 Don't use png_jmpbuf, it doesn't work with dynamic loading.
Eli Zaretskii <eliz@gnu.org>
parents: 112218
diff changeset
5518 longjmp (png_ptr->jmpbuf, 1);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5519 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5520
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5521
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5522 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5523 my_png_warning (png_struct *png_ptr, const char *msg)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5524 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5525 xassert (png_ptr != NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5526 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
5527 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5528
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5529 /* Memory source for PNG decoding. */
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 struct png_memory_storage
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5532 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5533 unsigned char *bytes; /* The data */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5534 size_t len; /* How big is it? */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5535 int index; /* Where are we? */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5536 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5537
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5538
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5539 /* 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
5540 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
5541 bytes from the input to DATA. */
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 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5544 png_read_from_memory (png_structp png_ptr, png_bytep data, png_size_t length)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5545 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5546 struct png_memory_storage *tbr
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5547 = (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
5548
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5549 if (length > tbr->len - tbr->index)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5550 fn_png_error (png_ptr, "Read error");
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5551
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5552 memcpy (data, tbr->bytes + tbr->index, length);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5553 tbr->index = tbr->index + length;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5554 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5555
55886
ae9227eb8392 Work around bugs/problems with MinGW builds of graphics libraries
Juanma Barranquero <lekktu@gmail.com>
parents: 55540
diff changeset
5556
63684
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5557 /* 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
5558 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
5559 bytes from the input to DATA. */
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5560
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5561 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5562 png_read_from_file (png_structp png_ptr, png_bytep data, png_size_t length)
63684
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5563 {
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5564 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
5565
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5566 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
5567 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
5568 }
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5569
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5570
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5571 /* 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
5572 successful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5573
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5574 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5575 png_load (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5576 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5577 Lisp_Object file, specified_file;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5578 Lisp_Object specified_data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5579 int x, y, i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5580 XImagePtr ximg, mask_img = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5581 png_struct *png_ptr = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5582 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
5583 FILE *volatile fp = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5584 png_byte sig[8];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5585 png_byte * volatile pixels = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5586 png_byte ** volatile rows = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5587 png_uint_32 width, height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5588 int bit_depth, color_type, interlace_type;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5589 png_byte channels;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5590 png_uint_32 row_bytes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5591 int transparent_p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5592 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
5593
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5594 /* Find out what file to load. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5595 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
5596 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
5597
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5598 if (NILP (specified_data))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5599 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5600 file = x_find_image_file (specified_file);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5601 if (!STRINGP (file))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5602 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5603 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
5604 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5605 }
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 /* Open the image file. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5608 fp = fopen (SDATA (file), "rb");
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5609 if (!fp)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5610 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5611 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
5612 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5613 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5614
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5615 /* Check PNG signature. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5616 if (fread (sig, 1, sizeof sig, fp) != sizeof sig
106975
62f86ca36527 Use png_sig_cmp to allow linking with libpng 1.4.0.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
5617 || fn_png_sig_cmp (sig, 0, sizeof sig))
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5618 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5619 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
5620 fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5621 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5622 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5623 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5624 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5625 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5626 if (!STRINGP (specified_data))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5627 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5628 image_error ("Invalid image data `%s'", specified_data, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5629 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5630 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
5631
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5632 /* Read from memory. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5633 tbr.bytes = SDATA (specified_data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5634 tbr.len = SBYTES (specified_data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5635 tbr.index = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5636
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5637 /* Check PNG signature. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5638 if (tbr.len < sizeof sig
106975
62f86ca36527 Use png_sig_cmp to allow linking with libpng 1.4.0.
Chong Yidong <cyd@stupidchicken.com>
parents: 106815
diff changeset
5639 || fn_png_sig_cmp (tbr.bytes, 0, sizeof sig))
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5640 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5641 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
5642 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5643 }
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 /* Need to skip past the signature. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5646 tbr.bytes += sizeof (sig);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5647 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5648
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
5649 /* 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
5650 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
5651 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
5652 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
5653 my_png_warning);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5654 if (!png_ptr)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5655 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5656 if (fp) fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5657 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5658 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5659
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
5660 /* 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
5661 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
5662 if (!info_ptr)
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 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
5665 if (fp) fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5666 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5667 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5668
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
5669 /* 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
5670 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
5671 if (!end_info)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5672 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5673 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
5674 if (fp) fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5675 return 0;
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 /* 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
5679 detects an error. */
112226
3fd4ea7be3a2 Don't use png_jmpbuf, it doesn't work with dynamic loading.
Eli Zaretskii <eliz@gnu.org>
parents: 112218
diff changeset
5680 if (setjmp (png_ptr->jmpbuf))
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5681 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5682 error:
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5683 if (png_ptr)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5684 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
5685 xfree (pixels);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5686 xfree (rows);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5687 if (fp) fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5688 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5689 }
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 /* Read image info. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5692 if (!NILP (specified_data))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5693 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
5694 else
63684
c95dbbf82d19 (fn_png_init_io): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 63323
diff changeset
5695 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
5696
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5697 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
5698 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
5699 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
5700 &interlace_type, NULL, NULL);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5701
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
5702 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
5703 {
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
5704 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
5705 goto error;
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
5706 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5707 /* 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
5708 construct a clipping mask. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5709 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
5710 transparent_p = 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5711 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5712 transparent_p = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5713
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5714 /* 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
5715 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
5716 transform other formats into that format. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5717
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5718 /* Strip more than 8 bits per channel. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5719 if (bit_depth == 16)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5720 fn_png_set_strip_16 (png_ptr);
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 /* 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
5723 if available. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5724 fn_png_set_expand (png_ptr);
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 /* Convert grayscale images to RGB. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5727 if (color_type == PNG_COLOR_TYPE_GRAY
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5728 || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5729 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
5730
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5731 /* 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
5732 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
5733 simple transparency, we prefer a clipping mask. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5734 if (!transparent_p)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5735 {
83763
14a686983252 (png_load): Comment-out var only used in commented-out code.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 83676
diff changeset
5736 /* png_color_16 *image_bg; */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5737 Lisp_Object specified_bg
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5738 = 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
5739 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
5740
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5741 if (STRINGP (specified_bg))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5742 /* The user specified `:background', use that. */
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 XColor color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5745 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
5746 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5747 png_color_16 user_bg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5748
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5749 memset (&user_bg, 0, 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
5750 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
5751 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
5752 user_bg.blue = color.blue >> shift;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5753
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5754 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
5755 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.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 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5759 {
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
5760 /* 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
5761 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
5762 #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
5763 XColor color;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5764 png_color_16 frame_background;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5765
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5766 color.pixel = FRAME_BACKGROUND_PIXEL (f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5767 x_query_color (f, &color);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5768
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5769 memset (&frame_background, 0, 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
5770 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
5771 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
5772 frame_background.blue = color.blue >> shift;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5773 #endif /* HAVE_X_WINDOWS */
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 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
5776 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
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 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5779
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5780 /* Update info structure. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5781 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
5782
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5783 /* 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
5784 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
5785 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
5786 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
5787 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
5788 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
5789 xassert (channels == 3 || channels == 4);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5790
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5791 /* 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
5792 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
5793
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5794 /* Allocate memory for the image. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5795 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
5796 rows = (png_byte **) xmalloc (height * sizeof *rows);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5797 for (i = 0; i < height; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5798 rows[i] = pixels + i * row_bytes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5799
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5800 /* Read the entire image. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5801 fn_png_read_image (png_ptr, rows);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5802 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
5803 if (fp)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5804 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5805 fclose (fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5806 fp = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5807 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5808
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5809 /* Create the X image and pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5810 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
5811 &img->pixmap))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5812 goto error;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5813
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5814 /* 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
5815 contains an alpha channel. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5816 if (channels == 4
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5817 && !transparent_p
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5818 && !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
5819 &mask_img, &img->mask))
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 x_destroy_x_image (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5822 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
5823 img->pixmap = NO_PIXMAP;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5824 goto error;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5827 /* 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
5828 init_color_table ();
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 for (y = 0; y < height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5831 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5832 png_byte *p = rows[y];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5833
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5834 for (x = 0; x < width; ++x)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5835 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5836 unsigned r, g, b;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5837
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5838 r = *p++ << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5839 g = *p++ << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5840 b = *p++ << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5841 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
5842 /* 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
5843 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
5844 support binary transparency---fully transparent or fully
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5845 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
5846 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
5847 the image with a specified background color.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5848
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5849 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
5850 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
5851 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
5852 a new image for each possible background.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5853
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5854 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
5855 boolean transparency information. Otherwise I'm using
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5856 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
5857
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5858 if (channels == 4)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5859 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5860 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
5861 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
5862 ++p;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5863 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5864 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5865 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5866
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5867 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
5868 /* 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
5869 overrode it. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5870 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5871 png_color_16 *bg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5872 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
5873 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5874 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
5875 img->background_valid = 1;
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 }
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 #ifdef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5880 /* Remember colors allocated for this image. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5881 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
5882 free_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5883 #endif /* COLOR_TABLE_SUPPORT */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5884
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5885 /* Clean up. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5886 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
5887 xfree (rows);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5888 xfree (pixels);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5889
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5890 img->width = width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5891 img->height = height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5892
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
5893 /* 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
5894 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
5895 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
5896
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5897 /* 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
5898 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
5899 x_destroy_x_image (ximg);
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 /* Same for the mask. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5902 if (mask_img)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5903 {
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
5904 /* 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
5905 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
5906 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
5907
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5908 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
5909 x_destroy_x_image (mask_img);
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 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5913 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5914
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5915 #else /* HAVE_PNG */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5916
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5917 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5918 static int
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5919 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
5920 {
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5921 return ns_load_image(f, img,
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5922 image_spec_value (img->spec, QCfile, NULL),
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5923 image_spec_value (img->spec, QCdata, NULL));
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5924 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5925 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5926
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
5927
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5928 #endif /* !HAVE_PNG */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5929
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5932 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5933 JPEG
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5934 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5935
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
5936 #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
5937
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
5938 static int jpeg_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
5939 static int jpeg_load (struct frame *f, struct image *img);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5940
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5941 /* 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
5942
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5943 Lisp_Object Qjpeg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5944
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5945 /* 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
5946
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5947 enum jpeg_keyword_index
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5948 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5949 JPEG_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5950 JPEG_DATA,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5951 JPEG_FILE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5952 JPEG_ASCENT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5953 JPEG_MARGIN,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5954 JPEG_RELIEF,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5955 JPEG_ALGORITHM,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5956 JPEG_HEURISTIC_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5957 JPEG_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5958 JPEG_BACKGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5959 JPEG_LAST
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5960 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5961
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5962 /* 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
5963 of valid user-defined image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5964
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
5965 static const struct image_keyword jpeg_format[JPEG_LAST] =
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5966 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5967 {":type", IMAGE_SYMBOL_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5968 {":data", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5969 {":file", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5970 {":ascent", IMAGE_ASCENT_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5971 {":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
5972 {":relief", IMAGE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5973 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5974 {":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
5975 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5976 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5977 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5978
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5979 /* Structure describing the image type `jpeg'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5980
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5981 static struct image_type jpeg_type =
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5982 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5983 &Qjpeg,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5984 jpeg_image_p,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5985 jpeg_load,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5986 x_clear_image,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5987 NULL
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5988 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5989
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5990 /* 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
5991
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5992 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
5993 jpeg_image_p (Lisp_Object object)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5994 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5995 struct image_keyword fmt[JPEG_LAST];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5996
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
5997 memcpy (fmt, jpeg_format, sizeof fmt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5998
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
5999 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
6000 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6001
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6002 /* 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
6003 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
6004 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6005
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
6006 #endif /* HAVE_JPEG || HAVE_NS */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6007
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6008 #ifdef HAVE_JPEG
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 /* 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
6011 jconfig.h. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6012 #ifdef HAVE_STDLIB_H
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6013 #define HAVE_STDLIB_H_1
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6014 #undef HAVE_STDLIB_H
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6015 #endif /* HAVE_STLIB_H */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6016
59073
3501c078df60 (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents: 58846
diff changeset
6017 #if defined (HAVE_NTGUI) && !defined (__WIN32__)
63112
e369bf902cfc Update comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 62815
diff changeset
6018 /* In older releases of the jpeg library, jpeglib.h will define boolean
e369bf902cfc Update comment.
Juanma Barranquero <lekktu@gmail.com>
parents: 62815
diff changeset
6019 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
6020 #define __WIN32__ 1
3501c078df60 (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents: 58846
diff changeset
6021 #endif
3501c078df60 (__WIN32__) [HAVE_NTGUI]: Define for correct behaviour of JPEG library.
Jason Rumney <jasonr@gnu.org>
parents: 58846
diff changeset
6022
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6023 #include <jpeglib.h>
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6024 #include <jerror.h>
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 #ifdef HAVE_STLIB_H_1
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6027 #define HAVE_STDLIB_H 1
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6028 #endif
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 #ifdef HAVE_NTGUI
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6031
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6032 /* JPEG library details. */
110973
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6033 DEF_IMGLIB_FN (jpeg_CreateDecompress, (j_decompress_ptr, int, size_t));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6034 DEF_IMGLIB_FN (jpeg_start_decompress, (j_decompress_ptr));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6035 DEF_IMGLIB_FN (jpeg_finish_decompress, (j_decompress_ptr));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6036 DEF_IMGLIB_FN (jpeg_destroy_decompress, (j_decompress_ptr));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6037 DEF_IMGLIB_FN (jpeg_read_header, (j_decompress_ptr, boolean));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6038 DEF_IMGLIB_FN (jpeg_read_scanlines, (j_decompress_ptr, JSAMPARRAY, JDIMENSION));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6039 DEF_IMGLIB_FN (jpeg_std_error, (struct jpeg_error_mgr *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6040 DEF_IMGLIB_FN (jpeg_resync_to_restart, (j_decompress_ptr, int));
54341
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 static int
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
6043 init_jpeg_functions (Lisp_Object libraries)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6044 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6045 HMODULE library;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6046
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
6047 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
6048 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6049
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6050 LOAD_IMGLIB_FN (library, jpeg_finish_decompress);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6051 LOAD_IMGLIB_FN (library, jpeg_read_scanlines);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6052 LOAD_IMGLIB_FN (library, jpeg_start_decompress);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6053 LOAD_IMGLIB_FN (library, jpeg_read_header);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6054 LOAD_IMGLIB_FN (library, jpeg_CreateDecompress);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6055 LOAD_IMGLIB_FN (library, jpeg_destroy_decompress);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6056 LOAD_IMGLIB_FN (library, jpeg_std_error);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6057 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
6058 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6059 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6060
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6061 /* 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
6062 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
6063 static boolean
109480
d12162869c07 Convert some more functions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109302
diff changeset
6064 jpeg_resync_to_restart_wrapper (j_decompress_ptr cinfo, int desired)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6065 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6066 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
6067 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6068
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6069 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6070
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6071 #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
6072 #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
6073 #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
6074 #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
6075 #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
6076 #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
6077 #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
6078 #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
6079
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6080 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6081
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6082 struct my_jpeg_error_mgr
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6083 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6084 struct jpeg_error_mgr pub;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6085 jmp_buf setjmp_buffer;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6086 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6087
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6088
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6089 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6090 my_error_exit (j_common_ptr cinfo)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6091 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6092 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
6093 longjmp (mgr->setjmp_buffer, 1);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6094 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6095
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6096
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6097 /* 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
6098 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
6099 libjpeg.doc from the JPEG lib distribution. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6100
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6101 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6102 our_common_init_source (j_decompress_ptr cinfo)
66013
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6103 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6104 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6105
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6106
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6107 /* 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
6108 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
6109
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6110 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6111 our_common_term_source (j_decompress_ptr cinfo)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6112 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6113 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6114
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6115
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6116 /* 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
6117 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
6118 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
6119
78863
abdfd1f5b491 (our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 78788
diff changeset
6120 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
6121
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6122 static boolean
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6123 our_memory_fill_input_buffer (j_decompress_ptr cinfo)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6124 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6125 /* Insert a fake EOI marker. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6126 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
6127
78863
abdfd1f5b491 (our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 78788
diff changeset
6128 our_memory_buffer[0] = (JOCTET) 0xFF;
abdfd1f5b491 (our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 78788
diff changeset
6129 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
6130
abdfd1f5b491 (our_memory_buffer): Renamed from omfib_buffer.
Richard M. Stallman <rms@gnu.org>
parents: 78788
diff changeset
6131 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
6132 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
6133 return 1;
54341
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6136
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6137 /* 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
6138 is the JPEG data source manager. */
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 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6141 our_memory_skip_input_data (j_decompress_ptr cinfo, long int num_bytes)
54341
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 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
6144
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6145 if (src)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6146 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6147 if (num_bytes > src->bytes_in_buffer)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6148 ERREXIT (cinfo, JERR_INPUT_EOF);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6149
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6150 src->bytes_in_buffer -= num_bytes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6151 src->next_input_byte += num_bytes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6152 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6153 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6154
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6155
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6156 /* 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
6157 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
6158 reading the image. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6159
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6160 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6161 jpeg_memory_src (j_decompress_ptr cinfo, JOCTET *data, unsigned int len)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6162 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6163 struct jpeg_source_mgr *src;
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 if (cinfo->src == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6166 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6167 /* First time for this JPEG object? */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6168 cinfo->src = (struct jpeg_source_mgr *)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6169 (*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
6170 sizeof (struct jpeg_source_mgr));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6171 src = (struct jpeg_source_mgr *) cinfo->src;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6172 src->next_input_byte = data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6173 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6174
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6175 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
6176 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
6177 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
6178 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
6179 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
6180 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
6181 src->bytes_in_buffer = len;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6182 src->next_input_byte = data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6183 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6184
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6185
66013
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6186 struct jpeg_stdio_mgr
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6187 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6188 struct jpeg_source_mgr mgr;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6189 boolean finished;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6190 FILE *file;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6191 JOCTET *buffer;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6192 };
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6193
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6194
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6195 /* 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
6196 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
6197 #define JPEG_STDIO_BUFFER_SIZE 8192
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6198
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6199
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6200 /* 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
6201 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
6202
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6203 static boolean
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6204 our_stdio_fill_input_buffer (j_decompress_ptr cinfo)
66013
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6205 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6206 struct jpeg_stdio_mgr *src;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6207
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6208 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
6209 if (!src->finished)
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6210 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6211 size_t bytes;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6212
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6213 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
6214 if (bytes > 0)
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6215 src->mgr.bytes_in_buffer = bytes;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6216 else
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6217 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6218 WARNMS (cinfo, JWRN_JPEG_EOF);
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6219 src->finished = 1;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6220 src->buffer[0] = (JOCTET) 0xFF;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6221 src->buffer[1] = (JOCTET) JPEG_EOI;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6222 src->mgr.bytes_in_buffer = 2;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6223 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6224 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
6225 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6226
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6227 return 1;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6228 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6229
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6230
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6231 /* 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
6232 is the JPEG data source manager. */
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6233
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6234 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6235 our_stdio_skip_input_data (j_decompress_ptr cinfo, long int num_bytes)
66013
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6236 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6237 struct jpeg_stdio_mgr *src;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6238 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
6239
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6240 while (num_bytes > 0 && !src->finished)
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6241 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6242 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
6243 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6244 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
6245 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
6246 break;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6247 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6248 else
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6249 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6250 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
6251 src->mgr.bytes_in_buffer = 0;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6252 src->mgr.next_input_byte = NULL;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6253
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6254 our_stdio_fill_input_buffer (cinfo);
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6255 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6256 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6257 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6258
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6259
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6260 /* 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
6261 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
6262 reading the image. */
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6263
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6264 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6265 jpeg_file_src (j_decompress_ptr cinfo, FILE *fp)
66013
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6266 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6267 struct jpeg_stdio_mgr *src;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6268
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6269 if (cinfo->src != NULL)
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6270 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
6271 else
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6272 {
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6273 /* First time for this JPEG object? */
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6274 cinfo->src = (struct jpeg_source_mgr *)
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6275 (*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
6276 sizeof (struct jpeg_stdio_mgr));
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6277 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
6278 src->buffer = (JOCTET *)
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6279 (*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
6280 JPEG_STDIO_BUFFER_SIZE);
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6281 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6282
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6283 src->file = fp;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6284 src->finished = 0;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6285 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
6286 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
6287 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
6288 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
6289 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
6290 src->mgr.bytes_in_buffer = 0;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6291 src->mgr.next_input_byte = NULL;
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6292 }
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6293
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6294
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6295 /* 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
6296 from the JPEG lib. */
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 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6299 jpeg_load (struct frame *f, struct image *img)
54341
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 struct jpeg_decompress_struct cinfo;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6302 struct my_jpeg_error_mgr mgr;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6303 Lisp_Object file, specified_file;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6304 Lisp_Object specified_data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6305 FILE * volatile fp = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6306 JSAMPARRAY buffer;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6307 int row_stride, x, y;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6308 XImagePtr ximg = NULL;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6309 int rc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6310 unsigned long *colors;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6311 int width, height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6312
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6313 /* Open the JPEG file. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6314 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
6315 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
6316
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6317 if (NILP (specified_data))
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 file = x_find_image_file (specified_file);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6320 if (!STRINGP (file))
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 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
6323 return 0;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6326 fp = fopen (SDATA (file), "rb");
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6327 if (fp == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6328 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6329 image_error ("Cannot open `%s'", file, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6330 return 0;
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 }
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6333 else if (!STRINGP (specified_data))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6334 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6335 image_error ("Invalid image data `%s'", specified_data, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6336 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6337 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6338
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6339 /* 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
6340 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
6341 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
6342 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
6343 mgr.pub.error_exit = my_error_exit;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6344
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6345 if ((rc = setjmp (mgr.setjmp_buffer)) != 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6346 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6347 if (rc == 1)
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 /* 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
6350 char buffer[JMSG_LENGTH_MAX];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6351 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
6352 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
6353 build_string (buffer));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6354 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6355
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6356 /* 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
6357 if (fp)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6358 fclose ((FILE *) fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6359 fn_jpeg_destroy_decompress (&cinfo);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6360
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6361 /* 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
6362 x_destroy_x_image (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6363
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6364 /* Free pixmap and colors. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6365 x_clear_image (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6366 return 0;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6369 /* 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
6370 Read the JPEG image header. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6371 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
6372
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6373 if (NILP (specified_data))
66013
1de4729d29d6 (fn_jpeg_stdio_src): Don't define it.
Juanma Barranquero <lekktu@gmail.com>
parents: 65764
diff changeset
6374 jpeg_file_src (&cinfo, (FILE *) fp);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6375 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6376 jpeg_memory_src (&cinfo, SDATA (specified_data),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6377 SBYTES (specified_data));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6378
58846
4d7444f1a64c (our_fill_input_buffer, jpeg_load, CHECK_LIB_AVAILABLE, init_image):
Richard M. Stallman <rms@gnu.org>
parents: 58752
diff changeset
6379 fn_jpeg_read_header (&cinfo, 1);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6380
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6381 /* 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
6382 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
6383 cinfo.quantize_colors = 1;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6384 fn_jpeg_start_decompress (&cinfo);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6385 width = img->width = cinfo.output_width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6386 height = img->height = cinfo.output_height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6387
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6388 if (!check_image_size (f, width, height))
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6389 {
102392
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
6390 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
6391 longjmp (mgr.setjmp_buffer, 2);
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6392 }
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6393
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6394 /* Create X image and pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6395 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
6396 longjmp (mgr.setjmp_buffer, 2);
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 /* Allocate colors. When color quantization is used,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6399 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
6400 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
6401 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
6402 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
6403 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6404 int i, ir, ig, ib;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6405
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6406 if (cinfo.out_color_components > 2)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6407 ir = 0, ig = 1, ib = 2;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6408 else if (cinfo.out_color_components > 1)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6409 ir = 0, ig = 1, ib = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6410 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6411 ir = 0, ig = 0, ib = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6412
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6413 /* 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
6414 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
6415 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
6416 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
6417 init_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6418 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
6419 * sizeof *colors);
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 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
6422 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6423 /* 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
6424 in the range 0..0xffff. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6425 int r = cinfo.colormap[ir][i] << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6426 int g = cinfo.colormap[ig][i] << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6427 int b = cinfo.colormap[ib][i] << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6428 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
6429 }
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 #ifdef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6432 /* Remember those colors actually allocated. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6433 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
6434 free_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6435 #endif /* COLOR_TABLE_SUPPORT */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6436 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6437
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6438 /* Read pixels. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6439 row_stride = width * cinfo.output_components;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6440 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
6441 row_stride, 1);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6442 for (y = 0; y < height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6443 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6444 fn_jpeg_read_scanlines (&cinfo, buffer, 1);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6445 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
6446 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
6447 }
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 /* Clean up. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6450 fn_jpeg_finish_decompress (&cinfo);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6451 fn_jpeg_destroy_decompress (&cinfo);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6452 if (fp)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6453 fclose ((FILE *) fp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6454
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6455 /* 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
6456 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
6457 /* 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
6458 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
6459
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6460 /* Put the image into the pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6461 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
6462 x_destroy_x_image (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6463 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6464 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6465
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6466 #else /* HAVE_JPEG */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6467
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6468 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6469 static int
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6470 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
6471 {
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
6472 return ns_load_image (f, img,
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
6473 image_spec_value (img->spec, QCfile, NULL),
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
6474 image_spec_value (img->spec, QCdata, NULL));
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6475 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6476 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6477
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6478 #endif /* !HAVE_JPEG */
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6481
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6482 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6483 TIFF
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6484 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6485
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
6486 #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
6487
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
6488 static int tiff_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
6489 static int tiff_load (struct frame *f, struct image *img);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6490
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6491 /* 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
6492
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6493 Lisp_Object Qtiff;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6494
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6495 /* 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
6496
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6497 enum tiff_keyword_index
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6498 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6499 TIFF_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6500 TIFF_DATA,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6501 TIFF_FILE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6502 TIFF_ASCENT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6503 TIFF_MARGIN,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6504 TIFF_RELIEF,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6505 TIFF_ALGORITHM,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6506 TIFF_HEURISTIC_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6507 TIFF_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6508 TIFF_BACKGROUND,
97635
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6509 TIFF_INDEX,
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6510 TIFF_LAST
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6511 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6512
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6513 /* 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
6514 of valid user-defined image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6515
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
6516 static const struct image_keyword tiff_format[TIFF_LAST] =
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6517 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6518 {":type", IMAGE_SYMBOL_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6519 {":data", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6520 {":file", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6521 {":ascent", IMAGE_ASCENT_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6522 {":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
6523 {":relief", IMAGE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6524 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6525 {":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
6526 {":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
6527 {":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
6528 {":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
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 /* Structure describing the image type `tiff'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6532
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6533 static struct image_type tiff_type =
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 &Qtiff,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6536 tiff_image_p,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6537 tiff_load,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6538 x_clear_image,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6539 NULL
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6540 };
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 /* 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
6543
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6544 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6545 tiff_image_p (Lisp_Object object)
54341
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 struct image_keyword fmt[TIFF_LAST];
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
6548 memcpy (fmt, tiff_format, sizeof fmt);
54341
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 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
6551 return 0;
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 /* 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
6554 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
6555 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6556
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
6557 #endif /* HAVE_TIFF || HAVE_NS */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6558
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6559 #ifdef HAVE_TIFF
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6560
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6561 #include <tiffio.h>
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 #ifdef HAVE_NTGUI
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 /* TIFF library details. */
110973
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6566 DEF_IMGLIB_FN (TIFFSetErrorHandler, (TIFFErrorHandler));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6567 DEF_IMGLIB_FN (TIFFSetWarningHandler, (TIFFErrorHandler));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6568 DEF_IMGLIB_FN (TIFFOpen, (const char *, const char *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6569 DEF_IMGLIB_FN (TIFFClientOpen, (const char *, const char *, thandle_t,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6570 TIFFReadWriteProc, TIFFReadWriteProc,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6571 TIFFSeekProc, TIFFCloseProc, TIFFSizeProc,
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6572 TIFFMapFileProc, TIFFUnmapFileProc));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6573 DEF_IMGLIB_FN (TIFFGetField, (TIFF *, ttag_t, ...));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6574 DEF_IMGLIB_FN (TIFFReadRGBAImage, (TIFF *, uint32, uint32, uint32 *, int));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6575 DEF_IMGLIB_FN (TIFFClose, (TIFF *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
6576 DEF_IMGLIB_FN (TIFFSetDirectory, (TIFF *, tdir_t));
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6577
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6578 static int
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
6579 init_tiff_functions (Lisp_Object libraries)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6580 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6581 HMODULE library;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6582
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
6583 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
6584 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6585
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6586 LOAD_IMGLIB_FN (library, TIFFSetErrorHandler);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6587 LOAD_IMGLIB_FN (library, TIFFSetWarningHandler);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6588 LOAD_IMGLIB_FN (library, TIFFOpen);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6589 LOAD_IMGLIB_FN (library, TIFFClientOpen);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6590 LOAD_IMGLIB_FN (library, TIFFGetField);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6591 LOAD_IMGLIB_FN (library, TIFFReadRGBAImage);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6592 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
6593 LOAD_IMGLIB_FN (library, TIFFSetDirectory);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6594 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6595 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6596
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6597 #else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6598
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6599 #define fn_TIFFSetErrorHandler TIFFSetErrorHandler
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6600 #define fn_TIFFSetWarningHandler TIFFSetWarningHandler
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6601 #define fn_TIFFOpen TIFFOpen
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6602 #define fn_TIFFClientOpen TIFFClientOpen
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6603 #define fn_TIFFGetField TIFFGetField
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6604 #define fn_TIFFReadRGBAImage TIFFReadRGBAImage
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6605 #define fn_TIFFClose TIFFClose
97635
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6606 #define fn_TIFFSetDirectory TIFFSetDirectory
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6607 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6608
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6609
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6610 /* 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
6611 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
6612 Blah.
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6613
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6614 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
6615 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
6616 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
6617 override. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6618
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6619 typedef struct
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6620 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6621 unsigned char *bytes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6622 size_t len;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6623 int index;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6624 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6625 tiff_memory_source;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6626
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6627 static size_t
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6628 tiff_read_from_memory (thandle_t data, tdata_t buf, tsize_t size)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6629 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6630 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
6631
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6632 if (size > src->len - src->index)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6633 return (size_t) -1;
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
6634 memcpy (buf, src->bytes + src->index, size);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6635 src->index += size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6636 return size;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6637 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6638
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6639 static size_t
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6640 tiff_write_from_memory (thandle_t data, tdata_t buf, tsize_t size)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6641 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6642 return (size_t) -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6643 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6644
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6645 static toff_t
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6646 tiff_seek_in_memory (thandle_t data, toff_t off, int whence)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6647 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6648 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
6649 int idx;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6650
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6651 switch (whence)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6652 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6653 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
6654 idx = off;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6655 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6656
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6657 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
6658 idx = src->len + off;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6659 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6660
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6661 case SEEK_CUR: /* Go from current position. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6662 idx = src->index + off;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6663 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6664
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6665 default: /* Invalid `whence'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6666 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6667 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6668
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6669 if (idx > src->len || idx < 0)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6670 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6671
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6672 src->index = idx;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6673 return src->index;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6674 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6675
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6676 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6677 tiff_close_memory (thandle_t data)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6678 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6679 /* NOOP */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6680 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6681 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6682
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6683 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6684 tiff_mmap_memory (thandle_t data, tdata_t *pbase, toff_t *psize)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6685 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6686 /* It is already _IN_ memory. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6687 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6688 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6689
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6690 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6691 tiff_unmap_memory (thandle_t data, tdata_t base, toff_t size)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6692 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6693 /* We don't need to do this. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6694 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6695
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6696 static toff_t
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6697 tiff_size_of_memory (thandle_t data)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6698 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6699 return ((tiff_memory_source *) data)->len;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6700 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6701
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 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6704 tiff_error_handler (const char *title, const char *format, va_list ap)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6705 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6706 char buf[512];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6707 int len;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6708
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6709 len = sprintf (buf, "TIFF error: %s ", title);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6710 vsprintf (buf + len, format, ap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6711 add_to_log (buf, Qnil, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6712 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6713
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6714
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6715 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6716 tiff_warning_handler (const char *title, const char *format, va_list ap)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6717 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6718 char buf[512];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6719 int len;
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 len = sprintf (buf, "TIFF warning: %s ", title);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6722 vsprintf (buf + len, format, ap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6723 add_to_log (buf, Qnil, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6724 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6725
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6726
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6727 /* 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
6728 successful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6729
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6730 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6731 tiff_load (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6732 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6733 Lisp_Object file, specified_file;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6734 Lisp_Object specified_data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6735 TIFF *tiff;
97635
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6736 int width, height, x, y, count;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6737 uint32 *buf;
97635
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6738 int rc, rc2;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6739 XImagePtr ximg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6740 tiff_memory_source memsrc;
97635
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6741 Lisp_Object image;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6742
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6743 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
6744 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
6745
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6746 fn_TIFFSetErrorHandler (tiff_error_handler);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6747 fn_TIFFSetWarningHandler (tiff_warning_handler);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6748
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6749 if (NILP (specified_data))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6750 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6751 /* Read from a file */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6752 file = x_find_image_file (specified_file);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6753 if (!STRINGP (file))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6754 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6755 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
6756 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6757 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6758
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
6759 /* 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
6760 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
6761 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
6762 if (tiff == NULL)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6763 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6764 image_error ("Cannot open `%s'", file, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6765 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6766 }
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 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6769 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6770 if (!STRINGP (specified_data))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6771 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6772 image_error ("Invalid image data `%s'", specified_data, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6773 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6774 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
6775
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6776 /* Memory source! */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6777 memsrc.bytes = SDATA (specified_data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6778 memsrc.len = SBYTES (specified_data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6779 memsrc.index = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6780
111003
d5445d83cf4a image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
Eli Zaretskii <eliz@gnu.org>
parents: 110973
diff changeset
6781 /* Casting arguments return value avoids a GCC warning on W32. */
d5445d83cf4a image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
Eli Zaretskii <eliz@gnu.org>
parents: 110973
diff changeset
6782 tiff = (TIFF *)fn_TIFFClientOpen ("memory_source", "r",
d5445d83cf4a image.c (tiff_load): Cast 3rd argument to avoid compiler warning.
Eli Zaretskii <eliz@gnu.org>
parents: 110973
diff changeset
6783 (thandle_t) &memsrc,
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
6784 (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
6785 (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
6786 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
6787 tiff_close_memory,
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
6788 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
6789 tiff_mmap_memory,
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
6790 tiff_unmap_memory);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6791
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6792 if (!tiff)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6793 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6794 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
6795 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6796 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6797 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6798
97635
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6799 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
6800 if (INTEGERP (image))
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6801 {
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6802 int ino = XFASTINT (image);
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6803 if (!fn_TIFFSetDirectory (tiff, ino))
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6804 {
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6805 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
6806 image, img->spec);
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6807 fn_TIFFClose (tiff);
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6808 return 0;
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6809 }
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6810 }
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6811
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6812 /* 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
6813 of width x height 32-bit values. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6814 fn_TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &width);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6815 fn_TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &height);
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6816
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6817 if (!check_image_size (f, width, height))
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6818 {
102392
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
6819 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
6820 fn_TIFFClose (tiff);
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6821 return 0;
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6822 }
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
6823
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6824 buf = (uint32 *) xmalloc (width * height * sizeof *buf);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6825
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6826 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
6827
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6828 /* 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
6829 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
6830 rc2 = fn_TIFFSetDirectory (tiff, count);
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6831
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6832 if (count > 1)
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6833 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
6834 Fcons (make_number (count),
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6835 img->data.lisp_val));
eb8c3a9e1565 (enum tiff_keyword_index, tiff_format): Add :index keyword.
Jason Rumney <jasonr@gnu.org>
parents: 97043
diff changeset
6836
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6837 fn_TIFFClose (tiff);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6838 if (!rc)
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 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
6841 xfree (buf);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6842 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6843 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6844
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6845 /* Create the X image and pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6846 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
6847 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6848 xfree (buf);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6849 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6850 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6851
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6852 /* Initialize the color table. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6853 init_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6854
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6855 /* 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
6856 for (y = 0; y < height; ++y)
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 uint32 *row = buf + y * width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6859
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6860 for (x = 0; x < width; ++x)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6861 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6862 uint32 abgr = row[x];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6863 int r = TIFFGetR (abgr) << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6864 int g = TIFFGetG (abgr) << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6865 int b = TIFFGetB (abgr) << 8;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6866 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
6867 }
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6870 #ifdef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6871 /* 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
6872 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
6873 free_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6874 #endif /* COLOR_TABLE_SUPPORT */
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 img->width = width;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6877 img->height = height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6878
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6879 /* 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
6880 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
6881 /* 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
6882 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
6883
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6884 /* 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
6885 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
6886 x_destroy_x_image (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6887 xfree (buf);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6888
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6889 return 1;
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 #else /* HAVE_TIFF */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6893
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6894 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6895 static int
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6896 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
6897 {
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
6898 return ns_load_image (f, img,
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
6899 image_spec_value (img->spec, QCfile, NULL),
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
6900 image_spec_value (img->spec, QCdata, NULL));
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6901 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6902 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
6903
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6904 #endif /* !HAVE_TIFF */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6905
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
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 GIF
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6910 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6911
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
6912 #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
6913
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
6914 static int gif_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
6915 static int gif_load (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
6916 static void gif_clear_image (struct frame *f, struct image *img);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6917
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6918 /* 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
6919
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6920 Lisp_Object Qgif;
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 /* 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
6923
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6924 enum gif_keyword_index
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 GIF_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6927 GIF_DATA,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6928 GIF_FILE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6929 GIF_ASCENT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6930 GIF_MARGIN,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6931 GIF_RELIEF,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6932 GIF_ALGORITHM,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6933 GIF_HEURISTIC_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6934 GIF_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6935 GIF_IMAGE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6936 GIF_BACKGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6937 GIF_LAST
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6938 };
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 /* 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
6941 of valid user-defined image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6942
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
6943 static const struct image_keyword gif_format[GIF_LAST] =
54341
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 {":type", IMAGE_SYMBOL_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6946 {":data", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6947 {":file", IMAGE_STRING_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6948 {":ascent", IMAGE_ASCENT_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6949 {":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
6950 {":relief", IMAGE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6951 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6952 {":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
6953 {":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
6954 {":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
6955 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6956 };
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 /* Structure describing the image type `gif'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6959
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6960 static struct image_type gif_type =
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6961 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6962 &Qgif,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6963 gif_image_p,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6964 gif_load,
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
6965 gif_clear_image,
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6966 NULL
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6967 };
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6968
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
6969 /* 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
6970
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
6971 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6972 gif_clear_image (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
6973 {
107719
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
6974 /* IMG->data.ptr_val may contain metadata with extension data. */
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
6975 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
6976 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
6977 }
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
6978
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6979 /* Return non-zero if OBJECT is a valid GIF image specification. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6980
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6981 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
6982 gif_image_p (Lisp_Object object)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6983 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6984 struct image_keyword fmt[GIF_LAST];
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
6985 memcpy (fmt, gif_format, sizeof fmt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6986
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6987 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
6988 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6989
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6990 /* 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
6991 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
6992 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6993
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
6994 #endif /* HAVE_GIF */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6995
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6996 #ifdef HAVE_GIF
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
6997
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
6998 #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
6999 /* 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
7000 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
7001 #ifdef DrawText
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
7002 #undef DrawText
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
7003 #endif
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7004 /* avoid conflict with QuickdrawText.h */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7005 #define DrawText gif_DrawText
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7006 #include <gif_lib.h>
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7007 #undef DrawText
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7008
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
7009 #else /* HAVE_NTGUI */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7010
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7011 #include <gif_lib.h>
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7012
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
7013 #endif /* HAVE_NTGUI */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7014
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7015
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7016 #ifdef HAVE_NTGUI
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 /* GIF library details. */
110973
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
7019 DEF_IMGLIB_FN (DGifCloseFile, (GifFileType *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
7020 DEF_IMGLIB_FN (DGifSlurp, (GifFileType *));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
7021 DEF_IMGLIB_FN (DGifOpen, (void *, InputFunc));
8955f6658bfa src/image.c (DEF_IMGLIB_FN): Add argument to adapt to strict prototypes.
Juanma Barranquero <lekktu@gmail.com>
parents: 110967
diff changeset
7022 DEF_IMGLIB_FN (DGifOpenFileName, (const char *));
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7023
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7024 static int
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
7025 init_gif_functions (Lisp_Object libraries)
54341
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 HMODULE library;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7028
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
7029 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
7030 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7031
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7032 LOAD_IMGLIB_FN (library, DGifCloseFile);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7033 LOAD_IMGLIB_FN (library, DGifSlurp);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7034 LOAD_IMGLIB_FN (library, DGifOpen);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7035 LOAD_IMGLIB_FN (library, DGifOpenFileName);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7036 return 1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7037 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7038
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7039 #else
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 #define fn_DGifCloseFile DGifCloseFile
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7042 #define fn_DGifSlurp DGifSlurp
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7043 #define fn_DGifOpen DGifOpen
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7044 #define fn_DGifOpenFileName DGifOpenFileName
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7045
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7046 #endif /* HAVE_NTGUI */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7047
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7048 /* Reading a GIF image from memory
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7049 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
7050
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7051 typedef struct
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7052 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7053 unsigned char *bytes;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7054 size_t len;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7055 int index;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7056 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7057 gif_memory_source;
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 /* 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
7060 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
7061 a UserData field in the GifFileType structure. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7062 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
7063
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7064 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
7065 gif_read_from_memory (GifFileType *file, GifByteType *buf, int len)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7066 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7067 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
7068
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7069 if (len > src->len - src->index)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7070 return -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7071
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
7072 memcpy (buf, src->bytes + src->index, len);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7073 src->index += len;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7074 return len;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7075 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7076
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7077
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7078 /* 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
7079 successful. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7080
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
7081 static const int interlace_start[] = {0, 4, 2, 1};
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
7082 static const int interlace_increment[] = {8, 8, 4, 2};
78788
c077ece08ff6 (our_memory_fill_input_buffer) <buffer>: Move to file scope and rename
Glenn Morris <rgm@gnu.org>
parents: 78746
diff changeset
7083
111393
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7084 #define GIF_LOCAL_DESCRIPTOR_EXTENSION 249
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7085
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7086 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
7087 gif_load (struct frame *f, struct image *img)
54341
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 Lisp_Object file, specified_file;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7090 Lisp_Object specified_data;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7091 int rc, width, height, x, y, i;
111393
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7092 boolean transparent_p;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7093 XImagePtr ximg;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7094 ColorMapObject *gif_color_map;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7095 unsigned long pixel_colors[256];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7096 GifFileType *gif;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7097 Lisp_Object image;
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7098 int ino, image_height, image_width;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7099 gif_memory_source memsrc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7100 unsigned char *raster;
111393
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7101 unsigned int transparency_color_index;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7102
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7103 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
7104 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
7105
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7106 if (NILP (specified_data))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7107 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7108 file = x_find_image_file (specified_file);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7109 if (!STRINGP (file))
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 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
7112 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7113 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7114
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
7115 /* 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
7116 on W32. */
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
7117 gif = (GifFileType *)fn_DGifOpenFileName (SDATA (file));
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7118 if (gif == NULL)
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 image_error ("Cannot open `%s'", file, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7121 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7122 }
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 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7125 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7126 if (!STRINGP (specified_data))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7127 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7128 image_error ("Invalid image data `%s'", specified_data, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7129 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7130 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7131
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7132 /* Read from memory! */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7133 current_gif_memory_src = &memsrc;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7134 memsrc.bytes = SDATA (specified_data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7135 memsrc.len = SBYTES (specified_data);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7136 memsrc.index = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7137
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
7138 /* 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
7139 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
7140 if (!gif)
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 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
7143 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7144 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7145 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7146
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7147 /* 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
7148 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
7149 {
102392
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
7150 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
7151 fn_DGifCloseFile (gif);
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7152 return 0;
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7153 }
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7154
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7155 /* Read entire contents. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7156 rc = fn_DGifSlurp (gif);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7157 if (rc == GIF_ERROR)
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 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
7160 fn_DGifCloseFile (gif);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7161 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7162 }
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 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
7165 ino = INTEGERP (image) ? XFASTINT (image) : 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7166 if (ino >= gif->ImageCount)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7167 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7168 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
7169 image, img->spec);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7170 fn_DGifCloseFile (gif);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7171 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7172 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7173
111393
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7174 for (i = 0; i < gif->SavedImages[ino].ExtensionBlockCount; i++)
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7175 if ((gif->SavedImages[ino].ExtensionBlocks[i].Function
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7176 == GIF_LOCAL_DESCRIPTOR_EXTENSION)
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7177 && gif->SavedImages[ino].ExtensionBlocks[i].ByteCount == 4
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7178 /* Transparency enabled? */
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7179 && gif->SavedImages[ino].ExtensionBlocks[i].Bytes[0] & 1)
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7180 {
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7181 transparent_p = 1;
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7182 transparency_color_index
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7183 = (unsigned char) gif->SavedImages[ino].ExtensionBlocks[i].Bytes[3];
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7184 }
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7185
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7186 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
7187 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
7188 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
7189 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
7190 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
7191 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
7192
b88d5090aa86 (gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents: 65250
diff changeset
7193 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
7194 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
7195 img->corners[RIGHT_CORNER]));
65723
b88d5090aa86 (gif_load): Fix size of allocated image buffer
Kim F. Storm <storm@cua.dk>
parents: 65250
diff changeset
7196 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
7197 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
7198 img->corners[BOT_CORNER]));
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7199
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7200 if (!check_image_size (f, width, height))
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7201 {
102392
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
7202 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
7203 fn_DGifCloseFile (gif);
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7204 return 0;
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7205 }
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
7206
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7207 /* Create the X image and pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7208 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
7209 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7210 fn_DGifCloseFile (gif);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7211 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7212 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7213
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7214 /* Allocate colors. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7215 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
7216 if (!gif_color_map)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7217 gif_color_map = gif->SColorMap;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7218 init_color_table ();
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
7219 memset (pixel_colors, 0, sizeof pixel_colors);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7220
78746
8090732dfc6d (gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78692
diff changeset
7221 if (gif_color_map)
8090732dfc6d (gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78692
diff changeset
7222 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
7223 {
111393
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7224 if (transparent_p && transparency_color_index == i)
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7225 {
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7226 Lisp_Object specified_bg
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7227 = image_spec_value (img->spec, QCbackground, NULL);
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7228 pixel_colors[i] = STRINGP (specified_bg)
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7229 ? x_alloc_image_color (f, img, specified_bg,
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7230 FRAME_BACKGROUND_PIXEL (f))
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7231 : FRAME_BACKGROUND_PIXEL (f);
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7232 }
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7233 else
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7234 {
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7235 int r = gif_color_map->Colors[i].Red << 8;
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7236 int g = gif_color_map->Colors[i].Green << 8;
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7237 int b = gif_color_map->Colors[i].Blue << 8;
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7238 pixel_colors[i] = lookup_rgb_color (f, r, g, b);
230a50b33a46 Support for gif transparency.
Chong Yidong <cyd@stupidchicken.com>
parents: 111003
diff changeset
7239 }
78746
8090732dfc6d (gif_load): Fix bug: Handle nonexistent colormap.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 78692
diff changeset
7240 }
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7241
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7242 #ifdef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7243 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
7244 free_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7245 #endif /* COLOR_TABLE_SUPPORT */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7246
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7247 /* 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
7248 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
7249 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
7250 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
7251 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
7252 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
7253 for (x = 0; x < width; ++x)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7254 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
7255
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7256 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
7257 for (x = 0; x < width; ++x)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7258 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
7259
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7260 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
7261 {
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7262 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
7263 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
7264 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
7265 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
7266 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7267
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7268 /* 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
7269 `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
7270 problems with bytes >= 0x80. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7271 raster = (unsigned char *) gif->SavedImages[ino].RasterBits;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7272
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7273 if (gif->SavedImages[ino].ImageDesc.Interlace)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7274 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7275 int pass;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7276 int row = interlace_start[0];
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 pass = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7279
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7280 for (y = 0; y < image_height; y++)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7281 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7282 if (row >= image_height)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7283 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7284 row = interlace_start[++pass];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7285 while (row >= image_height)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7286 row = interlace_start[++pass];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7287 }
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 for (x = 0; x < image_width; x++)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7290 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7291 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
7292 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
7293 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
7294 }
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 row += interlace_increment[pass];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7297 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7298 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7299 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7300 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7301 for (y = 0; y < image_height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7302 for (x = 0; x < image_width; ++x)
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 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
7305 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
7306 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
7307 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7308 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7309
107719
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
7310 /* Save GIF image extension data for `image-metadata'.
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
7311 Format is (count IMAGES extension-data (FUNCTION "BYTES" ...)). */
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7312 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
7313 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
7314 {
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7315 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
7316 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
7317 /* Append (... FUNCTION "BYTES") */
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7318 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
7319 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
7320 img->data.lisp_val));
107719
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
7321 img->data.lisp_val = Fcons (Qextension_data,
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
7322 Fcons (Fnreverse (img->data.lisp_val),
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
7323 Qnil));
70168
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7324 }
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7325 if (gif->ImageCount > 1)
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7326 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
7327 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
7328 img->data.lisp_val));
60bff6b0c656 (four_corners_best): New arg CORNERS specifies what pixels
Kim F. Storm <storm@cua.dk>
parents: 70147
diff changeset
7329
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7330 fn_DGifCloseFile (gif);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7331
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7332 /* 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
7333 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
7334 /* 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
7335 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
7336
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7337 /* 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
7338 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
7339 x_destroy_x_image (ximg);
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 return 1;
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
63323
ccf928f0383c (x_create_x_image_and_pixmap) [HAVE_NTGUI]: Cast 4th arg
Eli Zaretskii <eliz@gnu.org>
parents: 63112
diff changeset
7344 #else /* !HAVE_GIF */
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7345
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
7346 #ifdef HAVE_NS
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
7347 static int
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
7348 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
7349 {
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
7350 return ns_load_image (f, img,
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
7351 image_spec_value (img->spec, QCfile, NULL),
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
7352 image_spec_value (img->spec, QCdata, NULL));
96675
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
7353 }
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
7354 #endif /* HAVE_NS */
d45acf0c8d23 merging Emacs.app (NeXTstep port)
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 95213
diff changeset
7355
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7356 #endif /* HAVE_GIF */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7357
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7358
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7359 /***********************************************************************
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7360 imagemagick
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7361 ***********************************************************************/
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7362 #if defined (HAVE_IMAGEMAGICK)
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7363
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7364 /* The symbol `imagemagick' identifying images of this type. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7365
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7366 Lisp_Object Qimagemagick;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7367 /* Indices of image specification fields in imagemagick_format, below. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7368
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7369 enum imagemagick_keyword_index
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7370 {
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7371 IMAGEMAGICK_TYPE,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7372 IMAGEMAGICK_DATA,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7373 IMAGEMAGICK_FILE,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7374 IMAGEMAGICK_ASCENT,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7375 IMAGEMAGICK_MARGIN,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7376 IMAGEMAGICK_RELIEF,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7377 IMAGEMAGICK_ALGORITHM,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7378 IMAGEMAGICK_HEURISTIC_MASK,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7379 IMAGEMAGICK_MASK,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7380 IMAGEMAGICK_BACKGROUND,
109866
73512e4aa257 image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.
Joakim <joakim@localhost.localdomain>
parents: 109864
diff changeset
7381 IMAGEMAGICK_HEIGHT,
73512e4aa257 image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.
Joakim <joakim@localhost.localdomain>
parents: 109864
diff changeset
7382 IMAGEMAGICK_WIDTH,
73512e4aa257 image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.
Joakim <joakim@localhost.localdomain>
parents: 109864
diff changeset
7383 IMAGEMAGICK_ROTATION,
73512e4aa257 image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.
Joakim <joakim@localhost.localdomain>
parents: 109864
diff changeset
7384 IMAGEMAGICK_CROP,
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7385 IMAGEMAGICK_LAST
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7386 };
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7387
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7388 /* Vector of image_keyword structures describing the format
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7389 of valid user-defined image specifications. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7390
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7391 static struct image_keyword imagemagick_format[IMAGEMAGICK_LAST] =
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7392 {
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7393 {":type", IMAGE_SYMBOL_VALUE, 1},
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7394 {":data", IMAGE_STRING_VALUE, 0},
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7395 {":file", IMAGE_STRING_VALUE, 0},
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7396 {":ascent", IMAGE_ASCENT_VALUE, 0},
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7397 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7398 {":relief", IMAGE_INTEGER_VALUE, 0},
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7399 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7400 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7401 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
109866
73512e4aa257 image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.
Joakim <joakim@localhost.localdomain>
parents: 109864
diff changeset
7402 {":background", IMAGE_STRING_OR_NIL_VALUE, 0},
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7403 {":height", IMAGE_INTEGER_VALUE, 0},
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7404 {":width", IMAGE_INTEGER_VALUE, 0},
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7405 {":rotation", IMAGE_NUMBER_VALUE, 0},
109866
73512e4aa257 image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.
Joakim <joakim@localhost.localdomain>
parents: 109864
diff changeset
7406 {":crop", IMAGE_DONT_CHECK_VALUE_TYPE, 0}
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7407 };
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7408 /* Free X resources of imagemagick image IMG which is used on frame F. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7409
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7410 static void
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7411 imagemagick_clear_image (struct frame *f,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7412 struct image *img)
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7413 {
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7414 x_clear_image (f, img);
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7415 }
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7416
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7417
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7418
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7419 /* Return non-zero if OBJECT is a valid IMAGEMAGICK image specification. Do
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7420 this by calling parse_image_spec and supplying the keywords that
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7421 identify the IMAGEMAGICK format. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7422
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7423 static int
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7424 imagemagick_image_p (Lisp_Object object)
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7425 {
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7426 struct image_keyword fmt[IMAGEMAGICK_LAST];
110174
873c8f137ae3 * image.c (imagemagick_image_p): Replace bcopy by memcpy.
Andreas Schwab <schwab@linux-m68k.org>
parents: 109885
diff changeset
7427 memcpy (fmt, imagemagick_format, sizeof fmt);
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7428
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7429 if (!parse_image_spec (object, fmt, IMAGEMAGICK_LAST, Qimagemagick))
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7430 return 0;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7431
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7432 /* Must specify either the :data or :file keyword. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7433 return fmt[IMAGEMAGICK_FILE].count + fmt[IMAGEMAGICK_DATA].count == 1;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7434 }
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7435
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7436 /* The GIF library also defines DrawRectangle, but its never used in Emacs.
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7437 Therefore rename the function so it doesnt collide with ImageMagick. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7438 #define DrawRectangle DrawRectangleGif
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7439 #include <wand/MagickWand.h>
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7440
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7441 /* imagemagick_load_image is a helper function for imagemagick_load,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7442 which does the actual loading given contents and size, apart from
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7443 frame and image structures, passed from imagemagick_load.
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7444
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7445 Uses librimagemagick to do most of the image processing.
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7446
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7447 non-zero when successful.
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7448 */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7449
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7450 static int
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7451 imagemagick_load_image (/* Pointer to emacs frame structure. */
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7452 struct frame *f,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7453 /* Pointer to emacs image structure. */
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7454 struct image *img,
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7455 /* String containing the IMAGEMAGICK data to
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7456 be parsed. */
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7457 unsigned char *contents,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7458 /* Size of data in bytes. */
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7459 unsigned int size,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7460 /* Filename, either pass filename or
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7461 contents/size. */
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7462 unsigned char *filename)
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7463 {
110175
6488e31d7e94 Fix type mismatch in ImageMagick loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110174
diff changeset
7464 unsigned long width;
6488e31d7e94 Fix type mismatch in ImageMagick loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110174
diff changeset
7465 unsigned long height;
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7466
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7467 MagickBooleanType
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7468 status;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7469
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7470 XImagePtr ximg;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7471 Lisp_Object specified_bg;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7472 XColor background;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7473 int x;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7474 int y;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7475
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7476 MagickWand *image_wand;
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7477 MagickWand *ping_wand;
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7478 PixelIterator *iterator;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7479 PixelWand **pixels;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7480 MagickPixelPacket pixel;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7481 Lisp_Object image;
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7482 Lisp_Object value;
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7483 Lisp_Object crop, geometry;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7484 long ino;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7485 int desired_width, desired_height;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7486 double rotation;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7487 int imagemagick_rendermethod;
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7488 int pixelwidth;
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7489 ImageInfo *image_info;
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7490 ExceptionInfo *exception;
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7491 Image * im_image;
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7492
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7493
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7494 /* Handle image index for image types who can contain more than one
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7495 image. Interface :index is same as for GIF. First we "ping" the
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7496 image to see how many sub-images it contains. Pinging is faster
109876
224f72d9b53f some minor cosmetic fixes in comments
Joakim <joakim@localhost.localdomain>
parents: 109875
diff changeset
7497 than loading the image to find out things about it. */
112192
3dff252e42ea * image.c (imagemagick_load_image, Finit_image_library): Free
Tassilo Horn <tassilo@member.fsf.org>
parents: 112152
diff changeset
7498
112195
0a2b87003c28 Minor docfixes in imagemagick_load_image.
Tassilo Horn <tassilo@member.fsf.org>
parents: 112192
diff changeset
7499 /* `MagickWandGenesis' initializes the imagemagick environment. */
112192
3dff252e42ea * image.c (imagemagick_load_image, Finit_image_library): Free
Tassilo Horn <tassilo@member.fsf.org>
parents: 112152
diff changeset
7500 MagickWandGenesis ();
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7501 image = image_spec_value (img->spec, QCindex, NULL);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7502 ino = INTEGERP (image) ? XFASTINT (image) : 0;
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7503 ping_wand = NewMagickWand ();
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7504 MagickSetResolution (ping_wand, 2, 2);
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7505 if (filename != NULL)
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7506 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7507 status = MagickPingImage (ping_wand, filename);
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7508 }
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7509 else
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7510 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7511 status = MagickPingImageBlob (ping_wand, contents, size);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7512 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7513
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7514 if (ino >= MagickGetNumberImages (ping_wand))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7515 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7516 image_error ("Invalid image number `%s' in image `%s'",
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7517 image, img->spec);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7518 DestroyMagickWand (ping_wand);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7519 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7520 }
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7521
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7522 if (MagickGetNumberImages(ping_wand) > 1)
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7523 img->data.lisp_val =
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7524 Fcons (Qcount,
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7525 Fcons (make_number (MagickGetNumberImages (ping_wand)),
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7526 img->data.lisp_val));
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7527
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7528 DestroyMagickWand (ping_wand);
112192
3dff252e42ea * image.c (imagemagick_load_image, Finit_image_library): Free
Tassilo Horn <tassilo@member.fsf.org>
parents: 112152
diff changeset
7529
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7530 /* Now, after pinging, we know how many images are inside the
109876
224f72d9b53f some minor cosmetic fixes in comments
Joakim <joakim@localhost.localdomain>
parents: 109875
diff changeset
7531 file. If its not a bundle, just one. */
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7532
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7533 if (filename != NULL)
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7534 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7535 image_info = CloneImageInfo ((ImageInfo *) NULL);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7536 (void) strcpy (image_info->filename, filename);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7537 image_info->number_scenes = 1;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7538 image_info->scene = ino;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7539 exception = AcquireExceptionInfo ();
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7540
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7541 im_image = ReadImage (image_info, exception);
112152
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7542 DestroyExceptionInfo (exception);
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7543
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7544 if (im_image != NULL)
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7545 {
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7546 image_wand = NewMagickWandFromImage (im_image);
112192
3dff252e42ea * image.c (imagemagick_load_image, Finit_image_library): Free
Tassilo Horn <tassilo@member.fsf.org>
parents: 112152
diff changeset
7547 DestroyImage(im_image);
112152
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7548 status = MagickTrue;
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7549 }
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7550 else
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7551 status = MagickFalse;
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7552 }
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7553 else
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7554 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7555 image_wand = NewMagickWand ();
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7556 status = MagickReadImageBlob (image_wand, contents, size);
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7557 }
112192
3dff252e42ea * image.c (imagemagick_load_image, Finit_image_library): Free
Tassilo Horn <tassilo@member.fsf.org>
parents: 112152
diff changeset
7558
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7559 if (status == MagickFalse) goto imagemagick_error;
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7560
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7561 /* If width and/or height is set in the display spec assume we want
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7562 to scale to those values. if either h or w is unspecified, the
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7563 unspecified should be calculated from the specified to preserve
109876
224f72d9b53f some minor cosmetic fixes in comments
Joakim <joakim@localhost.localdomain>
parents: 109875
diff changeset
7564 aspect ratio. */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7565
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7566 value = image_spec_value (img->spec, QCwidth, NULL);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7567 desired_width = (INTEGERP (value) ? XFASTINT (value) : -1);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7568 value = image_spec_value (img->spec, QCheight, NULL);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7569 desired_height = (INTEGERP (value) ? XFASTINT (value) : -1);
109866
73512e4aa257 image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.
Joakim <joakim@localhost.localdomain>
parents: 109864
diff changeset
7570
109864
458fda2a5cff improved lisp interface to scaling, doc changed acordingly
Joakim <joakim@localhost.localdomain>
parents: 109861
diff changeset
7571 height = MagickGetImageHeight (image_wand);
458fda2a5cff improved lisp interface to scaling, doc changed acordingly
Joakim <joakim@localhost.localdomain>
parents: 109861
diff changeset
7572 width = MagickGetImageWidth (image_wand);
458fda2a5cff improved lisp interface to scaling, doc changed acordingly
Joakim <joakim@localhost.localdomain>
parents: 109861
diff changeset
7573
458fda2a5cff improved lisp interface to scaling, doc changed acordingly
Joakim <joakim@localhost.localdomain>
parents: 109861
diff changeset
7574 if(desired_width != -1 && desired_height == -1)
458fda2a5cff improved lisp interface to scaling, doc changed acordingly
Joakim <joakim@localhost.localdomain>
parents: 109861
diff changeset
7575 {
109876
224f72d9b53f some minor cosmetic fixes in comments
Joakim <joakim@localhost.localdomain>
parents: 109875
diff changeset
7576 /* w known, calculate h. */
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7577 desired_height = (double) desired_width / width * height;
109864
458fda2a5cff improved lisp interface to scaling, doc changed acordingly
Joakim <joakim@localhost.localdomain>
parents: 109861
diff changeset
7578 }
458fda2a5cff improved lisp interface to scaling, doc changed acordingly
Joakim <joakim@localhost.localdomain>
parents: 109861
diff changeset
7579 if(desired_width == -1 && desired_height != -1)
458fda2a5cff improved lisp interface to scaling, doc changed acordingly
Joakim <joakim@localhost.localdomain>
parents: 109861
diff changeset
7580 {
109876
224f72d9b53f some minor cosmetic fixes in comments
Joakim <joakim@localhost.localdomain>
parents: 109875
diff changeset
7581 /* h known, calculate w. */
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7582 desired_width = (double) desired_height / height * width;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7583 }
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7584 if(desired_width != -1 && desired_height != -1)
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7585 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7586 status = MagickScaleImage (image_wand, desired_width, desired_height);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7587 if (status == MagickFalse)
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7588 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7589 image_error ("Imagemagick scale failed", Qnil, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7590 goto imagemagick_error;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7591 }
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7592 }
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7593
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7594
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7595 /* crop behaves similar to image slicing in Emacs but is more memory
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7596 efficient. */
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7597 crop = image_spec_value (img->spec, QCcrop, NULL);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7598
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7599 if (CONSP (crop) && INTEGERP (XCAR (crop)))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7600 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7601 /* After some testing, it seems MagickCropImage is the fastest
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7602 crop function in ImageMagick. This crop function seems to do
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7603 less copying than the alternatives, but it still reads the
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7604 entire image into memory before croping, which is aparently
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7605 difficult to avoid when using imagemagick. */
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7606
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7607 int w, h, x, y;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7608 w = XFASTINT (XCAR (crop));
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7609 crop = XCDR (crop);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7610 if (CONSP (crop) && INTEGERP (XCAR (crop)))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7611 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7612 h = XFASTINT (XCAR (crop));
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7613 crop = XCDR (crop);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7614 if (CONSP (crop) && INTEGERP (XCAR (crop)))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7615 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7616 x = XFASTINT (XCAR (crop));
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7617 crop = XCDR (crop);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7618 if (CONSP (crop) && INTEGERP (XCAR (crop)))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7619 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7620 y = XFASTINT (XCAR (crop));
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7621 MagickCropImage (image_wand, w, h, x, y);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7622 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7623 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7624 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7625 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7626
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7627 /* Furthermore :rotation. we need background color and angle for
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7628 rotation. */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7629 /*
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7630 TODO background handling for rotation specified_bg =
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7631 image_spec_value (img->spec, QCbackground, NULL); if (!STRINGP
109876
224f72d9b53f some minor cosmetic fixes in comments
Joakim <joakim@localhost.localdomain>
parents: 109875
diff changeset
7632 (specified_bg). */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7633 value = image_spec_value (img->spec, QCrotation, NULL);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7634 if (FLOATP (value))
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7635 {
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7636 PixelWand* background = NewPixelWand ();
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7637 PixelSetColor (background, "#ffffff");/*TODO remove hardcode*/
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7638
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7639 rotation = extract_float (value);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7640
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7641 status = MagickRotateImage (image_wand, background, rotation);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7642 DestroyPixelWand (background);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7643 if (status == MagickFalse)
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7644 {
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7645 image_error ("Imagemagick image rotate failed", Qnil, Qnil);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7646 goto imagemagick_error;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7647 }
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7648 }
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7649
109866
73512e4aa257 image-mode changes. removed the imagemagick specific :geometry and :crop interface that wasnt very good.
Joakim <joakim@localhost.localdomain>
parents: 109864
diff changeset
7650 /* Finaly we are done manipulating the image, figure out resulting
109876
224f72d9b53f some minor cosmetic fixes in comments
Joakim <joakim@localhost.localdomain>
parents: 109875
diff changeset
7651 width, height, and then transfer ownerwship to Emacs. */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7652 height = MagickGetImageHeight (image_wand);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7653 width = MagickGetImageWidth (image_wand);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7654
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7655 if (! check_image_size (f, width, height))
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7656 {
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7657 image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7658 goto imagemagick_error;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7659 }
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7660
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7661 /* We can now get a valid pixel buffer from the imagemagick file, if all
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7662 went ok. */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7663
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7664 init_color_table ();
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7665 imagemagick_rendermethod = (INTEGERP (Vimagemagick_render_type)
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7666 ? XFASTINT (Vimagemagick_render_type) : 0);
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7667 if (imagemagick_rendermethod == 0)
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7668 {
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7669 /* Try to create a x pixmap to hold the imagemagick pixmap. */
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7670 if (!x_create_x_image_and_pixmap (f, width, height, 0,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7671 &ximg, &img->pixmap))
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7672 {
112152
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7673 #ifdef COLOR_TABLE_SUPPORT
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7674 free_color_table ();
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7675 #endif
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7676 image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7677 goto imagemagick_error;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7678 }
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7679
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7680 /* Copy imagegmagick image to x with primitive yet robust pixel
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7681 pusher loop. This has been tested a lot with many different
109876
224f72d9b53f some minor cosmetic fixes in comments
Joakim <joakim@localhost.localdomain>
parents: 109875
diff changeset
7682 images. */
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7683
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7684 /* Copy pixels from the imagemagick image structure to the x image map. */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7685 iterator = NewPixelIterator (image_wand);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7686 if (iterator == (PixelIterator *) NULL)
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7687 {
112152
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7688 #ifdef COLOR_TABLE_SUPPORT
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7689 free_color_table ();
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7690 #endif
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7691 x_destroy_x_image (ximg);
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7692 image_error ("Imagemagick pixel iterator creation failed",
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7693 Qnil, Qnil);
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7694 goto imagemagick_error;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7695 }
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7696
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7697 for (y = 0; y < (long) MagickGetImageHeight (image_wand); y++)
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7698 {
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7699 pixels = PixelGetNextIteratorRow (iterator, &width);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7700 if (pixels == (PixelWand **) NULL)
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7701 break;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7702 for (x = 0; x < (long) width; x++)
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7703 {
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7704 PixelGetMagickColor (pixels[x], &pixel);
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7705 XPutPixel (ximg, x, y,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7706 lookup_rgb_color (f,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7707 pixel.red,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7708 pixel.green,
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7709 pixel.blue));
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7710 }
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7711 }
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7712 DestroyPixelIterator (iterator);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7713 }
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7714
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7715 if (imagemagick_rendermethod == 1)
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7716 {
109872
45bb792f536e minor cleanup
Joakim <joakim@localhost.localdomain>
parents: 109871
diff changeset
7717 /* Magicexportimage is normaly faster than pixelpushing. This
45bb792f536e minor cleanup
Joakim <joakim@localhost.localdomain>
parents: 109871
diff changeset
7718 method is also well tested. Some aspects of this method are
45bb792f536e minor cleanup
Joakim <joakim@localhost.localdomain>
parents: 109871
diff changeset
7719 ad-hoc and needs to be more researched. */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7720 int imagedepth = 24;/*MagickGetImageDepth(image_wand);*/
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7721 char* exportdepth = imagedepth <= 8 ? "I" : "BGRP";/*"RGBP";*/
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7722 /* Try to create a x pixmap to hold the imagemagick pixmap. */
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7723 if (!x_create_x_image_and_pixmap (f, width, height, imagedepth,
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7724 &ximg, &img->pixmap))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7725 {
112152
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7726 #ifdef COLOR_TABLE_SUPPORT
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7727 free_color_table ();
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7728 #endif
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7729 image_error("Imagemagick X bitmap allocation failure", Qnil, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7730 goto imagemagick_error;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7731 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7732
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7733
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7734 /* Oddly, the below code doesnt seem to work:*/
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7735 /* switch(ximg->bitmap_unit){ */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7736 /* case 8: */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7737 /* pixelwidth=CharPixel; */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7738 /* break; */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7739 /* case 16: */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7740 /* pixelwidth=ShortPixel; */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7741 /* break; */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7742 /* case 32: */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7743 /* pixelwidth=LongPixel; */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7744 /* break; */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7745 /* } */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7746 /*
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7747 Here im just guessing the format of the bitmap.
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7748 happens to work fine for:
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7749 - bw djvu images
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7750 on rgb display.
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7751 seems about 3 times as fast as pixel pushing(not carefully measured)
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7752 */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7753 pixelwidth = CharPixel;/*??? TODO figure out*/
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7754 #ifdef HAVE_MAGICKEXPORTIMAGEPIXELS
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7755 MagickExportImagePixels (image_wand,
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7756 0, 0,
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7757 width, height,
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7758 exportdepth,
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7759 pixelwidth,
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7760 /*&(img->pixmap));*/
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7761 ximg->data);
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7762 #else
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7763 image_error ("You dont have MagickExportImagePixels, upgrade ImageMagick!",
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7764 Qnil, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7765 #endif
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7766 }
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7767
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7768
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7769 #ifdef COLOR_TABLE_SUPPORT
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7770 /* Remember colors allocated for this image. */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7771 img->colors = colors_in_color_table (&img->ncolors);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7772 free_color_table ();
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7773 #endif /* COLOR_TABLE_SUPPORT */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7774
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7775
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7776 img->width = width;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7777 img->height = height;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7778
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7779 /* Put the image into the pixmap, then free the X image and its
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7780 buffer. */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7781 x_put_x_image (f, ximg, img->pixmap, width, height);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7782 x_destroy_x_image (ximg);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7783
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7784
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7785 /* Final cleanup. image_wand should be the only resource left. */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7786 DestroyMagickWand (image_wand);
112195
0a2b87003c28 Minor docfixes in imagemagick_load_image.
Tassilo Horn <tassilo@member.fsf.org>
parents: 112192
diff changeset
7787 /* `MagickWandTerminus' terminates the imagemagick environment. */
112192
3dff252e42ea * image.c (imagemagick_load_image, Finit_image_library): Free
Tassilo Horn <tassilo@member.fsf.org>
parents: 112152
diff changeset
7788 MagickWandTerminus ();
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7789
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7790 return 1;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7791
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7792 imagemagick_error:
112152
f87a5809d0c2 Fix some resource leaks in ImageMagick image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 112106
diff changeset
7793 DestroyMagickWand (image_wand);
112192
3dff252e42ea * image.c (imagemagick_load_image, Finit_image_library): Free
Tassilo Horn <tassilo@member.fsf.org>
parents: 112152
diff changeset
7794 MagickWandTerminus ();
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7795 /* TODO more cleanup. */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7796 image_error ("Error parsing IMAGEMAGICK image `%s'", img->spec, Qnil);
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7797 return 0;
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7798 }
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7799
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7800
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7801 /* Load IMAGEMAGICK image IMG for use on frame F. Value is non-zero if
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7802 successful. this function will go into the imagemagick_type structure, and
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7803 the prototype thus needs to be compatible with that structure. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7804
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7805 static int
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7806 imagemagick_load (struct frame *f,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7807 struct image *img)
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7808 {
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7809 int success_p = 0;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7810 Lisp_Object file_name;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7811
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7812 /* If IMG->spec specifies a file name, create a non-file spec from it. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7813 file_name = image_spec_value (img->spec, QCfile, NULL);
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7814 if (STRINGP (file_name))
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7815 {
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7816 Lisp_Object file;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7817
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7818 file = x_find_image_file (file_name);
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7819 if (!STRINGP (file))
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7820 {
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7821 image_error ("Cannot find image file `%s'", file_name, Qnil);
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7822 return 0;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7823 }
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7824 success_p = imagemagick_load_image (f, img, 0, 0, SDATA (file));
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7825 }
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7826 /* Else its not a file, its a lisp object. Load the image from a
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7827 lisp object rather than a file. */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7828 else
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7829 {
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7830 Lisp_Object data;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7831
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7832 data = image_spec_value (img->spec, QCdata, NULL);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7833 if (!STRINGP (data))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7834 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7835 image_error ("Invalid image data `%s'", data, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7836 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7837 }
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7838 success_p = imagemagick_load_image (f, img, SDATA (data),
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7839 SBYTES (data), NULL);
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7840 }
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7841
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7842 return success_p;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7843 }
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7844
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7845 /* Structure describing the image type `imagemagick'. Its the same
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7846 type of structure defined for all image formats, handled by Emacs
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7847 image functions. See struct image_type in dispextern.h. */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7848
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7849 static struct image_type imagemagick_type =
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7850 {
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7851 /* An identifier showing that this is an image structure for the
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7852 IMAGEMAGICK format. */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7853 &Qimagemagick,
109861
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7854 /* Handle to a function that can be used to identify a IMAGEMAGICK
8e0241dfb81c cosmetics, and changing of defconst to defcustom
Joakim <joakim@localhost.localdomain>
parents: 109860
diff changeset
7855 file. */
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7856 imagemagick_image_p,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7857 /* Handle to function used to load a IMAGEMAGICK file. */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7858 imagemagick_load,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7859 /* Handle to function to free resources for IMAGEMAGICK. */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7860 imagemagick_clear_image,
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7861 /* An internal field to link to the next image type in a list of
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7862 image types, will be filled in when registering the format. */
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7863 NULL
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7864 };
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7865
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7866
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7867
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7868
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7869 DEFUN ("imagemagick-types", Fimagemagick_types, Simagemagick_types, 0, 0, 0,
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7870 doc: /* Return image file types supported by ImageMagick.
110176
e04dbb6aa46a * image.c (Fimagemagick_types): Doc fix.
Andreas Schwab <schwab@linux-m68k.org>
parents: 110175
diff changeset
7871 Since ImageMagick recognizes a lot of file-types that clash with Emacs,
e04dbb6aa46a * image.c (Fimagemagick_types): Doc fix.
Andreas Schwab <schwab@linux-m68k.org>
parents: 110175
diff changeset
7872 such as .c, we want to be able to alter the list at the lisp level. */)
109871
3226ac2da7f7 merge from trunk
Joakim <joakim@localhost.localdomain>
parents: 109868 109717
diff changeset
7873 (void)
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7874 {
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7875 Lisp_Object typelist = Qnil;
110175
6488e31d7e94 Fix type mismatch in ImageMagick loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110174
diff changeset
7876 unsigned long numf;
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7877 ExceptionInfo ex;
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7878 char **imtypes = GetMagickList ("*", &numf, &ex);
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7879 int i;
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7880 Lisp_Object Qimagemagicktype;
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7881 for (i = 0; i < numf; i++)
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7882 {
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
7883 Qimagemagicktype = intern (imtypes[i]);
109868
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7884 typelist = Fcons (Qimagemagicktype, typelist);
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7885 }
c1ae0a9b14a1 reworked :index functionality a bit so its faster
Joakim <joakim@localhost.localdomain>
parents: 109866
diff changeset
7886 return typelist;
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7887 }
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
7888
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7889 #endif /* defined (HAVE_IMAGEMAGICK) */
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7890
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
7891
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7892
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
7893 /***********************************************************************
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7894 SVG
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7895 ***********************************************************************/
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7896
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7897 #if defined (HAVE_RSVG)
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7898
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7899 /* Function prototypes. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7900
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
7901 static int svg_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
7902 static int svg_load (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
7903
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
7904 static int svg_load_image (struct frame *, struct image *,
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
7905 unsigned char *, unsigned int);
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7906
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7907 /* The symbol `svg' identifying images of this type. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7908
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7909 Lisp_Object Qsvg;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7910
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7911 /* 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
7912
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7913 enum svg_keyword_index
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7914 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7915 SVG_TYPE,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7916 SVG_DATA,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7917 SVG_FILE,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7918 SVG_ASCENT,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7919 SVG_MARGIN,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7920 SVG_RELIEF,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7921 SVG_ALGORITHM,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7922 SVG_HEURISTIC_MASK,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7923 SVG_MASK,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7924 SVG_BACKGROUND,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7925 SVG_LAST
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7926 };
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7927
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7928 /* Vector of image_keyword structures describing the format
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7929 of valid user-defined image specifications. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7930
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
7931 static const struct image_keyword svg_format[SVG_LAST] =
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7932 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7933 {":type", IMAGE_SYMBOL_VALUE, 1},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7934 {":data", IMAGE_STRING_VALUE, 0},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7935 {":file", IMAGE_STRING_VALUE, 0},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7936 {":ascent", IMAGE_ASCENT_VALUE, 0},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7937 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7938 {":relief", IMAGE_INTEGER_VALUE, 0},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7939 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7940 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7941 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7942 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7943 };
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7944
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7945 /* 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
7946 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
7947 functions. See struct image_type in dispextern.h. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7948
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7949 static struct image_type svg_type =
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7950 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7951 /* 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
7952 &Qsvg,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7953 /* 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
7954 svg_image_p,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7955 /* 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
7956 svg_load,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7957 /* Handle to function to free sresources for SVG. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7958 x_clear_image,
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7959 /* 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
7960 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
7961 NULL
82518
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
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7964
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7965 /* 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
7966 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
7967 identify the SVG format. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7968
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7969 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
7970 svg_image_p (Lisp_Object object)
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7971 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7972 struct image_keyword fmt[SVG_LAST];
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
7973 memcpy (fmt, svg_format, sizeof fmt);
82518
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 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
7976 return 0;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7977
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7978 /* Must specify either the :data or :file keyword. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7979 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
7980 }
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7981
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7982 #include <librsvg/rsvg.h>
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
7983
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7984 #ifdef HAVE_NTGUI
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7985
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7986 /* SVG library functions. */
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7987 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
7988 DEF_IMGLIB_FN (rsvg_handle_get_dimensions);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7989 DEF_IMGLIB_FN (rsvg_handle_write);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7990 DEF_IMGLIB_FN (rsvg_handle_close);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7991 DEF_IMGLIB_FN (rsvg_handle_get_pixbuf);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7992 DEF_IMGLIB_FN (rsvg_handle_free);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7993
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7994 DEF_IMGLIB_FN (gdk_pixbuf_get_width);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7995 DEF_IMGLIB_FN (gdk_pixbuf_get_height);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7996 DEF_IMGLIB_FN (gdk_pixbuf_get_pixels);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7997 DEF_IMGLIB_FN (gdk_pixbuf_get_rowstride);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7998 DEF_IMGLIB_FN (gdk_pixbuf_get_colorspace);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
7999 DEF_IMGLIB_FN (gdk_pixbuf_get_n_channels);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8000 DEF_IMGLIB_FN (gdk_pixbuf_get_has_alpha);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8001 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
8002
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8003 DEF_IMGLIB_FN (g_type_init);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8004 DEF_IMGLIB_FN (g_object_unref);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8005 DEF_IMGLIB_FN (g_error_free);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8006
100826
dd451a5b1d77 (Qgobject): New symbol.
Jason Rumney <jasonr@gnu.org>
parents: 99904
diff changeset
8007 Lisp_Object Qgdk_pixbuf, Qglib, Qgobject;
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8008
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8009 static int
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8010 init_svg_functions (Lisp_Object libraries)
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8011 {
100826
dd451a5b1d77 (Qgobject): New symbol.
Jason Rumney <jasonr@gnu.org>
parents: 99904
diff changeset
8012 HMODULE library, gdklib, glib, gobject;
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8013
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8014 if (!(glib = w32_delayed_load (libraries, Qglib))
100826
dd451a5b1d77 (Qgobject): New symbol.
Jason Rumney <jasonr@gnu.org>
parents: 99904
diff changeset
8015 || !(gobject = w32_delayed_load (libraries, Qgobject))
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8016 || !(gdklib = w32_delayed_load (libraries, Qgdk_pixbuf))
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8017 || !(library = w32_delayed_load (libraries, Qsvg)))
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8018 return 0;
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8019
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8020 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
8021 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
8022 LOAD_IMGLIB_FN (library, rsvg_handle_write);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8023 LOAD_IMGLIB_FN (library, rsvg_handle_close);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8024 LOAD_IMGLIB_FN (library, rsvg_handle_get_pixbuf);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8025 LOAD_IMGLIB_FN (library, rsvg_handle_free);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8026
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8027 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_width);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8028 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_height);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8029 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_pixels);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8030 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_rowstride);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8031 LOAD_IMGLIB_FN (gdklib, gdk_pixbuf_get_colorspace);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8032 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
8033 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
8034 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
8035
100826
dd451a5b1d77 (Qgobject): New symbol.
Jason Rumney <jasonr@gnu.org>
parents: 99904
diff changeset
8036 LOAD_IMGLIB_FN (gobject, g_type_init);
dd451a5b1d77 (Qgobject): New symbol.
Jason Rumney <jasonr@gnu.org>
parents: 99904
diff changeset
8037 LOAD_IMGLIB_FN (gobject, g_object_unref);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8038 LOAD_IMGLIB_FN (glib, g_error_free);
100826
dd451a5b1d77 (Qgobject): New symbol.
Jason Rumney <jasonr@gnu.org>
parents: 99904
diff changeset
8039
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8040 return 1;
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8041 }
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8042
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8043 #else
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8044 /* 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
8045 to be used on some platforms. */
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8046 #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
8047 #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
8048 #define fn_rsvg_handle_write rsvg_handle_write
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8049 #define fn_rsvg_handle_close rsvg_handle_close
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8050 #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
8051 #define fn_rsvg_handle_free rsvg_handle_free
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8052
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8053 #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
8054 #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
8055 #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
8056 #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
8057 #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
8058 #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
8059 #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
8060 #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
8061
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8062 #define fn_g_type_init g_type_init
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8063 #define fn_g_object_unref g_object_unref
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8064 #define fn_g_error_free g_error_free
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8065 #endif /* !HAVE_NTGUI */
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8066
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8067 /* 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
8068 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
8069 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
8070
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8071 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8072 svg_load (struct frame *f, struct image *img)
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8073 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8074 int success_p = 0;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8075 Lisp_Object file_name;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8076
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8077 /* 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
8078 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
8079 if (STRINGP (file_name))
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8080 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8081 Lisp_Object file;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8082 unsigned char *contents;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8083 int size;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8084
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8085 file = x_find_image_file (file_name);
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8086 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
8087 {
916a16bcfda2 (svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 82736
diff changeset
8088 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
8089 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
8090 }
916a16bcfda2 (svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 82736
diff changeset
8091
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8092 /* Read the entire file into memory. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8093 contents = slurp_file (SDATA (file), &size);
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8094 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
8095 {
916a16bcfda2 (svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 82736
diff changeset
8096 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
8097 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
8098 }
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8099 /* 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
8100 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
8101 xfree (contents);
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8102 }
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8103 /* 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
8104 lisp object rather than a file. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8105 else
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8106 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8107 Lisp_Object data;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8108
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8109 data = image_spec_value (img->spec, QCdata, NULL);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8110 if (!STRINGP (data))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8111 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8112 image_error ("Invalid image data `%s'", data, Qnil);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8113 return 0;
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8114 }
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8115 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
8116 }
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 return success_p;
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
85039
50b33e26718b (syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 84561
diff changeset
8121 /* 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
8122 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
8123 structures, passed from svg_load.
50b33e26718b (syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 84561
diff changeset
8124
50b33e26718b (syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 84561
diff changeset
8125 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
8126
50b33e26718b (syms_of_image) <image-types>: Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents: 84561
diff changeset
8127 Returns non-zero when successful. */
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8128 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8129 svg_load_image (struct frame *f, /* Pointer to emacs frame structure. */
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8130 struct image *img, /* Pointer to emacs image structure. */
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8131 unsigned char *contents, /* String containing the SVG XML data to be parsed. */
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8132 unsigned int size) /* Size of data in bytes. */
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8133 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8134 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
8135 RsvgDimensionData dimension_data;
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8136 GError *error = NULL;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8137 GdkPixbuf *pixbuf;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8138 int width;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8139 int height;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8140 const guint8 *pixels;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8141 int rowstride;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8142 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
8143 Lisp_Object specified_bg;
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8144 XColor background;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8145 int x;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8146 int y;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8147
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8148 /* 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
8149 gnome type library functions. */
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8150 fn_g_type_init ();
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8151 /* 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
8152 rsvg_handle = (RsvgHandle *) fn_rsvg_handle_new ();
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8153
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8154 /* 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
8155 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
8156 if (error) goto rsvg_error;
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8157
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8158 /* 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
8159 for further writes. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8160 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
8161 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
8162
c5f36ea75cba (svg_load_image): Use rsvg_handle_get_dimensions to check that image
Chong Yidong <cyd@stupidchicken.com>
parents: 97007
diff changeset
8163 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
8164 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
8165 {
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
8166 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
8167 goto rsvg_error;
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
8168 }
97007
2b861be36de9 (svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 97003
diff changeset
8169
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8170 /* 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
8171 went ok. */
100845
58017ff34d94 * w32term.c (x_query_colors, x_query_color): New functions.
Jason Rumney <jasonr@gnu.org>
parents: 100826
diff changeset
8172 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
8173 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
8174 fn_g_object_unref (rsvg_handle);
82518
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 /* Extract some meta data from the svg handle. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8177 width = fn_gdk_pixbuf_get_width (pixbuf);
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8178 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
8179 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
8180 rowstride = fn_gdk_pixbuf_get_rowstride (pixbuf);
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8181
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8182 /* Validate the svg meta data. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8183 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
8184 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
8185 eassert (fn_gdk_pixbuf_get_has_alpha (pixbuf));
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8186 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
8187
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8188 /* 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
8189 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
8190 {
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8191 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
8192 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
8193 }
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8194
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8195 init_color_table ();
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8196
82781
916a16bcfda2 (svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 82736
diff changeset
8197 /* 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
8198 color. */
916a16bcfda2 (svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 82736
diff changeset
8199 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
8200 if (!STRINGP (specified_bg)
a4a5037b3040 (svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 101638
diff changeset
8201 || !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
8202 {
b6df48c94ca5 * image.c (svg_load_image): Don't right-shift background RGB when
Adrian Robert <Adrian.B.Robert@gmail.com>
parents: 100951
diff changeset
8203 #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
8204 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
8205 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
8206 #else
109160
f8660b83cdbf Fix whitespace to follow coding guidelines.
Juanma Barranquero <lekktu@gmail.com>
parents: 109144
diff changeset
8207 ns_query_color (FRAME_BACKGROUND_COLOR (f), &background, 1);
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
8208 #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
8209 }
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8210
101838
a4a5037b3040 (svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 101638
diff changeset
8211 /* 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
8212 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
8213 transparency. */
a4a5037b3040 (svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 101638
diff changeset
8214 background.red >>= 8;
a4a5037b3040 (svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 101638
diff changeset
8215 background.green >>= 8;
a4a5037b3040 (svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 101638
diff changeset
8216 background.blue >>= 8;
a4a5037b3040 (svg_load_image): Fix last change.
Chong Yidong <cyd@stupidchicken.com>
parents: 101638
diff changeset
8217
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8218 /* This loop handles opacity values, since Emacs assumes
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8219 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
8220 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
8221 pixel, and the image background color. */
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8222 for (y = 0; y < height; ++y)
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8223 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8224 for (x = 0; x < width; ++x)
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8225 {
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8226 unsigned red;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8227 unsigned green;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8228 unsigned blue;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8229 unsigned opacity;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8230
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8231 red = *pixels++;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8232 green = *pixels++;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8233 blue = *pixels++;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8234 opacity = *pixels++;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8235
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8236 red = ((red * opacity)
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8237 + (background.red * ((1 << 8) - opacity)));
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8238 green = ((green * opacity)
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8239 + (background.green * ((1 << 8) - opacity)));
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8240 blue = ((blue * opacity)
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8241 + (background.blue * ((1 << 8) - opacity)));
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8242
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8243 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
8244 }
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8245
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8246 pixels += rowstride - 4 * width;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8247 }
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8248
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8249 #ifdef COLOR_TABLE_SUPPORT
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8250 /* Remember colors allocated for this image. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8251 img->colors = colors_in_color_table (&img->ncolors);
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8252 free_color_table ();
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8253 #endif /* COLOR_TABLE_SUPPORT */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8254
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8255 fn_g_object_unref (pixbuf);
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8256
82781
916a16bcfda2 (svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 82736
diff changeset
8257 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
8258 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
8259
916a16bcfda2 (svg_load_image): Blend with specified background if exists.
YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
parents: 82736
diff changeset
8260 /* 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
8261 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
8262 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
8263
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8264 /* 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
8265 buffer. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8266 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
8267 x_destroy_x_image (ximg);
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8268
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8269 return 1;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8270
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8271 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
8272 fn_g_object_unref (rsvg_handle);
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8273 /* 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
8274 problem with the image. */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8275 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
8276 fn_g_error_free (error);
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8277 return 0;
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8278 }
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8279
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8280 #endif /* defined (HAVE_RSVG) */
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8281
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8282
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8283
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8284
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 Ghostscript
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8287 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8288
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8289 #ifdef HAVE_X_WINDOWS
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8290 #define HAVE_GHOSTSCRIPT 1
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8291 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8292
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8293 #ifdef HAVE_GHOSTSCRIPT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8294
109100
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
8295 static int gs_image_p (Lisp_Object object);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
8296 static int gs_load (struct frame *f, struct image *img);
2bc9a0c04c87 Remove __P and P_ from .c and .m files and definition of P_
Jan D <jan.h.d@swipnet.se>
parents: 108746
diff changeset
8297 static void gs_clear_image (struct frame *f, struct image *img);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8298
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8299 /* Keyword symbols. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8300
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8301 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
8302
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8303 /* 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
8304
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8305 enum gs_keyword_index
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 GS_TYPE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8308 GS_PT_WIDTH,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8309 GS_PT_HEIGHT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8310 GS_FILE,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8311 GS_LOADER,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8312 GS_BOUNDING_BOX,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8313 GS_ASCENT,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8314 GS_MARGIN,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8315 GS_RELIEF,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8316 GS_ALGORITHM,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8317 GS_HEURISTIC_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8318 GS_MASK,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8319 GS_BACKGROUND,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8320 GS_LAST
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8323 /* 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
8324 of valid user-defined image specifications. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8325
105959
ba3ffbd9c422 * process.c (ifflag_def): Make flag_sym constant.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105877
diff changeset
8326 static const struct image_keyword gs_format[GS_LAST] =
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8327 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8328 {":type", IMAGE_SYMBOL_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8329 {":pt-width", IMAGE_POSITIVE_INTEGER_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8330 {":pt-height", IMAGE_POSITIVE_INTEGER_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8331 {":file", IMAGE_STRING_VALUE, 1},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8332 {":loader", IMAGE_FUNCTION_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8333 {":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
8334 {":ascent", IMAGE_ASCENT_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8335 {":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
8336 {":relief", IMAGE_INTEGER_VALUE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8337 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8338 {":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
8339 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8340 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8343 /* Structure describing the image type `ghostscript'. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8344
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8345 static struct image_type gs_type =
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8346 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8347 &Qpostscript,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8348 gs_image_p,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8349 gs_load,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8350 gs_clear_image,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8351 NULL
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8352 };
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 /* 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
8356
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8357 static void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8358 gs_clear_image (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8359 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8360 /* 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
8361 xfree (img->data.ptr_val);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8362 x_clear_image (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8363 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8364
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 /* 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
8367 specification. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8368
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8369 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8370 gs_image_p (Lisp_Object object)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8371 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8372 struct image_keyword fmt[GS_LAST];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8373 Lisp_Object tem;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8374 int i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8375
109165
750db9f3e6d8 Replace bcopy, bzero, bcmp by memcpy, memmove, memset, memcmp
Andreas Schwab <schwab@linux-m68k.org>
parents: 109160
diff changeset
8376 memcpy (fmt, gs_format, sizeof fmt);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8377
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8378 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
8379 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8380
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8381 /* 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
8382 tem = fmt[GS_BOUNDING_BOX].value;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8383 if (CONSP (tem))
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 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
8386 if (!CONSP (tem) || !INTEGERP (XCAR (tem)))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8387 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8388 if (!NILP (tem))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8389 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8390 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8391 else if (VECTORP (tem))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8392 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8393 if (XVECTOR (tem)->size != 4)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8394 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8395 for (i = 0; i < 4; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8396 if (!INTEGERP (XVECTOR (tem)->contents[i]))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8397 return 0;
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 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8400 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8401
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8402 return 1;
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
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8405
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8406 /* 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
8407 if successful. */
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 static int
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8410 gs_load (struct frame *f, struct image *img)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8411 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8412 char buffer[100];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8413 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
8414 Lisp_Object frame;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8415 double in_width, in_height;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8416 Lisp_Object pixel_colors = Qnil;
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 /* 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
8419 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
8420 = 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
8421 info. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8422 pt_width = image_spec_value (img->spec, QCpt_width, NULL);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8423 in_width = INTEGERP (pt_width) ? XFASTINT (pt_width) / 72.0 : 0;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8424 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
8425 pt_height = image_spec_value (img->spec, QCpt_height, NULL);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8426 in_height = INTEGERP (pt_height) ? XFASTINT (pt_height) / 72.0 : 0;
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8427 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
8428
66195
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
8429 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
8430 {
102392
689fbe81edc4 (xbm_read_bitmap_data, png_load, svg_load_image):
Jason Rumney <jasonr@gnu.org>
parents: 101838
diff changeset
8431 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
8432 return 0;
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
8433 }
ad1acaef1abb * image.c (Vmax_image_size): New variable.
Chong Yidong <cyd@stupidchicken.com>
parents: 66013
diff changeset
8434
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8435 /* Create the pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8436 xassert (img->pixmap == NO_PIXMAP);
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 /* 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
8439 BLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8440 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
8441 img->width, img->height,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8442 DefaultDepthOfScreen (FRAME_X_SCREEN (f)));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8443 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8444
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8445 if (!img->pixmap)
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 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
8448 return 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8449 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8450
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8451 /* 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
8452 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
8453 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
8454 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
8455 sprintf (buffer, "%lu %lu",
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8456 (unsigned long) FRAME_X_WINDOW (f),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8457 (unsigned long) img->pixmap);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8458 window_and_pixmap_id = build_string (buffer);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8459
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8460 sprintf (buffer, "%lu %lu",
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8461 FRAME_FOREGROUND_PIXEL (f),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8462 FRAME_BACKGROUND_PIXEL (f));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8463 pixel_colors = build_string (buffer);
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 XSETFRAME (frame, f);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8466 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
8467 if (NILP (loader))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8468 loader = intern ("gs-load-image");
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8469
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8470 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
8471 make_number (img->width),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8472 make_number (img->height),
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8473 window_and_pixmap_id,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8474 pixel_colors);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8475 return PROCESSP (img->data.lisp_val);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8476 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8477
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 /* 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
8480 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
8481 telling Emacs that Ghostscript has finished drawing. */
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 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8484 x_kill_gs_process (Pixmap pixmap, struct frame *f)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8485 {
92109
4d9fc08769fa Consolidate the image_cache to the terminal struct.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 87649
diff changeset
8486 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
8487 int class, i;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8488 struct image *img;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8489
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8490 /* Find the image containing PIXMAP. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8491 for (i = 0; i < c->used; ++i)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8492 if (c->images[i]->pixmap == pixmap)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8493 break;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8494
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8495 /* 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
8496 instance, give up. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8497 if (i == c->used)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8498 return;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8499
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8500 /* 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
8501 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
8502 img = c->images[i];
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8503 xassert (PROCESSP (img->data.lisp_val));
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8504 Fkill_process (img->data.lisp_val, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8505 img->data.lisp_val = Qnil;
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 #if defined (HAVE_X_WINDOWS)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8508
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8509 /* 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
8510 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
8511 img->pixmap. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8512 class = FRAME_X_VISUAL (f)->class;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8513 if (class != StaticColor && class != StaticGray && class != TrueColor)
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 XImagePtr ximg;
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 BLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8518
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8519 /* 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
8520 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
8521 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
8522 if (ximg)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8523 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8524 int x, y;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8525
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8526 /* Initialize the color table. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8527 init_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8528
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8529 /* 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
8530 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
8531 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
8532 for (y = 0; y < img->height; ++y)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8533 for (x = 0; x < img->width; ++x)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8534 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8535 unsigned long pixel = XGetPixel (ximg, x, y);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8536 lookup_pixel_color (f, pixel);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8537 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8538
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8539 /* 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
8540 #ifdef COLOR_TABLE_SUPPORT
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8541 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
8542 free_color_table ();
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8543 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8544 XDestroyImage (ximg);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8545
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8546 #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
8547 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
8548 freeing the colors. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8549 /* 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
8550 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
8551 reference counts right, free them once. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8552 if (img->ncolors)
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8553 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
8554 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8555 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8556 else
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8557 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
8558 img->spec, Qnil);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8559
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8560 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8561 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8562 #endif /* HAVE_X_WINDOWS */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8563
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8564 /* 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
8565 image if requested. */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8566 BLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8567 postprocess_image (f, img);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8568 UNBLOCK_INPUT;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8569 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8570
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8571 #endif /* HAVE_GHOSTSCRIPT */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8572
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8573
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8574 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8575 Tests
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8576 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8577
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8578 #if GLYPH_DEBUG
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8579
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8580 DEFUN ("imagep", Fimagep, Simagep, 1, 1, 0,
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8581 doc: /* Value is non-nil if SPEC is a valid image specification. */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
8582 (Lisp_Object spec)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8583 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8584 return valid_image_p (spec) ? Qt : Qnil;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8585 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8586
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8587
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8588 DEFUN ("lookup-image", Flookup_image, Slookup_image, 1, 1, 0, "")
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
8589 (Lisp_Object spec)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8590 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8591 int id = -1;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8592
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8593 if (valid_image_p (spec))
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8594 id = lookup_image (SELECTED_FRAME (), spec);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8595
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8596 debug_print (spec);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8597 return make_number (id);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8598 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8599
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8600 #endif /* GLYPH_DEBUG != 0 */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8601
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8602
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8603 /***********************************************************************
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8604 Initialization
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8605 ***********************************************************************/
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8606
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8607 #ifdef HAVE_NTGUI
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8608 /* 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
8609 if the library is available. */
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
8610 #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
8611 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
8612 #else
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
8613 #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
8614 define_image_type (image_type, 1)
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8615 #endif /* HAVE_NTGUI */
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8616
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8617 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
8618 doc: /* Initialize image library implementing image type TYPE.
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8619 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
8620
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8621 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
8622 Libraries to load are specified in alist LIBRARIES (usually, the value
110967
188673195616 Rename `image-library-alist' to `dynamic-library-alist'.
Juanma Barranquero <lekktu@gmail.com>
parents: 110678
diff changeset
8623 of `dynamic-library-alist', which see). */)
109179
8cfee7d2955f Convert DEFUNs to standard C.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 109165
diff changeset
8624 (Lisp_Object type, Lisp_Object libraries)
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8625 {
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8626 Lisp_Object tested;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8627
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8628 /* Don't try to reload the library. */
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8629 tested = Fassq (type, Vimage_type_cache);
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8630 if (CONSP (tested))
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8631 return XCDR (tested);
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8632
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8633 #if defined (HAVE_XPM) || defined (HAVE_NS)
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8634 if (EQ (type, Qxpm))
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
8635 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
8636 #endif
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8637
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8638 #if defined (HAVE_JPEG) || defined (HAVE_NS)
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8639 if (EQ (type, Qjpeg))
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
8640 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
8641 #endif
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8642
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8643 #if defined (HAVE_TIFF) || defined (HAVE_NS)
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8644 if (EQ (type, Qtiff))
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
8645 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
8646 #endif
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8647
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8648 #if defined (HAVE_GIF) || defined (HAVE_NS)
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8649 if (EQ (type, Qgif))
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
8650 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
8651 #endif
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8652
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8653 #if defined (HAVE_PNG) || defined (HAVE_NS)
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8654 if (EQ (type, Qpng))
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
8655 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
8656 #endif
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8657
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8658 #if defined (HAVE_RSVG)
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8659 if (EQ (type, Qsvg))
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8660 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
8661 #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
8662
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8663 #if defined (HAVE_IMAGEMAGICK)
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8664 if (EQ (type, Qimagemagick))
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8665 {
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8666 return CHECK_LIB_AVAILABLE (&imagemagick_type, init_imagemagick_functions,
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8667 libraries);
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8668 }
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8669 #endif
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8670
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8671 #ifdef HAVE_GHOSTSCRIPT
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8672 if (EQ (type, Qpostscript))
56288
7acb38a05354 (CHECK_LIB_AVAILABLE): Add third parameter LIBRARIES.
Andreas Schwab <schwab@suse.de>
parents: 56132
diff changeset
8673 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
8674 #endif
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8675
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8676 /* 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
8677 CACHE_IMAGE_TYPE (type, Qnil);
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8678 return Qnil;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8679 }
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8680
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8681 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8682 syms_of_image (void)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8683 {
64910
eef3e25f6aed (syms_of_image): Init image_types here, and call define_image_type.
Richard M. Stallman <rms@gnu.org>
parents: 64770
diff changeset
8684 /* 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
8685 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
8686 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
8687 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
8688
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8689 /* 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
8690 defining the supported image types. */
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112362
diff changeset
8691 DEFVAR_LISP ("image-types", Vimage_types,
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8692 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
8693 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
8694 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
8695 Vimage_types = Qnil;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8696
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112362
diff changeset
8697 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
8698 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
8699 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
8700 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
8701
5414bd89ffde (check_image_size): Handle integer Vmax_image_size value
Kim F. Storm <storm@cua.dk>
parents: 66195
diff changeset
8702 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
8703 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
8704 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
8705 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
8706 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
8707 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
8708
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8709 Vimage_type_cache = Qnil;
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8710 staticpro (&Vimage_type_cache);
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8711
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8712 Qpbm = intern_c_string ("pbm");
64967
30b17a96bd90 (syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents: 64910
diff changeset
8713 staticpro (&Qpbm);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8714 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
8715
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8716 Qxbm = intern_c_string ("xbm");
64967
30b17a96bd90 (syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents: 64910
diff changeset
8717 staticpro (&Qxbm);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8718 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
8719
30b17a96bd90 (syms_of_image): Init Qxbm, Qpbm before calling define_image_type.
Richard M. Stallman <rms@gnu.org>
parents: 64910
diff changeset
8720 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
8721 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
8722
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8723 Qcount = intern_c_string ("count");
85710
beb909dfc54d Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85254
diff changeset
8724 staticpro (&Qcount);
107719
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
8725 Qextension_data = intern_c_string ("extension-data");
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
8726 staticpro (&Qextension_data);
85710
beb909dfc54d Rewrite abbrev.c in Elisp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85254
diff changeset
8727
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8728 QCascent = intern_c_string (":ascent");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8729 staticpro (&QCascent);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8730 QCmargin = intern_c_string (":margin");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8731 staticpro (&QCmargin);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8732 QCrelief = intern_c_string (":relief");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8733 staticpro (&QCrelief);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8734 QCconversion = intern_c_string (":conversion");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8735 staticpro (&QCconversion);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8736 QCcolor_symbols = intern_c_string (":color-symbols");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8737 staticpro (&QCcolor_symbols);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8738 QCheuristic_mask = intern_c_string (":heuristic-mask");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8739 staticpro (&QCheuristic_mask);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8740 QCindex = intern_c_string (":index");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8741 staticpro (&QCindex);
110678
7e83565f8d0e Use intern_c_string instead of intern.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110561
diff changeset
8742 QCgeometry = intern_c_string (":geometry");
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8743 staticpro (&QCgeometry);
110678
7e83565f8d0e Use intern_c_string instead of intern.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110561
diff changeset
8744 QCcrop = intern_c_string (":crop");
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8745 staticpro (&QCcrop);
110678
7e83565f8d0e Use intern_c_string instead of intern.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110561
diff changeset
8746 QCrotation = intern_c_string (":rotation");
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8747 staticpro (&QCrotation);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8748 QCmatrix = intern_c_string (":matrix");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8749 staticpro (&QCmatrix);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8750 QCcolor_adjustment = intern_c_string (":color-adjustment");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8751 staticpro (&QCcolor_adjustment);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8752 QCmask = intern_c_string (":mask");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8753 staticpro (&QCmask);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8754
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8755 Qlaplace = intern_c_string ("laplace");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8756 staticpro (&Qlaplace);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8757 Qemboss = intern_c_string ("emboss");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8758 staticpro (&Qemboss);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8759 Qedge_detection = intern_c_string ("edge-detection");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8760 staticpro (&Qedge_detection);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8761 Qheuristic = intern_c_string ("heuristic");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8762 staticpro (&Qheuristic);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8763
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8764 Qpostscript = intern_c_string ("postscript");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8765 staticpro (&Qpostscript);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8766 #ifdef HAVE_GHOSTSCRIPT
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8767 ADD_IMAGE_TYPE (Qpostscript);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8768 QCloader = intern_c_string (":loader");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8769 staticpro (&QCloader);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8770 QCbounding_box = intern_c_string (":bounding-box");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8771 staticpro (&QCbounding_box);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8772 QCpt_width = intern_c_string (":pt-width");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8773 staticpro (&QCpt_width);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8774 QCpt_height = intern_c_string (":pt-height");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8775 staticpro (&QCpt_height);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8776 #endif /* HAVE_GHOSTSCRIPT */
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8777
112088
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
8778 #ifdef HAVE_NTGUI
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
8779 Qlibpng_version = intern_c_string ("libpng-version");
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
8780 staticpro (&Qlibpng_version);
112344
7c2cdabbc4a9 * image.c (syms_of_image): Don't access XSYMBOL's internals directly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112343
diff changeset
8781 Fset (Qlibpng_version,
112088
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
8782 #if HAVE_PNG
112344
7c2cdabbc4a9 * image.c (syms_of_image): Don't access XSYMBOL's internals directly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112343
diff changeset
8783 make_number (PNG_LIBPNG_VER)
112088
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
8784 #else
112344
7c2cdabbc4a9 * image.c (syms_of_image): Don't access XSYMBOL's internals directly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112343
diff changeset
8785 make_number (-1)
112088
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
8786 #endif
112344
7c2cdabbc4a9 * image.c (syms_of_image): Don't access XSYMBOL's internals directly.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 112343
diff changeset
8787 );
112088
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
8788 #endif
704900942a8e Fix bug #7716 with PNG image support libraries on Windows.
Eli Zaretskii <eliz@gnu.org>
parents: 111372
diff changeset
8789
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8790 #if defined (HAVE_XPM) || defined (HAVE_NS)
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8791 Qxpm = intern_c_string ("xpm");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8792 staticpro (&Qxpm);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8793 ADD_IMAGE_TYPE (Qxpm);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8794 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8795
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8796 #if defined (HAVE_JPEG) || defined (HAVE_NS)
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8797 Qjpeg = intern_c_string ("jpeg");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8798 staticpro (&Qjpeg);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8799 ADD_IMAGE_TYPE (Qjpeg);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8800 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8801
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8802 #if defined (HAVE_TIFF) || defined (HAVE_NS)
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8803 Qtiff = intern_c_string ("tiff");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8804 staticpro (&Qtiff);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8805 ADD_IMAGE_TYPE (Qtiff);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8806 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8807
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8808 #if defined (HAVE_GIF) || defined (HAVE_NS)
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8809 Qgif = intern_c_string ("gif");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8810 staticpro (&Qgif);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8811 ADD_IMAGE_TYPE (Qgif);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8812 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8813
97043
9592c50233ab Remove support for Mac Carbon.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 97034
diff changeset
8814 #if defined (HAVE_PNG) || defined (HAVE_NS)
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8815 Qpng = intern_c_string ("png");
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8816 staticpro (&Qpng);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8817 ADD_IMAGE_TYPE (Qpng);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8818 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8819
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8820 #if defined (HAVE_IMAGEMAGICK)
110678
7e83565f8d0e Use intern_c_string instead of intern.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 110561
diff changeset
8821 Qimagemagick = intern_c_string ("imagemagick");
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8822 staticpro (&Qimagemagick);
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8823 ADD_IMAGE_TYPE (Qimagemagick);
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8824 #endif
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8825
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8826 #if defined (HAVE_RSVG)
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8827 Qsvg = intern_c_string ("svg");
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8828 staticpro (&Qsvg);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8829 ADD_IMAGE_TYPE (Qsvg);
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8830 #ifdef HAVE_NTGUI
100826
dd451a5b1d77 (Qgobject): New symbol.
Jason Rumney <jasonr@gnu.org>
parents: 99904
diff changeset
8831 /* Other libraries used directly by svg code. */
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8832 Qgdk_pixbuf = intern_c_string ("gdk-pixbuf");
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8833 staticpro (&Qgdk_pixbuf);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8834 Qglib = intern_c_string ("glib");
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8835 staticpro (&Qglib);
105877
21bdda3ded62 * xterm.c (syms_of_xterm):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105678
diff changeset
8836 Qgobject = intern_c_string ("gobject");
100826
dd451a5b1d77 (Qgobject): New symbol.
Jason Rumney <jasonr@gnu.org>
parents: 99904
diff changeset
8837 staticpro (&Qgobject);
82795
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8838 #endif /* HAVE_NTGUI */
bf61b6631aba [HAVE_NTGUI]: Define dynamic loaded functions.
Jason Rumney <jasonr@gnu.org>
parents: 82781
diff changeset
8839 #endif /* HAVE_RSVG */
82518
b6db95f12a9d Paul Pogonyshev <pogonyshev at gmx.net>
Glenn Morris <rgm@gnu.org>
parents: 82318
diff changeset
8840
56104
a450e67752ed (Vimage_types): Move from xdisp.c.
Juanma Barranquero <lekktu@gmail.com>
parents: 56065
diff changeset
8841 defsubr (&Sinit_image_library);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8842 #ifdef HAVE_IMAGEMAGICK
109849
28a8c62b8ee7 imagemagick patch5 + minor mods
joakim <joakim@exodia>
parents: 107719
diff changeset
8843 defsubr (&Simagemagick_types);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8844 #endif
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8845 defsubr (&Sclear_image_cache);
108746
24d486687f54 Rename image-refresh to image-flush.
Chong Yidong <cyd@stupidchicken.com>
parents: 108741
diff changeset
8846 defsubr (&Simage_flush);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8847 defsubr (&Simage_size);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8848 defsubr (&Simage_mask_p);
107719
9c0ed2d6731a Rename `image-extension-data' to `image-metadata'.
Juri Linkov <juri@jurta.org>
parents: 106975
diff changeset
8849 defsubr (&Simage_metadata);
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8850
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8851 #if GLYPH_DEBUG
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8852 defsubr (&Simagep);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8853 defsubr (&Slookup_image);
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8854 #endif
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8855
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112362
diff changeset
8856 DEFVAR_BOOL ("cross-disabled-images", cross_disabled_images,
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8857 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
8858 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
8859 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
8860 cross_disabled_images = 0;
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8861
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112362
diff changeset
8862 DEFVAR_LISP ("x-bitmap-file-path", Vx_bitmap_file_path,
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8863 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
8864 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
8865
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112362
diff changeset
8866 DEFVAR_LISP ("image-cache-eviction-delay", Vimage_cache_eviction_delay,
109875
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
8867 doc: /* Maximum time after which images are removed from the cache.
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
8868 When an image has not been displayed this many seconds, Emacs
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
8869 automatically removes it from the image cache. If the cache contains
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
8870 a large number of images, the actual eviction time may be shorter.
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
8871 The value can also be nil, meaning the cache is never cleared.
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
8872
ce46135d2b98 fix some accidental whitespace changes
Joakim <joakim@localhost.localdomain>
parents: 109872
diff changeset
8873 The function `clear-image-cache' disregards this variable. */);
108741
9480d787845f Improve image cache clearing logic (Bug#6230).
Chong Yidong <cyd@stupidchicken.com>
parents: 107719
diff changeset
8874 Vimage_cache_eviction_delay = make_number (300);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8875 #ifdef HAVE_IMAGEMAGICK
112364
42e22c4f06b7 Move all DEFVAR'd globals into a structure -- threading infrastructure
Tom Tromey <tromey@redhat.com>
parents: 112362
diff changeset
8876 DEFVAR_LISP ("imagemagick-render-type", Vimagemagick_render_type,
109860
c92f5e6103a8 mostly cosmetic, moving { instances, changing indentation accordingly.
Joakim <joakim@localhost.localdomain>
parents: 109859
diff changeset
8877 doc: /* Choose between ImageMagick render methods. */);
110184
44aeafd02c21 Check all lisp types in image loader
Andreas Schwab <schwab@linux-m68k.org>
parents: 110176
diff changeset
8878 #endif
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8879
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8880 }
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8881
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8882 void
109144
7dceae91724c Convert most remaining function definitions to standard C.
Juanma Barranquero <lekktu@gmail.com>
parents: 109100
diff changeset
8883 init_image (void)
54341
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8884 {
80dfe07a1d65 New file (image.c) for Image consolidation:
Kim F. Storm <storm@cua.dk>
parents:
diff changeset
8885 }