annotate src/xfns.c @ 82992:5de4189e659d

Got rid of the rif (window-based redisplay interface) global variable. src/dispextern.h (PRODUCE_GLYPHS): Use the rif in IT->f, not the global rif. (rif): Removed. src/dispnew.c (rif): Removed. (direct_output_for_insert, direct_output_forward_char, update_frame) (redraw_overlapped_rows, redraw_overlapping_rows, update_window) (update_marginal_area, update_text_area, update_window_line) (set_window_cursor_after_update, scrolling_window): Use the rif of the current frame, not the global rif. src/fontset.c: #include termhooks.h, for FRAME_RIF. (Finternal_char_font): Use the rif of the current frame. src/frame.c (x_set_frame_parameters): Use the rif of the current frame. src/keyboard.c (detect_input_pending_run_timers): Use the rif of the current frame. src/minibuf.c: #include termhooks.h, for FRAME_RIF. (read_minibuf): Use the rif of the current frame. src/term.c (update_begin): Removed rif update hack. src/termhooks.h (FRAME_RIF): New macro. src/xdisp.c (init_iterator, expose_frame): Removed rif update hack. (echo_area_display, x_cursor_to, draw_fringe_bitmap) (try_window_reusing_current_matrix, try_window_id) (get_glyph_face_and_encoding, x_get_glyph_overhangs) (get_char_face_and_encoding, compute_overhangs_and_x, draw_glyphs) (x_produce_glyphs, x_insert_glyphs, x_clear_end_of_line) (erase_phys_cursor, display_and_set_cursor, show_mouse_face) (define_frame_cursor1, x_draw_vertical_border): Use the rif of the current frame. src/xfns.c (Fx_create_frame): Removed rif update hack. src/xterm.c (frame_highlight, frame_unhighlight): Ditto. git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-32
author Karoly Lorentey <lorentey@elte.hu>
date Fri, 02 Jan 2004 04:22:23 +0000
parents 2ecd1f669db9
children 7900111db01c
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1 /* Functions for the X window system.
50392
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
2 Copyright (C) 1989, 92, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02, 03
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3 Free Software Foundation.
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
5 This file is part of GNU Emacs.
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
6
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
7 GNU Emacs is free software; you can redistribute it and/or modify
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
8 it under the terms of the GNU General Public License as published by
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 700
diff changeset
9 the Free Software Foundation; either version 2, or (at your option)
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10 any later version.
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
12 GNU Emacs is distributed in the hope that it will be useful,
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
13 but WITHOUT ANY WARRANTY; without even the implied warranty of
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
15 GNU General Public License for more details.
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
16
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
17 You should have received a copy of the GNU General Public License
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
18 along with GNU Emacs; see the file COPYING. If not, write to
14186
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 13867
diff changeset
19 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
ee40177f6c68 Update FSF's address in the preamble.
Erik Naggum <erik@naggum.no>
parents: 13867
diff changeset
20 Boston, MA 02111-1307, USA. */
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
21
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26032
diff changeset
22 #include <config.h>
7899
facf6b0e97ff Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7860
diff changeset
23 #include <signal.h>
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
24 #include <stdio.h>
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
25 #include <math.h>
7899
facf6b0e97ff Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 7860
diff changeset
26
40700
6f6287da52d1 Include unistd.h, if it exists.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
27 #ifdef HAVE_UNISTD_H
6f6287da52d1 Include unistd.h, if it exists.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
28 #include <unistd.h>
6f6287da52d1 Include unistd.h, if it exists.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
29 #endif
6f6287da52d1 Include unistd.h, if it exists.
Richard M. Stallman <rms@gnu.org>
parents: 40656
diff changeset
30
8091
f40cbe50c74f (XLIB_ILLEGAL_ACCESS): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8090
diff changeset
31 /* This makes the fields of a Display accessible, in Xlib header files. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
32
8091
f40cbe50c74f (XLIB_ILLEGAL_ACCESS): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8090
diff changeset
33 #define XLIB_ILLEGAL_ACCESS
f40cbe50c74f (XLIB_ILLEGAL_ACCESS): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 8090
diff changeset
34
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
35 #include "lisp.h"
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
36 #include "xterm.h"
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
37 #include "frame.h"
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
38 #include "window.h"
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
39 #include "buffer.h"
26876
578acd06aa3b Include intervals.h.
Kenichi Handa <handa@m17n.org>
parents: 26808
diff changeset
40 #include "intervals.h"
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
41 #include "dispextern.h"
515
0005d4c90c97 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 485
diff changeset
42 #include "keyboard.h"
2439
b6c62e4abf59 Put interrupt input blocking in a separate file from xterm.h.
Jim Blandy <jimb@redhat.com>
parents: 2355
diff changeset
43 #include "blockinput.h"
24412
d11ac02f9d6a Use epaths.h istead of paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 24170
diff changeset
44 #include <epaths.h>
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
45 #include "charset.h"
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
46 #include "coding.h"
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
47 #include "fontset.h"
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
48 #include "systime.h"
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
49 #include "termhooks.h"
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
50 #include "atimer.h"
53226
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 53069
diff changeset
51 #include "systty.h"
dd3018b4785b Implemented multiple tty support.
Karoly Lorentey <lorentey@elte.hu>
parents: 53069
diff changeset
52 #include "termchar.h"
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
53
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
54 #ifdef HAVE_X_WINDOWS
25451
786ab5197e4b Include <stdlib.h> if available, and declare abort only if not. Include
Andreas Schwab <schwab@suse.de>
parents: 25390
diff changeset
55
786ab5197e4b Include <stdlib.h> if available, and declare abort only if not. Include
Andreas Schwab <schwab@suse.de>
parents: 25390
diff changeset
56 #include <ctype.h>
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
57 #include <sys/types.h>
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
58 #include <sys/stat.h>
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
59
2355
cec8c9490d8a * xfns.c [VMS]: Get the gray_bits from [.bitmaps]gray.xbm.
Jim Blandy <jimb@redhat.com>
parents: 2341
diff changeset
60 #ifndef VMS
3821
8f353c2491d0 * xfns.c: Always #include "bitmaps/gray.xbm"; the bitmaps seem to
Jim Blandy <jimb@redhat.com>
parents: 3692
diff changeset
61 #if 1 /* Used to be #ifdef EMACS_BITMAP_FILES, but this should always work. */
3512
2657b04dd324 [EMACS_BIT_MAPS]: Include gray.xbm from ./bitmaps.
Richard M. Stallman <rms@gnu.org>
parents: 3507
diff changeset
62 #include "bitmaps/gray.xbm"
2657b04dd324 [EMACS_BIT_MAPS]: Include gray.xbm from ./bitmaps.
Richard M. Stallman <rms@gnu.org>
parents: 3507
diff changeset
63 #else
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1786
diff changeset
64 #include <X11/bitmaps/gray>
3512
2657b04dd324 [EMACS_BIT_MAPS]: Include gray.xbm from ./bitmaps.
Richard M. Stallman <rms@gnu.org>
parents: 3507
diff changeset
65 #endif
2355
cec8c9490d8a * xfns.c [VMS]: Get the gray_bits from [.bitmaps]gray.xbm.
Jim Blandy <jimb@redhat.com>
parents: 2341
diff changeset
66 #else
cec8c9490d8a * xfns.c [VMS]: Get the gray_bits from [.bitmaps]gray.xbm.
Jim Blandy <jimb@redhat.com>
parents: 2341
diff changeset
67 #include "[.bitmaps]gray.xbm"
cec8c9490d8a * xfns.c [VMS]: Get the gray_bits from [.bitmaps]gray.xbm.
Jim Blandy <jimb@redhat.com>
parents: 2341
diff changeset
68 #endif
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1786
diff changeset
69
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
70 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
71 #include "gtkutil.h"
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
72 #endif
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
73
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
74 #ifdef USE_X_TOOLKIT
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
75 #include <X11/Shell.h>
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
76
12616
ca170048a679 [USE_MOTIF]: Don't include X11/Xaw/Paned.h, X11/Xaw/Label.h.
Richard M. Stallman <rms@gnu.org>
parents: 12546
diff changeset
77 #ifndef USE_MOTIF
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
78 #include <X11/Xaw/Paned.h>
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
79 #include <X11/Xaw/Label.h>
12616
ca170048a679 [USE_MOTIF]: Don't include X11/Xaw/Paned.h, X11/Xaw/Label.h.
Richard M. Stallman <rms@gnu.org>
parents: 12546
diff changeset
80 #endif /* USE_MOTIF */
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
81
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
82 #ifdef USG
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
83 #undef USG /* ####KLUDGE for Solaris 2.2 and up */
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
84 #include <X11/Xos.h>
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
85 #define USG
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
86 #else
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
87 #include <X11/Xos.h>
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
88 #endif
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
89
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
90 #include "widget.h"
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
91
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
92 #include "../lwlib/lwlib.h"
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
93
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
94 #ifdef USE_MOTIF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
95 #include <Xm/Xm.h>
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
96 #include <Xm/DialogS.h>
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
97 #include <Xm/FileSB.h>
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
98 #endif
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
99
13508
b64345cf1ee9 (HACK_EDITRES): Don't define if NO_EDITRES is defined.
Richard M. Stallman <rms@gnu.org>
parents: 13227
diff changeset
100 /* Do the EDITRES protocol if running X11R5
b64345cf1ee9 (HACK_EDITRES): Don't define if NO_EDITRES is defined.
Richard M. Stallman <rms@gnu.org>
parents: 13227
diff changeset
101 Exception: HP-UX (at least version A.09.05) has X11R5 without EditRes */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
102
13508
b64345cf1ee9 (HACK_EDITRES): Don't define if NO_EDITRES is defined.
Richard M. Stallman <rms@gnu.org>
parents: 13227
diff changeset
103 #if (XtSpecificationRelease >= 5) && !defined(NO_EDITRES)
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
104 #define HACK_EDITRES
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
105 extern void _XEditResCheckMessages ();
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
106 #endif /* R5 + Athena */
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
107
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
108 /* Unique id counter for widgets created by the Lucid Widget Library. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
109
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
110 extern LWLIB_ID widget_id_tick;
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
111
15720
f1549b7501af (Fx_create_frame): Do xlwmenu hack only if USE_LUCID.
Karl Heuer <kwzh@gnu.org>
parents: 15706
diff changeset
112 #ifdef USE_LUCID
9742
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
113 /* This is part of a kludge--see lwlib/xlwmenu.c. */
15706
bf891f379d9f (xlwmenu_default_font): Declare, but don't define.
Karl Heuer <kwzh@gnu.org>
parents: 15704
diff changeset
114 extern XFontStruct *xlwmenu_default_font;
15720
f1549b7501af (Fx_create_frame): Do xlwmenu hack only if USE_LUCID.
Karl Heuer <kwzh@gnu.org>
parents: 15706
diff changeset
115 #endif
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
116
5900
284c0d70a50a (x_set_menu_bar_lines) [USE_X_TOOLKIT]: Dont Call XtDestroyWidget but
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 5899
diff changeset
117 extern void free_frame_menubar ();
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
118 extern double atof ();
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
119
37210
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
120 #ifdef USE_MOTIF
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
121
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
122 /* LessTif/Motif version info. */
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
123
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
124 static Lisp_Object Vmotif_version_string;
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
125
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
126 #endif /* USE_MOTIF */
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
127
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
128 #endif /* USE_X_TOOLKIT */
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
129
52334
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
130 #ifdef USE_GTK
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
131
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
132 /* GTK+ version info */
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
133
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
134 static Lisp_Object Vgtk_version_string;
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
135
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
136 #endif /* USE_GTK */
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
137
4279
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
138 #ifdef HAVE_X11R4
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
139 #define MAXREQUEST(dpy) (XMaxRequestSize (dpy))
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
140 #else
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
141 #define MAXREQUEST(dpy) ((dpy)->max_request_size)
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
142 #endif
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
143
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
144 /* The gray bitmap `bitmaps/gray'. This is done because xterm.c uses
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
145 it, and including `bitmaps/gray' more than once is a problem when
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
146 config.h defines `static' as an empty replacement string. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
147
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
148 int gray_bitmap_width = gray_width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
149 int gray_bitmap_height = gray_height;
34512
d069886667e6 (gray_bitmap_bits): Declare `char *'.
Gerd Moellmann <gerd@gnu.org>
parents: 34476
diff changeset
150 char *gray_bitmap_bits = gray_bits;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
151
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
152 /* Non-zero means we're allowed to display an hourglass cursor. */
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
153
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
154 int display_hourglass_p;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
155
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
156 /* The background and shape of the mouse pointer, and shape when not
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
157 over text or in the modeline. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
158
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
159 Lisp_Object Vx_pointer_shape, Vx_nontext_pointer_shape, Vx_mode_pointer_shape;
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
160 Lisp_Object Vx_hourglass_pointer_shape;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
161
7683
be3423efbdce (Vx_sensitive_text_pointer_shape):
Richard M. Stallman <rms@gnu.org>
parents: 7599
diff changeset
162 /* The shape when over mouse-sensitive text. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
163
7683
be3423efbdce (Vx_sensitive_text_pointer_shape):
Richard M. Stallman <rms@gnu.org>
parents: 7599
diff changeset
164 Lisp_Object Vx_sensitive_text_pointer_shape;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
165
33960
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
166 /* If non-nil, the pointer shape to indicate that windows can be
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
167 dragged horizontally. */
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
168
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
169 Lisp_Object Vx_window_horizontal_drag_shape;
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
170
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
171 /* Color of chars displayed in cursor box. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
172
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
173 Lisp_Object Vx_cursor_fore_pixel;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
174
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
175 /* Nonzero if using X. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
176
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
177 static int x_in_use;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
178
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
179 /* Non nil if no window manager is in use. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
180
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
181 Lisp_Object Vx_no_window_manager;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
182
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
183 /* Search path for bitmap files. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
184
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
185 Lisp_Object Vx_bitmap_file_path;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
186
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
187 /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
188
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
189 Lisp_Object Vx_pixel_size_width_font_regexp;
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
190
1874
19cf50641d6c * frame.c (Fframe_parameters): Report the `minibuffer' parameter of
Jim Blandy <jimb@redhat.com>
parents: 1821
diff changeset
191 Lisp_Object Qnone;
2328
82e4fed9cdd6 * xfns.c (Fx_parse_geometry): Renamed from Fx_geometry.
Jim Blandy <jimb@redhat.com>
parents: 2295
diff changeset
192 Lisp_Object Qsuppress_icon;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
193 Lisp_Object Qundefined_color;
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
194 Lisp_Object Qcenter;
35402
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
195 Lisp_Object Qcompound_text, Qcancel_timer;
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
196
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
197 /* In dispnew.c */
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
198
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
199 extern Lisp_Object Vwindow_system_version;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
200
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
201 /* The below are defined in frame.c. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
202
34895
53e52b3525bf Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34662
diff changeset
203 #if GLYPH_DEBUG
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
204 int image_cache_refcount, dpyinfo_refcount;
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
205 #endif
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
206
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
207
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
208
2999
33c820044087 (check_x): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2964
diff changeset
209 /* Error if we are not connected to X. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
210
5948
ef777779bd80 (check_x): Make it global.
Karl Heuer <kwzh@gnu.org>
parents: 5900
diff changeset
211 void
2999
33c820044087 (check_x): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2964
diff changeset
212 check_x ()
33c820044087 (check_x): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2964
diff changeset
213 {
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
214 if (! x_in_use)
2999
33c820044087 (check_x): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2964
diff changeset
215 error ("X windows are not in use or not initialized");
33c820044087 (check_x): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2964
diff changeset
216 }
33c820044087 (check_x): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2964
diff changeset
217
13867
19a05b5a597d (check_x_display_info, check_x_frame, x_set_font)
Richard M. Stallman <rms@gnu.org>
parents: 13781
diff changeset
218 /* Nonzero if we can use mouse menus.
19a05b5a597d (check_x_display_info, check_x_frame, x_set_font)
Richard M. Stallman <rms@gnu.org>
parents: 13781
diff changeset
219 You should not call this unless HAVE_MENUS is defined. */
7791
2b4e4a76468b (using_x_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7683
diff changeset
220
2b4e4a76468b (using_x_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7683
diff changeset
221 int
13867
19a05b5a597d (check_x_display_info, check_x_frame, x_set_font)
Richard M. Stallman <rms@gnu.org>
parents: 13781
diff changeset
222 have_menus_p ()
7791
2b4e4a76468b (using_x_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7683
diff changeset
223 {
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
224 return x_in_use;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
225 }
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
226
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
227 /* Extract a frame as a FRAME_PTR, defaulting to the selected frame
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
228 and checking validity for X. */
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
229
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
230 FRAME_PTR
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
231 check_x_frame (frame)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
232 Lisp_Object frame;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
233 {
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
234 FRAME_PTR f;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
235
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
236 if (NILP (frame))
25679
8b09c5927f1c (QCfile): Moved to xdisp.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25646
diff changeset
237 frame = selected_frame;
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
238 CHECK_LIVE_FRAME (frame);
25679
8b09c5927f1c (QCfile): Moved to xdisp.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25646
diff changeset
239 f = XFRAME (frame);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
240 if (! FRAME_X_P (f))
13867
19a05b5a597d (check_x_display_info, check_x_frame, x_set_font)
Richard M. Stallman <rms@gnu.org>
parents: 13781
diff changeset
241 error ("Non-X frame used");
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
242 return f;
7791
2b4e4a76468b (using_x_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7683
diff changeset
243 }
2b4e4a76468b (using_x_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7683
diff changeset
244
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
245 /* Let the user specify an X display with a frame.
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
246 nil stands for the selected frame--or, if that is not an X frame,
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
247 the first X display on the list. */
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
248
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
249 struct x_display_info *
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
250 check_x_display_info (frame)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
251 Lisp_Object frame;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
252 {
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
253 struct x_display_info *dpyinfo = NULL;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
254
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
255 if (NILP (frame))
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
256 {
25679
8b09c5927f1c (QCfile): Moved to xdisp.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25646
diff changeset
257 struct frame *sf = XFRAME (selected_frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
258
25679
8b09c5927f1c (QCfile): Moved to xdisp.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25646
diff changeset
259 if (FRAME_X_P (sf) && FRAME_LIVE_P (sf))
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
260 dpyinfo = FRAME_X_DISPLAY_INFO (sf);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
261 else if (x_display_list != 0)
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
262 dpyinfo = x_display_list;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
263 else
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
264 error ("X windows are not in use or not initialized");
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
265 }
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
266 else if (STRINGP (frame))
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
267 dpyinfo = x_display_info_for_name (frame);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
268 else
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
269 {
45968
6bf20f37b7c7 (check_x_display_info): Use check_x_frame.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 45603
diff changeset
270 FRAME_PTR f = check_x_frame (frame);
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
271 dpyinfo = FRAME_X_DISPLAY_INFO (f);
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
272 }
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
273
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
274 return dpyinfo;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
275 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
276
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
277
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
278 /* Return the Emacs frame-object corresponding to an X window.
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
279 It could be the frame's main window or an icon window. */
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
280
9948
982820033564 (x_window_to_frame, x_any_window_to_frame, x_top_window_to_frame): Use the new
Karl Heuer <kwzh@gnu.org>
parents: 9813
diff changeset
281 /* This function can be called during GC, so use GC_xxx type test macros. */
2964
a0ff2bc5dd05 (x_window_to_frame): Use XGCTYPE.
Richard M. Stallman <rms@gnu.org>
parents: 2936
diff changeset
282
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
283 struct frame *
11197
1bdc265aab86 (x_window_to_frame): New arg DPYINFO. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11060
diff changeset
284 x_window_to_frame (dpyinfo, wdesc)
1bdc265aab86 (x_window_to_frame): New arg DPYINFO. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11060
diff changeset
285 struct x_display_info *dpyinfo;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
286 int wdesc;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
287 {
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
288 Lisp_Object tail, frame;
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
289 struct frame *f;
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
290
25646
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
291 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
292 {
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
293 frame = XCAR (tail);
9948
982820033564 (x_window_to_frame, x_any_window_to_frame, x_top_window_to_frame): Use the new
Karl Heuer <kwzh@gnu.org>
parents: 9813
diff changeset
294 if (!GC_FRAMEP (frame))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
295 continue;
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
296 f = XFRAME (frame);
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
297 if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
11197
1bdc265aab86 (x_window_to_frame): New arg DPYINFO. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11060
diff changeset
298 continue;
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
299 if (f->output_data.x->hourglass_window == wdesc)
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
300 return f;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
301 #ifdef USE_X_TOOLKIT
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
302 if ((f->output_data.x->edit_widget
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
303 && XtWindow (f->output_data.x->edit_widget) == wdesc)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
304 /* A tooltip frame? */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
305 || (!f->output_data.x->edit_widget
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
306 && FRAME_X_WINDOW (f) == wdesc)
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
307 || f->output_data.x->icon_desc == wdesc)
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
308 return f;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
309 #else /* not USE_X_TOOLKIT */
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
310 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
311 if (f->output_data.x->edit_widget)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
312 {
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
313 GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
314 struct x_output *x = f->output_data.x;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
315 if (gwdesc != 0 && gwdesc == x->edit_widget)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
316 return f;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
317 }
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
318 #endif /* USE_GTK */
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
319 if (FRAME_X_WINDOW (f) == wdesc
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
320 || f->output_data.x->icon_desc == wdesc)
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
321 return f;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
322 #endif /* not USE_X_TOOLKIT */
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
323 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
324 return 0;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
325 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
326
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
327 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
328 /* Like x_window_to_frame but also compares the window with the widget's
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
329 windows. */
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
330
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
331 struct frame *
11197
1bdc265aab86 (x_window_to_frame): New arg DPYINFO. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11060
diff changeset
332 x_any_window_to_frame (dpyinfo, wdesc)
1bdc265aab86 (x_window_to_frame): New arg DPYINFO. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11060
diff changeset
333 struct x_display_info *dpyinfo;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
334 int wdesc;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
335 {
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
336 Lisp_Object tail, frame;
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
337 struct frame *f, *found;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
338 struct x_output *x;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
339
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
340 found = NULL;
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
341 for (tail = Vframe_list; GC_CONSP (tail) && !found; tail = XCDR (tail))
25646
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
342 {
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
343 frame = XCAR (tail);
9948
982820033564 (x_window_to_frame, x_any_window_to_frame, x_top_window_to_frame): Use the new
Karl Heuer <kwzh@gnu.org>
parents: 9813
diff changeset
344 if (!GC_FRAMEP (frame))
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
345 continue;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
346
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
347 f = XFRAME (frame);
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
348 if (FRAME_X_P (f) && FRAME_X_DISPLAY_INFO (f) == dpyinfo)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
349 {
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
350 /* This frame matches if the window is any of its widgets. */
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
351 x = f->output_data.x;
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
352 if (x->hourglass_window == wdesc)
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
353 found = f;
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
354 else if (x->widget)
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
355 {
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
356 #ifdef USE_GTK
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
357 GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
358 if (gwdesc != 0
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
359 && (gwdesc == x->widget
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
360 || gwdesc == x->edit_widget
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
361 || gwdesc == x->vbox_widget
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
362 || gwdesc == x->menubar_widget))
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
363 found = f;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
364 #else
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
365 if (wdesc == XtWindow (x->widget)
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
366 || wdesc == XtWindow (x->column_widget)
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
367 || wdesc == XtWindow (x->edit_widget))
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
368 found = f;
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
369 /* Match if the window is this frame's menubar. */
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
370 else if (lw_window_is_in_menubar (wdesc, x->menubar_widget))
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
371 found = f;
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
372 #endif
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
373 }
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
374 else if (FRAME_X_WINDOW (f) == wdesc)
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
375 /* A tooltip frame. */
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
376 found = f;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
377 }
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
378 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
379
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
380 return found;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
381 }
7040
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
382
11611
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
383 /* Likewise, but exclude the menu bar widget. */
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
384
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
385 struct frame *
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
386 x_non_menubar_window_to_frame (dpyinfo, wdesc)
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
387 struct x_display_info *dpyinfo;
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
388 int wdesc;
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
389 {
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
390 Lisp_Object tail, frame;
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
391 struct frame *f;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
392 struct x_output *x;
11611
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
393
25646
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
394 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
395 {
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
396 frame = XCAR (tail);
11611
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
397 if (!GC_FRAMEP (frame))
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
398 continue;
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
399 f = XFRAME (frame);
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
400 if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
11611
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
401 continue;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
402 x = f->output_data.x;
11611
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
403 /* This frame matches if the window is any of its widgets. */
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
404 if (x->hourglass_window == wdesc)
27798
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
405 return f;
d00730392332 (x_window_to_frame, x_any_window_to_frame)
Gerd Moellmann <gerd@gnu.org>
parents: 27659
diff changeset
406 else if (x->widget)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
407 {
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
408 #ifdef USE_GTK
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
409 GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
410 if (gwdesc != 0
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
411 && (gwdesc == x->widget
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
412 || gwdesc == x->edit_widget
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
413 || gwdesc == x->vbox_widget))
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
414 return f;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
415 #else
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
416 if (wdesc == XtWindow (x->widget)
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
417 || wdesc == XtWindow (x->column_widget)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
418 || wdesc == XtWindow (x->edit_widget))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
419 return f;
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
420 #endif
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
421 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
422 else if (FRAME_X_WINDOW (f) == wdesc)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
423 /* A tooltip frame. */
11611
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
424 return f;
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
425 }
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
426 return 0;
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
427 }
bf53e9945a3c (x_non_menubar_window_to_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 11537
diff changeset
428
12656
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
429 /* Likewise, but consider only the menu bar widget. */
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
430
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
431 struct frame *
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
432 x_menubar_window_to_frame (dpyinfo, wdesc)
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
433 struct x_display_info *dpyinfo;
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
434 int wdesc;
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
435 {
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
436 Lisp_Object tail, frame;
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
437 struct frame *f;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
438 struct x_output *x;
12656
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
439
25646
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
440 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
441 {
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
442 frame = XCAR (tail);
12656
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
443 if (!GC_FRAMEP (frame))
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
444 continue;
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
445 f = XFRAME (frame);
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
446 if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
12656
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
447 continue;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
448 x = f->output_data.x;
12656
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
449 /* Match if the window is this frame's menubar. */
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
450 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
451 if (x->menubar_widget)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
452 {
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
453 GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
454 int found = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
455
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
456 BLOCK_INPUT;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
457 if (gwdesc != 0
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
458 && (gwdesc == x->menubar_widget
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
459 || gtk_widget_get_parent (gwdesc) == x->menubar_widget))
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
460 found = 1;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
461 UNBLOCK_INPUT;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
462 if (found) return f;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
463 }
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
464 #else
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
465 if (x->menubar_widget
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
466 && lw_window_is_in_menubar (wdesc, x->menubar_widget))
12656
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
467 return f;
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
468 #endif
12656
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
469 }
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
470 return 0;
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
471 }
5beb1d2be5c1 (x_menubar_window_to_frame): New function.
Richard M. Stallman <rms@gnu.org>
parents: 12616
diff changeset
472
7040
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
473 /* Return the frame whose principal (outermost) window is WDESC.
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
474 If WDESC is some other (smaller) window, we return 0. */
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
475
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
476 struct frame *
11197
1bdc265aab86 (x_window_to_frame): New arg DPYINFO. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11060
diff changeset
477 x_top_window_to_frame (dpyinfo, wdesc)
1bdc265aab86 (x_window_to_frame): New arg DPYINFO. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11060
diff changeset
478 struct x_display_info *dpyinfo;
7040
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
479 int wdesc;
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
480 {
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
481 Lisp_Object tail, frame;
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
482 struct frame *f;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
483 struct x_output *x;
7040
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
484
25646
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
485 for (tail = Vframe_list; GC_CONSP (tail); tail = XCDR (tail))
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
486 {
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
487 frame = XCAR (tail);
9948
982820033564 (x_window_to_frame, x_any_window_to_frame, x_top_window_to_frame): Use the new
Karl Heuer <kwzh@gnu.org>
parents: 9813
diff changeset
488 if (!GC_FRAMEP (frame))
7040
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
489 continue;
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
490 f = XFRAME (frame);
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
491 if (!FRAME_X_P (f) || FRAME_X_DISPLAY_INFO (f) != dpyinfo)
11197
1bdc265aab86 (x_window_to_frame): New arg DPYINFO. All callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11060
diff changeset
492 continue;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
493 x = f->output_data.x;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
494
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
495 if (x->widget)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
496 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
497 /* This frame matches if the window is its topmost widget. */
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
498 #ifdef USE_GTK
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
499 GtkWidget *gwdesc = xg_win_to_widget (dpyinfo->display, wdesc);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
500 if (gwdesc == x->widget)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
501 return f;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
502 #else
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
503 if (wdesc == XtWindow (x->widget))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
504 return f;
12019
63ee64941021 (x_top_window_to_frame): Don't match menu-bar widget.
Karl Heuer <kwzh@gnu.org>
parents: 12011
diff changeset
505 #if 0 /* I don't know why it did this,
63ee64941021 (x_top_window_to_frame): Don't match menu-bar widget.
Karl Heuer <kwzh@gnu.org>
parents: 12011
diff changeset
506 but it seems logically wrong,
63ee64941021 (x_top_window_to_frame): Don't match menu-bar widget.
Karl Heuer <kwzh@gnu.org>
parents: 12011
diff changeset
507 and it causes trouble for MapNotify events. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
508 /* Match if the window is this frame's menubar. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
509 if (x->menubar_widget
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
510 && wdesc == XtWindow (x->menubar_widget))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
511 return f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
512 #endif
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
513 #endif
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
514 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
515 else if (FRAME_X_WINDOW (f) == wdesc)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
516 /* Tooltip frame. */
7040
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
517 return f;
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
518 }
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
519 return 0;
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
520 }
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
521 #endif /* USE_X_TOOLKIT || USE_GTK */
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
522
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
523
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
524
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
525 /* Code to deal with bitmaps. Bitmaps are referenced by their bitmap
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
526 id, which is just an int that this section returns. Bitmaps are
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
527 reference counted so they can be shared among frames.
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
528
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
529 Bitmap indices are guaranteed to be > 0, so a negative number can
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
530 be used to indicate no bitmap.
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
531
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
532 If you use x_create_bitmap_from_data, then you must keep track of
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
533 the bitmaps yourself. That is, creating a bitmap from the same
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
534 data more than once will not be caught. */
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
535
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
536
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
537 /* Functions to access the contents of a bitmap, given an id. */
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
538
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
539 int
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
540 x_bitmap_height (f, id)
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
541 FRAME_PTR f;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
542 int id;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
543 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
544 return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].height;
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
545 }
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
546
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
547 int
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
548 x_bitmap_width (f, id)
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
549 FRAME_PTR f;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
550 int id;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
551 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
552 return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].width;
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
553 }
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
554
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
555 int
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
556 x_bitmap_pixmap (f, id)
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
557 FRAME_PTR f;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
558 int id;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
559 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
560 return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].pixmap;
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
561 }
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
562
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
563 int
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
564 x_bitmap_mask (f, id)
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
565 FRAME_PTR f;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
566 int id;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
567 {
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
568 return FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].mask;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
569 }
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
570
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
571
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
572 /* Allocate a new bitmap record. Returns index of new record. */
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
573
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
574 static int
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
575 x_allocate_bitmap_record (f)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
576 FRAME_PTR f;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
577 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
578 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
579 int i;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
580
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
581 if (dpyinfo->bitmaps == NULL)
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
582 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
583 dpyinfo->bitmaps_size = 10;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
584 dpyinfo->bitmaps
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
585 = (struct x_bitmap_record *) xmalloc (dpyinfo->bitmaps_size * sizeof (struct x_bitmap_record));
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
586 dpyinfo->bitmaps_last = 1;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
587 return 1;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
588 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
589
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
590 if (dpyinfo->bitmaps_last < dpyinfo->bitmaps_size)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
591 return ++dpyinfo->bitmaps_last;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
592
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
593 for (i = 0; i < dpyinfo->bitmaps_size; ++i)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
594 if (dpyinfo->bitmaps[i].refcount == 0)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
595 return i + 1;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
596
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
597 dpyinfo->bitmaps_size *= 2;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
598 dpyinfo->bitmaps
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
599 = (struct x_bitmap_record *) xrealloc (dpyinfo->bitmaps,
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
600 dpyinfo->bitmaps_size * sizeof (struct x_bitmap_record));
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
601 return ++dpyinfo->bitmaps_last;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
602 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
603
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
604 /* Add one reference to the reference count of the bitmap with id ID. */
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
605
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
606 void
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
607 x_reference_bitmap (f, id)
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
608 FRAME_PTR f;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
609 int id;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
610 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
611 ++FRAME_X_DISPLAY_INFO (f)->bitmaps[id - 1].refcount;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
612 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
613
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
614 /* Create a bitmap for frame F from a HEIGHT x WIDTH array of bits at BITS. */
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
615
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
616 int
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
617 x_create_bitmap_from_data (f, bits, width, height)
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
618 struct frame *f;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
619 char *bits;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
620 unsigned int width, height;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
621 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
622 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
623 Pixmap bitmap;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
624 int id;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
625
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
626 bitmap = XCreateBitmapFromData (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
627 bits, width, height);
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
628
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
629
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
630
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
631 if (! bitmap)
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
632 return -1;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
633
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
634 id = x_allocate_bitmap_record (f);
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
635 dpyinfo->bitmaps[id - 1].pixmap = bitmap;
52091
c3f9f23be6a8 (x_create_bitmap_from_data): Initialize have_mask member to 0.
Kenichi Handa <handa@m17n.org>
parents: 52059
diff changeset
636 dpyinfo->bitmaps[id - 1].have_mask = 0;
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
637 dpyinfo->bitmaps[id - 1].file = NULL;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
638 dpyinfo->bitmaps[id - 1].refcount = 1;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
639 dpyinfo->bitmaps[id - 1].depth = 1;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
640 dpyinfo->bitmaps[id - 1].height = height;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
641 dpyinfo->bitmaps[id - 1].width = width;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
642
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
643 return id;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
644 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
645
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
646 /* Create bitmap from file FILE for frame F. */
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
647
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
648 int
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
649 x_create_bitmap_from_file (f, file)
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
650 struct frame *f;
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
651 Lisp_Object file;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
652 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
653 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
654 unsigned int width, height;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
655 Pixmap bitmap;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
656 int xhot, yhot, result, id;
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
657 Lisp_Object found;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
658 int fd;
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
659 char *filename;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
660
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
661 /* Look for an existing bitmap with the same name. */
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
662 for (id = 0; id < dpyinfo->bitmaps_last; ++id)
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
663 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
664 if (dpyinfo->bitmaps[id].refcount
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
665 && dpyinfo->bitmaps[id].file
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
666 && !strcmp (dpyinfo->bitmaps[id].file, (char *) SDATA (file)))
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
667 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
668 ++dpyinfo->bitmaps[id].refcount;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
669 return id + 1;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
670 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
671 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
672
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
673 /* Search bitmap-file-path for the file, if appropriate. */
45009
7a00556be3ce (x_create_bitmap_from_file, x_find_image_file): Update call to openp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44786
diff changeset
674 fd = openp (Vx_bitmap_file_path, file, Qnil, &found, Qnil);
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
675 if (fd < 0)
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
676 return -1;
26088
b7aa6ac26872 Add support for large files, 64-bit Solaris, system locale codings.
Paul Eggert <eggert@twinsun.com>
parents: 26032
diff changeset
677 emacs_close (fd);
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
678
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
679 filename = (char *) SDATA (found);
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
680
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
681 result = XReadBitmapFile (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
682 filename, &width, &height, &bitmap, &xhot, &yhot);
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
683 if (result != BitmapSuccess)
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
684 return -1;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
685
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
686 id = x_allocate_bitmap_record (f);
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
687 dpyinfo->bitmaps[id - 1].pixmap = bitmap;
52091
c3f9f23be6a8 (x_create_bitmap_from_data): Initialize have_mask member to 0.
Kenichi Handa <handa@m17n.org>
parents: 52059
diff changeset
688 dpyinfo->bitmaps[id - 1].have_mask = 0;
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
689 dpyinfo->bitmaps[id - 1].refcount = 1;
20629
69d52f3bdb46 (x_create_bitmap_from_file): Use size_byte on strings.
Richard M. Stallman <rms@gnu.org>
parents: 19825
diff changeset
690 dpyinfo->bitmaps[id - 1].file
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
691 = (char *) xmalloc (SBYTES (file) + 1);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
692 dpyinfo->bitmaps[id - 1].depth = 1;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
693 dpyinfo->bitmaps[id - 1].height = height;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
694 dpyinfo->bitmaps[id - 1].width = width;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
695 strcpy (dpyinfo->bitmaps[id - 1].file, SDATA (file));
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
696
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
697 return id;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
698 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
699
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
700 /* Remove reference to bitmap with id number ID. */
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
701
21536
468585662fa8 (x_destroy_bitmap): Declare as void, not int.
Karl Heuer <kwzh@gnu.org>
parents: 21267
diff changeset
702 void
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
703 x_destroy_bitmap (f, id)
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
704 FRAME_PTR f;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
705 int id;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
706 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
707 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
708
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
709 if (id > 0)
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
710 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
711 --dpyinfo->bitmaps[id - 1].refcount;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
712 if (dpyinfo->bitmaps[id - 1].refcount == 0)
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
713 {
12051
f193ce9efe24 (x_destroy_bitmap): Block and unblock input.
Karl Heuer <kwzh@gnu.org>
parents: 12046
diff changeset
714 BLOCK_INPUT;
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
715 XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].pixmap);
52091
c3f9f23be6a8 (x_create_bitmap_from_data): Initialize have_mask member to 0.
Kenichi Handa <handa@m17n.org>
parents: 52059
diff changeset
716 if (dpyinfo->bitmaps[id - 1].have_mask)
c3f9f23be6a8 (x_create_bitmap_from_data): Initialize have_mask member to 0.
Kenichi Handa <handa@m17n.org>
parents: 52059
diff changeset
717 XFreePixmap (FRAME_X_DISPLAY (f), dpyinfo->bitmaps[id - 1].mask);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
718 if (dpyinfo->bitmaps[id - 1].file)
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
719 {
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
720 xfree (dpyinfo->bitmaps[id - 1].file);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
721 dpyinfo->bitmaps[id - 1].file = NULL;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
722 }
12051
f193ce9efe24 (x_destroy_bitmap): Block and unblock input.
Karl Heuer <kwzh@gnu.org>
parents: 12046
diff changeset
723 UNBLOCK_INPUT;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
724 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
725 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
726 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
727
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
728 /* Free all the bitmaps for the display specified by DPYINFO. */
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
729
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
730 static void
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
731 x_destroy_all_bitmaps (dpyinfo)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
732 struct x_display_info *dpyinfo;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
733 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
734 int i;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
735 for (i = 0; i < dpyinfo->bitmaps_last; i++)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
736 if (dpyinfo->bitmaps[i].refcount > 0)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
737 {
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
738 XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].pixmap);
52091
c3f9f23be6a8 (x_create_bitmap_from_data): Initialize have_mask member to 0.
Kenichi Handa <handa@m17n.org>
parents: 52059
diff changeset
739 if (dpyinfo->bitmaps[i].have_mask)
c3f9f23be6a8 (x_create_bitmap_from_data): Initialize have_mask member to 0.
Kenichi Handa <handa@m17n.org>
parents: 52059
diff changeset
740 XFreePixmap (dpyinfo->display, dpyinfo->bitmaps[i].mask);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
741 if (dpyinfo->bitmaps[i].file)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
742 xfree (dpyinfo->bitmaps[i].file);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
743 }
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
744 dpyinfo->bitmaps_last = 0;
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
745 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
746
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
747
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
748
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
749
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
750 /* Useful functions defined in the section
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
751 `Image type independent image structures' below. */
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
752
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
753 static unsigned long four_corners_best P_ ((XImage *ximg, unsigned long width,
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
754 unsigned long height));
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
755
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
756 static int x_create_x_image_and_pixmap P_ ((struct frame *f, int width, int height,
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
757 int depth, XImage **ximg,
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
758 Pixmap *pixmap));
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
759
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
760 static void x_destroy_x_image P_ ((XImage *ximg));
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
761
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
762
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
763 /* Create a mask of a bitmap. Note is this not a perfect mask.
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
764 It's nicer with some borders in this context */
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
765
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
766 int
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
767 x_create_bitmap_mask (f, id)
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
768 struct frame *f;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
769 int id;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
770 {
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
771 Pixmap pixmap, mask;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
772 XImage *ximg, *mask_img;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
773 unsigned long width, height;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
774 int result;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
775 unsigned long bg;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
776 unsigned long x, y, xp, xm, yp, ym;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
777 GC gc;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
778
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
779 int depth = DefaultDepthOfScreen (FRAME_X_SCREEN (f));
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
780 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
781
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
782 if (!(id > 0))
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
783 return -1;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
784
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
785 pixmap = x_bitmap_pixmap (f, id);
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
786 width = x_bitmap_width (f, id);
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
787 height = x_bitmap_height (f, id);
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
788
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
789 BLOCK_INPUT;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
790 ximg = XGetImage (FRAME_X_DISPLAY (f), pixmap, 0, 0, width, height,
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
791 ~0, ZPixmap);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
792
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
793 if (!ximg)
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
794 {
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
795 UNBLOCK_INPUT;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
796 return -1;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
797 }
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
798
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
799 result = x_create_x_image_and_pixmap (f, width, height, 1, &mask_img, &mask);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
800
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
801 UNBLOCK_INPUT;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
802 if (!result)
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
803 {
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
804 XDestroyImage (ximg);
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
805 return -1;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
806 }
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
807
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
808 bg = four_corners_best (ximg, width, height);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
809
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
810 for (y = 0; y < ximg->height; ++y)
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
811 {
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
812 for (x = 0; x < ximg->width; ++x)
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
813 {
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
814 xp = x != ximg->width - 1 ? x + 1 : 0;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
815 xm = x != 0 ? x - 1 : ximg->width - 1;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
816 yp = y != ximg->height - 1 ? y + 1 : 0;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
817 ym = y != 0 ? y - 1 : ximg->height - 1;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
818 if (XGetPixel (ximg, x, y) == bg
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
819 && XGetPixel (ximg, x, yp) == bg
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
820 && XGetPixel (ximg, x, ym) == bg
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
821 && XGetPixel (ximg, xp, y) == bg
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
822 && XGetPixel (ximg, xp, yp) == bg
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
823 && XGetPixel (ximg, xp, ym) == bg
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
824 && XGetPixel (ximg, xm, y) == bg
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
825 && XGetPixel (ximg, xm, yp) == bg
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
826 && XGetPixel (ximg, xm, ym) == bg)
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
827 XPutPixel (mask_img, x, y, 0);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
828 else
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
829 XPutPixel (mask_img, x, y, 1);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
830 }
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
831 }
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
832
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
833 xassert (interrupt_input_blocked);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
834 gc = XCreateGC (FRAME_X_DISPLAY (f), mask, 0, NULL);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
835 XPutImage (FRAME_X_DISPLAY (f), mask, gc, mask_img, 0, 0, 0, 0,
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
836 width, height);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
837 XFreeGC (FRAME_X_DISPLAY (f), gc);
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
838
52091
c3f9f23be6a8 (x_create_bitmap_from_data): Initialize have_mask member to 0.
Kenichi Handa <handa@m17n.org>
parents: 52059
diff changeset
839 dpyinfo->bitmaps[id - 1].have_mask = 1;
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
840 dpyinfo->bitmaps[id - 1].mask = mask;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
841
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
842 XDestroyImage (ximg);
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
843 x_destroy_x_image (mask_img);
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
844
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
845 return 0;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
846 }
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
847
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
848 static Lisp_Object unwind_create_frame P_ ((Lisp_Object));
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
849 static Lisp_Object unwind_create_tip_frame P_ ((Lisp_Object));
31651
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
850 static void x_disable_image P_ ((struct frame *, struct image *));
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
851
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
852 void x_set_foreground_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
38183
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
853 static void x_set_wait_for_wm P_ ((struct frame *, Lisp_Object, Lisp_Object));
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
854 void x_set_background_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
855 void x_set_mouse_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
856 void x_set_cursor_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
857 void x_set_border_color P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
858 void x_set_cursor_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
859 void x_set_icon_type P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
860 void x_set_icon_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
861 void x_explicitly_set_name P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
862 void x_set_menu_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
863 void x_set_title P_ ((struct frame *, Lisp_Object, Lisp_Object));
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25528
diff changeset
864 void x_set_tool_bar_lines P_ ((struct frame *, Lisp_Object, Lisp_Object));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
865 void x_set_scroll_bar_foreground P_ ((struct frame *, Lisp_Object,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
866 Lisp_Object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
867 void x_set_scroll_bar_background P_ ((struct frame *, Lisp_Object,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
868 Lisp_Object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
869 static Lisp_Object x_default_scroll_bar_color_parameter P_ ((struct frame *,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
870 Lisp_Object,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
871 Lisp_Object,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
872 char *, char *,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
873 int));
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
874 static void x_edge_detection P_ ((struct frame *, struct image *, Lisp_Object,
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
875 Lisp_Object));
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
876 static void init_color_table P_ ((void));
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
877 static void free_color_table P_ ((void));
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
878 static unsigned long *colors_in_color_table P_ ((int *n));
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
879 static unsigned long lookup_rgb_color P_ ((struct frame *f, int r, int g, int b));
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
880 static unsigned long lookup_pixel_color P_ ((struct frame *f, unsigned long p));
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
881
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
882
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
883
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
884
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
885
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
886 /* Store the screen positions of frame F into XPTR and YPTR.
7408
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
887 These are the positions of the containing window manager window,
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
888 not Emacs's own window. */
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
889
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
890 void
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
891 x_real_positions (f, xptr, yptr)
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
892 FRAME_PTR f;
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
893 int *xptr, *yptr;
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
894 {
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
895 int win_x, win_y, outer_x, outer_y;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
896 int real_x = 0, real_y = 0;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
897 int had_errors = 0;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
898 Window win = f->output_data.x->parent_desc;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
899
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
900 int count;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
901
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
902 BLOCK_INPUT;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
903
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
904 count = x_catch_errors (FRAME_X_DISPLAY (f));
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
905
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
906 if (win == FRAME_X_DISPLAY_INFO (f)->root_window)
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
907 win = FRAME_OUTER_WINDOW (f);
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
908
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
909 /* This loop traverses up the containment tree until we hit the root
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
910 window. Window managers may intersect many windows between our window
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
911 and the root window. The window we find just before the root window
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
912 should be the outer WM window. */
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
913 for (;;)
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
914 {
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
915 Window wm_window, rootw;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
916 Window *tmp_children;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
917 unsigned int tmp_nchildren;
43914
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
918 int success;
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
919
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
920 success = XQueryTree (FRAME_X_DISPLAY (f), win, &rootw,
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
921 &wm_window, &tmp_children, &tmp_nchildren);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
922
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
923 had_errors = x_had_errors_p (FRAME_X_DISPLAY (f));
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
924
43914
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
925 /* Don't free tmp_children if XQueryTree failed. */
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
926 if (! success)
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
927 break;
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
928
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
929 XFree ((char *) tmp_children);
fed15ed090bc (x_real_positions): Handle failure in XQueryTree.
Richard M. Stallman <rms@gnu.org>
parents: 43670
diff changeset
930
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
931 if (wm_window == rootw || had_errors)
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
932 break;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
933
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
934 win = wm_window;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
935 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
936
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
937 if (! had_errors)
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
938 {
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
939 int ign;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
940 Window child, rootw;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
941
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
942 /* Get the real coordinates for the WM window upper left corner */
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
943 XGetGeometry (FRAME_X_DISPLAY (f), win,
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
944 &rootw, &real_x, &real_y, &ign, &ign, &ign, &ign);
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
945
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
946 /* Translate real coordinates to coordinates relative to our
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
947 window. For our window, the upper left corner is 0, 0.
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
948 Since the upper left corner of the WM window is outside
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
949 our window, win_x and win_y will be negative:
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
950
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
951 ------------------ ---> x
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
952 | title |
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
953 | ----------------- v y
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
954 | | our window
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
955 */
17954
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
956 XTranslateCoordinates (FRAME_X_DISPLAY (f),
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
957
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
958 /* From-window, to-window. */
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
959 FRAME_X_DISPLAY_INFO (f)->root_window,
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
960 FRAME_X_WINDOW (f),
17954
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
961
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
962 /* From-position, to-position. */
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
963 real_x, real_y, &win_x, &win_y,
17954
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
964
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
965 /* Child of win. */
7c919d7f8217 (x_real_positions): Directly compare the frame's window
Richard M. Stallman <rms@gnu.org>
parents: 17836
diff changeset
966 &child);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
967
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
968 if (FRAME_X_WINDOW (f) == FRAME_OUTER_WINDOW (f))
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
969 {
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
970 outer_x = win_x;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
971 outer_y = win_y;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
972 }
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
973 else
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
974 {
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
975 XTranslateCoordinates (FRAME_X_DISPLAY (f),
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
976
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
977 /* From-window, to-window. */
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
978 FRAME_X_DISPLAY_INFO (f)->root_window,
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
979 FRAME_OUTER_WINDOW (f),
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
980
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
981 /* From-position, to-position. */
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
982 real_x, real_y, &outer_x, &outer_y,
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
983
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
984 /* Child of win. */
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
985 &child);
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
986 }
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
987
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
988 had_errors = x_had_errors_p (FRAME_X_DISPLAY (f));
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
989 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
990
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
991 x_uncatch_errors (FRAME_X_DISPLAY (f), count);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
992
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
993 UNBLOCK_INPUT;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
994
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
995 if (had_errors) return;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
996
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
997 f->x_pixels_diff = -win_x;
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
998 f->y_pixels_diff = -win_y;
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
999
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
1000 FRAME_X_OUTPUT (f)->x_pixels_outer_diff = -outer_x;
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
1001 FRAME_X_OUTPUT (f)->y_pixels_outer_diff = -outer_y;
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
1002
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
1003 *xptr = real_x;
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
1004 *yptr = real_y;
7408
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
1005 }
65c133b66371 (x_real_positions): New function.
Richard M. Stallman <rms@gnu.org>
parents: 7308
diff changeset
1006
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1007
10920
bb3f9aaf0e46 (defined_color): If colormap is full, find closest match.
Richard M. Stallman <rms@gnu.org>
parents: 10742
diff changeset
1008
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1009
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1010 /* Gamma-correct COLOR on frame F. */
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1011
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1012 void
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1013 gamma_correct (f, color)
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1014 struct frame *f;
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1015 XColor *color;
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1016 {
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1017 if (f->gamma)
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1018 {
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1019 color->red = pow (color->red / 65535.0, f->gamma) * 65535.0 + 0.5;
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1020 color->green = pow (color->green / 65535.0, f->gamma) * 65535.0 + 0.5;
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1021 color->blue = pow (color->blue / 65535.0, f->gamma) * 65535.0 + 0.5;
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1022 }
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1023 }
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1024
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
1025
28096
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1026 /* Decide if color named COLOR_NAME is valid for use on frame F. If
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1027 so, return the RGB values in COLOR. If ALLOC_P is non-zero,
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1028 allocate the color. Value is zero if COLOR_NAME is invalid, or
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1029 no color could be allocated. */
8675
1fe413b0a916 (defined_color): New arg ALLOC--optionally don't allocate the color.
Richard M. Stallman <rms@gnu.org>
parents: 8655
diff changeset
1030
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1031 int
28096
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1032 x_defined_color (f, color_name, color, alloc_p)
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1033 struct frame *f;
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1034 char *color_name;
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1035 XColor *color;
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1036 int alloc_p;
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1037 {
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1038 int success_p;
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1039 Display *dpy = FRAME_X_DISPLAY (f);
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1040 Colormap cmap = FRAME_X_COLORMAP (f);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1041
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1042 BLOCK_INPUT;
28096
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1043 success_p = XParseColor (dpy, cmap, color_name, color);
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1044 if (success_p && alloc_p)
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1045 success_p = x_alloc_nearest_color (f, cmap, color);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1046 UNBLOCK_INPUT;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1047
28096
244f283b3d03 (x_defined_color): Rewritten to use x_allocate_nearest_color.
Gerd Moellmann <gerd@gnu.org>
parents: 28050
diff changeset
1048 return success_p;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1049 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1050
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1051
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1052 /* Return the pixel color value for color COLOR_NAME on frame F. If F
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1053 is a monochrome frame, return MONO_COLOR regardless of what ARG says.
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1054 Signal an error if color can't be allocated. */
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1055
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1056 int
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1057 x_decode_color (f, color_name, mono_color)
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
1058 FRAME_PTR f;
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1059 Lisp_Object color_name;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1060 int mono_color;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1061 {
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
1062 XColor cdef;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1063
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1064 CHECK_STRING (color_name);
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1065
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1066 #if 0 /* Don't do this. It's wrong when we're not using the default
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1067 colormap, it makes freeing difficult, and it's probably not
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1068 an important optimization. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1069 if (strcmp (SDATA (color_name), "black") == 0)
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
1070 return BLACK_PIX_DEFAULT (f);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1071 else if (strcmp (SDATA (color_name), "white") == 0)
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
1072 return WHITE_PIX_DEFAULT (f);
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1073 #endif
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1074
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1075 /* Return MONO_COLOR for monochrome frames. */
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
1076 if (FRAME_X_DISPLAY_INFO (f)->n_planes == 1)
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1077 return mono_color;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1078
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
1079 /* x_defined_color is responsible for coping with failures
11060
0a7048d331e6 (x_decode_color): Don't use cdef if defined_color failed.
Richard M. Stallman <rms@gnu.org>
parents: 11014
diff changeset
1080 by looking for a near-miss. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1081 if (x_defined_color (f, SDATA (color_name), &cdef, 1))
11060
0a7048d331e6 (x_decode_color): Don't use cdef if defined_color failed.
Richard M. Stallman <rms@gnu.org>
parents: 11014
diff changeset
1082 return cdef.pixel;
0a7048d331e6 (x_decode_color): Don't use cdef if defined_color failed.
Richard M. Stallman <rms@gnu.org>
parents: 11014
diff changeset
1083
31902
f526f6f002d7 (x_decode_color): Don't return a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 31824
diff changeset
1084 Fsignal (Qerror, Fcons (build_string ("Undefined color"),
f526f6f002d7 (x_decode_color): Don't return a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 31824
diff changeset
1085 Fcons (color_name, Qnil)));
f526f6f002d7 (x_decode_color): Don't return a Lisp_Object.
Gerd Moellmann <gerd@gnu.org>
parents: 31824
diff changeset
1086 return 0;
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1087 }
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1088
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
1089
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1090
38183
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1091 /* Change the `wait-for-wm' frame parameter of frame F. OLD_VALUE is
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1092 the previous value of that parameter, NEW_VALUE is the new value.
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1093 See also the comment of wait_for_wm in struct x_output. */
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1094
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1095 static void
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1096 x_set_wait_for_wm (f, new_value, old_value)
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1097 struct frame *f;
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1098 Lisp_Object new_value, old_value;
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1099 {
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1100 f->output_data.x->wait_for_wm = !NILP (new_value);
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1101 }
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1102
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1103 #ifdef USE_GTK
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1104
52095
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1105 static Lisp_Object x_find_image_file P_ ((Lisp_Object file));
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1106
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1107 /* Set icon from FILE for frame F. By using GTK functions the icon
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1108 may be any format that GdkPixbuf knows about, i.e. not just bitmaps. */
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1109
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1110 int
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
1111 xg_set_icon (f, file)
52095
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1112 FRAME_PTR f;
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1113 Lisp_Object file;
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1114 {
52095
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1115 struct gcpro gcpro1;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1116 int result = 0;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1117 Lisp_Object found;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1118
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1119 GCPRO1 (found);
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1120
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1121 found = x_find_image_file (file);
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1122
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1123 if (! NILP (found))
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1124 {
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1125 GdkPixbuf *pixbuf;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1126 GError *err = NULL;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1127 char *filename;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1128
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1129 filename = SDATA (found);
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1130 BLOCK_INPUT;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1131
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1132 pixbuf = gdk_pixbuf_new_from_file (filename, &err);
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1133
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1134 if (pixbuf)
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1135 {
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1136 gtk_window_set_icon (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1137 pixbuf);
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1138 g_object_unref (pixbuf);
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1139
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1140 result = 1;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1141 }
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1142 else
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1143 g_error_free (err);
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1144
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1145 UNBLOCK_INPUT;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1146 }
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1147
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1148 UNGCPRO;
a2208fe45c36 * xfns.c (xg_set_icon): Rewrite to compile with GTK 2.0 and 2.2.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52091
diff changeset
1149 return result;
51898
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1150 }
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1151 #endif /* USE_GTK */
b65c743ccded (x_bitmap_mask, x_create_bitmap_mask): New functions to handle mask of bitmaps.
Juanma Barranquero <lekktu@gmail.com>
parents: 51876
diff changeset
1152
38183
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
1153
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1154 /* Functions called only from `x_set_frame_param'
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1155 to set individual parameters.
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1156
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1157 If FRAME_X_WINDOW (f) is 0,
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1158 the frame is being created and its X-window does not exist yet.
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1159 In that case, just record the parameter's new value
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1160 in the standard place; do not attempt to change the window. */
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1161
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1162 void
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1163 x_set_foreground_color (f, arg, oldval)
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1164 struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1165 Lisp_Object arg, oldval;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1166 {
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1167 struct x_output *x = f->output_data.x;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1168 unsigned long fg, old_fg;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1169
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1170 fg = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1171 old_fg = x->foreground_pixel;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1172 x->foreground_pixel = fg;
21779
6aaa0268fe91 (x_set_foreground_color, x_set_background_color)
Richard M. Stallman <rms@gnu.org>
parents: 21555
diff changeset
1173
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1174 if (FRAME_X_WINDOW (f) != 0)
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1175 {
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1176 Display *dpy = FRAME_X_DISPLAY (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1177
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1178 BLOCK_INPUT;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1179 XSetForeground (dpy, x->normal_gc, fg);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1180 XSetBackground (dpy, x->reverse_gc, fg);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1181
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1182 if (x->cursor_pixel == old_fg)
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1183 {
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1184 unload_color (f, x->cursor_pixel);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1185 x->cursor_pixel = x_copy_color (f, fg);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1186 XSetBackground (dpy, x->cursor_gc, x->cursor_pixel);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1187 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1188
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1189 UNBLOCK_INPUT;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1190
25593
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1191 update_face_from_frame_parameter (f, Qforeground_color, arg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1192
1719
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
1193 if (FRAME_VISIBLE_P (f))
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1194 redraw_frame (f);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1195 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1196
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1197 unload_color (f, old_fg);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1198 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1199
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1200 void
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1201 x_set_background_color (f, arg, oldval)
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1202 struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1203 Lisp_Object arg, oldval;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1204 {
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1205 struct x_output *x = f->output_data.x;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1206 unsigned long bg;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1207
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1208 bg = x_decode_color (f, arg, WHITE_PIX_DEFAULT (f));
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1209 unload_color (f, x->background_pixel);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1210 x->background_pixel = bg;
21779
6aaa0268fe91 (x_set_foreground_color, x_set_background_color)
Richard M. Stallman <rms@gnu.org>
parents: 21555
diff changeset
1211
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1212 if (FRAME_X_WINDOW (f) != 0)
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1213 {
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1214 Display *dpy = FRAME_X_DISPLAY (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1215
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1216 BLOCK_INPUT;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1217 XSetBackground (dpy, x->normal_gc, bg);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1218 XSetForeground (dpy, x->reverse_gc, bg);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1219 XSetWindowBackground (dpy, FRAME_X_WINDOW (f), bg);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1220 XSetForeground (dpy, x->cursor_gc, bg);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1221
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1222 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1223 xg_set_background_color (f, bg);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1224 #endif
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1225
39159
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1226 #ifndef USE_TOOLKIT_SCROLL_BARS /* Turns out to be annoying with
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1227 toolkit scroll bars. */
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1228 {
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1229 Lisp_Object bar;
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1230 for (bar = FRAME_SCROLL_BARS (f);
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1231 !NILP (bar);
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1232 bar = XSCROLL_BAR (bar)->next)
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1233 {
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1234 Window window = SCROLL_BAR_X_WINDOW (XSCROLL_BAR (bar));
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1235 XSetWindowBackground (dpy, window, bg);
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1236 }
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1237 }
2c7a6a1b047e (x_set_background_color): Don't change the colors
Gerd Moellmann <gerd@gnu.org>
parents: 38749
diff changeset
1238 #endif /* USE_TOOLKIT_SCROLL_BARS */
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1239
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1240 UNBLOCK_INPUT;
25593
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1241 update_face_from_frame_parameter (f, Qbackground_color, arg);
3075
878381e48b0d * xfns.c: Clear out the old face stuff.
Jim Blandy <jimb@redhat.com>
parents: 3048
diff changeset
1242
1719
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
1243 if (FRAME_VISIBLE_P (f))
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1244 redraw_frame (f);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1245 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1246 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1247
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1248 void
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1249 x_set_mouse_color (f, arg, oldval)
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1250 struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1251 Lisp_Object arg, oldval;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1252 {
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1253 struct x_output *x = f->output_data.x;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1254 Display *dpy = FRAME_X_DISPLAY (f);
50236
156baddab173 Setup and use hand_cursor instead of cross_cursor.
Kim F. Storm <storm@cua.dk>
parents: 50099
diff changeset
1255 Cursor cursor, nontext_cursor, mode_cursor, hand_cursor;
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
1256 Cursor hourglass_cursor, horizontal_drag_cursor;
17609
8c878d76d6a4 (x_real_positions, x_set_mouse_color, Fx_list_fonts):
Richard M. Stallman <rms@gnu.org>
parents: 17579
diff changeset
1257 int count;
25075
9f5d679349e9 (x_set_mouse_color): Always unload the old color.
Karl Heuer <kwzh@gnu.org>
parents: 24994
diff changeset
1258 unsigned long pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1259 unsigned long mask_color = x->background_pixel;
25075
9f5d679349e9 (x_set_mouse_color): Always unload the old color.
Karl Heuer <kwzh@gnu.org>
parents: 24994
diff changeset
1260
9f5d679349e9 (x_set_mouse_color): Always unload the old color.
Karl Heuer <kwzh@gnu.org>
parents: 24994
diff changeset
1261 /* Don't let pointers be invisible. */
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1262 if (mask_color == pixel)
35261
ba1f849f9381 (x_set_mouse_color): Fix color allocation.
Gerd Moellmann <gerd@gnu.org>
parents: 35191
diff changeset
1263 {
ba1f849f9381 (x_set_mouse_color): Fix color allocation.
Gerd Moellmann <gerd@gnu.org>
parents: 35191
diff changeset
1264 x_free_colors (f, &pixel, 1);
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1265 pixel = x_copy_color (f, x->foreground_pixel);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1266 }
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1267
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1268 unload_color (f, x->mouse_pixel);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1269 x->mouse_pixel = pixel;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1270
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1271 BLOCK_INPUT;
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1272
3591
507f64624555 Apply typo patches from Paul Eggert.
Jim Blandy <jimb@redhat.com>
parents: 3512
diff changeset
1273 /* It's not okay to crash if the user selects a screwy cursor. */
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1274 count = x_catch_errors (dpy);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1275
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1276 if (!NILP (Vx_pointer_shape))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1277 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1278 CHECK_NUMBER (Vx_pointer_shape);
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1279 cursor = XCreateFontCursor (dpy, XINT (Vx_pointer_shape));
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1280 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1281 else
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1282 cursor = XCreateFontCursor (dpy, XC_xterm);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1283 x_check_errors (dpy, "bad text pointer cursor: %s");
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1284
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1285 if (!NILP (Vx_nontext_pointer_shape))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1286 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1287 CHECK_NUMBER (Vx_nontext_pointer_shape);
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1288 nontext_cursor
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1289 = XCreateFontCursor (dpy, XINT (Vx_nontext_pointer_shape));
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1290 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1291 else
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1292 nontext_cursor = XCreateFontCursor (dpy, XC_left_ptr);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1293 x_check_errors (dpy, "bad nontext pointer cursor: %s");
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1294
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1295 if (!NILP (Vx_hourglass_pointer_shape))
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
1296 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1297 CHECK_NUMBER (Vx_hourglass_pointer_shape);
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1298 hourglass_cursor
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1299 = XCreateFontCursor (dpy, XINT (Vx_hourglass_pointer_shape));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1300 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1301 else
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1302 hourglass_cursor = XCreateFontCursor (dpy, XC_watch);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1303 x_check_errors (dpy, "bad hourglass pointer cursor: %s");
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1304
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1305 if (!NILP (Vx_mode_pointer_shape))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1306 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1307 CHECK_NUMBER (Vx_mode_pointer_shape);
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1308 mode_cursor = XCreateFontCursor (dpy, XINT (Vx_mode_pointer_shape));
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1309 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1310 else
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1311 mode_cursor = XCreateFontCursor (dpy, XC_xterm);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1312 x_check_errors (dpy, "bad modeline pointer cursor: %s");
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1313
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1314 if (!NILP (Vx_sensitive_text_pointer_shape))
6759
e0938c42218c (syms_of_xfns): Define Vx_cross_pointer_shape.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6610
diff changeset
1315 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1316 CHECK_NUMBER (Vx_sensitive_text_pointer_shape);
50236
156baddab173 Setup and use hand_cursor instead of cross_cursor.
Kim F. Storm <storm@cua.dk>
parents: 50099
diff changeset
1317 hand_cursor
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1318 = XCreateFontCursor (dpy, XINT (Vx_sensitive_text_pointer_shape));
6759
e0938c42218c (syms_of_xfns): Define Vx_cross_pointer_shape.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6610
diff changeset
1319 }
e0938c42218c (syms_of_xfns): Define Vx_cross_pointer_shape.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6610
diff changeset
1320 else
50236
156baddab173 Setup and use hand_cursor instead of cross_cursor.
Kim F. Storm <storm@cua.dk>
parents: 50099
diff changeset
1321 hand_cursor = XCreateFontCursor (dpy, XC_hand2);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1322
33960
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
1323 if (!NILP (Vx_window_horizontal_drag_shape))
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
1324 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1325 CHECK_NUMBER (Vx_window_horizontal_drag_shape);
33960
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
1326 horizontal_drag_cursor
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1327 = XCreateFontCursor (dpy, XINT (Vx_window_horizontal_drag_shape));
33960
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
1328 }
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
1329 else
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
1330 horizontal_drag_cursor
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1331 = XCreateFontCursor (dpy, XC_sb_h_double_arrow);
33960
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
1332
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1333 /* Check and report errors with the above calls. */
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1334 x_check_errors (dpy, "can't set cursor shape: %s");
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1335 x_uncatch_errors (dpy, count);
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1336
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1337 {
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1338 XColor fore_color, back_color;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1339
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1340 fore_color.pixel = x->mouse_pixel;
32606
78b4e9f31087 (x_to_xcolors, x_set_mouse_color, lookup_pixel_color)
Gerd Moellmann <gerd@gnu.org>
parents: 32549
diff changeset
1341 x_query_color (f, &fore_color);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1342 back_color.pixel = mask_color;
32606
78b4e9f31087 (x_to_xcolors, x_set_mouse_color, lookup_pixel_color)
Gerd Moellmann <gerd@gnu.org>
parents: 32549
diff changeset
1343 x_query_color (f, &back_color);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1344
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1345 XRecolorCursor (dpy, cursor, &fore_color, &back_color);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1346 XRecolorCursor (dpy, nontext_cursor, &fore_color, &back_color);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1347 XRecolorCursor (dpy, mode_cursor, &fore_color, &back_color);
50236
156baddab173 Setup and use hand_cursor instead of cross_cursor.
Kim F. Storm <storm@cua.dk>
parents: 50099
diff changeset
1348 XRecolorCursor (dpy, hand_cursor, &fore_color, &back_color);
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1349 XRecolorCursor (dpy, hourglass_cursor, &fore_color, &back_color);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1350 XRecolorCursor (dpy, horizontal_drag_cursor, &fore_color, &back_color);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1351 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1352
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1353 if (FRAME_X_WINDOW (f) != 0)
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1354 XDefineCursor (dpy, FRAME_X_WINDOW (f), cursor);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1355
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1356 if (cursor != x->text_cursor
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1357 && x->text_cursor != 0)
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1358 XFreeCursor (dpy, x->text_cursor);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1359 x->text_cursor = cursor;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1360
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1361 if (nontext_cursor != x->nontext_cursor
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1362 && x->nontext_cursor != 0)
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1363 XFreeCursor (dpy, x->nontext_cursor);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1364 x->nontext_cursor = nontext_cursor;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1365
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1366 if (hourglass_cursor != x->hourglass_cursor
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1367 && x->hourglass_cursor != 0)
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1368 XFreeCursor (dpy, x->hourglass_cursor);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1369 x->hourglass_cursor = hourglass_cursor;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1370
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1371 if (mode_cursor != x->modeline_cursor
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1372 && x->modeline_cursor != 0)
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1373 XFreeCursor (dpy, f->output_data.x->modeline_cursor);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1374 x->modeline_cursor = mode_cursor;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1375
50236
156baddab173 Setup and use hand_cursor instead of cross_cursor.
Kim F. Storm <storm@cua.dk>
parents: 50099
diff changeset
1376 if (hand_cursor != x->hand_cursor
156baddab173 Setup and use hand_cursor instead of cross_cursor.
Kim F. Storm <storm@cua.dk>
parents: 50099
diff changeset
1377 && x->hand_cursor != 0)
156baddab173 Setup and use hand_cursor instead of cross_cursor.
Kim F. Storm <storm@cua.dk>
parents: 50099
diff changeset
1378 XFreeCursor (dpy, x->hand_cursor);
156baddab173 Setup and use hand_cursor instead of cross_cursor.
Kim F. Storm <storm@cua.dk>
parents: 50099
diff changeset
1379 x->hand_cursor = hand_cursor;
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1380
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1381 if (horizontal_drag_cursor != x->horizontal_drag_cursor
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1382 && x->horizontal_drag_cursor != 0)
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1383 XFreeCursor (dpy, x->horizontal_drag_cursor);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1384 x->horizontal_drag_cursor = horizontal_drag_cursor;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1385
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1386 XFlush (dpy);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1387 UNBLOCK_INPUT;
25593
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1388
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1389 update_face_from_frame_parameter (f, Qmouse_color, arg);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1390 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1391
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1392 void
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1393 x_set_cursor_color (f, arg, oldval)
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1394 struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1395 Lisp_Object arg, oldval;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1396 {
21779
6aaa0268fe91 (x_set_foreground_color, x_set_background_color)
Richard M. Stallman <rms@gnu.org>
parents: 21555
diff changeset
1397 unsigned long fore_pixel, pixel;
28355
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1398 int fore_pixel_allocated_p = 0, pixel_allocated_p = 0;
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1399 struct x_output *x = f->output_data.x;
28355
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1400
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1401 if (!NILP (Vx_cursor_fore_pixel))
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1402 {
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1403 fore_pixel = x_decode_color (f, Vx_cursor_fore_pixel,
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1404 WHITE_PIX_DEFAULT (f));
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1405 fore_pixel_allocated_p = 1;
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1406 }
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1407 else
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1408 fore_pixel = x->background_pixel;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1409
21779
6aaa0268fe91 (x_set_foreground_color, x_set_background_color)
Richard M. Stallman <rms@gnu.org>
parents: 21555
diff changeset
1410 pixel = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
28355
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1411 pixel_allocated_p = 1;
21779
6aaa0268fe91 (x_set_foreground_color, x_set_background_color)
Richard M. Stallman <rms@gnu.org>
parents: 21555
diff changeset
1412
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
1413 /* Make sure that the cursor color differs from the background color. */
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1414 if (pixel == x->background_pixel)
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1415 {
28355
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1416 if (pixel_allocated_p)
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1417 {
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1418 x_free_colors (f, &pixel, 1);
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1419 pixel_allocated_p = 0;
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1420 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1421
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1422 pixel = x->mouse_pixel;
21779
6aaa0268fe91 (x_set_foreground_color, x_set_background_color)
Richard M. Stallman <rms@gnu.org>
parents: 21555
diff changeset
1423 if (pixel == fore_pixel)
28355
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1424 {
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1425 if (fore_pixel_allocated_p)
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1426 {
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1427 x_free_colors (f, &fore_pixel, 1);
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1428 fore_pixel_allocated_p = 0;
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1429 }
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1430 fore_pixel = x->background_pixel;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1431 }
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1432 }
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1433
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1434 unload_color (f, x->cursor_foreground_pixel);
28355
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1435 if (!fore_pixel_allocated_p)
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1436 fore_pixel = x_copy_color (f, fore_pixel);
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1437 x->cursor_foreground_pixel = fore_pixel;
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1438
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1439 unload_color (f, x->cursor_pixel);
28355
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1440 if (!pixel_allocated_p)
11d7a6fdad5f (x_set_cursor_color): Get color reference counts right.
Gerd Moellmann <gerd@gnu.org>
parents: 28347
diff changeset
1441 pixel = x_copy_color (f, pixel);
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1442 x->cursor_pixel = pixel;
21779
6aaa0268fe91 (x_set_foreground_color, x_set_background_color)
Richard M. Stallman <rms@gnu.org>
parents: 21555
diff changeset
1443
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1444 if (FRAME_X_WINDOW (f) != 0)
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1445 {
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1446 BLOCK_INPUT;
37762
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1447 XSetBackground (FRAME_X_DISPLAY (f), x->cursor_gc, x->cursor_pixel);
ddf0a963805f (x_set_foreground_color): Change frame's cursor_pixel
Gerd Moellmann <gerd@gnu.org>
parents: 37608
diff changeset
1448 XSetForeground (FRAME_X_DISPLAY (f), x->cursor_gc, fore_pixel);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1449 UNBLOCK_INPUT;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1450
1719
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
1451 if (FRAME_VISIBLE_P (f))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1452 {
15999
0e148af7d4ec (x_set_cursor_color): Use x_update_cursor.
Richard M. Stallman <rms@gnu.org>
parents: 15942
diff changeset
1453 x_update_cursor (f, 0);
0e148af7d4ec (x_set_cursor_color): Use x_update_cursor.
Richard M. Stallman <rms@gnu.org>
parents: 15942
diff changeset
1454 x_update_cursor (f, 1);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1455 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1456 }
25593
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1457
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1458 update_face_from_frame_parameter (f, Qcursor_color, arg);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1459 }
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1460
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1461 /* Set the border-color of frame F to pixel value PIX.
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1462 Note that this does not fully take effect if done before
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1463 F has an x-window. */
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1464
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1465 void
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1466 x_set_border_pixel (f, pix)
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1467 struct frame *f;
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1468 int pix;
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1469 {
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1470 unload_color (f, f->output_data.x->border_pixel);
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1471 f->output_data.x->border_pixel = pix;
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1472
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
1473 if (FRAME_X_WINDOW (f) != 0 && f->border_width > 0)
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1474 {
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1475 BLOCK_INPUT;
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1476 XSetWindowBorder (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1477 (unsigned long)pix);
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1478 UNBLOCK_INPUT;
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1479
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1480 if (FRAME_VISIBLE_P (f))
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1481 redraw_frame (f);
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1482 }
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1483 }
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1484
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1485 /* Set the border-color of frame F to value described by ARG.
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1486 ARG can be a string naming a color.
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1487 The border-color is used for the border that is drawn by the X server.
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1488 Note that this does not fully take effect if done before
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1489 F has an x-window; it must be redone when the window is created.
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1490
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1491 Note: this is done in two routines because of the way X10 works.
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1492
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1493 Note: under X11, this is normally the province of the window manager,
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
1494 and so emacs' border colors may be overridden. */
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1495
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1496 void
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1497 x_set_border_color (f, arg, oldval)
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1498 struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1499 Lisp_Object arg, oldval;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1500 {
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1501 int pix;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1502
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1503 CHECK_STRING (arg);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
1504 pix = x_decode_color (f, arg, BLACK_PIX_DEFAULT (f));
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1505 x_set_border_pixel (f, pix);
25593
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1506 update_face_from_frame_parameter (f, Qborder_color, arg);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1507 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1508
28347
ce7dddf6dfb7 (x_specified_cursor_type): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28229
diff changeset
1509
ce7dddf6dfb7 (x_specified_cursor_type): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28229
diff changeset
1510 void
ce7dddf6dfb7 (x_specified_cursor_type): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28229
diff changeset
1511 x_set_cursor_type (f, arg, oldval)
ce7dddf6dfb7 (x_specified_cursor_type): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28229
diff changeset
1512 FRAME_PTR f;
ce7dddf6dfb7 (x_specified_cursor_type): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28229
diff changeset
1513 Lisp_Object arg, oldval;
ce7dddf6dfb7 (x_specified_cursor_type): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28229
diff changeset
1514 {
47142
21cac7a2dcb9 (Vblink_cursor_alist): Removed.
Kim F. Storm <storm@cua.dk>
parents: 47086
diff changeset
1515 set_frame_cursor_types (f, arg);
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1786
diff changeset
1516
43987
ea6530f23937 (x_set_cursor_type): Set cursor_type_changed,
Richard M. Stallman <rms@gnu.org>
parents: 43917
diff changeset
1517 /* Make sure the cursor gets redrawn. */
ea6530f23937 (x_set_cursor_type): Set cursor_type_changed,
Richard M. Stallman <rms@gnu.org>
parents: 43917
diff changeset
1518 cursor_type_changed = 1;
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1786
diff changeset
1519 }
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1520
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1786
diff changeset
1521 void
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1522 x_set_icon_type (f, arg, oldval)
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
1523 struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1524 Lisp_Object arg, oldval;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1525 {
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1526 int result;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1527
9543
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
1528 if (STRINGP (arg))
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
1529 {
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
1530 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt))
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
1531 return;
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
1532 }
3cf8aa53c4cf (x_set_icon_type): If icon-type is a string, then use
Richard M. Stallman <rms@gnu.org>
parents: 9528
diff changeset
1533 else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1534 return;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1535
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1536 BLOCK_INPUT;
485
8c615e453683 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 436
diff changeset
1537 if (NILP (arg))
12073
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1538 result = x_text_icon (f,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1539 (char *) SDATA ((!NILP (f->icon_name)
12276
2e376a4397bc (x_report_frame_params, x_set_icon_type, x_set_icon_name)
Richard M. Stallman <rms@gnu.org>
parents: 12209
diff changeset
1540 ? f->icon_name
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1541 : f->name)));
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
1542 else
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
1543 result = x_bitmap_icon (f, arg);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1544
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1545 if (result)
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1546 {
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
1547 UNBLOCK_INPUT;
9353
30659ed71a1b (x_set_icon_type): Remove period from error message.
Richard M. Stallman <rms@gnu.org>
parents: 9329
diff changeset
1548 error ("No icon window available");
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1549 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1550
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
1551 XFlush (FRAME_X_DISPLAY (f));
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1552 UNBLOCK_INPUT;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1553 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1554
12073
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1555 void
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1556 x_set_icon_name (f, arg, oldval)
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1557 struct frame *f;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1558 Lisp_Object arg, oldval;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1559 {
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1560 int result;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1561
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1562 if (STRINGP (arg))
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1563 {
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1564 if (STRINGP (oldval) && EQ (Fstring_equal (oldval, arg), Qt))
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1565 return;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1566 }
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1567 else if (!STRINGP (oldval) && EQ (oldval, Qnil) == EQ (arg, Qnil))
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1568 return;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1569
12276
2e376a4397bc (x_report_frame_params, x_set_icon_type, x_set_icon_name)
Richard M. Stallman <rms@gnu.org>
parents: 12209
diff changeset
1570 f->icon_name = arg;
12073
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1571
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
1572 if (f->output_data.x->icon_bitmap != 0)
12073
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1573 return;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1574
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1575 BLOCK_INPUT;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1576
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1577 result = x_text_icon (f,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1578 (char *) SDATA ((!NILP (f->icon_name)
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1579 ? f->icon_name
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1580 : !NILP (f->title)
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1581 ? f->title
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1582 : f->name)));
12073
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1583
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1584 if (result)
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1585 {
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1586 UNBLOCK_INPUT;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1587 error ("No icon window available");
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1588 }
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1589
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1590 XFlush (FRAME_X_DISPLAY (f));
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1591 UNBLOCK_INPUT;
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1592 }
31930
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1593
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1594
2136
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1595 void
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1596 x_set_menu_bar_lines (f, value, oldval)
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1597 struct frame *f;
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1598 Lisp_Object value, oldval;
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1599 {
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1600 int nlines;
25715
feaedc03dbc8 (x_set_background_color): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents: 25691
diff changeset
1601 #ifndef USE_X_TOOLKIT
2136
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1602 int olines = FRAME_MENU_BAR_LINES (f);
25715
feaedc03dbc8 (x_set_background_color): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents: 25691
diff changeset
1603 #endif
2136
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1604
2880
9a78169e44df * xfns.c (x_set_menu_bar_lines): Minibuffer-only frames can't have
Jim Blandy <jimb@redhat.com>
parents: 2842
diff changeset
1605 /* Right now, menu bars don't work properly in minibuf-only frames;
9a78169e44df * xfns.c (x_set_menu_bar_lines): Minibuffer-only frames can't have
Jim Blandy <jimb@redhat.com>
parents: 2842
diff changeset
1606 most of the commands try to apply themselves to the minibuffer
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1607 frame itself, and get an error because you can't switch buffers
2880
9a78169e44df * xfns.c (x_set_menu_bar_lines): Minibuffer-only frames can't have
Jim Blandy <jimb@redhat.com>
parents: 2842
diff changeset
1608 in or split the minibuffer window. */
2885
cb1709f302e9 (x_set_menu_bar_lines): Fix typo in last change.
Richard M. Stallman <rms@gnu.org>
parents: 2880
diff changeset
1609 if (FRAME_MINIBUF_ONLY_P (f))
2880
9a78169e44df * xfns.c (x_set_menu_bar_lines): Minibuffer-only frames can't have
Jim Blandy <jimb@redhat.com>
parents: 2842
diff changeset
1610 return;
9a78169e44df * xfns.c (x_set_menu_bar_lines): Minibuffer-only frames can't have
Jim Blandy <jimb@redhat.com>
parents: 2842
diff changeset
1611
9103
948e8acb6990 (x_set_frame_parameters, x_set_menu_bar_lines, Fx_create_frame,
Karl Heuer <kwzh@gnu.org>
parents: 9022
diff changeset
1612 if (INTEGERP (value))
2136
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1613 nlines = XINT (value);
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1614 else
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1615 nlines = 0;
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1616
17556
c0f8f4264f7a (x_set_menu_bar_lines): Increment windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents: 17106
diff changeset
1617 /* Make sure we redisplay all windows in this frame. */
c0f8f4264f7a (x_set_menu_bar_lines): Increment windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents: 17106
diff changeset
1618 windows_or_buffers_changed++;
c0f8f4264f7a (x_set_menu_bar_lines): Increment windows_or_buffers_changed.
Richard M. Stallman <rms@gnu.org>
parents: 17106
diff changeset
1619
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1620 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
1621 FRAME_MENU_BAR_LINES (f) = 0;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
1622 if (nlines)
12832
0d750e41c4f2 (x_set_menu_bar_lines) [USE_X_TOOLKIT]: When turning
Richard M. Stallman <rms@gnu.org>
parents: 12773
diff changeset
1623 {
0d750e41c4f2 (x_set_menu_bar_lines) [USE_X_TOOLKIT]: When turning
Richard M. Stallman <rms@gnu.org>
parents: 12773
diff changeset
1624 FRAME_EXTERNAL_MENU_BAR (f) = 1;
13734
714433bead7f (x_set_menu_bar_lines) [USE_X_TOOLKIT]:
Richard M. Stallman <rms@gnu.org>
parents: 13508
diff changeset
1625 if (FRAME_X_P (f) && f->output_data.x->menubar_widget == 0)
12832
0d750e41c4f2 (x_set_menu_bar_lines) [USE_X_TOOLKIT]: When turning
Richard M. Stallman <rms@gnu.org>
parents: 12773
diff changeset
1626 /* Make sure next redisplay shows the menu bar. */
0d750e41c4f2 (x_set_menu_bar_lines) [USE_X_TOOLKIT]: When turning
Richard M. Stallman <rms@gnu.org>
parents: 12773
diff changeset
1627 XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = Qt;
0d750e41c4f2 (x_set_menu_bar_lines) [USE_X_TOOLKIT]: When turning
Richard M. Stallman <rms@gnu.org>
parents: 12773
diff changeset
1628 }
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
1629 else
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
1630 {
5900
284c0d70a50a (x_set_menu_bar_lines) [USE_X_TOOLKIT]: Dont Call XtDestroyWidget but
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 5899
diff changeset
1631 if (FRAME_EXTERNAL_MENU_BAR (f) == 1)
284c0d70a50a (x_set_menu_bar_lines) [USE_X_TOOLKIT]: Dont Call XtDestroyWidget but
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 5899
diff changeset
1632 free_frame_menubar (f);
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
1633 FRAME_EXTERNAL_MENU_BAR (f) = 0;
13734
714433bead7f (x_set_menu_bar_lines) [USE_X_TOOLKIT]:
Richard M. Stallman <rms@gnu.org>
parents: 13508
diff changeset
1634 if (FRAME_X_P (f))
714433bead7f (x_set_menu_bar_lines) [USE_X_TOOLKIT]:
Richard M. Stallman <rms@gnu.org>
parents: 13508
diff changeset
1635 f->output_data.x->menubar_widget = 0;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
1636 }
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1637 #else /* not USE_X_TOOLKIT && not USE_GTK */
2136
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
1638 FRAME_MENU_BAR_LINES (f) = nlines;
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1639 change_window_heights (f->root_window, nlines - olines);
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
1640 #endif /* not USE_X_TOOLKIT */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1641 adjust_glyphs (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1642 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1643
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1644
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1645 /* Set the number of lines used for the tool bar of frame F to VALUE.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1646 VALUE not an integer, or < 0 means set the lines to zero. OLDVAL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1647 is the old number of tool bar lines. This function changes the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1648 height of all windows on frame F to match the new tool bar height.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1649 The frame's height doesn't change. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1650
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1651 void
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25528
diff changeset
1652 x_set_tool_bar_lines (f, value, oldval)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1653 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1654 Lisp_Object value, oldval;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1655 {
31930
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1656 int delta, nlines, root_height;
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1657 Lisp_Object root_window;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1658
35819
74e2d9de2fc1 (x_set_tool_bar_lines): Do nothing If frame is
Gerd Moellmann <gerd@gnu.org>
parents: 35733
diff changeset
1659 /* Treat tool bars like menu bars. */
74e2d9de2fc1 (x_set_tool_bar_lines): Do nothing If frame is
Gerd Moellmann <gerd@gnu.org>
parents: 35733
diff changeset
1660 if (FRAME_MINIBUF_ONLY_P (f))
74e2d9de2fc1 (x_set_tool_bar_lines): Do nothing If frame is
Gerd Moellmann <gerd@gnu.org>
parents: 35733
diff changeset
1661 return;
74e2d9de2fc1 (x_set_tool_bar_lines): Do nothing If frame is
Gerd Moellmann <gerd@gnu.org>
parents: 35733
diff changeset
1662
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1663 /* Use VALUE only if an integer >= 0. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1664 if (INTEGERP (value) && XINT (value) >= 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1665 nlines = XFASTINT (value);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1666 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1667 nlines = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1668
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1669 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1670 FRAME_TOOL_BAR_LINES (f) = 0;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1671 if (nlines)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1672 {
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1673 FRAME_EXTERNAL_TOOL_BAR (f) = 1;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1674 if (FRAME_X_P (f) && f->output_data.x->toolbar_widget == 0)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1675 /* Make sure next redisplay shows the tool bar. */
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1676 XWINDOW (FRAME_SELECTED_WINDOW (f))->update_mode_line = Qt;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1677 update_frame_tool_bar (f);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1678 }
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1679 else
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1680 {
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1681 if (FRAME_EXTERNAL_TOOL_BAR (f))
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1682 free_frame_tool_bar (f);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1683 FRAME_EXTERNAL_TOOL_BAR (f) = 0;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1684 }
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1685
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1686 return;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1687 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1688
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1689 /* Make sure we redisplay all windows in this frame. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1690 ++windows_or_buffers_changed;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1691
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25528
diff changeset
1692 delta = nlines - FRAME_TOOL_BAR_LINES (f);
31930
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1693
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1694 /* Don't resize the tool-bar to more than we have room for. */
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1695 root_window = FRAME_ROOT_WINDOW (f);
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
1696 root_height = WINDOW_TOTAL_LINES (XWINDOW (root_window));
31930
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1697 if (root_height - delta < 1)
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1698 {
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1699 delta = root_height - 1;
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1700 nlines = FRAME_TOOL_BAR_LINES (f) + delta;
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1701 }
9c779861abff (x_set_tool_bar_lines): Don't use more lines for the
Gerd Moellmann <gerd@gnu.org>
parents: 31902
diff changeset
1702
25544
693ca9ba497a Change spelling of `toolbar' to `tool_bar' or `tool-bar'.
Gerd Moellmann <gerd@gnu.org>
parents: 25528
diff changeset
1703 FRAME_TOOL_BAR_LINES (f) = nlines;
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
1704 change_window_heights (root_window, delta);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1705 adjust_glyphs (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1706
31999
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1707 /* We also have to make sure that the internal border at the top of
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1708 the frame, below the menu bar or tool bar, is redrawn when the
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1709 tool bar disappears. This is so because the internal border is
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1710 below the tool bar if one is displayed, but is below the menu bar
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1711 if there isn't a tool bar. The tool bar draws into the area
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1712 below the menu bar. */
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1713 if (FRAME_X_WINDOW (f) && FRAME_TOOL_BAR_LINES (f) == 0)
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1714 {
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1715 updating_frame = f;
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1716 clear_frame ();
33601
1ee8ea329b7b (x_set_tool_bar_lines): When clearing the frame, also
Gerd Moellmann <gerd@gnu.org>
parents: 33589
diff changeset
1717 clear_current_matrices (f);
31999
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1718 updating_frame = NULL;
d862c73ea0d5 (x_set_tool_bar_lines): Clear frame when tool bar
Gerd Moellmann <gerd@gnu.org>
parents: 31930
diff changeset
1719 }
33747
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1720
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1721 /* If the tool bar gets smaller, the internal border below it
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1722 has to be cleared. It was formerly part of the display
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1723 of the larger tool bar, and updating windows won't clear it. */
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1724 if (delta < 0)
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1725 {
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1726 int height = FRAME_INTERNAL_BORDER_WIDTH (f);
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
1727 int width = FRAME_PIXEL_WIDTH (f);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
1728 int y = nlines * FRAME_LINE_HEIGHT (f);
33747
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1729
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1730 BLOCK_INPUT;
35579
65c31f59048a * xfns.c (x_set_tool_bar_lines): Use x_clear_area instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35566
diff changeset
1731 x_clear_area (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
65c31f59048a * xfns.c (x_set_tool_bar_lines): Use x_clear_area instead of
Gerd Moellmann <gerd@gnu.org>
parents: 35566
diff changeset
1732 0, y, width, height, False);
33747
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1733 UNBLOCK_INPUT;
38625
0bfdfd449f4a (x_set_tool_bar_lines): Clear the tool bar window's
Gerd Moellmann <gerd@gnu.org>
parents: 38575
diff changeset
1734
0bfdfd449f4a (x_set_tool_bar_lines): Clear the tool bar window's
Gerd Moellmann <gerd@gnu.org>
parents: 38575
diff changeset
1735 if (WINDOWP (f->tool_bar_window))
0bfdfd449f4a (x_set_tool_bar_lines): Clear the tool bar window's
Gerd Moellmann <gerd@gnu.org>
parents: 38575
diff changeset
1736 clear_glyph_matrix (XWINDOW (f->tool_bar_window)->current_matrix);
33747
e0e2461a24fe (x_set_tool_bar_lines): Clear internal border when
Gerd Moellmann <gerd@gnu.org>
parents: 33713
diff changeset
1737 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1738 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1739
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1740
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1741 /* Set the foreground color for scroll bars on frame F to VALUE.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1742 VALUE should be a string, a color name. If it isn't a string or
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1743 isn't a valid color name, do nothing. OLDVAL is the old value of
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1744 the frame parameter. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1745
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1746 void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1747 x_set_scroll_bar_foreground (f, value, oldval)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1748 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1749 Lisp_Object value, oldval;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1750 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1751 unsigned long pixel;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1752
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1753 if (STRINGP (value))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1754 pixel = x_decode_color (f, value, BLACK_PIX_DEFAULT (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1755 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1756 pixel = -1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1757
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1758 if (f->output_data.x->scroll_bar_foreground_pixel != -1)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1759 unload_color (f, f->output_data.x->scroll_bar_foreground_pixel);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1760
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1761 f->output_data.x->scroll_bar_foreground_pixel = pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1762 if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1763 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1764 /* Remove all scroll bars because they have wrong colors. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1765 if (condemn_scroll_bars_hook)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1766 (*condemn_scroll_bars_hook) (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1767 if (judge_scroll_bars_hook)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1768 (*judge_scroll_bars_hook) (f);
25593
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1769
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1770 update_face_from_frame_parameter (f, Qscroll_bar_foreground, value);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1771 redraw_frame (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1772 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1773 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1774
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1775
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1776 /* Set the background color for scroll bars on frame F to VALUE VALUE
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1777 should be a string, a color name. If it isn't a string or isn't a
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1778 valid color name, do nothing. OLDVAL is the old value of the frame
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1779 parameter. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1780
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1781 void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1782 x_set_scroll_bar_background (f, value, oldval)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1783 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1784 Lisp_Object value, oldval;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1785 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1786 unsigned long pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1787
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1788 if (STRINGP (value))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1789 pixel = x_decode_color (f, value, WHITE_PIX_DEFAULT (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1790 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1791 pixel = -1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1792
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1793 if (f->output_data.x->scroll_bar_background_pixel != -1)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1794 unload_color (f, f->output_data.x->scroll_bar_background_pixel);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1795
39619
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1796 #ifdef USE_TOOLKIT_SCROLL_BARS
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1797 /* Scrollbar shadow colors. */
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1798 if (f->output_data.x->scroll_bar_top_shadow_pixel != -1)
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1799 {
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1800 unload_color (f, f->output_data.x->scroll_bar_top_shadow_pixel);
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1801 f->output_data.x->scroll_bar_top_shadow_pixel = -1;
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1802 }
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1803 if (f->output_data.x->scroll_bar_bottom_shadow_pixel != -1)
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1804 {
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1805 unload_color (f, f->output_data.x->scroll_bar_bottom_shadow_pixel);
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1806 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1;
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1807 }
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1808 #endif /* USE_TOOLKIT_SCROLL_BARS */
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
1809
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1810 f->output_data.x->scroll_bar_background_pixel = pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1811 if (FRAME_X_WINDOW (f) && FRAME_VISIBLE_P (f))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1812 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1813 /* Remove all scroll bars because they have wrong colors. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1814 if (condemn_scroll_bars_hook)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1815 (*condemn_scroll_bars_hook) (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1816 if (judge_scroll_bars_hook)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1817 (*judge_scroll_bars_hook) (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1818
25593
9aecfcf3cb43 (x_set_foreground_color): Call
Gerd Moellmann <gerd@gnu.org>
parents: 25550
diff changeset
1819 update_face_from_frame_parameter (f, Qscroll_bar_background, value);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1820 redraw_frame (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1821 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1822 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
1823
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1824
30383
2bec5f82f5d0 Correct typo in a comment.
Eli Zaretskii <eliz@gnu.org>
parents: 30355
diff changeset
1825 /* Encode Lisp string STRING as a text in a format appropriate for
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1826 XICCC (X Inter Client Communication Conventions).
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1827
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1828 If STRING contains only ASCII characters, do no conversion and
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1829 return the string data of STRING. Otherwise, encode the text by
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1830 CODING_SYSTEM, and return a newly allocated memory area which
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1831 should be freed by `xfree' by a caller.
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1832
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1833 SELECTIONP non-zero means the string is being encoded for an X
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1834 selection, so it is safe to run pre-write conversions (which
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1835 may run Lisp code).
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1836
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1837 Store the byte length of resulting text in *TEXT_BYTES.
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1838
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1839 If the text contains only ASCII and Latin-1, store 1 in *STRING_P,
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1840 which means that the `encoding' of the result can be `STRING'.
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1841 Otherwise store 0 in *STRINGP, which means that the `encoding' of
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1842 the result should be `COMPOUND_TEXT'. */
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1843
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1844 unsigned char *
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1845 x_encode_text (string, coding_system, selectionp, text_bytes, stringp)
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1846 Lisp_Object string, coding_system;
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1847 int *text_bytes, *stringp;
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1848 int selectionp;
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1849 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1850 unsigned char *str = SDATA (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1851 int chars = SCHARS (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1852 int bytes = SBYTES (string);
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1853 int charset_info;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1854 int bufsize;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1855 unsigned char *buf;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1856 struct coding_system coding;
45603
97212b1039e9 (x_encode_text): Return stringp non-NULL if coding_system
Eli Zaretskii <eliz@gnu.org>
parents: 45413
diff changeset
1857 extern Lisp_Object Qcompound_text_with_extensions;
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1858
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1859 charset_info = find_charset_in_text (str, chars, bytes, NULL, Qnil);
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1860 if (charset_info == 0)
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1861 {
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1862 /* No multibyte character in OBJ. We need not encode it. */
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1863 *text_bytes = bytes;
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1864 *stringp = 1;
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1865 return str;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1866 }
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1867
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1868 setup_coding_system (coding_system, &coding);
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1869 if (selectionp
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1870 && SYMBOLP (coding.pre_write_conversion)
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1871 && !NILP (Ffboundp (coding.pre_write_conversion)))
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1872 {
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1873 string = run_pre_post_conversion_on_str (string, &coding, 1);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1874 str = SDATA (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1875 chars = SCHARS (string);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1876 bytes = SBYTES (string);
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1877 }
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1878 coding.src_multibyte = 1;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1879 coding.dst_multibyte = 0;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1880 coding.mode |= CODING_MODE_LAST_BLOCK;
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1881 if (coding.type == coding_type_iso2022)
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1882 coding.flags |= CODING_FLAG_ISO_SAFE;
33242
421e3db4e24e (x_encode_text): Suppress producing escape sequences for composition.
Kenichi Handa <handa@m17n.org>
parents: 32606
diff changeset
1883 /* We suppress producing escape sequences for composition. */
421e3db4e24e (x_encode_text): Suppress producing escape sequences for composition.
Kenichi Handa <handa@m17n.org>
parents: 32606
diff changeset
1884 coding.composing = COMPOSITION_DISABLED;
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1885 bufsize = encoding_buffer_size (&coding, bytes);
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1886 buf = (unsigned char *) xmalloc (bufsize);
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1887 encode_coding (&coding, str, buf, bytes, bufsize);
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1888 *text_bytes = coding.produced;
45603
97212b1039e9 (x_encode_text): Return stringp non-NULL if coding_system
Eli Zaretskii <eliz@gnu.org>
parents: 45413
diff changeset
1889 *stringp = (charset_info == 1
97212b1039e9 (x_encode_text): Return stringp non-NULL if coding_system
Eli Zaretskii <eliz@gnu.org>
parents: 45413
diff changeset
1890 || (!EQ (coding_system, Qcompound_text)
97212b1039e9 (x_encode_text): Return stringp non-NULL if coding_system
Eli Zaretskii <eliz@gnu.org>
parents: 45413
diff changeset
1891 && !EQ (coding_system, Qcompound_text_with_extensions)));
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1892 return buf;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1893 }
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1894
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1895
4650
d81041bb1e3d comment fix
David J. MacKenzie <djm@gnu.org>
parents: 4629
diff changeset
1896 /* Change the name of frame F to NAME. If NAME is nil, set F's name to
1018
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1897 x_id_name.
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1898
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1899 If EXPLICIT is non-zero, that indicates that lisp code is setting the
4650
d81041bb1e3d comment fix
David J. MacKenzie <djm@gnu.org>
parents: 4629
diff changeset
1900 name; if NAME is a string, set F's name to NAME and set
d81041bb1e3d comment fix
David J. MacKenzie <djm@gnu.org>
parents: 4629
diff changeset
1901 F->explicit_name; if NAME is Qnil, then clear F->explicit_name.
1018
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1902
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1903 If EXPLICIT is zero, that indicates that Emacs redisplay code is
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1904 suggesting a new name, which lisp code should override; if
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1905 F->explicit_name is set, ignore the new name; otherwise, set it. */
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1906
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1907 void
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1908 x_set_name (f, name, explicit)
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1909 struct frame *f;
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1910 Lisp_Object name;
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1911 int explicit;
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1912 {
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
1913 /* Make sure that requests from lisp code override requests from
1018
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1914 Emacs redisplay code. */
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1915 if (explicit)
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1916 {
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1917 /* If we're switching from explicit to implicit, we had better
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1918 update the mode lines and thereby update the title. */
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1919 if (f->explicit_name && NILP (name))
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
1920 update_mode_lines = 1;
1018
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1921
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1922 f->explicit_name = ! NILP (name);
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1923 }
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1924 else if (f->explicit_name)
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1925 return;
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1926
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1927 /* If NAME is nil, set the name to the x_id_name. */
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1928 if (NILP (name))
8090
bb03e344f07e (x_set_frame_parameters): Call x_set_offset directly.
Richard M. Stallman <rms@gnu.org>
parents: 7989
diff changeset
1929 {
bb03e344f07e (x_set_frame_parameters): Call x_set_offset directly.
Richard M. Stallman <rms@gnu.org>
parents: 7989
diff changeset
1930 /* Check for no change needed in this very common case
bb03e344f07e (x_set_frame_parameters): Call x_set_offset directly.
Richard M. Stallman <rms@gnu.org>
parents: 7989
diff changeset
1931 before we do any consing. */
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
1932 if (!strcmp (FRAME_X_DISPLAY_INFO (f)->x_id_name,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
1933 SDATA (f->name)))
8090
bb03e344f07e (x_set_frame_parameters): Call x_set_offset directly.
Richard M. Stallman <rms@gnu.org>
parents: 7989
diff changeset
1934 return;
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
1935 name = build_string (FRAME_X_DISPLAY_INFO (f)->x_id_name);
8090
bb03e344f07e (x_set_frame_parameters): Call x_set_offset directly.
Richard M. Stallman <rms@gnu.org>
parents: 7989
diff changeset
1936 }
833
14748faa4f17 entered into RCS
Jim Blandy <jimb@redhat.com>
parents: 817
diff changeset
1937 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
1938 CHECK_STRING (name);
1018
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1939
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1940 /* Don't change the name if it's already NAME. */
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
1941 if (! NILP (Fstring_equal (name, f->name)))
727
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 708
diff changeset
1942 return;
540b047ece4d *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 708
diff changeset
1943
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1944 f->name = name;
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1945
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1946 /* For setting the frame title, the title parameter should override
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1947 the name parameter. */
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1948 if (! NILP (f->title))
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1949 name = f->title;
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
1950
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1951 if (FRAME_X_WINDOW (f))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
1952 {
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 700
diff changeset
1953 BLOCK_INPUT;
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1954 #ifdef HAVE_X11R4
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1955 {
12073
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
1956 XTextProperty text, icon;
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1957 int bytes, stringp;
30355
36c049a9730b *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30354
diff changeset
1958 Lisp_Object coding_system;
36c049a9730b *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30354
diff changeset
1959
49473
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1960 /* Note: Encoding strategy
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1961
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1962 We encode NAME by compound-text and use "COMPOUND-TEXT" in
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1963 text.encoding. But, there are non-internationalized window
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1964 managers which don't support that encoding. So, if NAME
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1965 contains only ASCII and 8859-1 characters, encode it by
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1966 iso-latin-1, and use "STRING" in text.encoding hoping that
52008
66104cf372d8 Consider both png.h and libpng/png.h.
Dave Love <fx@gnu.org>
parents: 51898
diff changeset
1967 such window managers at least analyze this format correctly,
49473
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1968 i.e. treat 8-bit bytes as 8859-1 characters.
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1969
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1970 We may also be able to use "UTF8_STRING" in text.encoding
52008
66104cf372d8 Consider both png.h and libpng/png.h.
Dave Love <fx@gnu.org>
parents: 51898
diff changeset
1971 in the future which can encode all Unicode characters.
49473
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1972 But, for the moment, there's no way to know that the
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1973 current window manager supports it or not. */
48000
5144fabfb105 (x_set_name): Encode by Qcompound_text unconditionally.
Kenichi Handa <handa@m17n.org>
parents: 47974
diff changeset
1974 coding_system = Qcompound_text;
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1975 text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1976 text.encoding = (stringp ? XA_STRING
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1977 : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
1978 text.format = 8;
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1979 text.nitems = bytes;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1980
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1981 if (NILP (f->icon_name))
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1982 {
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1983 icon = text;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1984 }
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1985 else
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1986 {
49473
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
1987 /* See the above comment "Note: Encoding strategy". */
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
1988 icon.value = x_encode_text (f->icon_name, coding_system, 0,
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1989 &bytes, &stringp);
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
1990 icon.encoding = (stringp ? XA_STRING
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1991 : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1992 icon.format = 8;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1993 icon.nitems = bytes;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
1994 }
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1995 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1996 gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1997 SDATA (name));
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
1998 #else /* not USE_GTK */
49644
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
1999 XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2000 #endif /* not USE_GTK */
49644
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2001
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2002 XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &icon);
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2003
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2004 if (!NILP (f->icon_name)
47974
ed2cc4e5f0b8 (x_set_name, x_set_title): `icon.value' has unsigned char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47731
diff changeset
2005 && icon.value != (unsigned char *) SDATA (f->icon_name))
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2006 xfree (icon.value);
47974
ed2cc4e5f0b8 (x_set_name, x_set_title): `icon.value' has unsigned char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47731
diff changeset
2007 if (text.value != (unsigned char *) SDATA (name))
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2008 xfree (text.value);
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
2009 }
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2010 #else /* not HAVE_X11R4 */
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2011 XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2012 SDATA (name));
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2013 XStoreName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2014 SDATA (name));
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2015 #endif /* not HAVE_X11R4 */
708
030fb4635335 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 700
diff changeset
2016 UNBLOCK_INPUT;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2017 }
1018
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2018 }
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2019
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2020 /* This function should be called when the user's lisp code has
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2021 specified a name for the frame; the name will override any set by the
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2022 redisplay code. */
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2023 void
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2024 x_explicitly_set_name (f, arg, oldval)
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2025 FRAME_PTR f;
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2026 Lisp_Object arg, oldval;
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2027 {
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2028 x_set_name (f, arg, 1);
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2029 }
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2030
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2031 /* This function should be called by Emacs redisplay code to set the
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2032 name; names set this way will never override names set by the user's
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2033 lisp code. */
1125
059624bf9bf0 Declare x_implicitly_set_name to be void.
Jim Blandy <jimb@redhat.com>
parents: 1096
diff changeset
2034 void
1018
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2035 x_implicitly_set_name (f, arg, oldval)
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2036 FRAME_PTR f;
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2037 Lisp_Object arg, oldval;
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2038 {
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
2039 x_set_name (f, arg, 0);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2040 }
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2041
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2042 /* Change the title of frame F to NAME.
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2043 If NAME is nil, use the frame name as the title.
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2044
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2045 If EXPLICIT is non-zero, that indicates that lisp code is setting the
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2046 name; if NAME is a string, set F's name to NAME and set
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2047 F->explicit_name; if NAME is Qnil, then clear F->explicit_name.
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2048
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2049 If EXPLICIT is zero, that indicates that Emacs redisplay code is
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2050 suggesting a new name, which lisp code should override; if
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2051 F->explicit_name is set, ignore the new name; otherwise, set it. */
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2052
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2053 void
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
2054 x_set_title (f, name, old_name)
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2055 struct frame *f;
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
2056 Lisp_Object name, old_name;
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2057 {
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2058 /* Don't change the title if it's already NAME. */
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2059 if (EQ (name, f->title))
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2060 return;
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2061
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2062 update_mode_lines = 1;
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2063
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2064 f->title = name;
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2065
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2066 if (NILP (name))
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2067 name = f->name;
16732
f52c4fd47f03 (x_set_title): Check data type of NAME.
Richard M. Stallman <rms@gnu.org>
parents: 16682
diff changeset
2068 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
2069 CHECK_STRING (name);
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2070
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2071 if (FRAME_X_WINDOW (f))
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2072 {
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2073 BLOCK_INPUT;
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2074 #ifdef HAVE_X11R4
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2075 {
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2076 XTextProperty text, icon;
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
2077 int bytes, stringp;
30355
36c049a9730b *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30354
diff changeset
2078 Lisp_Object coding_system;
36c049a9730b *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30354
diff changeset
2079
48000
5144fabfb105 (x_set_name): Encode by Qcompound_text unconditionally.
Kenichi Handa <handa@m17n.org>
parents: 47974
diff changeset
2080 coding_system = Qcompound_text;
49473
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
2081 /* See the comment "Note: Encoding strategy" in x_set_name. */
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
2082 text.value = x_encode_text (name, coding_system, 0, &bytes, &stringp);
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
2083 text.encoding = (stringp ? XA_STRING
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2084 : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2085 text.format = 8;
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2086 text.nitems = bytes;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2087
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2088 if (NILP (f->icon_name))
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2089 {
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2090 icon = text;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2091 }
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2092 else
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2093 {
49473
5579114f7b97 (x_set_name, x_set_title): Add comment about encoding strategy.
Kenichi Handa <handa@m17n.org>
parents: 49434
diff changeset
2094 /* See the comment "Note: Encoding strategy" in x_set_name. */
43452
75677c801c26 (x_encode_text): Accept additional arg SELECTIONP; all
Eli Zaretskii <eliz@gnu.org>
parents: 43426
diff changeset
2095 icon.value = x_encode_text (f->icon_name, coding_system, 0,
30354
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
2096 &bytes, &stringp);
7540bd2b5a34 *** empty log message ***
Kenichi Handa <handa@m17n.org>
parents: 30351
diff changeset
2097 icon.encoding = (stringp ? XA_STRING
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2098 : FRAME_X_DISPLAY_INFO (f)->Xatom_COMPOUND_TEXT);
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2099 icon.format = 8;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2100 icon.nitems = bytes;
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2101 }
49644
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2102
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2103 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2104 gtk_window_set_title (GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)),
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2105 SDATA (name));
49644
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2106 #else /* not USE_GTK */
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2107 XSetWMName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), &text);
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2108 #endif /* not USE_GTK */
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2109
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2110 XSetWMIconName (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f),
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2111 &icon);
49644
834df49192b0 Use FRAME_OUTER_WINDOW instead of ifdef X_TOOLKIT/else/endif
Jan Djärv <jan.h.d@swipnet.se>
parents: 49600
diff changeset
2112
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2113 if (!NILP (f->icon_name)
47974
ed2cc4e5f0b8 (x_set_name, x_set_title): `icon.value' has unsigned char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47731
diff changeset
2114 && icon.value != (unsigned char *) SDATA (f->icon_name))
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2115 xfree (icon.value);
47974
ed2cc4e5f0b8 (x_set_name, x_set_title): `icon.value' has unsigned char.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47731
diff changeset
2116 if (text.value != (unsigned char *) SDATA (name))
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
2117 xfree (text.value);
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2118 }
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2119 #else /* not HAVE_X11R4 */
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2120 XSetIconName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2121 SDATA (name));
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2122 XStoreName (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2123 SDATA (name));
14482
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2124 #endif /* not HAVE_X11R4 */
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2125 UNBLOCK_INPUT;
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2126 }
479987ba2c8d (x_frame_parms): Add "title" element.
Richard M. Stallman <rms@gnu.org>
parents: 14439
diff changeset
2127 }
9580
bcc9342cf633 (x_set_unsplittable): New function.
Karl Heuer <kwzh@gnu.org>
parents: 9563
diff changeset
2128
bcc9342cf633 (x_set_unsplittable): New function.
Karl Heuer <kwzh@gnu.org>
parents: 9563
diff changeset
2129 void
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2130 x_set_scroll_bar_default_width (f)
1719
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
2131 struct frame *f;
8942
a43f3b56ed47 (x_set_scroll_bar_width): New function.
Karl Heuer <kwzh@gnu.org>
parents: 8845
diff changeset
2132 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2133 int wid = FRAME_COLUMN_WIDTH (f);
18594
5ca5ff1c74eb (x_set_scroll_bar_width): By default, use enough
Richard M. Stallman <rms@gnu.org>
parents: 18114
diff changeset
2134
25511
9bc9d4d6c716 (x_set_scroll_bar_width): Change conditional compilation
Gerd Moellmann <gerd@gnu.org>
parents: 25464
diff changeset
2135 #ifdef USE_TOOLKIT_SCROLL_BARS
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2136 /* A minimum width of 14 doesn't look good for toolkit scroll bars. */
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2137 int width = 16 + 2 * VERTICAL_SCROLL_BAR_WIDTH_TRIM;
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2138 FRAME_CONFIG_SCROLL_BAR_COLS (f) = (width + wid - 1) / wid;
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2139 FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = width;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2140 #else
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2141 /* Make the actual width at least 14 pixels and a multiple of a
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2142 character width. */
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2143 FRAME_CONFIG_SCROLL_BAR_COLS (f) = (14 + wid - 1) / wid;
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2144
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2145 /* Use all of that space (aside from required margins) for the
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2146 scroll bar. */
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2147 FRAME_CONFIG_SCROLL_BAR_WIDTH (f) = 0;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2148 #endif
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2149 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2150
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2151
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2152 /* Record in frame F the specified or default value according to ALIST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2153 of the parameter named PROP (a Lisp symbol). If no value is
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2154 specified for PROP, look for an X default for XPROP on the frame
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2155 named NAME. If that is not found either, use the value DEFLT. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2156
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2157 static Lisp_Object
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2158 x_default_scroll_bar_color_parameter (f, alist, prop, xprop, xclass,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2159 foreground_p)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2160 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2161 Lisp_Object alist;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2162 Lisp_Object prop;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2163 char *xprop;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2164 char *xclass;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2165 int foreground_p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2166 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2167 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2168 Lisp_Object tem;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2169
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2170 tem = x_get_arg (dpyinfo, alist, prop, xprop, xclass, RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2171 if (EQ (tem, Qunbound))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2172 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2173 #ifdef USE_TOOLKIT_SCROLL_BARS
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2174
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2175 /* See if an X resource for the scroll bar color has been
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2176 specified. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2177 tem = display_x_get_resource (dpyinfo,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2178 build_string (foreground_p
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2179 ? "foreground"
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2180 : "background"),
39812
66e0816837a8 Update calls to openp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39682
diff changeset
2181 empty_string,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2182 build_string ("verticalScrollBar"),
39812
66e0816837a8 Update calls to openp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39682
diff changeset
2183 empty_string);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2184 if (!STRINGP (tem))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2185 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2186 /* If nothing has been specified, scroll bars will use a
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2187 toolkit-dependent default. Because these defaults are
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2188 difficult to get at without actually creating a scroll
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2189 bar, use nil to indicate that no color has been
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2190 specified. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2191 tem = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2192 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2193
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2194 #else /* not USE_TOOLKIT_SCROLL_BARS */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2195
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2196 tem = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2197
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2198 #endif /* not USE_TOOLKIT_SCROLL_BARS */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2199 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2200
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2201 x_set_frame_parameters (f, Fcons (Fcons (prop, tem), Qnil));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2202 return tem;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2203 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2204
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2205
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2206
5229
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2207 #if !defined (HAVE_X11R4) && !defined (HAVE_XSETWMPROTOCOLS)
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2208
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2209 Status
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2210 XSetWMProtocols (dpy, w, protocols, count)
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2211 Display *dpy;
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2212 Window w;
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2213 Atom *protocols;
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2214 int count;
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2215 {
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2216 Atom prop;
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2217 prop = XInternAtom (dpy, "WM_PROTOCOLS", False);
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2218 if (prop == None) return False;
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2219 XChangeProperty (dpy, w, prop, XA_ATOM, 32, PropModeReplace,
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2220 (unsigned char *) protocols, count);
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2221 return True;
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2222 }
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2223 #endif /* not HAVE_X11R4 && not HAVE_XSETWMPROTOCOLS */
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2224
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2225 #ifdef USE_X_TOOLKIT
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2226
9528
db02bc274f20 (Fx_create_frame): Init the FRAME_X_SCREEN as soon as can be done.
Richard M. Stallman <rms@gnu.org>
parents: 9353
diff changeset
2227 /* If the WM_PROTOCOLS property does not already contain WM_TAKE_FOCUS,
db02bc274f20 (Fx_create_frame): Init the FRAME_X_SCREEN as soon as can be done.
Richard M. Stallman <rms@gnu.org>
parents: 9353
diff changeset
2228 WM_DELETE_WINDOW, and WM_SAVE_YOURSELF, then add them. (They may
8845
c4b7fda8f611 (hack_wm_protocols): Arrange to handle WM_SAVE_YOURSELF.
Richard M. Stallman <rms@gnu.org>
parents: 8782
diff changeset
2229 already be present because of the toolkit (Motif adds some of them,
c4b7fda8f611 (hack_wm_protocols): Arrange to handle WM_SAVE_YOURSELF.
Richard M. Stallman <rms@gnu.org>
parents: 8782
diff changeset
2230 for example, but Xt doesn't). */
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2231
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2232 static void
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2233 hack_wm_protocols (f, widget)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2234 FRAME_PTR f;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2235 Widget widget;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2236 {
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2237 Display *dpy = XtDisplay (widget);
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2238 Window w = XtWindow (widget);
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2239 int need_delete = 1;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2240 int need_focus = 1;
8845
c4b7fda8f611 (hack_wm_protocols): Arrange to handle WM_SAVE_YOURSELF.
Richard M. Stallman <rms@gnu.org>
parents: 8782
diff changeset
2241 int need_save = 1;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2242
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2243 BLOCK_INPUT;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2244 {
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2245 Atom type, *atoms = 0;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2246 int format = 0;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2247 unsigned long nitems = 0;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2248 unsigned long bytes_after;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2249
11882
8b3575269610 (hack_wm_protocols): Cast args of XGetWindowProperty.
Karl Heuer <kwzh@gnu.org>
parents: 11774
diff changeset
2250 if ((XGetWindowProperty (dpy, w,
8b3575269610 (hack_wm_protocols): Cast args of XGetWindowProperty.
Karl Heuer <kwzh@gnu.org>
parents: 11774
diff changeset
2251 FRAME_X_DISPLAY_INFO (f)->Xatom_wm_protocols,
11894
b20c45d49063 (hack_wm_protocols): Use cast instead of suffix.
Karl Heuer <kwzh@gnu.org>
parents: 11893
diff changeset
2252 (long)0, (long)100, False, XA_ATOM,
11882
8b3575269610 (hack_wm_protocols): Cast args of XGetWindowProperty.
Karl Heuer <kwzh@gnu.org>
parents: 11774
diff changeset
2253 &type, &format, &nitems, &bytes_after,
8b3575269610 (hack_wm_protocols): Cast args of XGetWindowProperty.
Karl Heuer <kwzh@gnu.org>
parents: 11774
diff changeset
2254 (unsigned char **) &atoms)
8b3575269610 (hack_wm_protocols): Cast args of XGetWindowProperty.
Karl Heuer <kwzh@gnu.org>
parents: 11774
diff changeset
2255 == Success)
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2256 && format == 32 && type == XA_ATOM)
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2257 while (nitems > 0)
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2258 {
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2259 nitems--;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2260 if (atoms[nitems] == FRAME_X_DISPLAY_INFO (f)->Xatom_wm_delete_window)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2261 need_delete = 0;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2262 else if (atoms[nitems] == FRAME_X_DISPLAY_INFO (f)->Xatom_wm_take_focus)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2263 need_focus = 0;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2264 else if (atoms[nitems] == FRAME_X_DISPLAY_INFO (f)->Xatom_wm_save_yourself)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2265 need_save = 0;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2266 }
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2267 if (atoms) XFree ((char *) atoms);
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2268 }
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2269 {
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2270 Atom props [10];
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2271 int count = 0;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2272 if (need_delete)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2273 props[count++] = FRAME_X_DISPLAY_INFO (f)->Xatom_wm_delete_window;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2274 if (need_focus)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2275 props[count++] = FRAME_X_DISPLAY_INFO (f)->Xatom_wm_take_focus;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2276 if (need_save)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2277 props[count++] = FRAME_X_DISPLAY_INFO (f)->Xatom_wm_save_yourself;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2278 if (count)
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2279 XChangeProperty (dpy, w, FRAME_X_DISPLAY_INFO (f)->Xatom_wm_protocols,
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2280 XA_ATOM, 32, PropModeAppend,
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2281 (unsigned char *) props, count);
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2282 }
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2283 UNBLOCK_INPUT;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2284 }
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2285 #endif
27157
3dafddaefc2c (x_create_im): New function to set IM and IC of a frame.
Gerd Moellmann <gerd@gnu.org>
parents: 27153
diff changeset
2286
3dafddaefc2c (x_create_im): New function to set IM and IC of a frame.
Gerd Moellmann <gerd@gnu.org>
parents: 27153
diff changeset
2287
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2288
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2289 /* Support routines for XIC (X Input Context). */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2290
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2291 #ifdef HAVE_X_I18N
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2292
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2293 static XFontSet xic_create_xfontset P_ ((struct frame *, char *));
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2294 static XIMStyle best_xim_style P_ ((XIMStyles *, XIMStyles *));
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2295
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2296
51130
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2297 /* Supported XIM styles, ordered by preference. */
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2298
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2299 static XIMStyle supported_xim_styles[] =
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2300 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2301 XIMPreeditPosition | XIMStatusArea,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2302 XIMPreeditPosition | XIMStatusNothing,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2303 XIMPreeditPosition | XIMStatusNone,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2304 XIMPreeditNothing | XIMStatusArea,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2305 XIMPreeditNothing | XIMStatusNothing,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2306 XIMPreeditNothing | XIMStatusNone,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2307 XIMPreeditNone | XIMStatusArea,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2308 XIMPreeditNone | XIMStatusNothing,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2309 XIMPreeditNone | XIMStatusNone,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2310 0,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2311 };
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2312
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2313
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2314 /* Create an X fontset on frame F with base font name
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2315 BASE_FONTNAME.. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2316
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2317 static XFontSet
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2318 xic_create_xfontset (f, base_fontname)
27157
3dafddaefc2c (x_create_im): New function to set IM and IC of a frame.
Gerd Moellmann <gerd@gnu.org>
parents: 27153
diff changeset
2319 struct frame *f;
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2320 char *base_fontname;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2321 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2322 XFontSet xfs;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2323 char **missing_list;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2324 int missing_count;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2325 char *def_string;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2326
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2327 xfs = XCreateFontSet (FRAME_X_DISPLAY (f),
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2328 base_fontname, &missing_list,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2329 &missing_count, &def_string);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2330 if (missing_list)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2331 XFreeStringList (missing_list);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2332
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2333 /* No need to free def_string. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2334 return xfs;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2335 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2336
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2337
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2338 /* Value is the best input style, given user preferences USER (already
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2339 checked to be supported by Emacs), and styles supported by the
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2340 input method XIM. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2341
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2342 static XIMStyle
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2343 best_xim_style (user, xim)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2344 XIMStyles *user;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2345 XIMStyles *xim;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2346 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2347 int i, j;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2348
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2349 for (i = 0; i < user->count_styles; ++i)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2350 for (j = 0; j < xim->count_styles; ++j)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2351 if (user->supported_styles[i] == xim->supported_styles[j])
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2352 return user->supported_styles[i];
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2353
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2354 /* Return the default style. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2355 return XIMPreeditNothing | XIMStatusNothing;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2356 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2357
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2358 /* Create XIC for frame F. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2359
35592
52b5b50a0604 (xic_style): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35579
diff changeset
2360 static XIMStyle xic_style;
52b5b50a0604 (xic_style): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35579
diff changeset
2361
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2362 void
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2363 create_frame_xic (f)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2364 struct frame *f;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2365 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2366 XIM xim;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2367 XIC xic = NULL;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2368 XFontSet xfs = NULL;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2369
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2370 if (FRAME_XIC (f))
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2371 return;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2372
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2373 xim = FRAME_X_XIM (f);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2374 if (xim)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2375 {
27659
4137c807296b (create_frame_xic): Fix initialization of automatic aggregates for pcc.
Dave Love <fx@gnu.org>
parents: 27502
diff changeset
2376 XRectangle s_area;
4137c807296b (create_frame_xic): Fix initialization of automatic aggregates for pcc.
Dave Love <fx@gnu.org>
parents: 27502
diff changeset
2377 XPoint spot;
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2378 XVaNestedList preedit_attr;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2379 XVaNestedList status_attr;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2380 char *base_fontname;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2381 int fontset;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2382
27659
4137c807296b (create_frame_xic): Fix initialization of automatic aggregates for pcc.
Dave Love <fx@gnu.org>
parents: 27502
diff changeset
2383 s_area.x = 0; s_area.y = 0; s_area.width = 1; s_area.height = 1;
4137c807296b (create_frame_xic): Fix initialization of automatic aggregates for pcc.
Dave Love <fx@gnu.org>
parents: 27502
diff changeset
2384 spot.x = 0; spot.y = 1;
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2385 /* Create X fontset. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2386 fontset = FRAME_FONTSET (f);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2387 if (fontset < 0)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2388 base_fontname = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2389 else
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2390 {
28229
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2391 /* Determine the base fontname from the ASCII font name of
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2392 FONTSET. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2393 char *ascii_font = (char *) SDATA (fontset_ascii (fontset));
28229
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2394 char *p = ascii_font;
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2395 int i;
28229
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2396
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2397 for (i = 0; *p; p++)
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2398 if (*p == '-') i++;
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2399 if (i != 14)
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2400 /* As the font name doesn't conform to XLFD, we can't
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2401 modify it to get a suitable base fontname for the
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2402 frame. */
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2403 base_fontname = "-*-*-*-r-normal--14-*-*-*-*-*-*-*";
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2404 else
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2405 {
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2406 int len = strlen (ascii_font) + 1;
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
2407 char *p1 = NULL;
28229
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2408
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2409 for (i = 0, p = ascii_font; i < 8; p++)
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2410 {
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2411 if (*p == '-')
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2412 {
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2413 i++;
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2414 if (i == 3)
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2415 p1 = p + 1;
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2416 }
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2417 }
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2418 base_fontname = (char *) alloca (len);
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2419 bzero (base_fontname, len);
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2420 strcpy (base_fontname, "-*-*-");
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2421 bcopy (p1, base_fontname + 5, p - p1);
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2422 strcat (base_fontname, "*-*-*-*-*-*-*");
5a0af67169a7 (Fx_create_frame): Don't cal fs_register_fontset.
Kenichi Handa <handa@m17n.org>
parents: 28199
diff changeset
2423 }
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2424 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2425 xfs = xic_create_xfontset (f, base_fontname);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2426
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2427 /* Determine XIC style. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2428 if (xic_style == 0)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2429 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2430 XIMStyles supported_list;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2431 supported_list.count_styles = (sizeof supported_xim_styles
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2432 / sizeof supported_xim_styles[0]);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2433 supported_list.supported_styles = supported_xim_styles;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2434 xic_style = best_xim_style (&supported_list,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2435 FRAME_X_XIM_STYLES (f));
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2436 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2437
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2438 preedit_attr = XVaCreateNestedList (0,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2439 XNFontSet, xfs,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2440 XNForeground,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2441 FRAME_FOREGROUND_PIXEL (f),
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2442 XNBackground,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2443 FRAME_BACKGROUND_PIXEL (f),
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2444 (xic_style & XIMPreeditPosition
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2445 ? XNSpotLocation
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2446 : NULL),
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2447 &spot,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2448 NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2449 status_attr = XVaCreateNestedList (0,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2450 XNArea,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2451 &s_area,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2452 XNFontSet,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2453 xfs,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2454 XNForeground,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2455 FRAME_FOREGROUND_PIXEL (f),
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2456 XNBackground,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2457 FRAME_BACKGROUND_PIXEL (f),
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2458 NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2459
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2460 xic = XCreateIC (xim,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2461 XNInputStyle, xic_style,
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
2462 XNClientWindow, FRAME_X_WINDOW (f),
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
2463 XNFocusWindow, FRAME_X_WINDOW (f),
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2464 XNStatusAttributes, status_attr,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2465 XNPreeditAttributes, preedit_attr,
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2466 NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2467 XFree (preedit_attr);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2468 XFree (status_attr);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2469 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2470
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2471 FRAME_XIC (f) = xic;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2472 FRAME_XIC_STYLE (f) = xic_style;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2473 FRAME_XIC_FONTSET (f) = xfs;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2474 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2475
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2476
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2477 /* Destroy XIC and free XIC fontset of frame F, if any. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2478
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2479 void
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2480 free_frame_xic (f)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2481 struct frame *f;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2482 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2483 if (FRAME_XIC (f) == NULL)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2484 return;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2485
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2486 XDestroyIC (FRAME_XIC (f));
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2487 if (FRAME_XIC_FONTSET (f))
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2488 XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2489
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2490 FRAME_XIC (f) = NULL;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2491 FRAME_XIC_FONTSET (f) = NULL;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2492 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2493
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2494
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2495 /* Place preedit area for XIC of window W's frame to specified
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2496 pixel position X/Y. X and Y are relative to window W. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2497
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2498 void
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2499 xic_set_preeditarea (w, x, y)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2500 struct window *w;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2501 int x, y;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2502 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2503 struct frame *f = XFRAME (w->frame);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2504 XVaNestedList attr;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2505 XPoint spot;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2506
52059
4b5692f6703a (xic_set_preeditarea): Add the left fringe width to spot.x.
Kenichi Handa <handa@m17n.org>
parents: 52015
diff changeset
2507 spot.x = WINDOW_TO_FRAME_PIXEL_X (w, x) + WINDOW_LEFT_FRINGE_WIDTH (w);
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2508 spot.y = WINDOW_TO_FRAME_PIXEL_Y (w, y) + FONT_BASE (FRAME_FONT (f));
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2509 attr = XVaCreateNestedList (0, XNSpotLocation, &spot, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2510 XSetICValues (FRAME_XIC (f), XNPreeditAttributes, attr, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2511 XFree (attr);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2512 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2513
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2514
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2515 /* Place status area for XIC in bottom right corner of frame F.. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2516
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2517 void
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2518 xic_set_statusarea (f)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2519 struct frame *f;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2520 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2521 XIC xic = FRAME_XIC (f);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2522 XVaNestedList attr;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2523 XRectangle area;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2524 XRectangle *needed;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2525
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2526 /* Negotiate geometry of status area. If input method has existing
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2527 status area, use its current size. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2528 area.x = area.y = area.width = area.height = 0;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2529 attr = XVaCreateNestedList (0, XNAreaNeeded, &area, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2530 XSetICValues (xic, XNStatusAttributes, attr, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2531 XFree (attr);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2532
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2533 attr = XVaCreateNestedList (0, XNAreaNeeded, &needed, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2534 XGetICValues (xic, XNStatusAttributes, attr, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2535 XFree (attr);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2536
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2537 if (needed->width == 0) /* Use XNArea instead of XNAreaNeeded */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2538 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2539 attr = XVaCreateNestedList (0, XNArea, &needed, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2540 XGetICValues (xic, XNStatusAttributes, attr, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2541 XFree (attr);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2542 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2543
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2544 area.width = needed->width;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2545 area.height = needed->height;
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2546 area.x = FRAME_PIXEL_WIDTH (f) - area.width - FRAME_INTERNAL_BORDER_WIDTH (f);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2547 area.y = (FRAME_PIXEL_HEIGHT (f) - area.height
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2548 - FRAME_MENUBAR_HEIGHT (f)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2549 - FRAME_TOOLBAR_HEIGHT (f)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2550 - FRAME_INTERNAL_BORDER_WIDTH (f));
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2551 XFree (needed);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2552
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2553 attr = XVaCreateNestedList (0, XNArea, &area, NULL);
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
2554 XSetICValues (xic, XNStatusAttributes, attr, NULL);
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2555 XFree (attr);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2556 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2557
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2558
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2559 /* Set X fontset for XIC of frame F, using base font name
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2560 BASE_FONTNAME. Called when a new Emacs fontset is chosen. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2561
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2562 void
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2563 xic_set_xfontset (f, base_fontname)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2564 struct frame *f;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2565 char *base_fontname;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2566 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2567 XVaNestedList attr;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2568 XFontSet xfs;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2569
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2570 xfs = xic_create_xfontset (f, base_fontname);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2571
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2572 attr = XVaCreateNestedList (0, XNFontSet, xfs, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2573 if (FRAME_XIC_STYLE (f) & XIMPreeditPosition)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2574 XSetICValues (FRAME_XIC (f), XNPreeditAttributes, attr, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2575 if (FRAME_XIC_STYLE (f) & XIMStatusArea)
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2576 XSetICValues (FRAME_XIC (f), XNStatusAttributes, attr, NULL);
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2577 XFree (attr);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2578
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2579 if (FRAME_XIC_FONTSET (f))
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2580 XFreeFontSet (FRAME_X_DISPLAY (f), FRAME_XIC_FONTSET (f));
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2581 FRAME_XIC_FONTSET (f) = xfs;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2582 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2583
27157
3dafddaefc2c (x_create_im): New function to set IM and IC of a frame.
Gerd Moellmann <gerd@gnu.org>
parents: 27153
diff changeset
2584 #endif /* HAVE_X_I18N */
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2585
27157
3dafddaefc2c (x_create_im): New function to set IM and IC of a frame.
Gerd Moellmann <gerd@gnu.org>
parents: 27153
diff changeset
2586
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2587
6790
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2588 #ifdef USE_X_TOOLKIT
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2589
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2590 /* Create and set up the X widget for frame F. */
5229
110539a25499 (Fx_list_fonts): Handle BROKEN_XLISTFONTSWITHINFO.
Richard M. Stallman <rms@gnu.org>
parents: 5193
diff changeset
2591
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2592 static void
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2593 x_window (f, window_prompting, minibuffer_only)
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2594 struct frame *f;
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2595 long window_prompting;
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2596 int minibuffer_only;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2597 {
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2598 XClassHint class_hints;
6059
0021cbdc591b (x_window): Call XChangeWindowAttributes with the standard
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6011
diff changeset
2599 XSetWindowAttributes attributes;
0021cbdc591b (x_window): Call XChangeWindowAttributes with the standard
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6011
diff changeset
2600 unsigned long attribute_mask;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2601 Widget shell_widget;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2602 Widget pane_widget;
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2603 Widget frame_widget;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2604 Arg al [25];
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2605 int ac;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2606
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2607 BLOCK_INPUT;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2608
11917
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
2609 /* Use the resource name as the top-level widget name
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
2610 for looking up resources. Make a non-Lisp copy
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
2611 for the window manager, so GC relocation won't bother it.
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
2612
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
2613 Elsewhere we specify the window name for the window manager. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2614
11496
db02849ee365 (x_window): Use (or reuse) frame's namebuf instead of a
Karl Heuer <kwzh@gnu.org>
parents: 11483
diff changeset
2615 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2616 char *str = (char *) SDATA (Vx_resource_name);
11917
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
2617 f->namebuf = (char *) xmalloc (strlen (str) + 1);
11496
db02849ee365 (x_window): Use (or reuse) frame's namebuf instead of a
Karl Heuer <kwzh@gnu.org>
parents: 11483
diff changeset
2618 strcpy (f->namebuf, str);
db02849ee365 (x_window): Use (or reuse) frame's namebuf instead of a
Karl Heuer <kwzh@gnu.org>
parents: 11483
diff changeset
2619 }
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2620
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2621 ac = 0;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2622 XtSetArg (al[ac], XtNallowShellResize, 1); ac++;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2623 XtSetArg (al[ac], XtNinput, 1); ac++;
11707
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2624 XtSetArg (al[ac], XtNmappedWhenManaged, 0); ac++;
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2625 XtSetArg (al[ac], XtNborderWidth, f->border_width); ac++;
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2626 XtSetArg (al[ac], XtNvisual, FRAME_X_VISUAL (f)); ac++;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2627 XtSetArg (al[ac], XtNdepth, FRAME_X_DISPLAY_INFO (f)->n_planes); ac++;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2628 XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++;
11496
db02849ee365 (x_window): Use (or reuse) frame's namebuf instead of a
Karl Heuer <kwzh@gnu.org>
parents: 11483
diff changeset
2629 shell_widget = XtAppCreateShell (f->namebuf, EMACS_CLASS,
12019
63ee64941021 (x_top_window_to_frame): Don't match menu-bar widget.
Karl Heuer <kwzh@gnu.org>
parents: 12011
diff changeset
2630 applicationShellWidgetClass,
9742
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
2631 FRAME_X_DISPLAY (f), al, ac);
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2632
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2633 f->output_data.x->widget = shell_widget;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2634 /* maybe_set_screen_title_format (shell_widget); */
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2635
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2636 pane_widget = lw_create_widget ("main", "pane", widget_id_tick++,
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2637 (widget_value *) NULL,
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2638 shell_widget, False,
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2639 (lw_callback) NULL,
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2640 (lw_callback) NULL,
27343
43230463dfcf (x_window): Call lw_create_widget with new parameter
Gerd Moellmann <gerd@gnu.org>
parents: 27157
diff changeset
2641 (lw_callback) NULL,
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2642 (lw_callback) NULL);
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2643
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2644 ac = 0;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2645 XtSetArg (al[ac], XtNvisual, FRAME_X_VISUAL (f)); ac++;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2646 XtSetArg (al[ac], XtNdepth, FRAME_X_DISPLAY_INFO (f)->n_planes); ac++;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2647 XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2648 XtSetValues (pane_widget, al, ac);
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2649 f->output_data.x->column_widget = pane_widget;
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2650
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2651 /* mappedWhenManaged to false tells to the paned window to not map/unmap
7040
cd4dd38925f9 (x_window): Test FRAME_EXTERNAL_MENU_BAR
Richard M. Stallman <rms@gnu.org>
parents: 6940
diff changeset
2652 the emacs screen when changing menubar. This reduces flickering. */
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2653
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2654 ac = 0;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2655 XtSetArg (al[ac], XtNmappedWhenManaged, 0); ac++;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2656 XtSetArg (al[ac], XtNshowGrip, 0); ac++;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2657 XtSetArg (al[ac], XtNallowResize, 1); ac++;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2658 XtSetArg (al[ac], XtNresizeToPreferred, 1); ac++;
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2659 XtSetArg (al[ac], XtNemacsFrame, f); ac++;
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2660 XtSetArg (al[ac], XtNvisual, FRAME_X_VISUAL (f)); ac++;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2661 XtSetArg (al[ac], XtNdepth, FRAME_X_DISPLAY_INFO (f)->n_planes); ac++;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2662 XtSetArg (al[ac], XtNcolormap, FRAME_X_COLORMAP (f)); ac++;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2663 frame_widget = XtCreateWidget (f->namebuf, emacsFrameClass, pane_widget,
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2664 al, ac);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2665
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2666 f->output_data.x->edit_widget = frame_widget;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2667
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2668 XtManageChild (frame_widget);
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2669
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2670 /* Do some needed geometry management. */
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2671 {
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2672 int len;
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2673 char *tem, shell_position[32];
53027
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2674 Arg al[10];
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2675 int ac = 0;
12190
e0abe30899a9 [USE_X_TOOLKIT] (x_window): If using Motif,
Karl Heuer <kwzh@gnu.org>
parents: 12111
diff changeset
2676 int extra_borders = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2677 int menubar_size
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2678 = (f->output_data.x->menubar_widget
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2679 ? (f->output_data.x->menubar_widget->core.height
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2680 + f->output_data.x->menubar_widget->core.border_width)
6790
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2681 : 0);
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2682
15942
ff30ec8aab54 (x_window): Don't add ibw to menubar_size.
Richard M. Stallman <rms@gnu.org>
parents: 15891
diff changeset
2683 #if 0 /* Experimentally, we now get the right results
ff30ec8aab54 (x_window): Don't add ibw to menubar_size.
Richard M. Stallman <rms@gnu.org>
parents: 15891
diff changeset
2684 for -geometry -0-0 without this. 24 Aug 96, rms. */
7969
7f15f77cb644 (x_window): Take account of pane widget internal border width.
Richard M. Stallman <rms@gnu.org>
parents: 7946
diff changeset
2685 if (FRAME_EXTERNAL_MENU_BAR (f))
7f15f77cb644 (x_window): Take account of pane widget internal border width.
Richard M. Stallman <rms@gnu.org>
parents: 7946
diff changeset
2686 {
9808
4c43c9dbe130 (x_window): Make ibw 0 by default.
Richard M. Stallman <rms@gnu.org>
parents: 9742
diff changeset
2687 Dimension ibw = 0;
7969
7f15f77cb644 (x_window): Take account of pane widget internal border width.
Richard M. Stallman <rms@gnu.org>
parents: 7946
diff changeset
2688 XtVaGetValues (pane_widget, XtNinternalBorderWidth, &ibw, NULL);
7f15f77cb644 (x_window): Take account of pane widget internal border width.
Richard M. Stallman <rms@gnu.org>
parents: 7946
diff changeset
2689 menubar_size += ibw;
7f15f77cb644 (x_window): Take account of pane widget internal border width.
Richard M. Stallman <rms@gnu.org>
parents: 7946
diff changeset
2690 }
15942
ff30ec8aab54 (x_window): Don't add ibw to menubar_size.
Richard M. Stallman <rms@gnu.org>
parents: 15891
diff changeset
2691 #endif
7969
7f15f77cb644 (x_window): Take account of pane widget internal border width.
Richard M. Stallman <rms@gnu.org>
parents: 7946
diff changeset
2692
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2693 f->output_data.x->menubar_height = menubar_size;
11897
cbd3724a9696 (x_window) [both versions]: Set menubar_height.
Karl Heuer <kwzh@gnu.org>
parents: 11894
diff changeset
2694
16305
00e57c8adaba (x_window): With Motif, double extra_borders.
Richard M. Stallman <rms@gnu.org>
parents: 16302
diff changeset
2695 #ifndef USE_LUCID
12190
e0abe30899a9 [USE_X_TOOLKIT] (x_window): If using Motif,
Karl Heuer <kwzh@gnu.org>
parents: 12111
diff changeset
2696 /* Motif seems to need this amount added to the sizes
e0abe30899a9 [USE_X_TOOLKIT] (x_window): If using Motif,
Karl Heuer <kwzh@gnu.org>
parents: 12111
diff changeset
2697 specified for the shell widget. The Athena/Lucid widgets don't.
e0abe30899a9 [USE_X_TOOLKIT] (x_window): If using Motif,
Karl Heuer <kwzh@gnu.org>
parents: 12111
diff changeset
2698 Both conclusions reached experimentally. -- rms. */
16305
00e57c8adaba (x_window): With Motif, double extra_borders.
Richard M. Stallman <rms@gnu.org>
parents: 16302
diff changeset
2699 XtVaGetValues (f->output_data.x->edit_widget, XtNinternalBorderWidth,
00e57c8adaba (x_window): With Motif, double extra_borders.
Richard M. Stallman <rms@gnu.org>
parents: 16302
diff changeset
2700 &extra_borders, NULL);
00e57c8adaba (x_window): With Motif, double extra_borders.
Richard M. Stallman <rms@gnu.org>
parents: 16302
diff changeset
2701 extra_borders *= 2;
00e57c8adaba (x_window): With Motif, double extra_borders.
Richard M. Stallman <rms@gnu.org>
parents: 16302
diff changeset
2702 #endif
12190
e0abe30899a9 [USE_X_TOOLKIT] (x_window): If using Motif,
Karl Heuer <kwzh@gnu.org>
parents: 12111
diff changeset
2703
11707
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2704 /* Convert our geometry parameters into a geometry string
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2705 and specify it.
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2706 Note that we do not specify here whether the position
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2707 is a user-specified or program-specified one.
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2708 We pass that information later, in x_wm_set_size_hints. */
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2709 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2710 int left = f->left_pos;
11707
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2711 int xneg = window_prompting & XNegative;
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2712 int top = f->top_pos;
11707
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2713 int yneg = window_prompting & YNegative;
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2714 if (xneg)
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2715 left = -left;
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2716 if (yneg)
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2717 top = -top;
11893
1f70ffad3d6d [USE_X_TOOLKIT] (x_window): Pass position to toolkit
Karl Heuer <kwzh@gnu.org>
parents: 11882
diff changeset
2718
1f70ffad3d6d [USE_X_TOOLKIT] (x_window): Pass position to toolkit
Karl Heuer <kwzh@gnu.org>
parents: 11882
diff changeset
2719 if (window_prompting & USPosition)
12190
e0abe30899a9 [USE_X_TOOLKIT] (x_window): If using Motif,
Karl Heuer <kwzh@gnu.org>
parents: 12111
diff changeset
2720 sprintf (shell_position, "=%dx%d%c%d%c%d",
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2721 FRAME_PIXEL_WIDTH (f) + extra_borders,
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2722 FRAME_PIXEL_HEIGHT (f) + menubar_size + extra_borders,
11893
1f70ffad3d6d [USE_X_TOOLKIT] (x_window): Pass position to toolkit
Karl Heuer <kwzh@gnu.org>
parents: 11882
diff changeset
2723 (xneg ? '-' : '+'), left,
1f70ffad3d6d [USE_X_TOOLKIT] (x_window): Pass position to toolkit
Karl Heuer <kwzh@gnu.org>
parents: 11882
diff changeset
2724 (yneg ? '-' : '+'), top);
1f70ffad3d6d [USE_X_TOOLKIT] (x_window): Pass position to toolkit
Karl Heuer <kwzh@gnu.org>
parents: 11882
diff changeset
2725 else
53027
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2726 {
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2727 sprintf (shell_position, "=%dx%d",
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2728 FRAME_PIXEL_WIDTH (f) + extra_borders,
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2729 FRAME_PIXEL_HEIGHT (f) + menubar_size + extra_borders);
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2730
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2731 /* Setting x and y when the position is not specified in
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2732 the geometry string will set program position in the WM hints.
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2733 If Emacs had just one program position, we could set it in
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2734 fallback resources, but since each make-frame call can specify
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2735 different program positions, this is easier. */
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2736 XtSetArg (al[ac], XtNx, left); ac++;
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2737 XtSetArg (al[ac], XtNy, top); ac++;
8ea9dad9855f * xfns.c (x_window): Set XtNx and XtNy in shell widget for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52763
diff changeset
2738 }
11707
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2739 }
b0cb8129be58 [USE_X_TOOLKIT] (x_window): Always pass position in geometry.
Richard M. Stallman <rms@gnu.org>
parents: 11611
diff changeset
2740
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2741 len = strlen (shell_position) + 1;
17579
8dd146dbe737 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17556
diff changeset
2742 /* We don't free this because we don't know whether
8dd146dbe737 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17556
diff changeset
2743 it is safe to free it while the frame exists.
8dd146dbe737 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17556
diff changeset
2744 It isn't worth the trouble of arranging to free it
8dd146dbe737 Comment change.
Richard M. Stallman <rms@gnu.org>
parents: 17556
diff changeset
2745 when the frame is deleted. */
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2746 tem = (char *) xmalloc (len);
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2747 strncpy (tem, shell_position, len);
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2748 XtSetArg (al[ac], XtNgeometry, tem); ac++;
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2749 XtSetValues (shell_widget, al, ac);
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2750 }
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
2751
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2752 XtManageChild (pane_widget);
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2753 XtRealizeWidget (shell_widget);
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2754
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2755 FRAME_X_WINDOW (f) = XtWindow (frame_widget);
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2756
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2757 validate_x_resource_name ();
11917
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
2758
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2759 class_hints.res_name = (char *) SDATA (Vx_resource_name);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2760 class_hints.res_class = (char *) SDATA (Vx_resource_class);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2761 XSetClassHint (FRAME_X_DISPLAY (f), XtWindow (shell_widget), &class_hints);
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2762
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2763 #ifdef HAVE_X_I18N
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2764 FRAME_XIC (f) = NULL;
51130
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2765 if (use_xim)
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2766 create_frame_xic (f);
29947
b7556fa4c05b (x_window) [!USE_XIM]: Don't call create_frame_ic.
Gerd Moellmann <gerd@gnu.org>
parents: 29938
diff changeset
2767 #endif
13227
d8af44485b3c (x_window, both versions): Add HAVE_X_I18N support.
Richard M. Stallman <rms@gnu.org>
parents: 13083
diff changeset
2768
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2769 f->output_data.x->wm_hints.input = True;
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2770 f->output_data.x->wm_hints.flags |= InputHint;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2771 XSetWMHints (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2772 &f->output_data.x->wm_hints);
7172
f9eeb75c2b76 (x_window) [USE_X_TOOLKIT]: Call XSetWMHints.
Richard M. Stallman <rms@gnu.org>
parents: 7040
diff changeset
2773
9703
85ac0e4030d4 (x_window): Pass new arg f to hack_wm_protocols.
Richard M. Stallman <rms@gnu.org>
parents: 9690
diff changeset
2774 hack_wm_protocols (f, shell_widget);
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2775
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2776 #ifdef HACK_EDITRES
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2777 XtAddEventHandler (shell_widget, 0, True, _XEditResCheckMessages, 0);
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2778 #endif
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2779
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2780 /* Do a stupid property change to force the server to generate a
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
2781 PropertyNotify event so that the event_stream server timestamp will
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2782 be initialized to something relevant to the time we created the window.
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2783 */
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2784 XChangeProperty (XtDisplay (frame_widget), XtWindow (frame_widget),
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2785 FRAME_X_DISPLAY_INFO (f)->Xatom_wm_protocols,
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2786 XA_ATOM, 32, PropModeAppend,
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2787 (unsigned char*) NULL, 0);
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2788
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2789 /* Make all the standard events reach the Emacs frame. */
6059
0021cbdc591b (x_window): Call XChangeWindowAttributes with the standard
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6011
diff changeset
2790 attributes.event_mask = STANDARD_EVENT_SET;
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2791
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2792 #ifdef HAVE_X_I18N
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2793 if (FRAME_XIC (f))
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2794 {
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2795 /* XIM server might require some X events. */
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2796 unsigned long fevent = NoEventMask;
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
2797 XGetICValues (FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2798 attributes.event_mask |= fevent;
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2799 }
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2800 #endif /* HAVE_X_I18N */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2801
6059
0021cbdc591b (x_window): Call XChangeWindowAttributes with the standard
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6011
diff changeset
2802 attribute_mask = CWEventMask;
0021cbdc591b (x_window): Call XChangeWindowAttributes with the standard
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6011
diff changeset
2803 XChangeWindowAttributes (XtDisplay (shell_widget), XtWindow (shell_widget),
0021cbdc591b (x_window): Call XChangeWindowAttributes with the standard
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6011
diff changeset
2804 attribute_mask, &attributes);
0021cbdc591b (x_window): Call XChangeWindowAttributes with the standard
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6011
diff changeset
2805
9231
eeb35369e536 (HACK_EDITRES): Declare if using X11R5.
Paul Reilly <pmr@pajato.com>
parents: 9182
diff changeset
2806 XtMapWidget (frame_widget);
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2807
6790
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2808 /* x_set_name normally ignores requests to set the name if the
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2809 requested name is the same as the current name. This is the one
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2810 place where that assumption isn't correct; f->name is set, but
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2811 the X server hasn't been told. */
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2812 {
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2813 Lisp_Object name;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2814 int explicit = f->explicit_name;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2815
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2816 f->explicit_name = 0;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2817 name = f->name;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2818 f->name = Qnil;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2819 x_set_name (f, name, explicit);
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2820 }
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2821
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2822 XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2823 f->output_data.x->text_cursor);
6790
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2824
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2825 UNBLOCK_INPUT;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2826
25320
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
2827 /* This is a no-op, except under Motif. Make sure main areas are
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
2828 set to something reasonable, in case we get an error later. */
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
2829 lw_set_main_areas (pane_widget, 0, frame_widget);
6790
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2830 }
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2831
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2832 #else /* not USE_X_TOOLKIT */
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2833 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2834 void
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2835 x_window (f)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2836 FRAME_PTR f;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2837 {
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2838 if (! xg_create_frame_widgets (f))
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2839 error ("Unable to create window");
49434
a4d0ee33dcce Fix input methods for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49322
diff changeset
2840
a4d0ee33dcce Fix input methods for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49322
diff changeset
2841 #ifdef HAVE_X_I18N
a4d0ee33dcce Fix input methods for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49322
diff changeset
2842 FRAME_XIC (f) = NULL;
51130
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2843 if (use_xim)
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2844 {
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2845 BLOCK_INPUT;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2846 create_frame_xic (f);
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2847 if (FRAME_XIC (f))
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2848 {
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2849 /* XIM server might require some X events. */
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2850 unsigned long fevent = NoEventMask;
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
2851 XGetICValues (FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
51130
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2852
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2853 if (fevent != NoEventMask)
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2854 {
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2855 XSetWindowAttributes attributes;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2856 XWindowAttributes wattr;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2857 unsigned long attribute_mask;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2858
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2859 XGetWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2860 &wattr);
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2861 attributes.event_mask = wattr.your_event_mask | fevent;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2862 attribute_mask = CWEventMask;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2863 XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2864 attribute_mask, &attributes);
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2865 }
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2866 }
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2867 UNBLOCK_INPUT;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2868 }
49434
a4d0ee33dcce Fix input methods for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49322
diff changeset
2869 #endif
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2870 }
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2871
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2872 #else /*! USE_GTK */
6790
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2873 /* Create and set up the X window for frame F. */
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2874
21846
486ac68ce051 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21779
diff changeset
2875 void
6790
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2876 x_window (f)
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2877 struct frame *f;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2878
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2879 {
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2880 XClassHint class_hints;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2881 XSetWindowAttributes attributes;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2882 unsigned long attribute_mask;
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2883
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2884 attributes.background_pixel = f->output_data.x->background_pixel;
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2885 attributes.border_pixel = f->output_data.x->border_pixel;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2886 attributes.bit_gravity = StaticGravity;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2887 attributes.backing_store = NotUseful;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2888 attributes.save_under = True;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2889 attributes.event_mask = STANDARD_EVENT_SET;
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2890 attributes.colormap = FRAME_X_COLORMAP (f);
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2891 attribute_mask = (CWBackPixel | CWBorderPixel | CWBitGravity | CWEventMask
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
2892 | CWColormap);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2893
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2894 BLOCK_INPUT;
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
2895 FRAME_X_WINDOW (f)
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2896 = XCreateWindow (FRAME_X_DISPLAY (f),
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2897 f->output_data.x->parent_desc,
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2898 f->left_pos,
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2899 f->top_pos,
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2900 FRAME_PIXEL_WIDTH (f), FRAME_PIXEL_HEIGHT (f),
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
2901 f->border_width,
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2902 CopyFromParent, /* depth */
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2903 InputOutput, /* class */
28144
71ebba3566ec (X_I18N_INHIBITED): Don't define.
Gerd Moellmann <gerd@gnu.org>
parents: 28096
diff changeset
2904 FRAME_X_VISUAL (f),
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2905 attribute_mask, &attributes);
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2906
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2907 #ifdef HAVE_X_I18N
51175
a072cc265dff (x_window): Fix typo.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 51130
diff changeset
2908 if (use_xim)
51130
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2909 {
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2910 create_frame_xic (f);
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2911 if (FRAME_XIC (f))
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2912 {
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2913 /* XIM server might require some X events. */
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2914 unsigned long fevent = NoEventMask;
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
2915 XGetICValues (FRAME_XIC (f), XNFilterEvents, &fevent, NULL);
51130
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2916 attributes.event_mask |= fevent;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2917 attribute_mask = CWEventMask;
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2918 XChangeWindowAttributes (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2919 attribute_mask, &attributes);
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2920 }
0e2a60d0ca7b (x_window, x_window): Use use_xim.
Dave Love <fx@gnu.org>
parents: 50392
diff changeset
2921 }
27502
52e8cb1333f2 (xic_set_preeditarea): Take window parameter and
Gerd Moellmann <gerd@gnu.org>
parents: 27343
diff changeset
2922 #endif /* HAVE_X_I18N */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
2923
4146
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
2924 validate_x_resource_name ();
11917
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
2925
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2926 class_hints.res_name = (char *) SDATA (Vx_resource_name);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
2927 class_hints.res_class = (char *) SDATA (Vx_resource_class);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2928 XSetClassHint (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), &class_hints);
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
2929
11897
cbd3724a9696 (x_window) [both versions]: Set menubar_height.
Karl Heuer <kwzh@gnu.org>
parents: 11894
diff changeset
2930 /* The menubar is part of the ordinary display;
cbd3724a9696 (x_window) [both versions]: Set menubar_height.
Karl Heuer <kwzh@gnu.org>
parents: 11894
diff changeset
2931 it does not count in addition to the height of the window. */
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2932 f->output_data.x->menubar_height = 0;
11897
cbd3724a9696 (x_window) [both versions]: Set menubar_height.
Karl Heuer <kwzh@gnu.org>
parents: 11894
diff changeset
2933
1719
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
2934 /* This indicates that we use the "Passive Input" input model.
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
2935 Unless we do this, we don't get the Focus{In,Out} events that we
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
2936 need to draw the cursor correctly. Accursed bureaucrats.
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2937 XWhipsAndChains (FRAME_X_DISPLAY (f), IronMaiden, &TheRack); */
1719
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
2938
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2939 f->output_data.x->wm_hints.input = True;
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2940 f->output_data.x->wm_hints.flags |= InputHint;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2941 XSetWMHints (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2942 &f->output_data.x->wm_hints);
15081
ab8c81feacf9 (x_window) [! USE_X_TOOLKIT]: Initialize wm_hints.icon_pixmap.
Richard M. Stallman <rms@gnu.org>
parents: 15079
diff changeset
2943 f->output_data.x->wm_hints.icon_pixmap = None;
7860
26a1d7b2670b (x_window): Request "save yourself" commands.
Richard M. Stallman <rms@gnu.org>
parents: 7802
diff changeset
2944
26a1d7b2670b (x_window): Request "save yourself" commands.
Richard M. Stallman <rms@gnu.org>
parents: 7802
diff changeset
2945 /* Request "save yourself" and "delete window" commands from wm. */
26a1d7b2670b (x_window): Request "save yourself" commands.
Richard M. Stallman <rms@gnu.org>
parents: 7802
diff changeset
2946 {
26a1d7b2670b (x_window): Request "save yourself" commands.
Richard M. Stallman <rms@gnu.org>
parents: 7802
diff changeset
2947 Atom protocols[2];
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2948 protocols[0] = FRAME_X_DISPLAY_INFO (f)->Xatom_wm_delete_window;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2949 protocols[1] = FRAME_X_DISPLAY_INFO (f)->Xatom_wm_save_yourself;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2950 XSetWMProtocols (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), protocols, 2);
7860
26a1d7b2670b (x_window): Request "save yourself" commands.
Richard M. Stallman <rms@gnu.org>
parents: 7802
diff changeset
2951 }
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2952
817
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2953 /* x_set_name normally ignores requests to set the name if the
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2954 requested name is the same as the current name. This is the one
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2955 place where that assumption isn't correct; f->name is set, but
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2956 the X server hasn't been told. */
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2957 {
6519
22c56514eeb3 (x_set_frame_parameters, x_get_arg, x_window, Fx_create_frame,
Karl Heuer <kwzh@gnu.org>
parents: 6506
diff changeset
2958 Lisp_Object name;
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
2959 int explicit = f->explicit_name;
817
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2960
6519
22c56514eeb3 (x_set_frame_parameters, x_get_arg, x_window, Fx_create_frame,
Karl Heuer <kwzh@gnu.org>
parents: 6506
diff changeset
2961 f->explicit_name = 0;
22c56514eeb3 (x_set_frame_parameters, x_get_arg, x_window, Fx_create_frame,
Karl Heuer <kwzh@gnu.org>
parents: 6506
diff changeset
2962 name = f->name;
817
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2963 f->name = Qnil;
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
2964 x_set_name (f, name, explicit);
817
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2965 }
1dd126823b36 *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 771
diff changeset
2966
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2967 XDefineCursor (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
2968 f->output_data.x->text_cursor);
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2969
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2970 UNBLOCK_INPUT;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2971
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
2972 if (FRAME_X_WINDOW (f) == 0)
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
2973 error ("Unable to create window");
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2974 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2975
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
2976 #endif /* not USE_GTK */
6790
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2977 #endif /* not USE_X_TOOLKIT */
ee8090b47ea6 (x_figure_window_size): Don't call x_calc_absolute_position.
Richard M. Stallman <rms@gnu.org>
parents: 6783
diff changeset
2978
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2979 /* Handle the icon stuff for this window. Perhaps later we might
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2980 want an x_set_icon_position which can be called interactively as
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2981 well. */
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2982
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2983 static void
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
2984 x_icon (f, parms)
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
2985 struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2986 Lisp_Object parms;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2987 {
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
2988 Lisp_Object icon_x, icon_y;
17779
094e5efd262d (Fx_create_frame): Get X resources from the display
Richard M. Stallman <rms@gnu.org>
parents: 17722
diff changeset
2989 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2990
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2991 /* Set the position of the icon. Note that twm groups all
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
2992 icons in an icon window. */
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2993 icon_x = x_frame_get_and_record_arg (f, parms, Qicon_left, 0, 0, RES_TYPE_NUMBER);
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
2994 icon_y = x_frame_get_and_record_arg (f, parms, Qicon_top, 0, 0, RES_TYPE_NUMBER);
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
2995 if (!EQ (icon_x, Qunbound) && !EQ (icon_y, Qunbound))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2996 {
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
2997 CHECK_NUMBER (icon_x);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
2998 CHECK_NUMBER (icon_y);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
2999 }
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3000 else if (!EQ (icon_x, Qunbound) || !EQ (icon_y, Qunbound))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3001 error ("Both left and top icon corners of icon must be specified");
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3002
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3003 BLOCK_INPUT;
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3004
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
3005 if (! EQ (icon_x, Qunbound))
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
3006 x_wm_set_icon_position (f, XINT (icon_x), XINT (icon_y));
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3007
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3008 /* Start up iconic or window? */
2294
9bce20507666 Use the `visiblity' parameter to determine the initial state of
Jim Blandy <jimb@redhat.com>
parents: 2283
diff changeset
3009 x_wm_set_window_state
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3010 (f, (EQ (x_get_arg (dpyinfo, parms, Qvisibility, 0, 0, RES_TYPE_SYMBOL),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3011 Qicon)
2294
9bce20507666 Use the `visiblity' parameter to determine the initial state of
Jim Blandy <jimb@redhat.com>
parents: 2283
diff changeset
3012 ? IconicState
9bce20507666 Use the `visiblity' parameter to determine the initial state of
Jim Blandy <jimb@redhat.com>
parents: 2283
diff changeset
3013 : NormalState));
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3014
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
3015 x_text_icon (f, (char *) SDATA ((!NILP (f->icon_name)
12276
2e376a4397bc (x_report_frame_params, x_set_icon_type, x_set_icon_name)
Richard M. Stallman <rms@gnu.org>
parents: 12209
diff changeset
3016 ? f->icon_name
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
3017 : f->name)));
12073
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
3018
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3019 UNBLOCK_INPUT;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3020 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3021
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
3022 /* Make the GCs needed for this window, setting the
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3023 background, border and mouse colors; also create the
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3024 mouse cursor and the gray border tile. */
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3025
1018
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
3026 static char cursor_bits[] =
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
3027 {
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
3028 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
3029 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
3030 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
3031 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
3032 };
5fd29acd3db7 * xfns.c (x_set_name): Take new argument EXPLICIT, instead of
Jim Blandy <jimb@redhat.com>
parents: 974
diff changeset
3033
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3034 static void
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3035 x_make_gc (f)
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3036 struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3037 {
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3038 XGCValues gc_values;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3039
2341
1982e2983822 * xfns.c (x_make_gc): Don't forget to block X input around the
Jim Blandy <jimb@redhat.com>
parents: 2328
diff changeset
3040 BLOCK_INPUT;
1982e2983822 * xfns.c (x_make_gc): Don't forget to block X input around the
Jim Blandy <jimb@redhat.com>
parents: 2328
diff changeset
3041
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
3042 /* Create the GCs of this frame.
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
3043 Note that many default values are used. */
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3044
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3045 /* Normal video */
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3046 gc_values.font = FRAME_FONT (f)->fid;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3047 gc_values.foreground = f->output_data.x->foreground_pixel;
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3048 gc_values.background = f->output_data.x->background_pixel;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
3049 gc_values.line_width = 0; /* Means 1 using fast algorithm. */
34321
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3050 f->output_data.x->normal_gc
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3051 = XCreateGC (FRAME_X_DISPLAY (f),
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3052 FRAME_X_WINDOW (f),
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3053 GCLineWidth | GCFont | GCForeground | GCBackground,
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3054 &gc_values);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3055
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3056 /* Reverse video style. */
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3057 gc_values.foreground = f->output_data.x->background_pixel;
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3058 gc_values.background = f->output_data.x->foreground_pixel;
34321
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3059 f->output_data.x->reverse_gc
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3060 = XCreateGC (FRAME_X_DISPLAY (f),
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3061 FRAME_X_WINDOW (f),
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3062 GCFont | GCForeground | GCBackground | GCLineWidth,
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3063 &gc_values);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3064
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
3065 /* Cursor has cursor-color background, background-color foreground. */
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3066 gc_values.foreground = f->output_data.x->background_pixel;
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3067 gc_values.background = f->output_data.x->cursor_pixel;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3068 gc_values.fill_style = FillOpaqueStippled;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3069 gc_values.stipple
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3070 = XCreateBitmapFromData (FRAME_X_DISPLAY (f),
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3071 FRAME_X_DISPLAY_INFO (f)->root_window,
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3072 cursor_bits, 16, 16);
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3073 f->output_data.x->cursor_gc
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3074 = XCreateGC (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3075 (GCFont | GCForeground | GCBackground
24905
2c79eecad64d (x_make_gc): Turn off GCStipple when setting up cursor_gc.
Richard M. Stallman <rms@gnu.org>
parents: 24677
diff changeset
3076 | GCFillStyle /* | GCStipple */ | GCLineWidth),
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3077 &gc_values);
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3078
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3079 /* Reliefs. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3080 f->output_data.x->white_relief.gc = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3081 f->output_data.x->black_relief.gc = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3082
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3083 /* Create the gray border tile used when the pointer is not in
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3084 the frame. Since this depends on the frame's pixel values,
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
3085 this must be done on a per-frame basis. */
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3086 f->output_data.x->border_tile
2136
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
3087 = (XCreatePixmapFromBitmapData
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3088 (FRAME_X_DISPLAY (f), FRAME_X_DISPLAY_INFO (f)->root_window,
2136
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
3089 gray_bits, gray_width, gray_height,
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3090 f->output_data.x->foreground_pixel,
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3091 f->output_data.x->background_pixel,
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
3092 DefaultDepth (FRAME_X_DISPLAY (f), FRAME_X_SCREEN_NUMBER (f))));
2341
1982e2983822 * xfns.c (x_make_gc): Don't forget to block X input around the
Jim Blandy <jimb@redhat.com>
parents: 2328
diff changeset
3093
1982e2983822 * xfns.c (x_make_gc): Don't forget to block X input around the
Jim Blandy <jimb@redhat.com>
parents: 2328
diff changeset
3094 UNBLOCK_INPUT;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3095 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3096
34321
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3097
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3098 /* Free what was was allocated in x_make_gc. */
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3099
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3100 void
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3101 x_free_gcs (f)
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3102 struct frame *f;
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3103 {
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3104 Display *dpy = FRAME_X_DISPLAY (f);
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3105
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3106 BLOCK_INPUT;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3107
34321
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3108 if (f->output_data.x->normal_gc)
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3109 {
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3110 XFreeGC (dpy, f->output_data.x->normal_gc);
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3111 f->output_data.x->normal_gc = 0;
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3112 }
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3113
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3114 if (f->output_data.x->reverse_gc)
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3115 {
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3116 XFreeGC (dpy, f->output_data.x->reverse_gc);
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3117 f->output_data.x->reverse_gc = 0;
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3118 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3119
34321
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3120 if (f->output_data.x->cursor_gc)
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3121 {
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3122 XFreeGC (dpy, f->output_data.x->cursor_gc);
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3123 f->output_data.x->cursor_gc = 0;
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3124 }
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3125
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3126 if (f->output_data.x->border_tile)
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3127 {
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3128 XFreePixmap (dpy, f->output_data.x->border_tile);
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3129 f->output_data.x->border_tile = 0;
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3130 }
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3131
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3132 UNBLOCK_INPUT;
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3133 }
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3134
41ecc8525dbc (x_free_gcs): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 33994
diff changeset
3135
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3136 /* Handler for signals raised during x_create_frame and
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3137 x_create_top_frame. FRAME is the frame which is partially
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3138 constructed. */
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3139
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3140 static Lisp_Object
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3141 unwind_create_frame (frame)
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3142 Lisp_Object frame;
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3143 {
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3144 struct frame *f = XFRAME (frame);
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3145
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3146 /* If frame is ``official'', nothing to do. */
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3147 if (!CONSP (Vframe_list) || !EQ (XCAR (Vframe_list), frame))
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3148 {
34895
53e52b3525bf Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34662
diff changeset
3149 #if GLYPH_DEBUG
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3150 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3151 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3152
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3153 x_free_frame_resources (f);
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3154
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3155 /* Check that reference counts are indeed correct. */
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3156 xassert (dpyinfo->reference_count == dpyinfo_refcount);
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3157 xassert (dpyinfo->image_cache->refcount == image_cache_refcount);
34638
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
3158 return Qt;
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3159 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3160
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3161 return Qnil;
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3162 }
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3163
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3164
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3165 DEFUN ("x-create-frame", Fx_create_frame, Sx_create_frame,
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3166 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3167 doc: /* Make a new X window, which is called a "frame" in Emacs terms.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3168 Returns an Emacs frame object.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3169 ALIST is an alist of frame parameters.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3170 If the parameters specify that the frame should not have a minibuffer,
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3171 and do not specify a specific minibuffer window to use,
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3172 then `default-minibuffer-frame' must be a frame whose minibuffer can
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3173 be shared by the new frame.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3174
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3175 This function is an internal primitive--use `make-frame' instead. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3176 (parms)
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3177 Lisp_Object parms;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3178 {
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3179 struct frame *f;
6935
675e4ec5f14f (Fx_create_frame): Delete excess args to x_wm_set_size_hint.
Richard M. Stallman <rms@gnu.org>
parents: 6882
diff changeset
3180 Lisp_Object frame, tem;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3181 Lisp_Object name;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3182 int minibuffer_only = 0;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3183 long window_prompting = 0;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3184 int width, height;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45968
diff changeset
3185 int count = SPECPDL_INDEX ();
15566
3d03a3fb8757 (Fx_create_frame): Gcpro parms, parent, and name.
Richard M. Stallman <rms@gnu.org>
parents: 15495
diff changeset
3186 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3187 Lisp_Object display;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3188 struct x_display_info *dpyinfo = NULL;
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3189 Lisp_Object parent;
11774
0b5cb5170084 (Fx_create_frame): Pass kb to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11772
diff changeset
3190 struct kboard *kb;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3191
2999
33c820044087 (check_x): New function.
Richard M. Stallman <rms@gnu.org>
parents: 2964
diff changeset
3192 check_x ();
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3193
11917
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
3194 /* Use this general default value to start with
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
3195 until we know if this frame has a specified name. */
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
3196 Vx_resource_name = Vinvocation_name;
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
3197
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3198 display = x_get_arg (dpyinfo, parms, Qdisplay, 0, 0, RES_TYPE_STRING);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3199 if (EQ (display, Qunbound))
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3200 display = Qnil;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3201 dpyinfo = check_x_display_info (display);
11774
0b5cb5170084 (Fx_create_frame): Pass kb to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11772
diff changeset
3202 #ifdef MULTI_KBOARD
0b5cb5170084 (Fx_create_frame): Pass kb to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11772
diff changeset
3203 kb = dpyinfo->kboard;
0b5cb5170084 (Fx_create_frame): Pass kb to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11772
diff changeset
3204 #else
0b5cb5170084 (Fx_create_frame): Pass kb to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11772
diff changeset
3205 kb = &the_only_kboard;
0b5cb5170084 (Fx_create_frame): Pass kb to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11772
diff changeset
3206 #endif
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3207
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3208 name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
9103
948e8acb6990 (x_set_frame_parameters, x_set_menu_bar_lines, Fx_create_frame,
Karl Heuer <kwzh@gnu.org>
parents: 9022
diff changeset
3209 if (!STRINGP (name)
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3210 && ! EQ (name, Qunbound)
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3211 && ! NILP (name))
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3212 error ("Invalid frame name--not a string or nil");
398
a60eafebd43f *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 389
diff changeset
3213
11917
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
3214 if (STRINGP (name))
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
3215 Vx_resource_name = name;
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
3216
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3217 /* See if parent window is specified. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3218 parent = x_get_arg (dpyinfo, parms, Qparent_id, NULL, NULL, RES_TYPE_NUMBER);
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3219 if (EQ (parent, Qunbound))
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3220 parent = Qnil;
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3221 if (! NILP (parent))
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
3222 CHECK_NUMBER (parent);
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3223
15566
3d03a3fb8757 (Fx_create_frame): Gcpro parms, parent, and name.
Richard M. Stallman <rms@gnu.org>
parents: 15495
diff changeset
3224 /* make_frame_without_minibuffer can run Lisp code and garbage collect. */
3d03a3fb8757 (Fx_create_frame): Gcpro parms, parent, and name.
Richard M. Stallman <rms@gnu.org>
parents: 15495
diff changeset
3225 /* No need to protect DISPLAY because that's not used after passing
3d03a3fb8757 (Fx_create_frame): Gcpro parms, parent, and name.
Richard M. Stallman <rms@gnu.org>
parents: 15495
diff changeset
3226 it to make_frame_without_minibuffer. */
3d03a3fb8757 (Fx_create_frame): Gcpro parms, parent, and name.
Richard M. Stallman <rms@gnu.org>
parents: 15495
diff changeset
3227 frame = Qnil;
3d03a3fb8757 (Fx_create_frame): Gcpro parms, parent, and name.
Richard M. Stallman <rms@gnu.org>
parents: 15495
diff changeset
3228 GCPRO4 (parms, parent, name, frame);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3229 tem = x_get_arg (dpyinfo, parms, Qminibuffer, "minibuffer", "Minibuffer",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3230 RES_TYPE_SYMBOL);
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3231 if (EQ (tem, Qnone) || NILP (tem))
12011
854e396aabed (Fx_create_frame): Pass new arg to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11989
diff changeset
3232 f = make_frame_without_minibuffer (Qnil, kb, display);
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3233 else if (EQ (tem, Qonly))
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3234 {
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3235 f = make_minibuffer_frame ();
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3236 minibuffer_only = 1;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3237 }
9103
948e8acb6990 (x_set_frame_parameters, x_set_menu_bar_lines, Fx_create_frame,
Karl Heuer <kwzh@gnu.org>
parents: 9022
diff changeset
3238 else if (WINDOWP (tem))
12011
854e396aabed (Fx_create_frame): Pass new arg to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11989
diff changeset
3239 f = make_frame_without_minibuffer (tem, kb, display);
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3240 else
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3241 f = make_frame (1);
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3242
15566
3d03a3fb8757 (Fx_create_frame): Gcpro parms, parent, and name.
Richard M. Stallman <rms@gnu.org>
parents: 15495
diff changeset
3243 XSETFRAME (frame, f);
3d03a3fb8757 (Fx_create_frame): Gcpro parms, parent, and name.
Richard M. Stallman <rms@gnu.org>
parents: 15495
diff changeset
3244
1994
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1932
diff changeset
3245 /* Note that X Windows does support scroll bars. */
73ce9dd21093 Use the term `scroll bar', instead of `scrollbar'.
Jim Blandy <jimb@redhat.com>
parents: 1932
diff changeset
3246 FRAME_CAN_HAVE_SCROLL_BARS (f) = 1;
1719
48f539ac6921 * frame.h (struct frame): New fields `can_have_scrollbars' and
Jim Blandy <jimb@redhat.com>
parents: 1657
diff changeset
3247
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 53339
diff changeset
3248 f->display_method = &x_display_method;
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3249 f->output_method = output_x_window;
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3250 f->output_data.x = (struct x_output *) xmalloc (sizeof (struct x_output));
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3251 bzero (f->output_data.x, sizeof (struct x_output));
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3252 f->output_data.x->icon_bitmap = -1;
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3253 FRAME_FONTSET (f) = -1;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3254 f->output_data.x->scroll_bar_foreground_pixel = -1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3255 f->output_data.x->scroll_bar_background_pixel = -1;
39619
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
3256 #ifdef USE_TOOLKIT_SCROLL_BARS
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
3257 f->output_data.x->scroll_bar_top_shadow_pixel = -1;
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
3258 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1;
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
3259 #endif /* USE_TOOLKIT_SCROLL_BARS */
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3260 record_unwind_protect (unwind_create_frame, frame);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3261
12276
2e376a4397bc (x_report_frame_params, x_set_icon_type, x_set_icon_name)
Richard M. Stallman <rms@gnu.org>
parents: 12209
diff changeset
3262 f->icon_name
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3263 = x_get_arg (dpyinfo, parms, Qicon_name, "iconName", "Title",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3264 RES_TYPE_STRING);
12276
2e376a4397bc (x_report_frame_params, x_set_icon_type, x_set_icon_name)
Richard M. Stallman <rms@gnu.org>
parents: 12209
diff changeset
3265 if (! STRINGP (f->icon_name))
2e376a4397bc (x_report_frame_params, x_set_icon_type, x_set_icon_name)
Richard M. Stallman <rms@gnu.org>
parents: 12209
diff changeset
3266 f->icon_name = Qnil;
12073
1b0018c43060 (Qicon_name): New variable.
Karl Heuer <kwzh@gnu.org>
parents: 12051
diff changeset
3267
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3268 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
34895
53e52b3525bf Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34662
diff changeset
3269 #if GLYPH_DEBUG
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3270 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3271 dpyinfo_refcount = dpyinfo->reference_count;
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3272 #endif /* GLYPH_DEBUG */
11014
634a98104921 (Fx_create_frame): set the frame's kboard member.
Karl Heuer <kwzh@gnu.org>
parents: 10920
diff changeset
3273 #ifdef MULTI_KBOARD
11774
0b5cb5170084 (Fx_create_frame): Pass kb to make_frame_without_minibuffer.
Karl Heuer <kwzh@gnu.org>
parents: 11772
diff changeset
3274 FRAME_KBOARD (f) = kb;
11014
634a98104921 (Fx_create_frame): set the frame's kboard member.
Karl Heuer <kwzh@gnu.org>
parents: 10920
diff changeset
3275 #endif
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3276
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3277 /* These colors will be set anyway later, but it's important
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3278 to get the color reference counts right, so initialize them! */
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3279 {
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3280 Lisp_Object black;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3281 struct gcpro gcpro1;
38345
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3282
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3283 /* Function x_decode_color can signal an error. Make
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3284 sure to initialize color slots so that we won't try
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3285 to free colors we haven't allocated. */
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3286 f->output_data.x->foreground_pixel = -1;
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3287 f->output_data.x->background_pixel = -1;
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3288 f->output_data.x->cursor_pixel = -1;
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3289 f->output_data.x->cursor_foreground_pixel = -1;
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3290 f->output_data.x->border_pixel = -1;
3238db7bdfef (Fx_create_frame): Initialize frame colors to -1,
Gerd Moellmann <gerd@gnu.org>
parents: 38183
diff changeset
3291 f->output_data.x->mouse_pixel = -1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3292
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3293 black = build_string ("black");
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3294 GCPRO1 (black);
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3295 f->output_data.x->foreground_pixel
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3296 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3297 f->output_data.x->background_pixel
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3298 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3299 f->output_data.x->cursor_pixel
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3300 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3301 f->output_data.x->cursor_foreground_pixel
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3302 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3303 f->output_data.x->border_pixel
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3304 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3305 f->output_data.x->mouse_pixel
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3306 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3307 UNGCPRO;
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3308 }
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
3309
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3310 /* Specify the parent under which to make this X window. */
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3311
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3312 if (!NILP (parent))
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3313 {
18612
88efccff8970 Fix bugs with inappropriate mixing of Lisp_Object with int.
Richard M. Stallman <rms@gnu.org>
parents: 18594
diff changeset
3314 f->output_data.x->parent_desc = (Window) XFASTINT (parent);
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3315 f->output_data.x->explicit_parent = 1;
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3316 }
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3317 else
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3318 {
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3319 f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window;
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3320 f->output_data.x->explicit_parent = 0;
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3321 }
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3322
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3323 /* Set the name; the functions to which we pass f expect the name to
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3324 be set. */
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3325 if (EQ (name, Qunbound) || NILP (name))
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3326 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3327 f->name = build_string (dpyinfo->x_id_name);
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3328 f->explicit_name = 0;
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3329 }
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3330 else
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3331 {
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3332 f->name = name;
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3333 f->explicit_name = 1;
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
3334 /* use the frame's title when getting resources for this frame. */
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
3335 specbind (Qx_resource_name, name);
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3336 }
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3337
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3338 /* Extract the window parameters from the supplied values
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3339 that are needed to determine window geometry. */
4146
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
3340 {
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
3341 Lisp_Object font;
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
3342
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3343 font = x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING);
18947
386d68191907 (Fx_create_frame): Don't fail to initialize `font'.
Richard M. Stallman <rms@gnu.org>
parents: 18893
diff changeset
3344
4150
e2e92cd737bf * xfns.c (Fx_create_frame): Block input around call to
Jim Blandy <jimb@redhat.com>
parents: 4146
diff changeset
3345 BLOCK_INPUT;
4259
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3346 /* First, try whatever font the caller has specified. */
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3347 if (STRINGP (font))
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
3348 {
21555
0927f341e390 (x_set_font): Give 2nd arg nil to Fquery_fontset.
Kenichi Handa <handa@m17n.org>
parents: 21549
diff changeset
3349 tem = Fquery_fontset (font, Qnil);
17722
27df69e20b98 (Fx_create_frame): Delete code for handling the X
Kenichi Handa <handa@m17n.org>
parents: 17629
diff changeset
3350 if (STRINGP (tem))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
3351 font = x_new_fontset (f, SDATA (tem));
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
3352 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
3353 font = x_new_font (f, SDATA (font));
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
3354 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3355
4259
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3356 /* Try out a font which we hope has bold and italic variations. */
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3357 if (!STRINGP (font))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3358 font = x_new_font (f, "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3359 if (!STRINGP (font))
8270
1a0af0f4fb1d (Fx_create_frame): Use 140 as default font size.
Richard M. Stallman <rms@gnu.org>
parents: 8192
diff changeset
3360 font = x_new_font (f, "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1");
4259
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3361 if (! STRINGP (font))
8270
1a0af0f4fb1d (Fx_create_frame): Use 140 as default font size.
Richard M. Stallman <rms@gnu.org>
parents: 8192
diff changeset
3362 font = x_new_font (f, "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1");
4259
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3363 if (! STRINGP (font))
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3364 /* This was formerly the first thing tried, but it finds too many fonts
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3365 and takes too long. */
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3366 font = x_new_font (f, "-*-*-medium-r-*-*-*-*-*-*-c-*-iso8859-1");
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3367 /* If those didn't work, look for something which will at least work. */
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3368 if (! STRINGP (font))
8270
1a0af0f4fb1d (Fx_create_frame): Use 140 as default font size.
Richard M. Stallman <rms@gnu.org>
parents: 8192
diff changeset
3369 font = x_new_font (f, "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1");
4150
e2e92cd737bf * xfns.c (Fx_create_frame): Block input around call to
Jim Blandy <jimb@redhat.com>
parents: 4146
diff changeset
3370 UNBLOCK_INPUT;
e2e92cd737bf * xfns.c (Fx_create_frame): Block input around call to
Jim Blandy <jimb@redhat.com>
parents: 4146
diff changeset
3371 if (! STRINGP (font))
4259
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3372 font = build_string ("fixed");
085095792d99 (Fx_create_frame): Don't look for default font
Richard M. Stallman <rms@gnu.org>
parents: 4195
diff changeset
3373
17722
27df69e20b98 (Fx_create_frame): Delete code for handling the X
Kenichi Handa <handa@m17n.org>
parents: 17629
diff changeset
3374 x_default_parameter (f, parms, Qfont, font,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3375 "font", "Font", RES_TYPE_STRING);
4146
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
3376 }
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
3377
15720
f1549b7501af (Fx_create_frame): Do xlwmenu hack only if USE_LUCID.
Karl Heuer <kwzh@gnu.org>
parents: 15706
diff changeset
3378 #ifdef USE_LUCID
9742
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
3379 /* Prevent lwlib/xlwmenu.c from crashing because of a bug
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
3380 whereby it fails to get any font. */
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3381 xlwmenu_default_font = FRAME_FONT (f);
9808
4c43c9dbe130 (x_window): Make ibw 0 by default.
Richard M. Stallman <rms@gnu.org>
parents: 9742
diff changeset
3382 #endif
9742
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
3383
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3384 x_default_parameter (f, parms, Qborder_width, make_number (2),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3385 "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3386
40715
221a78cc7b5f (Fx_create_frame): Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 40700
diff changeset
3387 /* This defaults to 1 in order to match xterm. We recognize either
3923
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3388 internalBorderWidth or internalBorder (which is what xterm calls
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3389 it). */
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3390 if (NILP (Fassq (Qinternal_border_width, parms)))
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3391 {
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3392 Lisp_Object value;
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3393
17779
094e5efd262d (Fx_create_frame): Get X resources from the display
Richard M. Stallman <rms@gnu.org>
parents: 17722
diff changeset
3394 value = x_get_arg (dpyinfo, parms, Qinternal_border_width,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3395 "internalBorder", "internalBorder", RES_TYPE_NUMBER);
3923
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3396 if (! EQ (value, Qunbound))
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3397 parms = Fcons (Fcons (Qinternal_border_width, value),
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3398 parms);
cb16ebff1c44 * xfns.c (Fx_create_frame): Check for internalBorder resource, as
Jim Blandy <jimb@redhat.com>
parents: 3888
diff changeset
3399 }
16302
025b3dc7a6ba (Fx_create_frame): Default Qinternal_border_width to 1.
Richard M. Stallman <rms@gnu.org>
parents: 16254
diff changeset
3400 x_default_parameter (f, parms, Qinternal_border_width, make_number (1),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3401 "internalBorderWidth", "internalBorderWidth",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3402 RES_TYPE_NUMBER);
16254
3e8b16badf3d (Fx_create_frame): Default Qvertical_scroll_bars to `left'.
Richard M. Stallman <rms@gnu.org>
parents: 16156
diff changeset
3403 x_default_parameter (f, parms, Qvertical_scroll_bars, Qleft,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3404 "verticalScrollBars", "ScrollBars",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3405 RES_TYPE_SYMBOL);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3406
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3407 /* Also do the stuff which must be set before the window exists. */
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3408 x_default_parameter (f, parms, Qforeground_color, build_string ("black"),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3409 "foreground", "Foreground", RES_TYPE_STRING);
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3410 x_default_parameter (f, parms, Qbackground_color, build_string ("white"),
26808
d8a6c42deb4e Indentation fixes.
Gerd Moellmann <gerd@gnu.org>
parents: 26729
diff changeset
3411 "background", "Background", RES_TYPE_STRING);
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3412 x_default_parameter (f, parms, Qmouse_color, build_string ("black"),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3413 "pointerColor", "Foreground", RES_TYPE_STRING);
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3414 x_default_parameter (f, parms, Qcursor_color, build_string ("black"),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3415 "cursorColor", "Foreground", RES_TYPE_STRING);
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3416 x_default_parameter (f, parms, Qborder_color, build_string ("black"),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3417 "borderColor", "BorderColor", RES_TYPE_STRING);
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
3418 x_default_parameter (f, parms, Qscreen_gamma, Qnil,
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
3419 "screenGamma", "ScreenGamma", RES_TYPE_FLOAT);
28690
01a3287bb747 (x_set_line_spacing): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28597
diff changeset
3420 x_default_parameter (f, parms, Qline_spacing, Qnil,
01a3287bb747 (x_set_line_spacing): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28597
diff changeset
3421 "lineSpacing", "LineSpacing", RES_TYPE_NUMBER);
41722
fd499c5c75d2 (x_frame_parms): Add `left-fringe' and `right-fringe' parms.
Kim F. Storm <storm@cua.dk>
parents: 41449
diff changeset
3422 x_default_parameter (f, parms, Qleft_fringe, Qnil,
fd499c5c75d2 (x_frame_parms): Add `left-fringe' and `right-fringe' parms.
Kim F. Storm <storm@cua.dk>
parents: 41449
diff changeset
3423 "leftFringe", "LeftFringe", RES_TYPE_NUMBER);
fd499c5c75d2 (x_frame_parms): Add `left-fringe' and `right-fringe' parms.
Kim F. Storm <storm@cua.dk>
parents: 41449
diff changeset
3424 x_default_parameter (f, parms, Qright_fringe, Qnil,
fd499c5c75d2 (x_frame_parms): Add `left-fringe' and `right-fringe' parms.
Kim F. Storm <storm@cua.dk>
parents: 41449
diff changeset
3425 "rightFringe", "RightFringe", RES_TYPE_NUMBER);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3426
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3427 x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_foreground,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3428 "scrollBarForeground",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3429 "ScrollBarForeground", 1);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3430 x_default_scroll_bar_color_parameter (f, parms, Qscroll_bar_background,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3431 "scrollBarBackground",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3432 "ScrollBarBackground", 0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3433
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3434 /* Init faces before x_default_parameter is called for scroll-bar
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3435 parameters because that function calls x_set_scroll_bar_width,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3436 which calls change_frame_size, which calls Fset_window_buffer,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3437 which runs hooks, which call Fvertical_motion. At the end, we
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3438 end up in init_iterator with a null face cache, which should not
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3439 happen. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3440 init_frame_faces (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3441
8758
fac1c4722677 (Fx_create_frame): Make 1 the default for menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 8675
diff changeset
3442 x_default_parameter (f, parms, Qmenu_bar_lines, make_number (1),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3443 "menuBar", "MenuBar", RES_TYPE_NUMBER);
31824
b3295c7e7a60 (Fx_create_frame): Set default frame parameter value
Gerd Moellmann <gerd@gnu.org>
parents: 31768
diff changeset
3444 x_default_parameter (f, parms, Qtool_bar_lines, make_number (1),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3445 "toolBar", "ToolBar", RES_TYPE_NUMBER);
13083
16638ebb209f (Fx_create_frame): Set up buffer-predicate slot.
Richard M. Stallman <rms@gnu.org>
parents: 12832
diff changeset
3446 x_default_parameter (f, parms, Qbuffer_predicate, Qnil,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3447 "bufferPredicate", "BufferPredicate",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3448 RES_TYPE_SYMBOL);
14381
4d038c841cf4 (Qtitle): Declared.
Richard M. Stallman <rms@gnu.org>
parents: 14186
diff changeset
3449 x_default_parameter (f, parms, Qtitle, Qnil,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3450 "title", "Title", RES_TYPE_STRING);
38183
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
3451 x_default_parameter (f, parms, Qwait_for_wm, Qt,
3ef7b5a020b2 (Qwait_for_wm): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37946
diff changeset
3452 "waitForWM", "WaitForWM", RES_TYPE_BOOLEAN);
42721
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
3453 x_default_parameter (f, parms, Qfullscreen, Qnil,
462e0bbae65d (Qfullscreen, Qfullwidth, Qfullheight, Qfullboth): New variables.
Eli Zaretskii <eliz@gnu.org>
parents: 42247
diff changeset
3454 "fullscreen", "Fullscreen", RES_TYPE_SYMBOL);
6882
3096a6f7fffb (Fx_list_fonts): Error if non-X frame used.
Richard M. Stallman <rms@gnu.org>
parents: 6790
diff changeset
3455
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3456 f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window;
36459
919d77f8d0ff (Fx_create_frame): Adjust the frame's height for presence
Gerd Moellmann <gerd@gnu.org>
parents: 36448
diff changeset
3457
919d77f8d0ff (Fx_create_frame): Adjust the frame's height for presence
Gerd Moellmann <gerd@gnu.org>
parents: 36448
diff changeset
3458 /* Compute the size of the X window. */
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
3459 window_prompting = x_figure_window_size (f, parms, 1);
7263
b7025b4bf659 (Fx_create_frame): Set the size_hint_flags field.
Richard M. Stallman <rms@gnu.org>
parents: 7261
diff changeset
3460
25320
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3461 tem = x_get_arg (dpyinfo, parms, Qunsplittable, 0, 0, RES_TYPE_BOOLEAN);
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3462 f->no_split = minibuffer_only || EQ (tem, Qt);
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3463
35733
4f422aadd415 (Fx_create_frame): Add the tool bar height to the frame
Gerd Moellmann <gerd@gnu.org>
parents: 35592
diff changeset
3464 /* Create the X widget or window. */
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
3465 #ifdef USE_X_TOOLKIT
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
3466 x_window (f, window_prompting, minibuffer_only);
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
3467 #else
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3468 x_window (f);
6604
bb11213734d6 (x_window) [USE_X_TOOLKIT]: New args window_prompting and minibuffer_only.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6523
diff changeset
3469 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3470
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3471 x_icon (f, parms);
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3472 x_make_gc (f);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3473
25320
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3474 /* Now consider the frame official. */
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3475 FRAME_X_DISPLAY_INFO (f)->reference_count++;
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3476 Vframe_list = Fcons (frame, Vframe_list);
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3477
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3478 /* We need to do this after creating the X window, so that the
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3479 icon-creation functions can say whose icon they're describing. */
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3480 x_default_parameter (f, parms, Qicon_type, Qnil,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3481 "bitmapIcon", "BitmapIcon", RES_TYPE_SYMBOL);
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3482
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3483 x_default_parameter (f, parms, Qauto_raise, Qnil,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3484 "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN);
1786
5179baee010b * xfns.c (Fx_create_frame): After mapping the frame, call
Jim Blandy <jimb@redhat.com>
parents: 1733
diff changeset
3485 x_default_parameter (f, parms, Qauto_lower, Qnil,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3486 "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN);
1821
04fb1d3d6992 JimB's changes since January 18th
Jim Blandy <jimb@redhat.com>
parents: 1786
diff changeset
3487 x_default_parameter (f, parms, Qcursor_type, Qbox,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3488 "cursorType", "CursorType", RES_TYPE_SYMBOL);
26978
06f887a1c834 (Fx_create_frame): Move x_default_parameter calls that
Gerd Moellmann <gerd@gnu.org>
parents: 26954
diff changeset
3489 x_default_parameter (f, parms, Qscroll_bar_width, Qnil,
06f887a1c834 (Fx_create_frame): Move x_default_parameter calls that
Gerd Moellmann <gerd@gnu.org>
parents: 26954
diff changeset
3490 "scrollBarWidth", "ScrollBarWidth",
06f887a1c834 (Fx_create_frame): Move x_default_parameter calls that
Gerd Moellmann <gerd@gnu.org>
parents: 26954
diff changeset
3491 RES_TYPE_NUMBER);
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
3492
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3493 /* Dimensions, especially FRAME_LINES (f), must be done via change_frame_size.
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3494 Change will not be effected unless different from the current
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3495 FRAME_LINES (f). */
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3496 width = FRAME_COLS (f);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3497 height = FRAME_LINES (f);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3498
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3499 SET_FRAME_COLS (f, 0);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3500 FRAME_LINES (f) = 0;
25363
bf0488244270 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25335
diff changeset
3501 change_frame_size (f, height, width, 1, 0, 0);
2136
17ab6ed0f98b (x_frame_parms): Add elts for visibility and menu-bar-lines.
Richard M. Stallman <rms@gnu.org>
parents: 2067
diff changeset
3502
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
3503 #if defined (USE_X_TOOLKIT) || defined (USE_GTK)
25320
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3504 /* Create the menu bar. */
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3505 if (!minibuffer_only && FRAME_EXTERNAL_MENU_BAR (f))
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3506 {
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3507 /* If this signals an error, we haven't set size hints for the
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3508 frame and we didn't make it visible. */
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3509 initialize_frame_menubar (f);
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3510
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
3511 #ifndef USE_GTK
25320
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3512 /* This is a no-op, except under Motif where it arranges the
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3513 main window for the widgets on it. */
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3514 lw_set_main_areas (f->output_data.x->column_widget,
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3515 f->output_data.x->menubar_widget,
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3516 f->output_data.x->edit_widget);
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
3517 #endif /* not USE_GTK */
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
3518 }
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
3519 #endif /* USE_X_TOOLKIT || USE_GTK */
25320
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3520
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3521 /* Tell the server what size and position, etc, we want, and how
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3522 badly we want them. This should be done after we have the menu
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3523 bar so that its size can be taken into account. */
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3524 BLOCK_INPUT;
7209
ca5e04c9795c (Fx_create_frame): Pass 0 as 3rd arg to x_wm_set_size_hint.
Richard M. Stallman <rms@gnu.org>
parents: 7172
diff changeset
3525 x_wm_set_size_hint (f, window_prompting, 0);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3526 UNBLOCK_INPUT;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3527
25320
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3528 /* Make the window appear on the frame and enable display, unless
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3529 the caller says not to. However, with explicit parent, Emacs
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3530 cannot control visibility, so don't try. */
12667
a3466dad7d6d Renamings: frame->display => frame->output, struct x_display -> sruct x_output.
Richard M. Stallman <rms@gnu.org>
parents: 12656
diff changeset
3531 if (! f->output_data.x->explicit_parent)
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3532 {
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3533 Lisp_Object visibility;
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3534
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3535 visibility = x_get_arg (dpyinfo, parms, Qvisibility, 0, 0,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
3536 RES_TYPE_SYMBOL);
10222
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3537 if (EQ (visibility, Qunbound))
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3538 visibility = Qt;
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3539
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3540 if (EQ (visibility, Qicon))
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3541 x_iconify_frame (f);
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3542 else if (! NILP (visibility))
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3543 x_make_frame_visible (f);
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3544 else
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3545 /* Must have been Qnil. */
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3546 ;
617bee0c64f6 (x_set_frame_parameters): Handle icon-left, icon-top parms.
Richard M. Stallman <rms@gnu.org>
parents: 10080
diff changeset
3547 }
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
3548
52298
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3549 /* Set the WM leader property. GTK does this itself, so this is not
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3550 needed when using GTK. */
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3551 if (dpyinfo->client_leader_window != 0)
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3552 {
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3553 BLOCK_INPUT;
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3554 XChangeProperty (FRAME_X_DISPLAY (f),
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3555 FRAME_OUTER_WINDOW (f),
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3556 dpyinfo->Xatom_wm_client_leader,
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3557 XA_WINDOW, 32, PropModeReplace,
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3558 (char *) &dpyinfo->client_leader_window, 1);
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3559 UNBLOCK_INPUT;
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3560 }
1a4bd2bec861 Create and initialize a client leader window so session management
Jan Djärv <jan.h.d@swipnet.se>
parents: 52095
diff changeset
3561
25320
107c9221181c (x_window) [USE_X_TOOLKIT]: Remove test for
Gerd Moellmann <gerd@gnu.org>
parents: 25289
diff changeset
3562 UNGCPRO;
36594
756c28377036 (Fx_create_frame): Clear Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 36459
diff changeset
3563
756c28377036 (Fx_create_frame): Clear Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 36459
diff changeset
3564 /* Make sure windows on this frame appear in calls to next-window
756c28377036 (Fx_create_frame): Clear Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 36459
diff changeset
3565 and similar functions. */
756c28377036 (Fx_create_frame): Clear Vwindow_list.
Gerd Moellmann <gerd@gnu.org>
parents: 36459
diff changeset
3566 Vwindow_list = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3567
5671
5c597b8fbabe Find lwlib.h in ../lwlib.
Richard M. Stallman <rms@gnu.org>
parents: 5558
diff changeset
3568 return unbind_to (count, frame);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3569 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3570
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
3571
11537
9d4df3cf95b3 (x_get_focus_frame): New arg FRAME. Callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11496
diff changeset
3572 /* FRAME is used only to get a handle on the X display. We don't pass the
9d4df3cf95b3 (x_get_focus_frame): New arg FRAME. Callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11496
diff changeset
3573 display info directly because we're called from frame.c, which doesn't
9d4df3cf95b3 (x_get_focus_frame): New arg FRAME. Callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11496
diff changeset
3574 know about that structure. */
16156
d435199e529d (x_set_frame_parameters): Make height and width ints.
Richard M. Stallman <rms@gnu.org>
parents: 16041
diff changeset
3575
6485
b0825eef18b1 (x_get_focus_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6480
diff changeset
3576 Lisp_Object
11537
9d4df3cf95b3 (x_get_focus_frame): New arg FRAME. Callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11496
diff changeset
3577 x_get_focus_frame (frame)
9d4df3cf95b3 (x_get_focus_frame): New arg FRAME. Callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11496
diff changeset
3578 struct frame *frame;
6485
b0825eef18b1 (x_get_focus_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6480
diff changeset
3579 {
11537
9d4df3cf95b3 (x_get_focus_frame): New arg FRAME. Callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11496
diff changeset
3580 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (frame);
6485
b0825eef18b1 (x_get_focus_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6480
diff changeset
3581 Lisp_Object xfocus;
11537
9d4df3cf95b3 (x_get_focus_frame): New arg FRAME. Callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11496
diff changeset
3582 if (! dpyinfo->x_focus_frame)
6485
b0825eef18b1 (x_get_focus_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6480
diff changeset
3583 return Qnil;
b0825eef18b1 (x_get_focus_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6480
diff changeset
3584
11537
9d4df3cf95b3 (x_get_focus_frame): New arg FRAME. Callers changed.
Karl Heuer <kwzh@gnu.org>
parents: 11496
diff changeset
3585 XSETFRAME (xfocus, dpyinfo->x_focus_frame);
6485
b0825eef18b1 (x_get_focus_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6480
diff changeset
3586 return xfocus;
b0825eef18b1 (x_get_focus_frame): New function.
Karl Heuer <kwzh@gnu.org>
parents: 6480
diff changeset
3587 }
3048
96ff8e5744b2 * xfns.c (select_visual): Include the screen number in the
Jim Blandy <jimb@redhat.com>
parents: 3015
diff changeset
3588
28044
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3589
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3590 /* In certain situations, when the window manager follows a
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3591 click-to-focus policy, there seems to be no way around calling
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3592 XSetInputFocus to give another frame the input focus .
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3593
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3594 In an ideal world, XSetInputFocus should generally be avoided so
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3595 that applications don't interfere with the window manager's focus
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3596 policy. But I think it's okay to use when it's clearly done
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3597 following a user-command. */
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3598
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3599 DEFUN ("x-focus-frame", Fx_focus_frame, Sx_focus_frame, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3600 doc: /* Set the input focus to FRAME.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3601 FRAME nil means use the selected frame. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3602 (frame)
28044
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3603 Lisp_Object frame;
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3604 {
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3605 struct frame *f = check_x_frame (frame);
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3606 Display *dpy = FRAME_X_DISPLAY (f);
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3607 int count;
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3608
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3609 BLOCK_INPUT;
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3610 count = x_catch_errors (dpy);
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3611 XSetInputFocus (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3612 RevertToParent, CurrentTime);
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3613 x_uncatch_errors (dpy, count);
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3614 UNBLOCK_INPUT;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3615
28044
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3616 return Qnil;
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3617 }
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3618
3048
96ff8e5744b2 * xfns.c (select_visual): Include the screen number in the
Jim Blandy <jimb@redhat.com>
parents: 3015
diff changeset
3619
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
3620 DEFUN ("xw-color-defined-p", Fxw_color_defined_p, Sxw_color_defined_p, 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3621 doc: /* Internal function called by `color-defined-p', which see. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3622 (color, frame)
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3623 Lisp_Object color, frame;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3624 {
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3625 XColor foo;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3626 FRAME_PTR f = check_x_frame (frame);
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3627
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
3628 CHECK_STRING (color);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3629
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
3630 if (x_defined_color (f, SDATA (color), &foo, 0))
8675
1fe413b0a916 (defined_color): New arg ALLOC--optionally don't allocate the color.
Richard M. Stallman <rms@gnu.org>
parents: 8655
diff changeset
3631 return Qt;
1fe413b0a916 (defined_color): New arg ALLOC--optionally don't allocate the color.
Richard M. Stallman <rms@gnu.org>
parents: 8655
diff changeset
3632 else
1fe413b0a916 (defined_color): New arg ALLOC--optionally don't allocate the color.
Richard M. Stallman <rms@gnu.org>
parents: 8655
diff changeset
3633 return Qnil;
1fe413b0a916 (defined_color): New arg ALLOC--optionally don't allocate the color.
Richard M. Stallman <rms@gnu.org>
parents: 8655
diff changeset
3634 }
1fe413b0a916 (defined_color): New arg ALLOC--optionally don't allocate the color.
Richard M. Stallman <rms@gnu.org>
parents: 8655
diff changeset
3635
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
3636 DEFUN ("xw-color-values", Fxw_color_values, Sxw_color_values, 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3637 doc: /* Internal function called by `color-values', which see. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3638 (color, frame)
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3639 Lisp_Object color, frame;
8675
1fe413b0a916 (defined_color): New arg ALLOC--optionally don't allocate the color.
Richard M. Stallman <rms@gnu.org>
parents: 8655
diff changeset
3640 {
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3641 XColor foo;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3642 FRAME_PTR f = check_x_frame (frame);
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3643
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
3644 CHECK_STRING (color);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3645
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
3646 if (x_defined_color (f, SDATA (color), &foo, 0))
8655
4c69fcaaa037 (Fx_color_defined_p): Return list of RGB values, not just t.
Richard M. Stallman <rms@gnu.org>
parents: 8405
diff changeset
3647 {
4c69fcaaa037 (Fx_color_defined_p): Return list of RGB values, not just t.
Richard M. Stallman <rms@gnu.org>
parents: 8405
diff changeset
3648 Lisp_Object rgb[3];
4c69fcaaa037 (Fx_color_defined_p): Return list of RGB values, not just t.
Richard M. Stallman <rms@gnu.org>
parents: 8405
diff changeset
3649
4c69fcaaa037 (Fx_color_defined_p): Return list of RGB values, not just t.
Richard M. Stallman <rms@gnu.org>
parents: 8405
diff changeset
3650 rgb[0] = make_number (foo.red);
4c69fcaaa037 (Fx_color_defined_p): Return list of RGB values, not just t.
Richard M. Stallman <rms@gnu.org>
parents: 8405
diff changeset
3651 rgb[1] = make_number (foo.green);
4c69fcaaa037 (Fx_color_defined_p): Return list of RGB values, not just t.
Richard M. Stallman <rms@gnu.org>
parents: 8405
diff changeset
3652 rgb[2] = make_number (foo.blue);
4c69fcaaa037 (Fx_color_defined_p): Return list of RGB values, not just t.
Richard M. Stallman <rms@gnu.org>
parents: 8405
diff changeset
3653 return Flist (3, rgb);
4c69fcaaa037 (Fx_color_defined_p): Return list of RGB values, not just t.
Richard M. Stallman <rms@gnu.org>
parents: 8405
diff changeset
3654 }
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3655 else
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3656 return Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3657 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3658
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
3659 DEFUN ("xw-display-color-p", Fxw_display_color_p, Sxw_display_color_p, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3660 doc: /* Internal function called by `display-color-p', which see. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3661 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3662 Lisp_Object display;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3663 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3664 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3665
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3666 if (dpyinfo->n_planes <= 2)
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3667 return Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3668
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3669 switch (dpyinfo->visual->class)
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3670 {
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3671 case StaticColor:
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3672 case PseudoColor:
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3673 case TrueColor:
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3674 case DirectColor:
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3675 return Qt;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3676
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3677 default:
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3678 return Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3679 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3680 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3681
8779
12c6296bbb4b (Fx_display_grayscale_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8758
diff changeset
3682 DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3683 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3684 doc: /* Return t if the X display supports shades of gray.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3685 Note that color displays do support shades of gray.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3686 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3687 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3688 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3689 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3690 Lisp_Object display;
8779
12c6296bbb4b (Fx_display_grayscale_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8758
diff changeset
3691 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3692 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3693
12347
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3694 if (dpyinfo->n_planes <= 1)
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3695 return Qnil;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3696
12347
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3697 switch (dpyinfo->visual->class)
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3698 {
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3699 case StaticColor:
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3700 case PseudoColor:
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3701 case TrueColor:
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3702 case DirectColor:
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3703 case StaticGray:
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3704 case GrayScale:
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3705 return Qt;
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3706
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3707 default:
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3708 return Qnil;
0731c1ec96ad (Fx_display_grayscale_p): Return t or nil.
Richard M. Stallman <rms@gnu.org>
parents: 12316
diff changeset
3709 }
8779
12c6296bbb4b (Fx_display_grayscale_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8758
diff changeset
3710 }
12c6296bbb4b (Fx_display_grayscale_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8758
diff changeset
3711
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3712 DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3713 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3714 doc: /* Returns the width in pixels of the X display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3715 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3716 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3717 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3718 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3719 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3720 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3721 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3722
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3723 return make_number (dpyinfo->width);
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3724 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3725
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3726 DEFUN ("x-display-pixel-height", Fx_display_pixel_height,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3727 Sx_display_pixel_height, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3728 doc: /* Returns the height in pixels of the X display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3729 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3730 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3731 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3732 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3733 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3734 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3735 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3736
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3737 return make_number (dpyinfo->height);
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3738 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3739
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3740 DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3741 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3742 doc: /* Returns the number of bitplanes of the X display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3743 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3744 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3745 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3746 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3747 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3748 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3749 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3750
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3751 return make_number (dpyinfo->n_planes);
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3752 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3753
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3754 DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3755 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3756 doc: /* Returns the number of color cells of the X display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3757 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3758 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3759 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3760 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3761 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3762 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3763 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3764
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3765 return make_number (DisplayCells (dpyinfo->display,
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3766 XScreenNumberOfScreen (dpyinfo->screen)));
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3767 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3768
4279
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
3769 DEFUN ("x-server-max-request-size", Fx_server_max_request_size,
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
3770 Sx_server_max_request_size,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3771 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3772 doc: /* Returns the maximum request size of the X server of display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3773 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3774 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3775 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3776 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3777 Lisp_Object display;
4279
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
3778 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3779 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3780
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3781 return make_number (MAXREQUEST (dpyinfo->display));
4279
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
3782 }
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
3783
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3784 DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3785 doc: /* Returns the vendor ID string of the X server of display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3786 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3787 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3788 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3789 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3790 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3791 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3792 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3793 char *vendor = ServerVendor (dpyinfo->display);
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3794
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3795 if (! vendor) vendor = "";
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3796 return build_string (vendor);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3797 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3798
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3799 DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3800 doc: /* Returns the version numbers of the X server of display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3801 The value is a list of three integers: the major and minor
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3802 version numbers of the X Protocol in use, and the vendor-specific release
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3803 number. See also the function `x-server-vendor'.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3804
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3805 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3806 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3807 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3808 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3809 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3810 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3811 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3812 Display *dpy = dpyinfo->display;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3813
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3814 return Fcons (make_number (ProtocolVersion (dpy)),
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3815 Fcons (make_number (ProtocolRevision (dpy)),
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3816 Fcons (make_number (VendorRelease (dpy)), Qnil)));
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3817 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3818
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3819 DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3820 doc: /* Return the number of screens on the X server of display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3821 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3822 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3823 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3824 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3825 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3826 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3827 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3828
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3829 return make_number (ScreenCount (dpyinfo->display));
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3830 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3831
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3832 DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3833 doc: /* Return the height in millimeters of the X display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3834 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3835 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3836 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3837 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3838 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3839 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3840 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3841
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3842 return make_number (HeightMMOfScreen (dpyinfo->screen));
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3843 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3844
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3845 DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3846 doc: /* Return the width in millimeters of the X display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3847 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3848 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3849 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3850 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3851 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3852 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3853 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3854
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3855 return make_number (WidthMMOfScreen (dpyinfo->screen));
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3856 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3857
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3858 DEFUN ("x-display-backing-store", Fx_display_backing_store,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3859 Sx_display_backing_store, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3860 doc: /* Returns an indication of whether X display DISPLAY does backing store.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3861 The value may be `always', `when-mapped', or `not-useful'.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3862 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3863 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3864 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3865 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3866 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3867 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3868 struct x_display_info *dpyinfo = check_x_display_info (display);
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3869 Lisp_Object result;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3870
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3871 switch (DoesBackingStore (dpyinfo->screen))
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3872 {
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3873 case Always:
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3874 result = intern ("always");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3875 break;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3876
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3877 case WhenMapped:
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3878 result = intern ("when-mapped");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3879 break;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3880
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3881 case NotUseful:
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3882 result = intern ("not-useful");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3883 break;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3884
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3885 default:
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3886 error ("Strange value for BackingStore parameter of screen");
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3887 result = Qnil;
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3888 }
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3889
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3890 return result;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3891 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3892
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3893 DEFUN ("x-display-visual-class", Fx_display_visual_class,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3894 Sx_display_visual_class, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3895 doc: /* Return the visual class of the X display DISPLAY.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3896 The value is one of the symbols `static-gray', `gray-scale',
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3897 `static-color', `pseudo-color', `true-color', or `direct-color'.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3898
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3899 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3900 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3901 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3902 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3903 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3904 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3905 struct x_display_info *dpyinfo = check_x_display_info (display);
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3906 Lisp_Object result;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3907
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3908 switch (dpyinfo->visual->class)
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3909 {
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3910 case StaticGray:
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3911 result = intern ("static-gray");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3912 break;
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3913 case GrayScale:
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3914 result = intern ("gray-scale");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3915 break;
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3916 case StaticColor:
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3917 result = intern ("static-color");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3918 break;
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3919 case PseudoColor:
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3920 result = intern ("pseudo-color");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3921 break;
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3922 case TrueColor:
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3923 result = intern ("true-color");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3924 break;
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3925 case DirectColor:
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3926 result = intern ("direct-color");
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3927 break;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3928 default:
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3929 error ("Display has an unknown visual class");
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3930 result = Qnil;
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3931 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
3932
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
3933 return result;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3934 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3935
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3936 DEFUN ("x-display-save-under", Fx_display_save_under,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3937 Sx_display_save_under, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3938 doc: /* Returns t if the X display DISPLAY supports the save-under feature.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3939 The optional argument DISPLAY specifies which display to ask about.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
3940 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3941 If omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
3942 (display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3943 Lisp_Object display;
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3944 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
3945 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3946
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3947 if (DoesSaveUnders (dpyinfo->screen) == True)
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3948 return Qt;
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3949 else
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3950 return Qnil;
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3951 }
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
3952
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3953 int
2067
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3954 x_pixel_width (f)
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3955 register struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3956 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3957 return FRAME_PIXEL_WIDTH (f);
2067
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3958 }
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3959
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3960 int
2067
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3961 x_pixel_height (f)
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3962 register struct frame *f;
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3963 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3964 return FRAME_PIXEL_HEIGHT (f);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3965 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3966
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3967 int
2067
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3968 x_char_width (f)
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3969 register struct frame *f;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3970 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3971 return FRAME_COLUMN_WIDTH (f);
2067
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3972 }
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3973
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3974 int
2067
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3975 x_char_height (f)
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3976 register struct frame *f;
0a353ddd4bf4 (Fx_pixel_width, Fx_pixel_height): Fns deleted.
Richard M. Stallman <rms@gnu.org>
parents: 1994
diff changeset
3977 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
3978 return FRAME_LINE_HEIGHT (f);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3979 }
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3980
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3981 int
19825
cdfaf8ce5208 (x_screen_planes): Fix type of argument.
Richard M. Stallman <rms@gnu.org>
parents: 19095
diff changeset
3982 x_screen_planes (f)
cdfaf8ce5208 (x_screen_planes): Fix type of argument.
Richard M. Stallman <rms@gnu.org>
parents: 19095
diff changeset
3983 register struct frame *f;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3984 {
19825
cdfaf8ce5208 (x_screen_planes): Fix type of argument.
Richard M. Stallman <rms@gnu.org>
parents: 19095
diff changeset
3985 return FRAME_X_DISPLAY_INFO (f)->n_planes;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
3986 }
28044
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
3987
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3988
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
3989
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3990 /************************************************************************
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3991 X Displays
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3992 ************************************************************************/
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3994
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3995 /* Mapping visual names to visuals. */
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3996
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3997 static struct visual_class
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3998 {
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
3999 char *name;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4000 int class;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4001 }
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4002 visual_classes[] =
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4003 {
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4004 {"StaticGray", StaticGray},
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4005 {"GrayScale", GrayScale},
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4006 {"StaticColor", StaticColor},
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4007 {"PseudoColor", PseudoColor},
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4008 {"TrueColor", TrueColor},
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4009 {"DirectColor", DirectColor},
42123
7f5f06b97bfc (x_frame_parms): Add missing braces around initializer.
Pavel Janík <Pavel@Janik.cz>
parents: 42006
diff changeset
4010 {NULL, 0}
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4011 };
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4012
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4013
4606
0866f021a2cc (XScreenNumberOfScreen): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4571
diff changeset
4014 #ifndef HAVE_XSCREENNUMBEROFSCREEN
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4015
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4016 /* Value is the screen number of screen SCR. This is a substitute for
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4017 the X function with the same name when that doesn't exist. */
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4018
4606
0866f021a2cc (XScreenNumberOfScreen): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4571
diff changeset
4019 int
0866f021a2cc (XScreenNumberOfScreen): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4571
diff changeset
4020 XScreenNumberOfScreen (scr)
0866f021a2cc (XScreenNumberOfScreen): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4571
diff changeset
4021 register Screen *scr;
0866f021a2cc (XScreenNumberOfScreen): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4571
diff changeset
4022 {
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4023 Display *dpy = scr->display;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4024 int i;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4025
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4026 for (i = 0; i < dpy->nscreens; ++i)
40325
2eb0395c1697 (XScreenNumberOfScreen): Fix struct to pointer
Gerd Moellmann <gerd@gnu.org>
parents: 40279
diff changeset
4027 if (scr == dpy->screens + i)
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4028 break;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4029
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4030 return i;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4031 }
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4032
4606
0866f021a2cc (XScreenNumberOfScreen): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4571
diff changeset
4033 #endif /* not HAVE_XSCREENNUMBEROFSCREEN */
0866f021a2cc (XScreenNumberOfScreen): New function.
Richard M. Stallman <rms@gnu.org>
parents: 4571
diff changeset
4034
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4035
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4036 /* Select the visual that should be used on display DPYINFO. Set
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4037 members of DPYINFO appropriately. Called from x_term_init. */
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4038
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4039 void
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4040 select_visual (dpyinfo)
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4041 struct x_display_info *dpyinfo;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4042 {
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4043 Display *dpy = dpyinfo->display;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4044 Screen *screen = dpyinfo->screen;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4045 Lisp_Object value;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4046
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4047 /* See if a visual is specified. */
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4048 value = display_x_get_resource (dpyinfo,
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4049 build_string ("visualClass"),
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4050 build_string ("VisualClass"),
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4051 Qnil, Qnil);
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4052 if (STRINGP (value))
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4053 {
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4054 /* VALUE should be of the form CLASS-DEPTH, where CLASS is one
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4055 of `PseudoColor', `TrueColor' etc. and DEPTH is the color
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4056 depth, a decimal number. NAME is compared with case ignored. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4057 char *s = (char *) alloca (SBYTES (value) + 1);
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4058 char *dash;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4059 int i, class = -1;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4060 XVisualInfo vinfo;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4061
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4062 strcpy (s, SDATA (value));
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4063 dash = index (s, '-');
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4064 if (dash)
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4065 {
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4066 dpyinfo->n_planes = atoi (dash + 1);
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4067 *dash = '\0';
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4068 }
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4069 else
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4070 /* We won't find a matching visual with depth 0, so that
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4071 an error will be printed below. */
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4072 dpyinfo->n_planes = 0;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4073
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4074 /* Determine the visual class. */
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4075 for (i = 0; visual_classes[i].name; ++i)
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4076 if (xstricmp (s, visual_classes[i].name) == 0)
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4077 {
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4078 class = visual_classes[i].class;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4079 break;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4080 }
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4081
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4082 /* Look up a matching visual for the specified class. */
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4083 if (class == -1
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4084 || !XMatchVisualInfo (dpy, XScreenNumberOfScreen (screen),
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4085 dpyinfo->n_planes, class, &vinfo))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4086 fatal ("Invalid visual specification `%s'", SDATA (value));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4087
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4088 dpyinfo->visual = vinfo.visual;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4089 }
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4090 else
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4091 {
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4092 int n_visuals;
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4093 XVisualInfo *vinfo, vinfo_template;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4094
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4095 dpyinfo->visual = DefaultVisualOfScreen (screen);
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
4096
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
4097 #ifdef HAVE_X11R4
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4098 vinfo_template.visualid = XVisualIDFromVisual (dpyinfo->visual);
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
4099 #else
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4100 vinfo_template.visualid = dpyinfo->visual->visualid;
1050
133bad38bde1 * xfns.c (x_icon): Don't call x_wm_set_icon_positions if the user
Jim Blandy <jimb@redhat.com>
parents: 1018
diff changeset
4101 #endif
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4102 vinfo_template.screen = XScreenNumberOfScreen (screen);
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4103 vinfo = XGetVisualInfo (dpy, VisualIDMask | VisualScreenMask,
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4104 &vinfo_template, &n_visuals);
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4105 if (n_visuals != 1)
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4106 fatal ("Can't get proper X visual info");
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4107
28199
56a776500341 * xfns.c (select_visual): Don't set dpyinfo->n_planes to the
Gerd Moellmann <gerd@gnu.org>
parents: 28144
diff changeset
4108 dpyinfo->n_planes = vinfo->depth;
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4109 XFree ((char *) vinfo);
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4110 }
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4111 }
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4112
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4113
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4114 /* Return the X display structure for the display named NAME.
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4115 Open a new connection if necessary. */
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4116
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4117 struct x_display_info *
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4118 x_display_info_for_name (name)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4119 Lisp_Object name;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4120 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4121 Lisp_Object names;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4122 struct x_display_info *dpyinfo;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4123
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
4124 CHECK_STRING (name);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4125
12381
67cb86bbdb55 (Fx_open_connection, x_display_info_for_name):
Richard M. Stallman <rms@gnu.org>
parents: 12347
diff changeset
4126 if (! EQ (Vwindow_system, intern ("x")))
67cb86bbdb55 (Fx_open_connection, x_display_info_for_name):
Richard M. Stallman <rms@gnu.org>
parents: 12347
diff changeset
4127 error ("Not using X Windows");
67cb86bbdb55 (Fx_open_connection, x_display_info_for_name):
Richard M. Stallman <rms@gnu.org>
parents: 12347
diff changeset
4128
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4129 for (dpyinfo = x_display_list, names = x_display_name_list;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4130 dpyinfo;
25646
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
4131 dpyinfo = dpyinfo->next, names = XCDR (names))
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4132 {
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4133 Lisp_Object tem;
25646
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
4134 tem = Fstring_equal (XCAR (XCAR (names)), name);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4135 if (!NILP (tem))
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4136 return dpyinfo;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4137 }
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4138
11917
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
4139 /* Use this general default value to start with. */
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
4140 Vx_resource_name = Vinvocation_name;
2314b62ca4ab (Fx_get_resource): Major rewrite to make it clearer.
Karl Heuer <kwzh@gnu.org>
parents: 11900
diff changeset
4141
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4142 validate_x_resource_name ();
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4143
34976
05c36b1fa618 (x_display_info_for_name): Cast 0 to "char *" in the call
Eli Zaretskii <eliz@gnu.org>
parents: 34911
diff changeset
4144 dpyinfo = x_term_init (name, (char *)0,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4145 (char *) SDATA (Vx_resource_name));
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4146
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4147 if (dpyinfo == 0)
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4148 error ("Cannot connect to X server %s", SDATA (name));
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4149
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4150 x_in_use = 1;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4151 XSETFASTINT (Vwindow_system_version, 11);
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4152
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4153 return dpyinfo;
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4154 }
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4155
27993
3a34e2d1bf3c (select_visual): Rewritten. Recognize user-specified
Gerd Moellmann <gerd@gnu.org>
parents: 27987
diff changeset
4156
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4157 DEFUN ("x-open-connection", Fx_open_connection, Sx_open_connection,
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4158 1, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4159 doc: /* Open a connection to an X server.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4160 DISPLAY is the name of the display to connect to.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4161 Optional second arg XRM-STRING is a string of resources in xrdb format.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4162 If the optional third arg MUST-SUCCEED is non-nil,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4163 terminate Emacs if we can't open the connection. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4164 (display, xrm_string, must_succeed)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4165 Lisp_Object display, xrm_string, must_succeed;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4166 {
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4167 unsigned char *xrm_option;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4168 struct x_display_info *dpyinfo;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4169
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
4170 CHECK_STRING (display);
4146
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
4171 if (! NILP (xrm_string))
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
4172 CHECK_STRING (xrm_string);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4173
12381
67cb86bbdb55 (Fx_open_connection, x_display_info_for_name):
Richard M. Stallman <rms@gnu.org>
parents: 12347
diff changeset
4174 if (! EQ (Vwindow_system, intern ("x")))
67cb86bbdb55 (Fx_open_connection, x_display_info_for_name):
Richard M. Stallman <rms@gnu.org>
parents: 12347
diff changeset
4175 error ("Not using X Windows");
67cb86bbdb55 (Fx_open_connection, x_display_info_for_name):
Richard M. Stallman <rms@gnu.org>
parents: 12347
diff changeset
4176
4146
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
4177 if (! NILP (xrm_string))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4178 xrm_option = (unsigned char *) SDATA (xrm_string);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4179 else
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4180 xrm_option = (unsigned char *) 0;
4146
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
4181
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
4182 validate_x_resource_name ();
0c681748d0ce * xfns.c (Fx_open_connection): Don't trust HAVE_XRMSETDATABASE;
Jim Blandy <jimb@redhat.com>
parents: 3923
diff changeset
4183
7802
d687e885fa6a (Fx_open_connection): Set up Vx_resource_name and xrm_option
Richard M. Stallman <rms@gnu.org>
parents: 7797
diff changeset
4184 /* This is what opens the connection and sets x_current_display.
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4185 This also initializes many symbols, such as those used for input. */
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4186 dpyinfo = x_term_init (display, xrm_option,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4187 (char *) SDATA (Vx_resource_name));
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4188
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4189 if (dpyinfo == 0)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4190 {
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4191 if (!NILP (must_succeed))
39907
c62141d21872 Fix multi-line string.
Gerd Moellmann <gerd@gnu.org>
parents: 39905
diff changeset
4192 fatal ("Cannot connect to X server %s.\n\
c62141d21872 Fix multi-line string.
Gerd Moellmann <gerd@gnu.org>
parents: 39905
diff changeset
4193 Check the DISPLAY environment variable or use `-d'.\n\
47159
23b87fbdd685 (Fx_open_connection): Fix docstring. Patch from Rune Kleveland <runekl@viewpoint.no>.
Juanma Barranquero <lekktu@gmail.com>
parents: 47142
diff changeset
4194 Also use the `xauth' program to verify that you have the proper\n\
23b87fbdd685 (Fx_open_connection): Fix docstring. Patch from Rune Kleveland <runekl@viewpoint.no>.
Juanma Barranquero <lekktu@gmail.com>
parents: 47142
diff changeset
4195 authorization information needed to connect the X server.\n\
47086
527c24dbb2b1 (Fx_open_connection): Improve help when X connection
Simon Josefsson <jas@extundo.com>
parents: 47058
diff changeset
4196 An insecure way to solve the problem may be to use `xhost'.\n",
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4197 SDATA (display));
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4198 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4199 error ("Cannot connect to X server %s", SDATA (display));
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4200 }
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4201
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4202 x_in_use = 1;
7802
d687e885fa6a (Fx_open_connection): Set up Vx_resource_name and xrm_option
Richard M. Stallman <rms@gnu.org>
parents: 7797
diff changeset
4203
9327
b3398cf56fba (Fx_open_connection): Don't use XFASTINT as an lvalue.
Karl Heuer <kwzh@gnu.org>
parents: 9285
diff changeset
4204 XSETFASTINT (Vwindow_system_version, 11);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4205 return Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4206 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4207
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4208 DEFUN ("x-close-connection", Fx_close_connection,
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4209 Sx_close_connection, 1, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4210 doc: /* Close the connection to DISPLAY's X server.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4211 For DISPLAY, specify either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4212 If DISPLAY is nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4213 (display)
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4214 Lisp_Object display;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4215 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4216 struct x_display_info *dpyinfo = check_x_display_info (display);
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4217 int i;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4218
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4219 if (dpyinfo->reference_count > 0)
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4220 error ("Display still has frames on it");
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4221
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4222 BLOCK_INPUT;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4223 /* Free the fonts in the font table. */
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4224 for (i = 0; i < dpyinfo->n_fonts; i++)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4225 if (dpyinfo->font_table[i].name)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4226 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4227 XFreeFont (dpyinfo->display, dpyinfo->font_table[i].font);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4228 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4229
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4230 x_destroy_all_bitmaps (dpyinfo);
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4231 XSetCloseDownMode (dpyinfo->display, DestroyAll);
9742
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
4232
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
4233 #ifdef USE_X_TOOLKIT
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
4234 XtCloseDisplay (dpyinfo->display);
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
4235 #else
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4236 XCloseDisplay (dpyinfo->display);
9742
fe7653791d28 (Fx_create_frame): Set xlwmenu_default_font.
Richard M. Stallman <rms@gnu.org>
parents: 9703
diff changeset
4237 #endif
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4238
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4239 x_delete_display (dpyinfo);
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4240 UNBLOCK_INPUT;
8782
51241477cfc5 Delete X11 conditionals.
Richard M. Stallman <rms@gnu.org>
parents: 8780
diff changeset
4241
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4242 return Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4243 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4244
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4245 DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4246 doc: /* Return the list of display names that Emacs has connections to. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4247 ()
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4248 {
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4249 Lisp_Object tail, result;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4250
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4251 result = Qnil;
25646
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
4252 for (tail = x_display_name_list; ! NILP (tail); tail = XCDR (tail))
9154af188477 Use XCAR and XCDR instead of explicit member references.
Ken Raeburn <raeburn@raeburn.org>
parents: 25628
diff changeset
4253 result = Fcons (XCAR (XCAR (tail)), result);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4254
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4255 return result;
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4256 }
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4257
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4258 DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4259 doc: /* If ON is non-nil, report X errors as soon as the erring request is made.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4260 If ON is nil, allow buffering of requests.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4261 Turning on synchronization prohibits the Xlib routines from buffering
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4262 requests and seriously degrades performance, but makes debugging much
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4263 easier.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4264 The optional second argument DISPLAY specifies which display to act on.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4265 DISPLAY should be either a frame or a display name (a string).
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4266 If DISPLAY is omitted or nil, that stands for the selected frame's display. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4267 (on, display)
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4268 Lisp_Object display, on;
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4269 {
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
4270 struct x_display_info *dpyinfo = check_x_display_info (display);
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4271
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4272 XSynchronize (dpyinfo->display, !EQ (on, Qnil));
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4273
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4274 return Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4275 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4276
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4277 /* Wait for responses to all X commands issued so far for frame F. */
5536
f900f7bba4c2 (x_sync): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5429
diff changeset
4278
f900f7bba4c2 (x_sync): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5429
diff changeset
4279 void
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4280 x_sync (f)
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4281 FRAME_PTR f;
5536
f900f7bba4c2 (x_sync): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5429
diff changeset
4282 {
5558
42ec75481b8b (x_sync): Block input.
Richard M. Stallman <rms@gnu.org>
parents: 5536
diff changeset
4283 BLOCK_INPUT;
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
4284 XSync (FRAME_X_DISPLAY (f), False);
5558
42ec75481b8b (x_sync): Block input.
Richard M. Stallman <rms@gnu.org>
parents: 5536
diff changeset
4285 UNBLOCK_INPUT;
5536
f900f7bba4c2 (x_sync): New function.
Richard M. Stallman <rms@gnu.org>
parents: 5429
diff changeset
4286 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4287
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
4288
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4289 /***********************************************************************
52762
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4290 General X functions exposed to Elisp.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4291 ***********************************************************************/
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4292
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4293 DEFUN ("x-send-client-message", Fx_send_client_event,
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4294 Sx_send_client_message, 6, 6, 0,
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4295 doc: /* Send a client message of MESSAGE-TYPE to window DEST on DISPLAY.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4296
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4297 For DISPLAY, specify either a frame or a display name (a string).
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4298 If DISPLAY is nil, that stands for the selected frame's display.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4299 DEST may be an integer, in which case it is a Window id. The value 0 may
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4300 be used to send to the root window of the DISPLAY.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4301 If DEST is a frame the event is sent to the outer window of that frame.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4302 Nil means the currently selected frame.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4303 If DEST is the string "PointerWindow" the event is sent to the window that
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4304 contains the pointer. If DEST is the string "InputFocus" the event is
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4305 sent to the window that has the input focus.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4306 FROM is the frame sending the event. Use nil for currently selected frame.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4307 MESSAGE-TYPE is the name of an Atom as a string.
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4308 FORMAT must be one of 8, 16 or 32 and determines the size of the values in
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4309 bits. VALUES is a list of integer and/or strings containing the values to
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4310 send. If a value is a string, it is converted to an Atom and the value of
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4311 the Atom is sent. If more values than fits into the event is given,
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4312 the excessive values are ignored. */)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4313 (display, dest, from, message_type, format, values)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4314 Lisp_Object display, dest, from, message_type, format, values;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4315 {
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4316 struct x_display_info *dpyinfo = check_x_display_info (display);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4317 Window wdest;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4318 XEvent event;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4319 Lisp_Object cons;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4320 int i;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4321 int max_nr_values = (int) sizeof (event.xclient.data.b);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4322 struct frame *f = check_x_frame (from);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4323
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4324 CHECK_STRING (message_type);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4325 CHECK_NUMBER (format);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4326 CHECK_CONS (values);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4327
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4328 for (cons = values; CONSP (cons); cons = XCDR (cons))
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4329 {
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4330 Lisp_Object o = XCAR (cons);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4331
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4332 if (! INTEGERP (o) && ! STRINGP (o))
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4333 error ("Bad data in VALUES, must be integer or string");
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4334 }
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4335
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4336 event.xclient.type = ClientMessage;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4337 event.xclient.format = XFASTINT (format);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4338
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4339 if (event.xclient.format != 8 && event.xclient.format != 16
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4340 && event.xclient.format != 32)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4341 error ("FORMAT must be one of 8, 16 or 32");
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4342 if (event.xclient.format == 16) max_nr_values /= 2;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4343 if (event.xclient.format == 32) max_nr_values /= 4;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4344
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4345 if (FRAMEP (dest) || NILP (dest))
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4346 {
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4347 struct frame *fdest = check_x_frame (dest);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4348 wdest = FRAME_OUTER_WINDOW (fdest);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4349 }
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4350 else if (STRINGP (dest))
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4351 {
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4352 if (strcmp (SDATA (dest), "PointerWindow") == 0)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4353 wdest = PointerWindow;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4354 else if (strcmp (SDATA (dest), "InputFocus") == 0)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4355 wdest = InputFocus;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4356 else
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4357 error ("DEST as a string must be one of PointerWindow or InputFocus");
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4358 }
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4359 else
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4360 {
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4361 CHECK_NUMBER (dest);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4362 wdest = (Window) XFASTINT (dest);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4363 if (wdest == 0) wdest = dpyinfo->root_window;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4364 }
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4365
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4366 BLOCK_INPUT;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4367 for (cons = values, i = 0;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4368 CONSP (cons) && i < max_nr_values;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4369 cons = XCDR (cons), ++i)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4370 {
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4371 Lisp_Object o = XCAR (cons);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4372 long val;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4373
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4374 if (INTEGERP (o))
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4375 val = XINT (o);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4376 else if (STRINGP (o))
52763
9f0dd16cb11b * xfns.c (Fx_send_client_event): Remove unused variable s.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52762
diff changeset
4377 val = XInternAtom (dpyinfo->display, SDATA (o), False);
52762
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4378
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4379 if (event.xclient.format == 8)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4380 event.xclient.data.b[i] = (char) val;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4381 else if (event.xclient.format == 16)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4382 event.xclient.data.s[i] = (short) val;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4383 else
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4384 event.xclient.data.l[i] = val;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4385 }
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4386
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4387 for ( ; i < max_nr_values; ++i)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4388 if (event.xclient.format == 8)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4389 event.xclient.data.b[i] = 0;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4390 else if (event.xclient.format == 16)
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4391 event.xclient.data.s[i] = 0;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4392 else
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4393 event.xclient.data.l[i] = 0;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4394
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4395 event.xclient.message_type
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4396 = XInternAtom (dpyinfo->display, SDATA (message_type), False);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4397 event.xclient.display = dpyinfo->display;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4398 event.xclient.window = FRAME_OUTER_WINDOW (f);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4399
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4400 XSendEvent (dpyinfo->display, wdest, False, 0xffff, &event);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4401
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4402 XFlush (dpyinfo->display);
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4403 UNBLOCK_INPUT;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4404
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4405 return Qnil;
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4406 }
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4407
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
4408 /***********************************************************************
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4409 Image types
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4410 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4411
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4412 /* Value is the number of elements of vector VECTOR. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4413
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4414 #define DIM(VECTOR) (sizeof (VECTOR) / sizeof *(VECTOR))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4415
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4416 /* List of supported image types. Use define_image_type to add new
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4417 types. Use lookup_image_type to find a type for a given symbol. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4418
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4419 static struct image_type *image_types;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4420
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4421 /* The symbol `xbm' which is used as the type symbol for XBM images. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4422
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4423 Lisp_Object Qxbm;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4424
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4425 /* Keywords. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4426
25679
8b09c5927f1c (QCfile): Moved to xdisp.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25646
diff changeset
4427 extern Lisp_Object QCwidth, QCheight, QCforeground, QCbackground, QCfile;
44068
85388a495f68 (QCtype): Remove duplicate declaration and
Kim F. Storm <storm@cua.dk>
parents: 43987
diff changeset
4428 extern Lisp_Object QCdata, QCtype;
85388a495f68 (QCtype): Remove duplicate declaration and
Kim F. Storm <storm@cua.dk>
parents: 43987
diff changeset
4429 Lisp_Object QCascent, QCmargin, QCrelief;
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
4430 Lisp_Object QCconversion, QCcolor_symbols, QCheuristic_mask;
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
4431 Lisp_Object QCindex, QCmatrix, QCcolor_adjustment, QCmask;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4432
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4433 /* Other symbols. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4434
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
4435 Lisp_Object Qlaplace, Qemboss, Qedge_detection, Qheuristic;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4436
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4437 /* Time in seconds after which images should be removed from the cache
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4438 if not displayed. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4439
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
4440 Lisp_Object Vimage_cache_eviction_delay;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4441
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4442 /* Function prototypes. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4443
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4444 static void define_image_type P_ ((struct image_type *type));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4445 static struct image_type *lookup_image_type P_ ((Lisp_Object symbol));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4446 static void image_error P_ ((char *format, Lisp_Object, Lisp_Object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4447 static void x_laplace P_ ((struct frame *, struct image *));
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
4448 static void x_emboss P_ ((struct frame *, struct image *));
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
4449 static int x_build_heuristic_mask P_ ((struct frame *, struct image *,
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
4450 Lisp_Object));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4451
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4452
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4453 /* Define a new image type from TYPE. This adds a copy of TYPE to
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4454 image_types and adds the symbol *TYPE->type to Vimage_types. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4455
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4456 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4457 define_image_type (type)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4458 struct image_type *type;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4459 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4460 /* Make a copy of TYPE to avoid a bus error in a dumped Emacs.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4461 The initialized data segment is read-only. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4462 struct image_type *p = (struct image_type *) xmalloc (sizeof *p);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4463 bcopy (type, p, sizeof *p);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4464 p->next = image_types;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4465 image_types = p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4466 Vimage_types = Fcons (*p->type, Vimage_types);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4467 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4468
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4469
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4470 /* Look up image type SYMBOL, and return a pointer to its image_type
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4471 structure. Value is null if SYMBOL is not a known image type. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4472
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4473 static INLINE struct image_type *
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4474 lookup_image_type (symbol)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4475 Lisp_Object symbol;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4476 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4477 struct image_type *type;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4478
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4479 for (type = image_types; type; type = type->next)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4480 if (EQ (symbol, *type->type))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4481 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4482
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4483 return type;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4484 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4485
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4486
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4487 /* Value is non-zero if OBJECT is a valid Lisp image specification. A
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4488 valid image specification is a list whose car is the symbol
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4489 `image', and whose rest is a property list. The property list must
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4490 contain a value for key `:type'. That value must be the name of a
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4491 supported image type. The rest of the property list depends on the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4492 image type. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4493
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4494 int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4495 valid_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4496 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4497 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4498 int valid_p = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4499
53335
fe80edbc3909 (x_set_mouse_color): Remove bogus x_check_errors call.
Kim F. Storm <storm@cua.dk>
parents: 53069
diff changeset
4500 if (IMAGEP (object))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4501 {
38542
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4502 Lisp_Object tem;
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4503
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4504 for (tem = XCDR (object); CONSP (tem); tem = XCDR (tem))
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4505 if (EQ (XCAR (tem), QCtype))
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4506 {
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4507 tem = XCDR (tem);
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4508 if (CONSP (tem) && SYMBOLP (XCAR (tem)))
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4509 {
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4510 struct image_type *type;
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4511 type = lookup_image_type (XCAR (tem));
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4512 if (type)
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4513 valid_p = type->valid_p (object);
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4514 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4515
38542
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4516 break;
27905f0c73b7 (valid_image_p): Protect better against invalid image
Gerd Moellmann <gerd@gnu.org>
parents: 38345
diff changeset
4517 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4518 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4519
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4520 return valid_p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4521 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4522
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4523
25800
609695887d08 (image_error): Use add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents: 25715
diff changeset
4524 /* Log error message with format string FORMAT and argument ARG.
609695887d08 (image_error): Use add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents: 25715
diff changeset
4525 Signaling an error, e.g. when an image cannot be loaded, is not a
609695887d08 (image_error): Use add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents: 25715
diff changeset
4526 good idea because this would interrupt redisplay, and the error
609695887d08 (image_error): Use add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents: 25715
diff changeset
4527 message display would lead to another redisplay. This function
609695887d08 (image_error): Use add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents: 25715
diff changeset
4528 therefore simply displays a message. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4529
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4530 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4531 image_error (format, arg1, arg2)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4532 char *format;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4533 Lisp_Object arg1, arg2;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4534 {
25800
609695887d08 (image_error): Use add_to_log.
Gerd Moellmann <gerd@gnu.org>
parents: 25715
diff changeset
4535 add_to_log (format, arg1, arg2);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4536 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4537
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4538
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4539
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4540 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4541 Image specifications
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4542 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4543
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4544 enum image_value_type
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4545 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4546 IMAGE_DONT_CHECK_VALUE_TYPE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4547 IMAGE_STRING_VALUE,
37946
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
4548 IMAGE_STRING_OR_NIL_VALUE,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4549 IMAGE_SYMBOL_VALUE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4550 IMAGE_POSITIVE_INTEGER_VALUE,
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4551 IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4552 IMAGE_NON_NEGATIVE_INTEGER_VALUE,
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4553 IMAGE_ASCENT_VALUE,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4554 IMAGE_INTEGER_VALUE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4555 IMAGE_FUNCTION_VALUE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4556 IMAGE_NUMBER_VALUE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4557 IMAGE_BOOL_VALUE
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4558 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4559
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4560 /* Structure used when parsing image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4561
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4562 struct image_keyword
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4563 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4564 /* Name of keyword. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4565 char *name;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4566
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4567 /* The type of value allowed. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4568 enum image_value_type type;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4569
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4570 /* Non-zero means key must be present. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4571 int mandatory_p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4572
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4573 /* Used to recognize duplicate keywords in a property list. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4574 int count;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4575
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4576 /* The value that was found. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4577 Lisp_Object value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4578 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4579
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4580
26401
9457656ded8b (QCuser_data): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 26304
diff changeset
4581 static int parse_image_spec P_ ((Lisp_Object, struct image_keyword *,
9457656ded8b (QCuser_data): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 26304
diff changeset
4582 int, Lisp_Object));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4583 static Lisp_Object image_spec_value P_ ((Lisp_Object, Lisp_Object, int *));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4584
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4585
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4586 /* Parse image spec SPEC according to KEYWORDS. A valid image spec
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4587 has the format (image KEYWORD VALUE ...). One of the keyword/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4588 value pairs must be `:type TYPE'. KEYWORDS is a vector of
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4589 image_keywords structures of size NKEYWORDS describing other
26401
9457656ded8b (QCuser_data): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 26304
diff changeset
4590 allowed keyword/value pairs. Value is non-zero if SPEC is valid. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4591
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4592 static int
26401
9457656ded8b (QCuser_data): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 26304
diff changeset
4593 parse_image_spec (spec, keywords, nkeywords, type)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4594 Lisp_Object spec;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4595 struct image_keyword *keywords;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4596 int nkeywords;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4597 Lisp_Object type;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4598 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4599 int i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4600 Lisp_Object plist;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4601
53335
fe80edbc3909 (x_set_mouse_color): Remove bogus x_check_errors call.
Kim F. Storm <storm@cua.dk>
parents: 53069
diff changeset
4602 if (!IMAGEP (spec))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4603 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4604
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4605 plist = XCDR (spec);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4606 while (CONSP (plist))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4607 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4608 Lisp_Object key, value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4609
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4610 /* First element of a pair must be a symbol. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4611 key = XCAR (plist);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4612 plist = XCDR (plist);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4613 if (!SYMBOLP (key))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4614 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4615
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4616 /* There must follow a value. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4617 if (!CONSP (plist))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4618 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4619 value = XCAR (plist);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4620 plist = XCDR (plist);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4621
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4622 /* Find key in KEYWORDS. Error if not found. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4623 for (i = 0; i < nkeywords; ++i)
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
4624 if (strcmp (keywords[i].name, SDATA (SYMBOL_NAME (key))) == 0)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4625 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4626
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4627 if (i == nkeywords)
26401
9457656ded8b (QCuser_data): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 26304
diff changeset
4628 continue;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4629
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4630 /* Record that we recognized the keyword. If a keywords
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4631 was found more than once, it's an error. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4632 keywords[i].value = value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4633 ++keywords[i].count;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4634
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4635 if (keywords[i].count > 1)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4636 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4637
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4638 /* Check type of value against allowed type. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4639 switch (keywords[i].type)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4640 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4641 case IMAGE_STRING_VALUE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4642 if (!STRINGP (value))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4643 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4644 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4645
37946
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
4646 case IMAGE_STRING_OR_NIL_VALUE:
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
4647 if (!STRINGP (value) && !NILP (value))
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
4648 return 0;
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
4649 break;
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
4650
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4651 case IMAGE_SYMBOL_VALUE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4652 if (!SYMBOLP (value))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4653 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4654 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4655
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4656 case IMAGE_POSITIVE_INTEGER_VALUE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4657 if (!INTEGERP (value) || XINT (value) <= 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4658 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4659 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4660
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4661 case IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR:
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4662 if (INTEGERP (value) && XINT (value) >= 0)
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4663 break;
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4664 if (CONSP (value)
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4665 && INTEGERP (XCAR (value)) && INTEGERP (XCDR (value))
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4666 && XINT (XCAR (value)) >= 0 && XINT (XCDR (value)) >= 0)
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4667 break;
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4668 return 0;
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4669
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4670 case IMAGE_ASCENT_VALUE:
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4671 if (SYMBOLP (value) && EQ (value, Qcenter))
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4672 break;
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4673 else if (INTEGERP (value)
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4674 && XINT (value) >= 0
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4675 && XINT (value) <= 100)
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4676 break;
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4677 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4678
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4679 case IMAGE_NON_NEGATIVE_INTEGER_VALUE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4680 if (!INTEGERP (value) || XINT (value) < 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4681 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4682 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4683
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4684 case IMAGE_DONT_CHECK_VALUE_TYPE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4685 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4686
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4687 case IMAGE_FUNCTION_VALUE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4688 value = indirect_function (value);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4689 if (SUBRP (value)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4690 || COMPILEDP (value)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4691 || (CONSP (value) && EQ (XCAR (value), Qlambda)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4692 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4693 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4694
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4695 case IMAGE_NUMBER_VALUE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4696 if (!INTEGERP (value) && !FLOATP (value))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4697 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4698 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4699
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4700 case IMAGE_INTEGER_VALUE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4701 if (!INTEGERP (value))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4702 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4703 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4704
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4705 case IMAGE_BOOL_VALUE:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4706 if (!NILP (value) && !EQ (value, Qt))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4707 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4708 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4709
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4710 default:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4711 abort ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4712 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4713 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4714
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4715 if (EQ (key, QCtype) && !EQ (type, value))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4716 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4717 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4718
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4719 /* Check that all mandatory fields are present. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4720 for (i = 0; i < nkeywords; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4721 if (keywords[i].mandatory_p && keywords[i].count == 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4722 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4723
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4724 return NILP (plist);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4725 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4726
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4727
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4728 /* Return the value of KEY in image specification SPEC. Value is nil
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4729 if KEY is not present in SPEC. if FOUND is not null, set *FOUND
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4730 to 1 if KEY was found in SPEC, set it to 0 otherwise. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4731
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4732 static Lisp_Object
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4733 image_spec_value (spec, key, found)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4734 Lisp_Object spec, key;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4735 int *found;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4736 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4737 Lisp_Object tail;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4738
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4739 xassert (valid_image_p (spec));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4740
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4741 for (tail = XCDR (spec);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4742 CONSP (tail) && CONSP (XCDR (tail));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4743 tail = XCDR (XCDR (tail)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4744 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4745 if (EQ (XCAR (tail), key))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4746 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4747 if (found)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4748 *found = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4749 return XCAR (XCDR (tail));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4750 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4751 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4752
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4753 if (found)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4754 *found = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4755 return Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4756 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4757
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4758
29938
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4759 DEFUN ("image-size", Fimage_size, Simage_size, 1, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4760 doc: /* Return the size of image SPEC as pair (WIDTH . HEIGHT).
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4761 PIXELS non-nil means return the size in pixels, otherwise return the
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4762 size in canonical character units.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4763 FRAME is the frame on which the image will be displayed. FRAME nil
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4764 or omitted means use the selected frame. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4765 (spec, pixels, frame)
29938
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4766 Lisp_Object spec, pixels, frame;
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4767 {
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4768 Lisp_Object size;
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4769
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4770 size = Qnil;
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4771 if (valid_image_p (spec))
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4772 {
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4773 struct frame *f = check_x_frame (frame);
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
4774 int id = lookup_image (f, spec);
29938
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4775 struct image *img = IMAGE_FROM_ID (f, id);
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4776 int width = img->width + 2 * img->hmargin;
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4777 int height = img->height + 2 * img->vmargin;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4778
29938
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4779 if (NILP (pixels))
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
4780 size = Fcons (make_float ((double) width / FRAME_COLUMN_WIDTH (f)),
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
4781 make_float ((double) height / FRAME_LINE_HEIGHT (f)));
29938
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4782 else
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4783 size = Fcons (make_number (width), make_number (height));
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4784 }
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4785 else
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4786 error ("Invalid image specification");
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4787
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4788 return size;
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4789 }
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
4790
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4791
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4792 DEFUN ("image-mask-p", Fimage_mask_p, Simage_mask_p, 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4793 doc: /* Return t if image SPEC has a mask bitmap.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
4794 FRAME is the frame on which the image will be displayed. FRAME nil
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4795 or omitted means use the selected frame. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
4796 (spec, frame)
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4797 Lisp_Object spec, frame;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4798 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4799 Lisp_Object mask;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4800
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4801 mask = Qnil;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4802 if (valid_image_p (spec))
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4803 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4804 struct frame *f = check_x_frame (frame);
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
4805 int id = lookup_image (f, spec);
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4806 struct image *img = IMAGE_FROM_ID (f, id);
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4807 if (img->mask)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4808 mask = Qt;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4809 }
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4810 else
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4811 error ("Invalid image specification");
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4812
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4813 return mask;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4814 }
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4815
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
4816
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4817
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4818 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4819 Image type independent image structures
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4820 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4821
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4822 static struct image *make_image P_ ((Lisp_Object spec, unsigned hash));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4823 static void free_image P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4824
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4825
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4826 /* Allocate and return a new image structure for image specification
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4827 SPEC. SPEC has a hash value of HASH. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4828
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4829 static struct image *
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4830 make_image (spec, hash)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4831 Lisp_Object spec;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4832 unsigned hash;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4833 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4834 struct image *img = (struct image *) xmalloc (sizeof *img);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4835
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4836 xassert (valid_image_p (spec));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4837 bzero (img, sizeof *img);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4838 img->type = lookup_image_type (image_spec_value (spec, QCtype, NULL));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4839 xassert (img->type != NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4840 img->spec = spec;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4841 img->data.lisp_val = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4842 img->ascent = DEFAULT_IMAGE_ASCENT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4843 img->hash = hash;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4844 return img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4845 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4846
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4847
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4848 /* Free image IMG which was used on frame F, including its resources. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4849
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4850 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4851 free_image (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4852 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4853 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4854 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4855 if (img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4856 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4857 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4858
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4859 /* Remove IMG from the hash table of its cache. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4860 if (img->prev)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4861 img->prev->next = img->next;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4862 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4863 c->buckets[img->hash % IMAGE_CACHE_BUCKETS_SIZE] = img->next;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4864
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4865 if (img->next)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4866 img->next->prev = img->prev;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4867
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4868 c->images[img->id] = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4869
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4870 /* Free resources, then free IMG. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4871 img->type->free (f, img);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4872 xfree (img);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4873 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4874 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4875
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4876
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4877 /* Prepare image IMG for display on frame F. Must be called before
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4878 drawing an image. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4879
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4880 void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4881 prepare_image_for_display (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4882 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4883 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4884 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4885 EMACS_TIME t;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4886
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4887 /* We're about to display IMG, so set its timestamp to `now'. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4888 EMACS_GET_TIME (t);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4889 img->timestamp = EMACS_SECS (t);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4890
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4891 /* If IMG doesn't have a pixmap yet, load it now, using the image
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4892 type dependent loader function. */
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
4893 if (img->pixmap == None && !img->load_failed_p)
25955
3daaee890b1e (prepare_image_for_display): Don't try to load image if
Gerd Moellmann <gerd@gnu.org>
parents: 25817
diff changeset
4894 img->load_failed_p = img->type->load (f, img) == 0;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4895 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4896
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
4897
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4898 /* Value is the number of pixels for the ascent of image IMG when
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4899 drawn in face FACE. */
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4900
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4901 int
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4902 image_ascent (img, face)
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4903 struct image *img;
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4904 struct face *face;
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4905 {
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
4906 int height = img->height + img->vmargin;
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4907 int ascent;
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4908
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4909 if (img->ascent == CENTERED_IMAGE_ASCENT)
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4910 {
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4911 if (face->font)
32160
0abb3c153331 (image_ascent): Rearrange ascent calculation for the has-a-font case.
Miles Bader <miles@gnu.org>
parents: 31999
diff changeset
4912 /* This expression is arranged so that if the image can't be
0abb3c153331 (image_ascent): Rearrange ascent calculation for the has-a-font case.
Miles Bader <miles@gnu.org>
parents: 31999
diff changeset
4913 exactly centered, it will be moved slightly up. This is
0abb3c153331 (image_ascent): Rearrange ascent calculation for the has-a-font case.
Miles Bader <miles@gnu.org>
parents: 31999
diff changeset
4914 because a typical font is `top-heavy' (due to the presence
0abb3c153331 (image_ascent): Rearrange ascent calculation for the has-a-font case.
Miles Bader <miles@gnu.org>
parents: 31999
diff changeset
4915 uppercase letters), so the image placement should err towards
0abb3c153331 (image_ascent): Rearrange ascent calculation for the has-a-font case.
Miles Bader <miles@gnu.org>
parents: 31999
diff changeset
4916 being top-heavy too. It also just generally looks better. */
0abb3c153331 (image_ascent): Rearrange ascent calculation for the has-a-font case.
Miles Bader <miles@gnu.org>
parents: 31999
diff changeset
4917 ascent = (height + face->font->ascent - face->font->descent + 1) / 2;
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4918 else
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4919 ascent = height / 2;
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4920 }
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4921 else
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4922 ascent = height * img->ascent / 100.0;
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4923
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4924 return ascent;
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4925 }
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
4926
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4927
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4928 /* Image background colors. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4929
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4930 static unsigned long
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4931 four_corners_best (ximg, width, height)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4932 XImage *ximg;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4933 unsigned long width, height;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4934 {
40606
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4935 unsigned long corners[4], best;
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4936 int i, best_count;
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4937
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4938 /* Get the colors at the corners of ximg. */
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4939 corners[0] = XGetPixel (ximg, 0, 0);
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4940 corners[1] = XGetPixel (ximg, width - 1, 0);
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4941 corners[2] = XGetPixel (ximg, width - 1, height - 1);
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4942 corners[3] = XGetPixel (ximg, 0, height - 1);
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4943
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4944 /* Choose the most frequently found color as background. */
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4945 for (i = best_count = 0; i < 4; ++i)
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4946 {
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4947 int j, n;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
4948
40606
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4949 for (j = n = 0; j < 4; ++j)
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4950 if (corners[i] == corners[j])
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4951 ++n;
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4952
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4953 if (n > best_count)
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4954 best = corners[i], best_count = n;
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4955 }
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4956
d590ec395dcd (four_corners_best): Reindent.
Gerd Moellmann <gerd@gnu.org>
parents: 40599
diff changeset
4957 return best;
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4958 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4959
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4960 /* Return the `background' field of IMG. If IMG doesn't have one yet,
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4961 it is guessed heuristically. If non-zero, XIMG is an existing XImage
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4962 object to use for the heuristic. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4963
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4964 unsigned long
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4965 image_background (img, f, ximg)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4966 struct image *img;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4967 struct frame *f;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4968 XImage *ximg;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4969 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4970 if (! img->background_valid)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4971 /* IMG doesn't have a background yet, try to guess a reasonable value. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4972 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4973 int free_ximg = !ximg;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4974
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4975 if (! ximg)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4976 ximg = XGetImage (FRAME_X_DISPLAY (f), img->pixmap,
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4977 0, 0, img->width, img->height, ~0, ZPixmap);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4978
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4979 img->background = four_corners_best (ximg, img->width, img->height);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4980
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4981 if (free_ximg)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4982 XDestroyImage (ximg);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4983
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4984 img->background_valid = 1;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4985 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4986
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4987 return img->background;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4988 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4989
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4990 /* Return the `background_transparent' field of IMG. If IMG doesn't
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4991 have one yet, it is guessed heuristically. If non-zero, MASK is an
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4992 existing XImage object to use for the heuristic. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4993
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4994 int
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4995 image_background_transparent (img, f, mask)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4996 struct image *img;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4997 struct frame *f;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4998 XImage *mask;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
4999 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5000 if (! img->background_transparent_valid)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5001 /* IMG doesn't have a background yet, try to guess a reasonable value. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5002 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5003 if (img->mask)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5004 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5005 int free_mask = !mask;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5006
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5007 if (! mask)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5008 mask = XGetImage (FRAME_X_DISPLAY (f), img->mask,
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5009 0, 0, img->width, img->height, ~0, ZPixmap);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5010
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5011 img->background_transparent
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5012 = !four_corners_best (mask, img->width, img->height);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5013
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5014 if (free_mask)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5015 XDestroyImage (mask);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5016 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5017 else
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5018 img->background_transparent = 0;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5019
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5020 img->background_transparent_valid = 1;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5021 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5022
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5023 return img->background_transparent;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5024 }
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
5025
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5026
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5027 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5028 Helper functions for X image types
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5029 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5030
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5031 static void x_clear_image_1 P_ ((struct frame *, struct image *, int,
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5032 int, int));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5033 static void x_clear_image P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5034 static unsigned long x_alloc_image_color P_ ((struct frame *f,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5035 struct image *img,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5036 Lisp_Object color_name,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5037 unsigned long dflt));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5038
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5039
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5040 /* Clear X resources of image IMG on frame F. PIXMAP_P non-zero means
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5041 free the pixmap if any. MASK_P non-zero means clear the mask
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5042 pixmap if any. COLORS_P non-zero means free colors allocated for
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5043 the image, if any. */
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5044
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5045 static void
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5046 x_clear_image_1 (f, img, pixmap_p, mask_p, colors_p)
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5047 struct frame *f;
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5048 struct image *img;
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5049 int pixmap_p, mask_p, colors_p;
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5050 {
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5051 if (pixmap_p && img->pixmap)
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5052 {
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5053 XFreePixmap (FRAME_X_DISPLAY (f), img->pixmap);
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5054 img->pixmap = None;
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5055 img->background_valid = 0;
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5056 }
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5057
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5058 if (mask_p && img->mask)
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5059 {
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5060 XFreePixmap (FRAME_X_DISPLAY (f), img->mask);
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5061 img->mask = None;
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5062 img->background_transparent_valid = 0;
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5063 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5064
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5065 if (colors_p && img->ncolors)
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5066 {
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5067 x_free_colors (f, img->colors, img->ncolors);
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5068 xfree (img->colors);
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5069 img->colors = NULL;
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5070 img->ncolors = 0;
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5071 }
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5072 }
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5073
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5074 /* Free X resources of image IMG which is used on frame F. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5075
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5076 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5077 x_clear_image (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5078 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5079 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5080 {
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5081 BLOCK_INPUT;
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5082 x_clear_image_1 (f, img, 1, 1, 1);
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5083 UNBLOCK_INPUT;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5084 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5085
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5086
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5087 /* Allocate color COLOR_NAME for image IMG on frame F. If color
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5088 cannot be allocated, use DFLT. Add a newly allocated color to
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5089 IMG->colors, so that it can be freed again. Value is the pixel
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5090 color. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5091
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5092 static unsigned long
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5093 x_alloc_image_color (f, img, color_name, dflt)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5094 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5095 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5096 Lisp_Object color_name;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5097 unsigned long dflt;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5098 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5099 XColor color;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5100 unsigned long result;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5101
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5102 xassert (STRINGP (color_name));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5103
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
5104 if (x_defined_color (f, SDATA (color_name), &color, 1))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5105 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5106 /* This isn't called frequently so we get away with simply
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5107 reallocating the color vector to the needed size, here. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5108 ++img->ncolors;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5109 img->colors =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5110 (unsigned long *) xrealloc (img->colors,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5111 img->ncolors * sizeof *img->colors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5112 img->colors[img->ncolors - 1] = color.pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5113 result = color.pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5114 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5115 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5116 result = dflt;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5117
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5118 return result;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5119 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5120
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5121
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5122
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5123 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5124 Image Cache
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5125 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5126
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5127 static void cache_image P_ ((struct frame *f, struct image *img));
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5128 static void postprocess_image P_ ((struct frame *, struct image *));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5129
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5130
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5131 /* Return a new, initialized image cache that is allocated from the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5132 heap. Call free_image_cache to free an image cache. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5133
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5134 struct image_cache *
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5135 make_image_cache ()
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5136 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5137 struct image_cache *c = (struct image_cache *) xmalloc (sizeof *c);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5138 int size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5139
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5140 bzero (c, sizeof *c);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5141 c->size = 50;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5142 c->images = (struct image **) xmalloc (c->size * sizeof *c->images);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5143 size = IMAGE_CACHE_BUCKETS_SIZE * sizeof *c->buckets;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5144 c->buckets = (struct image **) xmalloc (size);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5145 bzero (c->buckets, size);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5146 return c;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5147 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5148
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5149
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5150 /* Free image cache of frame F. Be aware that X frames share images
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5151 caches. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5152
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5153 void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5154 free_image_cache (f)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5155 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5156 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5157 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5158 if (c)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5159 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5160 int i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5161
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5162 /* Cache should not be referenced by any frame when freed. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5163 xassert (c->refcount == 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5164
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5165 for (i = 0; i < c->used; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5166 free_image (f, c->images[i]);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5167 xfree (c->images);
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
5168 xfree (c->buckets);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5169 xfree (c);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5170 FRAME_X_IMAGE_CACHE (f) = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5171 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5172 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5173
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5174
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5175 /* Clear image cache of frame F. FORCE_P non-zero means free all
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5176 images. FORCE_P zero means clear only images that haven't been
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5177 displayed for some time. Should be called from time to time to
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5178 reduce the number of loaded images. If image-eviction-seconds is
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5179 non-nil, this frees images in the cache which weren't displayed for
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5180 at least that many seconds. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5181
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5182 void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5183 clear_image_cache (f, force_p)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5184 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5185 int force_p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5186 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5187 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5188
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
5189 if (c && INTEGERP (Vimage_cache_eviction_delay))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5190 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5191 EMACS_TIME t;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5192 unsigned long old;
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5193 int i, nfreed;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5194
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5195 EMACS_GET_TIME (t);
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
5196 old = EMACS_SECS (t) - XFASTINT (Vimage_cache_eviction_delay);
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5197
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5198 /* Block input so that we won't be interrupted by a SIGIO
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5199 while being in an inconsistent state. */
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5200 BLOCK_INPUT;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5201
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5202 for (i = nfreed = 0; i < c->used; ++i)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5203 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5204 struct image *img = c->images[i];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5205 if (img != NULL
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5206 && (force_p || img->timestamp < old))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5207 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5208 free_image (f, img);
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5209 ++nfreed;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5210 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5211 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5212
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5213 /* We may be clearing the image cache because, for example,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5214 Emacs was iconified for a longer period of time. In that
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5215 case, current matrices may still contain references to
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5216 images freed above. So, clear these matrices. */
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5217 if (nfreed)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5218 {
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5219 Lisp_Object tail, frame;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5220
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5221 FOR_EACH_FRAME (tail, frame)
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5222 {
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5223 struct frame *f = XFRAME (frame);
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5224 if (FRAME_X_P (f)
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5225 && FRAME_X_IMAGE_CACHE (f) == c)
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
5226 clear_current_matrices (f);
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5227 }
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5228
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5229 ++windows_or_buffers_changed;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5230 }
31688
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5231
437830e83b45 (clear_image_cache): Clear current matrices of all
Gerd Moellmann <gerd@gnu.org>
parents: 31686
diff changeset
5232 UNBLOCK_INPUT;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5233 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5234 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5235
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5236
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5237 DEFUN ("clear-image-cache", Fclear_image_cache, Sclear_image_cache,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5238 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
5239 doc: /* Clear the image cache of FRAME.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
5240 FRAME nil or omitted means use the selected frame.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
5241 FRAME t means clear the image caches of all frames. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
5242 (frame)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5243 Lisp_Object frame;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5244 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5245 if (EQ (frame, Qt))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5246 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5247 Lisp_Object tail;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5248
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5249 FOR_EACH_FRAME (tail, frame)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5250 if (FRAME_X_P (XFRAME (frame)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5251 clear_image_cache (XFRAME (frame), 1);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5252 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5253 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5254 clear_image_cache (check_x_frame (frame), 1);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5255
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5256 return Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5257 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5258
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5259
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5260 /* Compute masks and transform image IMG on frame F, as specified
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5261 by the image's specification, */
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5262
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5263 static void
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5264 postprocess_image (f, img)
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5265 struct frame *f;
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5266 struct image *img;
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5267 {
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5268 /* Manipulation of the image's mask. */
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5269 if (img->pixmap)
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5270 {
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5271 Lisp_Object conversion, spec;
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5272 Lisp_Object mask;
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5273
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5274 spec = img->spec;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5275
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5276 /* `:heuristic-mask t'
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5277 `:mask heuristic'
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5278 means build a mask heuristically.
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5279 `:heuristic-mask (R G B)'
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5280 `:mask (heuristic (R G B))'
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5281 means build a mask from color (R G B) in the
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5282 image.
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5283 `:mask nil'
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5284 means remove a mask, if any. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5285
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5286 mask = image_spec_value (spec, QCheuristic_mask, NULL);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5287 if (!NILP (mask))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5288 x_build_heuristic_mask (f, img, mask);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5289 else
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5290 {
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5291 int found_p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5292
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5293 mask = image_spec_value (spec, QCmask, &found_p);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5294
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5295 if (EQ (mask, Qheuristic))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5296 x_build_heuristic_mask (f, img, Qt);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5297 else if (CONSP (mask)
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5298 && EQ (XCAR (mask), Qheuristic))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5299 {
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5300 if (CONSP (XCDR (mask)))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5301 x_build_heuristic_mask (f, img, XCAR (XCDR (mask)));
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5302 else
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5303 x_build_heuristic_mask (f, img, XCDR (mask));
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5304 }
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5305 else if (NILP (mask) && found_p && img->mask)
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5306 {
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5307 XFreePixmap (FRAME_X_DISPLAY (f), img->mask);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5308 img->mask = None;
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5309 }
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5310 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5311
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5312
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5313 /* Should we apply an image transformation algorithm? */
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5314 conversion = image_spec_value (spec, QCconversion, NULL);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5315 if (EQ (conversion, Qdisabled))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5316 x_disable_image (f, img);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5317 else if (EQ (conversion, Qlaplace))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5318 x_laplace (f, img);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5319 else if (EQ (conversion, Qemboss))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5320 x_emboss (f, img);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5321 else if (CONSP (conversion)
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5322 && EQ (XCAR (conversion), Qedge_detection))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5323 {
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5324 Lisp_Object tem;
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5325 tem = XCDR (conversion);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5326 if (CONSP (tem))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5327 x_edge_detection (f, img,
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5328 Fplist_get (tem, QCmatrix),
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5329 Fplist_get (tem, QCcolor_adjustment));
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5330 }
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5331 }
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5332 }
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5333
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5334
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5335 /* Return the id of image with Lisp specification SPEC on frame F.
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
5336 SPEC must be a valid Lisp image specification (see valid_image_p). */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5337
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5338 int
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
5339 lookup_image (f, spec)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5340 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5341 Lisp_Object spec;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5342 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5343 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5344 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5345 int i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5346 unsigned hash;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5347 struct gcpro gcpro1;
25817
190a99688b53 (lookup_image): Set image's timestamp because it's
Gerd Moellmann <gerd@gnu.org>
parents: 25800
diff changeset
5348 EMACS_TIME now;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5349
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5350 /* F must be a window-system frame, and SPEC must be a valid image
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5351 specification. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5352 xassert (FRAME_WINDOW_P (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5353 xassert (valid_image_p (spec));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5354
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5355 GCPRO1 (spec);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5356
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5357 /* Look up SPEC in the hash table of the image cache. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5358 hash = sxhash (spec, 0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5359 i = hash % IMAGE_CACHE_BUCKETS_SIZE;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5360
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5361 for (img = c->buckets[i]; img; img = img->next)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5362 if (img->hash == hash && !NILP (Fequal (img->spec, spec)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5363 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5364
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5365 /* If not found, create a new image and cache it. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5366 if (img == NULL)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5367 {
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5368 extern Lisp_Object Qpostscript;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5369
31686
577372d71de8 (lookup_image): Block input while loading the image so
Gerd Moellmann <gerd@gnu.org>
parents: 31651
diff changeset
5370 BLOCK_INPUT;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5371 img = make_image (spec, hash);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5372 cache_image (f, img);
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
5373 img->load_failed_p = img->type->load (f, img) == 0;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5374
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5375 /* If we can't load the image, and we don't have a width and
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5376 height, use some arbitrary width and height so that we can
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5377 draw a rectangle for it. */
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
5378 if (img->load_failed_p)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5379 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5380 Lisp_Object value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5381
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5382 value = image_spec_value (spec, QCwidth, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5383 img->width = (INTEGERP (value)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5384 ? XFASTINT (value) : DEFAULT_IMAGE_WIDTH);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5385 value = image_spec_value (spec, QCheight, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5386 img->height = (INTEGERP (value)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5387 ? XFASTINT (value) : DEFAULT_IMAGE_HEIGHT);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5388 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5389 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5390 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5391 /* Handle image type independent image attributes
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5392 `:ascent ASCENT', `:margin MARGIN', `:relief RELIEF',
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5393 `:background COLOR'. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5394 Lisp_Object ascent, margin, relief, bg;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5395
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5396 ascent = image_spec_value (spec, QCascent, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5397 if (INTEGERP (ascent))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5398 img->ascent = XFASTINT (ascent);
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
5399 else if (EQ (ascent, Qcenter))
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
5400 img->ascent = CENTERED_IMAGE_ASCENT;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5401
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5402 margin = image_spec_value (spec, QCmargin, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5403 if (INTEGERP (margin) && XINT (margin) >= 0)
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5404 img->vmargin = img->hmargin = XFASTINT (margin);
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5405 else if (CONSP (margin) && INTEGERP (XCAR (margin))
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5406 && INTEGERP (XCDR (margin)))
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5407 {
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5408 if (XINT (XCAR (margin)) > 0)
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5409 img->hmargin = XFASTINT (XCAR (margin));
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5410 if (XINT (XCDR (margin)) > 0)
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5411 img->vmargin = XFASTINT (XCDR (margin));
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5412 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5413
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5414 relief = image_spec_value (spec, QCrelief, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5415 if (INTEGERP (relief))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5416 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5417 img->relief = XINT (relief);
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5418 img->hmargin += abs (img->relief);
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5419 img->vmargin += abs (img->relief);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5420 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5421
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5422 if (! img->background_valid)
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5423 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5424 bg = image_spec_value (img->spec, QCbackground, NULL);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5425 if (!NILP (bg))
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5426 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5427 img->background
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5428 = x_alloc_image_color (f, img, bg,
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5429 FRAME_BACKGROUND_PIXEL (f));
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5430 img->background_valid = 1;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5431 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5432 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
5433
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5434 /* Do image transformations and compute masks, unless we
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5435 don't have the image yet. */
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5436 if (!EQ (*img->type->type, Qpostscript))
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
5437 postprocess_image (f, img);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5438 }
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5439
31686
577372d71de8 (lookup_image): Block input while loading the image so
Gerd Moellmann <gerd@gnu.org>
parents: 31651
diff changeset
5440 UNBLOCK_INPUT;
577372d71de8 (lookup_image): Block input while loading the image so
Gerd Moellmann <gerd@gnu.org>
parents: 31651
diff changeset
5441 xassert (!interrupt_input_blocked);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5442 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5443
25817
190a99688b53 (lookup_image): Set image's timestamp because it's
Gerd Moellmann <gerd@gnu.org>
parents: 25800
diff changeset
5444 /* We're using IMG, so set its timestamp to `now'. */
190a99688b53 (lookup_image): Set image's timestamp because it's
Gerd Moellmann <gerd@gnu.org>
parents: 25800
diff changeset
5445 EMACS_GET_TIME (now);
190a99688b53 (lookup_image): Set image's timestamp because it's
Gerd Moellmann <gerd@gnu.org>
parents: 25800
diff changeset
5446 img->timestamp = EMACS_SECS (now);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5447
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5448 UNGCPRO;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5449
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5450 /* Value is the image id. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5451 return img->id;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5452 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5453
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5454
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5455 /* Cache image IMG in the image cache of frame F. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5456
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5457 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5458 cache_image (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5459 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5460 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5461 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5462 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5463 int i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5464
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5465 /* Find a free slot in c->images. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5466 for (i = 0; i < c->used; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5467 if (c->images[i] == NULL)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5468 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5469
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5470 /* If no free slot found, maybe enlarge c->images. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5471 if (i == c->used && c->used == c->size)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5472 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5473 c->size *= 2;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5474 c->images = (struct image **) xrealloc (c->images,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5475 c->size * sizeof *c->images);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5476 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5477
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5478 /* Add IMG to c->images, and assign IMG an id. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5479 c->images[i] = img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5480 img->id = i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5481 if (i == c->used)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5482 ++c->used;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5483
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5484 /* Add IMG to the cache's hash table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5485 i = img->hash % IMAGE_CACHE_BUCKETS_SIZE;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5486 img->next = c->buckets[i];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5487 if (img->next)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5488 img->next->prev = img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5489 img->prev = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5490 c->buckets[i] = img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5491 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5492
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5493
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5494 /* Call FN on every image in the image cache of frame F. Used to mark
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5495 Lisp Objects in the image cache. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5496
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5497 void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5498 forall_images_in_image_cache (f, fn)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5499 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5500 void (*fn) P_ ((struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5501 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5502 if (FRAME_LIVE_P (f) && FRAME_X_P (f))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5503 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5504 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5505 if (c)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5506 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5507 int i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5508 for (i = 0; i < c->used; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5509 if (c->images[i])
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5510 fn (c->images[i]);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5511 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5512 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5513 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5514
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5515
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5516
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5517 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5518 X support code
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5519 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5520
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
5521 static int x_create_x_image_and_pixmap P_ ((struct frame *, int, int, int,
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
5522 XImage **, Pixmap *));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5523 static void x_destroy_x_image P_ ((XImage *));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5524 static void x_put_x_image P_ ((struct frame *, XImage *, Pixmap, int, int));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5525
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5526
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5527 /* Create an XImage and a pixmap of size WIDTH x HEIGHT for use on
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5528 frame F. Set *XIMG and *PIXMAP to the XImage and Pixmap created.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5529 Set (*XIMG)->data to a raster of WIDTH x HEIGHT pixels allocated
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5530 via xmalloc. Print error messages via image_error if an error
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
5531 occurs. Value is non-zero if successful. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5532
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5533 static int
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
5534 x_create_x_image_and_pixmap (f, width, height, depth, ximg, pixmap)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5535 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5536 int width, height, depth;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5537 XImage **ximg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5538 Pixmap *pixmap;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5539 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5540 Display *display = FRAME_X_DISPLAY (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5541 Screen *screen = FRAME_X_SCREEN (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5542 Window window = FRAME_X_WINDOW (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5543
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5544 xassert (interrupt_input_blocked);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5545
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5546 if (depth <= 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5547 depth = DefaultDepthOfScreen (screen);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5548 *ximg = XCreateImage (display, DefaultVisualOfScreen (screen),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5549 depth, ZPixmap, 0, NULL, width, height,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5550 depth > 16 ? 32 : depth > 8 ? 16 : 8, 0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5551 if (*ximg == NULL)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5552 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
5553 image_error ("Unable to allocate X image", Qnil, Qnil);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5554 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5555 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5556
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5557 /* Allocate image raster. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5558 (*ximg)->data = (char *) xmalloc ((*ximg)->bytes_per_line * height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5559
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5560 /* Allocate a pixmap of the same size. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5561 *pixmap = XCreatePixmap (display, window, width, height, depth);
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
5562 if (*pixmap == None)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5563 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5564 x_destroy_x_image (*ximg);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5565 *ximg = NULL;
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
5566 image_error ("Unable to create X pixmap", Qnil, Qnil);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5567 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5568 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5569
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5570 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5571 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5572
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5573
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5574 /* Destroy XImage XIMG. Free XIMG->data. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5575
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5576 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5577 x_destroy_x_image (ximg)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5578 XImage *ximg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5579 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5580 xassert (interrupt_input_blocked);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5581 if (ximg)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5582 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5583 xfree (ximg->data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5584 ximg->data = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5585 XDestroyImage (ximg);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5586 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5587 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5588
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5589
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5590 /* Put XImage XIMG into pixmap PIXMAP on frame F. WIDTH and HEIGHT
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5591 are width and height of both the image and pixmap. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5592
25691
815efc48a80b (x_put_x_image): Make type consistent with declaration.
Dave Love <fx@gnu.org>
parents: 25679
diff changeset
5593 static void
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5594 x_put_x_image (f, ximg, pixmap, width, height)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5595 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5596 XImage *ximg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5597 Pixmap pixmap;
48328
7ce5ded16e10 (x_put_x_image):
Dave Love <fx@gnu.org>
parents: 48000
diff changeset
5598 int width, height;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5599 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5600 GC gc;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5601
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5602 xassert (interrupt_input_blocked);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5603 gc = XCreateGC (FRAME_X_DISPLAY (f), pixmap, 0, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5604 XPutImage (FRAME_X_DISPLAY (f), pixmap, gc, ximg, 0, 0, 0, 0, width, height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5605 XFreeGC (FRAME_X_DISPLAY (f), gc);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5606 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5607
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5608
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5609
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5610 /***********************************************************************
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5611 File Handling
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5612 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5613
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5614 static Lisp_Object x_find_image_file P_ ((Lisp_Object));
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5615 static char *slurp_file P_ ((char *, int *));
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5616
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5617
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5618 /* Find image file FILE. Look in data-directory, then
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5619 x-bitmap-file-path. Value is the full name of the file found, or
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5620 nil if not found. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5621
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5622 static Lisp_Object
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5623 x_find_image_file (file)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5624 Lisp_Object file;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5625 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5626 Lisp_Object file_found, search_path;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5627 struct gcpro gcpro1, gcpro2;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5628 int fd;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5629
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5630 file_found = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5631 search_path = Fcons (Vdata_directory, Vx_bitmap_file_path);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5632 GCPRO2 (file_found, search_path);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5633
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5634 /* Try to find FILE in data-directory, then x-bitmap-file-path. */
45009
7a00556be3ce (x_create_bitmap_from_file, x_find_image_file): Update call to openp.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44786
diff changeset
5635 fd = openp (search_path, file, Qnil, &file_found, Qnil);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5636
33443
2c60aa5cd386 (x_create_bitmap_from_file, x_find_image_file): Use new openp return protocol.
Miles Bader <miles@gnu.org>
parents: 33242
diff changeset
5637 if (fd == -1)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5638 file_found = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5639 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5640 close (fd);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5641
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5642 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5643 return file_found;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5644 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5645
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5646
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5647 /* Read FILE into memory. Value is a pointer to a buffer allocated
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5648 with xmalloc holding FILE's contents. Value is null if an error
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
5649 occurred. *SIZE is set to the size of the file. */
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5650
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5651 static char *
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5652 slurp_file (file, size)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5653 char *file;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5654 int *size;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5655 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5656 FILE *fp = NULL;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5657 char *buf = NULL;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5658 struct stat st;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5659
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5660 if (stat (file, &st) == 0
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5661 && (fp = fopen (file, "r")) != NULL
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5662 && (buf = (char *) xmalloc (st.st_size),
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5663 fread (buf, 1, st.st_size, fp) == st.st_size))
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5664 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5665 *size = st.st_size;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5666 fclose (fp);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5667 }
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5668 else
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5669 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5670 if (fp)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5671 fclose (fp);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5672 if (buf)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5673 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5674 xfree (buf);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5675 buf = NULL;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5676 }
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5677 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5678
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5679 return buf;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5680 }
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5681
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5682
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5683
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5684 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5685 XBM images
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5686 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5687
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5688 static int xbm_scan P_ ((char **, char *, char *, int *));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5689 static int xbm_load P_ ((struct frame *f, struct image *img));
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5690 static int xbm_load_image P_ ((struct frame *f, struct image *img,
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5691 char *, char *));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5692 static int xbm_image_p P_ ((Lisp_Object object));
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5693 static int xbm_read_bitmap_data P_ ((char *, char *, int *, int *,
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5694 unsigned char **));
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5695 static int xbm_file_p P_ ((Lisp_Object));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5696
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5697
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5698 /* Indices of image specification fields in xbm_format, below. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5699
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5700 enum xbm_keyword_index
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5701 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5702 XBM_TYPE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5703 XBM_FILE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5704 XBM_WIDTH,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5705 XBM_HEIGHT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5706 XBM_DATA,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5707 XBM_FOREGROUND,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5708 XBM_BACKGROUND,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5709 XBM_ASCENT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5710 XBM_MARGIN,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5711 XBM_RELIEF,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5712 XBM_ALGORITHM,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5713 XBM_HEURISTIC_MASK,
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
5714 XBM_MASK,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5715 XBM_LAST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5716 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5717
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5718 /* Vector of image_keyword structures describing the format
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5719 of valid XBM image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5720
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5721 static struct image_keyword xbm_format[XBM_LAST] =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5722 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5723 {":type", IMAGE_SYMBOL_VALUE, 1},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5724 {":file", IMAGE_STRING_VALUE, 0},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5725 {":width", IMAGE_POSITIVE_INTEGER_VALUE, 0},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5726 {":height", IMAGE_POSITIVE_INTEGER_VALUE, 0},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5727 {":data", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
37946
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
5728 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0},
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
5729 {":background", IMAGE_STRING_OR_NIL_VALUE, 0},
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
5730 {":ascent", IMAGE_ASCENT_VALUE, 0},
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
5731 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5732 {":relief", IMAGE_INTEGER_VALUE, 0},
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
5733 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
5734 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
5735 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0}
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5736 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5737
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5738 /* Structure describing the image type XBM. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5739
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5740 static struct image_type xbm_type =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5741 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5742 &Qxbm,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5743 xbm_image_p,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5744 xbm_load,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5745 x_clear_image,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5746 NULL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5747 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5748
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5749 /* Tokens returned from xbm_scan. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5750
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5751 enum xbm_token
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5752 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5753 XBM_TK_IDENT = 256,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5754 XBM_TK_NUMBER
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5755 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5756
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5757
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5758 /* Return non-zero if OBJECT is a valid XBM-type image specification.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5759 A valid specification is a list starting with the symbol `image'
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5760 The rest of the list is a property list which must contain an
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5761 entry `:type xbm..
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5762
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5763 If the specification specifies a file to load, it must contain
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5764 an entry `:file FILENAME' where FILENAME is a string.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5765
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5766 If the specification is for a bitmap loaded from memory it must
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5767 contain `:width WIDTH', `:height HEIGHT', and `:data DATA', where
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5768 WIDTH and HEIGHT are integers > 0. DATA may be:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5769
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5770 1. a string large enough to hold the bitmap data, i.e. it must
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5771 have a size >= (WIDTH + 7) / 8 * HEIGHT
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5772
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5773 2. a bool-vector of size >= WIDTH * HEIGHT
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5774
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5775 3. a vector of strings or bool-vectors, one for each line of the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5776 bitmap.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5777
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5778 4. A string containing an in-memory XBM file. WIDTH and HEIGHT
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5779 may not be specified in this case because they are defined in the
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5780 XBM file.
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5781
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5782 Both the file and data forms may contain the additional entries
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5783 `:background COLOR' and `:foreground COLOR'. If not present,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5784 foreground and background of the frame on which the image is
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
5785 displayed is used. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5786
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5787 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5788 xbm_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5789 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5790 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5791 struct image_keyword kw[XBM_LAST];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5792
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5793 bcopy (xbm_format, kw, sizeof kw);
26401
9457656ded8b (QCuser_data): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 26304
diff changeset
5794 if (!parse_image_spec (object, kw, XBM_LAST, Qxbm))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5795 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5796
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5797 xassert (EQ (kw[XBM_TYPE].value, Qxbm));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5798
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5799 if (kw[XBM_FILE].count)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5800 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5801 if (kw[XBM_WIDTH].count || kw[XBM_HEIGHT].count || kw[XBM_DATA].count)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5802 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5803 }
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5804 else if (kw[XBM_DATA].count && xbm_file_p (kw[XBM_DATA].value))
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5805 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5806 /* In-memory XBM file. */
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5807 if (kw[XBM_WIDTH].count || kw[XBM_HEIGHT].count || kw[XBM_FILE].count)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5808 return 0;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5809 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5810 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5811 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5812 Lisp_Object data;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5813 int width, height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5814
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5815 /* Entries for `:width', `:height' and `:data' must be present. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5816 if (!kw[XBM_WIDTH].count
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5817 || !kw[XBM_HEIGHT].count
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5818 || !kw[XBM_DATA].count)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5819 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5820
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5821 data = kw[XBM_DATA].value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5822 width = XFASTINT (kw[XBM_WIDTH].value);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5823 height = XFASTINT (kw[XBM_HEIGHT].value);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5824
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5825 /* Check type of data, and width and height against contents of
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5826 data. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5827 if (VECTORP (data))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5828 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5829 int i;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5830
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5831 /* Number of elements of the vector must be >= height. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5832 if (XVECTOR (data)->size < height)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5833 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5834
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5835 /* Each string or bool-vector in data must be large enough
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5836 for one line of the image. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5837 for (i = 0; i < height; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5838 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5839 Lisp_Object elt = XVECTOR (data)->contents[i];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5840
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5841 if (STRINGP (elt))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5842 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
5843 if (SCHARS (elt)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5844 < (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5845 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5846 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5847 else if (BOOL_VECTOR_P (elt))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5848 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5849 if (XBOOL_VECTOR (elt)->size < width)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5850 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5851 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5852 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5853 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5854 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5855 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5856 else if (STRINGP (data))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5857 {
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
5858 if (SCHARS (data)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5859 < (width + BITS_PER_CHAR - 1) / BITS_PER_CHAR * height)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5860 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5861 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5862 else if (BOOL_VECTOR_P (data))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5863 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5864 if (XBOOL_VECTOR (data)->size < width * height)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5865 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5866 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5867 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5868 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5869 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5870
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5871 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5872 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5873
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5874
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5875 /* Scan a bitmap file. FP is the stream to read from. Value is
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5876 either an enumerator from enum xbm_token, or a character for a
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5877 single-character token, or 0 at end of file. If scanning an
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5878 identifier, store the lexeme of the identifier in SVAL. If
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5879 scanning a number, store its value in *IVAL. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5880
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5881 static int
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5882 xbm_scan (s, end, sval, ival)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5883 char **s, *end;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5884 char *sval;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5885 int *ival;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5886 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5887 int c;
31768
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5888
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5889 loop:
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5890
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5891 /* Skip white space. */
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5892 while (*s < end && (c = *(*s)++, isspace (c)))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5893 ;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5894
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5895 if (*s >= end)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5896 c = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5897 else if (isdigit (c))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5898 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5899 int value = 0, digit;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5900
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5901 if (c == '0' && *s < end)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5902 {
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5903 c = *(*s)++;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5904 if (c == 'x' || c == 'X')
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5905 {
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5906 while (*s < end)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5907 {
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5908 c = *(*s)++;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5909 if (isdigit (c))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5910 digit = c - '0';
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5911 else if (c >= 'a' && c <= 'f')
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5912 digit = c - 'a' + 10;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5913 else if (c >= 'A' && c <= 'F')
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5914 digit = c - 'A' + 10;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5915 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5916 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5917 value = 16 * value + digit;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5918 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5919 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5920 else if (isdigit (c))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5921 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5922 value = c - '0';
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5923 while (*s < end
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5924 && (c = *(*s)++, isdigit (c)))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5925 value = 8 * value + c - '0';
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5926 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5927 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5928 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5929 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5930 value = c - '0';
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5931 while (*s < end
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5932 && (c = *(*s)++, isdigit (c)))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5933 value = 10 * value + c - '0';
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5934 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5935
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5936 if (*s < end)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5937 *s = *s - 1;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5938 *ival = value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5939 c = XBM_TK_NUMBER;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5940 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5941 else if (isalpha (c) || c == '_')
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5942 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5943 *sval++ = c;
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5944 while (*s < end
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5945 && (c = *(*s)++, (isalnum (c) || c == '_')))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5946 *sval++ = c;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5947 *sval = 0;
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5948 if (*s < end)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5949 *s = *s - 1;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5950 c = XBM_TK_IDENT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5951 }
31768
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5952 else if (c == '/' && **s == '*')
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5953 {
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5954 /* C-style comment. */
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5955 ++*s;
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5956 while (**s && (**s != '*' || *(*s + 1) != '/'))
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5957 ++*s;
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5958 if (**s)
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5959 {
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5960 *s += 2;
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5961 goto loop;
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5962 }
5f91cf9127a6 (xbm_scan): Allow C-style comments.
Gerd Moellmann <gerd@gnu.org>
parents: 31761
diff changeset
5963 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5964
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5965 return c;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5966 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5967
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5968
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5969 /* Replacement for XReadBitmapFileData which isn't available under old
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5970 X versions. CONTENTS is a pointer to a buffer to parse; END is the
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5971 buffer's end. Set *WIDTH and *HEIGHT to the width and height of
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5972 the image. Return in *DATA the bitmap data allocated with xmalloc.
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5973 Value is non-zero if successful. DATA null means just test if
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
5974 CONTENTS looks like an in-memory XBM file. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5975
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5976 static int
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5977 xbm_read_bitmap_data (contents, end, width, height, data)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5978 char *contents, *end;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5979 int *width, *height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5980 unsigned char **data;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5981 {
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5982 char *s = contents;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5983 char buffer[BUFSIZ];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5984 int padding_p = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5985 int v10 = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5986 int bytes_per_line, i, nbytes;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5987 unsigned char *p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5988 int value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5989 int LA1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5990
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5991 #define match() \
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
5992 LA1 = xbm_scan (&s, end, buffer, &value)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5993
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5994 #define expect(TOKEN) \
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5995 if (LA1 != (TOKEN)) \
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5996 goto failure; \
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5997 else \
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
5998 match ()
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
5999
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6000 #define expect_ident(IDENT) \
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6001 if (LA1 == XBM_TK_IDENT && strcmp (buffer, (IDENT)) == 0) \
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6002 match (); \
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6003 else \
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6004 goto failure
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6005
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6006 *width = *height = -1;
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6007 if (data)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6008 *data = NULL;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6009 LA1 = xbm_scan (&s, end, buffer, &value);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6010
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6011 /* Parse defines for width, height and hot-spots. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6012 while (LA1 == '#')
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6013 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6014 match ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6015 expect_ident ("define");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6016 expect (XBM_TK_IDENT);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6017
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6018 if (LA1 == XBM_TK_NUMBER);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6019 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6020 char *p = strrchr (buffer, '_');
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6021 p = p ? p + 1 : buffer;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6022 if (strcmp (p, "width") == 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6023 *width = value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6024 else if (strcmp (p, "height") == 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6025 *height = value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6026 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6027 expect (XBM_TK_NUMBER);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6028 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6029
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6030 if (*width < 0 || *height < 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6031 goto failure;
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6032 else if (data == NULL)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6033 goto success;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6034
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6035 /* Parse bits. Must start with `static'. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6036 expect_ident ("static");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6037 if (LA1 == XBM_TK_IDENT)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6038 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6039 if (strcmp (buffer, "unsigned") == 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6040 {
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6041 match ();
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6042 expect_ident ("char");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6043 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6044 else if (strcmp (buffer, "short") == 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6045 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6046 match ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6047 v10 = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6048 if (*width % 16 && *width % 16 < 9)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6049 padding_p = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6050 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6051 else if (strcmp (buffer, "char") == 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6052 match ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6053 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6054 goto failure;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6055 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6056 else
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6057 goto failure;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6058
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6059 expect (XBM_TK_IDENT);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6060 expect ('[');
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6061 expect (']');
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6062 expect ('=');
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6063 expect ('{');
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6064
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6065 bytes_per_line = (*width + 7) / 8 + padding_p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6066 nbytes = bytes_per_line * *height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6067 p = *data = (char *) xmalloc (nbytes);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6068
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6069 if (v10)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6070 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6071 for (i = 0; i < nbytes; i += 2)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6072 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6073 int val = value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6074 expect (XBM_TK_NUMBER);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6075
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6076 *p++ = val;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6077 if (!padding_p || ((i + 2) % bytes_per_line))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6078 *p++ = value >> 8;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6079
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6080 if (LA1 == ',' || LA1 == '}')
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6081 match ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6082 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6083 goto failure;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6084 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6085 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6086 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6087 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6088 for (i = 0; i < nbytes; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6089 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6090 int val = value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6091 expect (XBM_TK_NUMBER);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6092
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6093 *p++ = val;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6094
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6095 if (LA1 == ',' || LA1 == '}')
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6096 match ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6097 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6098 goto failure;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6099 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6100 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6101
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6102 success:
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6103 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6104
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6105 failure:
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6106
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6107 if (data && *data)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6108 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6109 xfree (*data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6110 *data = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6111 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6112 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6113
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6114 #undef match
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6115 #undef expect
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6116 #undef expect_ident
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6117 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6118
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6119
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6120 /* Load XBM image IMG which will be displayed on frame F from buffer
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6121 CONTENTS. END is the end of the buffer. Value is non-zero if
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6122 successful. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6123
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6124 static int
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6125 xbm_load_image (f, img, contents, end)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6126 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6127 struct image *img;
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6128 char *contents, *end;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6129 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6130 int rc;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6131 unsigned char *data;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6132 int success_p = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6133
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6134 rc = xbm_read_bitmap_data (contents, end, &img->width, &img->height, &data);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6135 if (rc)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6136 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6137 int depth = DefaultDepthOfScreen (FRAME_X_SCREEN (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6138 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6139 unsigned long background = FRAME_BACKGROUND_PIXEL (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6140 Lisp_Object value;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6141
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6142 xassert (img->width > 0 && img->height > 0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6143
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6144 /* Get foreground and background colors, maybe allocate colors. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6145 value = image_spec_value (img->spec, QCforeground, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6146 if (!NILP (value))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6147 foreground = x_alloc_image_color (f, img, value, foreground);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6148 value = image_spec_value (img->spec, QCbackground, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6149 if (!NILP (value))
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
6150 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
6151 background = x_alloc_image_color (f, img, value, background);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
6152 img->background = background;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
6153 img->background_valid = 1;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
6154 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6155
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6156 img->pixmap
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6157 = XCreatePixmapFromBitmapData (FRAME_X_DISPLAY (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6158 FRAME_X_WINDOW (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6159 data,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6160 img->width, img->height,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6161 foreground, background,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6162 depth);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6163 xfree (data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6164
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
6165 if (img->pixmap == None)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6166 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6167 x_clear_image (f, img);
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6168 image_error ("Unable to create X pixmap for `%s'", img->spec, Qnil);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6169 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6170 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6171 success_p = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6172 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6173 else
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
6174 image_error ("Error loading XBM image `%s'", img->spec, Qnil);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6175
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6176 return success_p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6177 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6178
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6179
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6180 /* Value is non-zero if DATA looks like an in-memory XBM file. */
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6181
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6182 static int
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6183 xbm_file_p (data)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6184 Lisp_Object data;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6185 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6186 int w, h;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6187 return (STRINGP (data)
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6188 && xbm_read_bitmap_data (SDATA (data),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6189 (SDATA (data)
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6190 + SBYTES (data)),
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6191 &w, &h, NULL));
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6192 }
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6193
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6194
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6195 /* Fill image IMG which is used on frame F with pixmap data. Value is
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6196 non-zero if successful. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6197
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6198 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6199 xbm_load (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6200 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6201 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6202 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6203 int success_p = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6204 Lisp_Object file_name;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6205
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6206 xassert (xbm_image_p (img->spec));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6207
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6208 /* If IMG->spec specifies a file name, create a non-file spec from it. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6209 file_name = image_spec_value (img->spec, QCfile, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6210 if (STRINGP (file_name))
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6211 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6212 Lisp_Object file;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6213 char *contents;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6214 int size;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6215 struct gcpro gcpro1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6216
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6217 file = x_find_image_file (file_name);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6218 GCPRO1 (file);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6219 if (!STRINGP (file))
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6220 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6221 image_error ("Cannot find image file `%s'", file_name, Qnil);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6222 UNGCPRO;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6223 return 0;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6224 }
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6225
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6226 contents = slurp_file (SDATA (file), &size);
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6227 if (contents == NULL)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6228 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6229 image_error ("Error loading XBM image `%s'", img->spec, Qnil);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6230 UNGCPRO;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6231 return 0;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6232 }
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6233
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6234 success_p = xbm_load_image (f, img, contents, contents + size);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6235 UNGCPRO;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6236 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6237 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6238 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6239 struct image_keyword fmt[XBM_LAST];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6240 Lisp_Object data;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6241 int depth;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6242 unsigned long foreground = FRAME_FOREGROUND_PIXEL (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6243 unsigned long background = FRAME_BACKGROUND_PIXEL (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6244 char *bits;
34976
05c36b1fa618 (x_display_info_for_name): Cast 0 to "char *" in the call
Eli Zaretskii <eliz@gnu.org>
parents: 34911
diff changeset
6245 int parsed_p;
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6246 int in_memory_file_p = 0;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6247
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6248 /* See if data looks like an in-memory XBM file. */
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6249 data = image_spec_value (img->spec, QCdata, NULL);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6250 in_memory_file_p = xbm_file_p (data);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6251
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6252 /* Parse the image specification. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6253 bcopy (xbm_format, fmt, sizeof fmt);
26401
9457656ded8b (QCuser_data): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 26304
diff changeset
6254 parsed_p = parse_image_spec (img->spec, fmt, XBM_LAST, Qxbm);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6255 xassert (parsed_p);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6256
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6257 /* Get specified width, and height. */
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6258 if (!in_memory_file_p)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6259 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6260 img->width = XFASTINT (fmt[XBM_WIDTH].value);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6261 img->height = XFASTINT (fmt[XBM_HEIGHT].value);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6262 xassert (img->width > 0 && img->height > 0);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6263 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6264
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6265 /* Get foreground and background colors, maybe allocate colors. */
37946
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
6266 if (fmt[XBM_FOREGROUND].count
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
6267 && STRINGP (fmt[XBM_FOREGROUND].value))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6268 foreground = x_alloc_image_color (f, img, fmt[XBM_FOREGROUND].value,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6269 foreground);
37946
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
6270 if (fmt[XBM_BACKGROUND].count
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
6271 && STRINGP (fmt[XBM_BACKGROUND].value))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6272 background = x_alloc_image_color (f, img, fmt[XBM_BACKGROUND].value,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6273 background);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6274
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6275 if (in_memory_file_p)
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6276 success_p = xbm_load_image (f, img, SDATA (data),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6277 (SDATA (data)
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6278 + SBYTES (data)));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6279 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6280 {
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6281 if (VECTORP (data))
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6282 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6283 int i;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6284 char *p;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6285 int nbytes = (img->width + BITS_PER_CHAR - 1) / BITS_PER_CHAR;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6286
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6287 p = bits = (char *) alloca (nbytes * img->height);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6288 for (i = 0; i < img->height; ++i, p += nbytes)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6289 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6290 Lisp_Object line = XVECTOR (data)->contents[i];
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6291 if (STRINGP (line))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6292 bcopy (SDATA (line), p, nbytes);
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6293 else
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6294 bcopy (XBOOL_VECTOR (line)->data, p, nbytes);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6295 }
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6296 }
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6297 else if (STRINGP (data))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6298 bits = SDATA (data);
28747
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6299 else
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6300 bits = XBOOL_VECTOR (data)->data;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6301
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6302 /* Create the pixmap. */
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6303 depth = DefaultDepthOfScreen (FRAME_X_SCREEN (f));
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6304 img->pixmap
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6305 = XCreatePixmapFromBitmapData (FRAME_X_DISPLAY (f),
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6306 FRAME_X_WINDOW (f),
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6307 bits,
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6308 img->width, img->height,
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6309 foreground, background,
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6310 depth);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6311 if (img->pixmap)
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6312 success_p = 1;
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6313 else
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6314 {
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6315 image_error ("Unable to create pixmap for XBM image `%s'",
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6316 img->spec, Qnil);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6317 x_clear_image (f, img);
6f90293e6ccb (slurp_file): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 28690
diff changeset
6318 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6319 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6320 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6321
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6322 return success_p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6323 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6324
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6325
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6326
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6327 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6328 XPM images
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6329 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6330
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6331 #if HAVE_XPM
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6332
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6333 static int xpm_image_p P_ ((Lisp_Object object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6334 static int xpm_load P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6335 static int xpm_valid_color_symbols_p P_ ((Lisp_Object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6336
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6337 #include "X11/xpm.h"
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6338
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6339 /* The symbol `xpm' identifying XPM-format images. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6340
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6341 Lisp_Object Qxpm;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6342
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6343 /* Indices of image specification fields in xpm_format, below. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6344
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6345 enum xpm_keyword_index
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6346 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6347 XPM_TYPE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6348 XPM_FILE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6349 XPM_DATA,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6350 XPM_ASCENT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6351 XPM_MARGIN,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6352 XPM_RELIEF,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6353 XPM_ALGORITHM,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6354 XPM_HEURISTIC_MASK,
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
6355 XPM_MASK,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6356 XPM_COLOR_SYMBOLS,
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
6357 XPM_BACKGROUND,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6358 XPM_LAST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6359 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6360
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6361 /* Vector of image_keyword structures describing the format
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6362 of valid XPM image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6363
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6364 static struct image_keyword xpm_format[XPM_LAST] =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6365 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6366 {":type", IMAGE_SYMBOL_VALUE, 1},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6367 {":file", IMAGE_STRING_VALUE, 0},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6368 {":data", IMAGE_STRING_VALUE, 0},
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
6369 {":ascent", IMAGE_ASCENT_VALUE, 0},
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
6370 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6371 {":relief", IMAGE_INTEGER_VALUE, 0},
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
6372 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6373 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
6374 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
6375 {":color-symbols", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
6376 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6377 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6378
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6379 /* Structure describing the image type XBM. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6380
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6381 static struct image_type xpm_type =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6382 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6383 &Qxpm,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6384 xpm_image_p,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6385 xpm_load,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6386 x_clear_image,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6387 NULL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6388 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6389
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6390
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6391 /* Define ALLOC_XPM_COLORS if we can use Emacs' own color allocation
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6392 functions for allocating image colors. Our own functions handle
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6393 color allocation failures more gracefully than the ones on the XPM
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6394 lib. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6395
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6396 #if defined XpmAllocColor && defined XpmFreeColors && defined XpmColorClosure
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6397 #define ALLOC_XPM_COLORS
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6398 #endif
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6399
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6400 #ifdef ALLOC_XPM_COLORS
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6401
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6402 static void xpm_init_color_cache P_ ((struct frame *, XpmAttributes *));
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6403 static void xpm_free_color_cache P_ ((void));
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6404 static int xpm_lookup_color P_ ((struct frame *, char *, XColor *));
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6405 static int xpm_color_bucket P_ ((char *));
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6406 static struct xpm_cached_color *xpm_cache_color P_ ((struct frame *, char *,
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6407 XColor *, int));
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6408
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6409 /* An entry in a hash table used to cache color definitions of named
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6410 colors. This cache is necessary to speed up XPM image loading in
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6411 case we do color allocations ourselves. Without it, we would need
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6412 a call to XParseColor per pixel in the image. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6413
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6414 struct xpm_cached_color
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6415 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6416 /* Next in collision chain. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6417 struct xpm_cached_color *next;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6418
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6419 /* Color definition (RGB and pixel color). */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6420 XColor color;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6421
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6422 /* Color name. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6423 char name[1];
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6424 };
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6425
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6426 /* The hash table used for the color cache, and its bucket vector
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6427 size. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6428
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6429 #define XPM_COLOR_CACHE_BUCKETS 1001
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6430 struct xpm_cached_color **xpm_color_cache;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6431
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6432 /* Initialize the color cache. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6433
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6434 static void
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6435 xpm_init_color_cache (f, attrs)
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6436 struct frame *f;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6437 XpmAttributes *attrs;
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6438 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6439 size_t nbytes = XPM_COLOR_CACHE_BUCKETS * sizeof *xpm_color_cache;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6440 xpm_color_cache = (struct xpm_cached_color **) xmalloc (nbytes);
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6441 memset (xpm_color_cache, 0, nbytes);
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6442 init_color_table ();
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6443
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6444 if (attrs->valuemask & XpmColorSymbols)
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6445 {
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6446 int i;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6447 XColor color;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6448
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6449 for (i = 0; i < attrs->numsymbols; ++i)
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6450 if (XParseColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6451 attrs->colorsymbols[i].value, &color))
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6452 {
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6453 color.pixel = lookup_rgb_color (f, color.red, color.green,
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6454 color.blue);
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6455 xpm_cache_color (f, attrs->colorsymbols[i].name, &color, -1);
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6456 }
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6457 }
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6458 }
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6459
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6460
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6461 /* Free the color cache. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6462
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6463 static void
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6464 xpm_free_color_cache ()
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6465 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6466 struct xpm_cached_color *p, *next;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6467 int i;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6468
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6469 for (i = 0; i < XPM_COLOR_CACHE_BUCKETS; ++i)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6470 for (p = xpm_color_cache[i]; p; p = next)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6471 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6472 next = p->next;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6473 xfree (p);
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6474 }
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6475
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6476 xfree (xpm_color_cache);
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6477 xpm_color_cache = NULL;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6478 free_color_table ();
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6479 }
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6480
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6481
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6482 /* Return the bucket index for color named COLOR_NAME in the color
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6483 cache. */
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6484
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6485 static int
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6486 xpm_color_bucket (color_name)
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6487 char *color_name;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6488 {
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6489 unsigned h = 0;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6490 char *s;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6491
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6492 for (s = color_name; *s; ++s)
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6493 h = (h << 2) ^ *s;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6494 return h %= XPM_COLOR_CACHE_BUCKETS;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6495 }
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6496
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6497
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6498 /* On frame F, cache values COLOR for color with name COLOR_NAME.
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6499 BUCKET, if >= 0, is a precomputed bucket index. Value is the cache
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6500 entry added. */
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6501
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6502 static struct xpm_cached_color *
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6503 xpm_cache_color (f, color_name, color, bucket)
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6504 struct frame *f;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6505 char *color_name;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6506 XColor *color;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6507 int bucket;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6508 {
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6509 size_t nbytes;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6510 struct xpm_cached_color *p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6511
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6512 if (bucket < 0)
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6513 bucket = xpm_color_bucket (color_name);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6514
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6515 nbytes = sizeof *p + strlen (color_name);
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6516 p = (struct xpm_cached_color *) xmalloc (nbytes);
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6517 strcpy (p->name, color_name);
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6518 p->color = *color;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6519 p->next = xpm_color_cache[bucket];
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6520 xpm_color_cache[bucket] = p;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6521 return p;
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6522 }
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6523
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6524
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6525 /* Look up color COLOR_NAME for frame F in the color cache. If found,
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6526 return the cached definition in *COLOR. Otherwise, make a new
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6527 entry in the cache and allocate the color. Value is zero if color
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6528 allocation failed. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6529
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6530 static int
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6531 xpm_lookup_color (f, color_name, color)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6532 struct frame *f;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6533 char *color_name;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6534 XColor *color;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6535 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6536 struct xpm_cached_color *p;
32536
c198e3edcae6 Revert last change.
Miles Bader <miles@gnu.org>
parents: 32524
diff changeset
6537 int h = xpm_color_bucket (color_name);
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6538
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6539 for (p = xpm_color_cache[h]; p; p = p->next)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6540 if (strcmp (p->name, color_name) == 0)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6541 break;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6542
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6543 if (p != NULL)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6544 *color = p->color;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6545 else if (XParseColor (FRAME_X_DISPLAY (f), FRAME_X_COLORMAP (f),
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6546 color_name, color))
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6547 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6548 color->pixel = lookup_rgb_color (f, color->red, color->green,
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6549 color->blue);
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6550 p = xpm_cache_color (f, color_name, color, h);
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6551 }
50392
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
6552 /* You get `opaque' at least from ImageMagick converting pbm to xpm
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
6553 with transparency, and it's useful. */
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
6554 else if (strcmp ("opaque", color_name) == 0)
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
6555 {
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
6556 bzero (color, sizeof (XColor)); /* Is this necessary/correct? */
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
6557 color->pixel = FRAME_FOREGROUND_PIXEL (f);
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
6558 p = xpm_cache_color (f, color_name, color, h);
ed2cdbfe7417 (xpm_lookup_color): Grok "opaque".
Dave Love <fx@gnu.org>
parents: 50370
diff changeset
6559 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6560
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6561 return p != NULL;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6562 }
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6563
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6564
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6565 /* Callback for allocating color COLOR_NAME. Called from the XPM lib.
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6566 CLOSURE is a pointer to the frame on which we allocate the
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6567 color. Return in *COLOR the allocated color. Value is non-zero
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6568 if successful. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6569
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6570 static int
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6571 xpm_alloc_color (dpy, cmap, color_name, color, closure)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6572 Display *dpy;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6573 Colormap cmap;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6574 char *color_name;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6575 XColor *color;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6576 void *closure;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6577 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6578 return xpm_lookup_color ((struct frame *) closure, color_name, color);
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6579 }
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6580
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6581
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6582 /* Callback for freeing NPIXELS colors contained in PIXELS. CLOSURE
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6583 is a pointer to the frame on which we allocate the color. Value is
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6584 non-zero if successful. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6585
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6586 static int
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6587 xpm_free_colors (dpy, cmap, pixels, npixels, closure)
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6588 Display *dpy;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6589 Colormap cmap;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6590 Pixel *pixels;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6591 int npixels;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6592 void *closure;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6593 {
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6594 return 1;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6595 }
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6596
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6597 #endif /* ALLOC_XPM_COLORS */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6598
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6599
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6600 /* Value is non-zero if COLOR_SYMBOLS is a valid color symbols list
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6601 for XPM images. Such a list must consist of conses whose car and
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6602 cdr are strings. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6603
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6604 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6605 xpm_valid_color_symbols_p (color_symbols)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6606 Lisp_Object color_symbols;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6607 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6608 while (CONSP (color_symbols))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6609 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6610 Lisp_Object sym = XCAR (color_symbols);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6611 if (!CONSP (sym)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6612 || !STRINGP (XCAR (sym))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6613 || !STRINGP (XCDR (sym)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6614 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6615 color_symbols = XCDR (color_symbols);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6616 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6617
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6618 return NILP (color_symbols);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6619 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6620
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6621
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6622 /* Value is non-zero if OBJECT is a valid XPM image specification. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6623
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6624 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6625 xpm_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6626 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6627 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6628 struct image_keyword fmt[XPM_LAST];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6629 bcopy (xpm_format, fmt, sizeof fmt);
26401
9457656ded8b (QCuser_data): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 26304
diff changeset
6630 return (parse_image_spec (object, fmt, XPM_LAST, Qxpm)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6631 /* Either `:file' or `:data' must be present. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6632 && fmt[XPM_FILE].count + fmt[XPM_DATA].count == 1
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6633 /* Either no `:color-symbols' or it's a list of conses
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6634 whose car and cdr are strings. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6635 && (fmt[XPM_COLOR_SYMBOLS].count == 0
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
6636 || xpm_valid_color_symbols_p (fmt[XPM_COLOR_SYMBOLS].value)));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6637 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6638
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6639
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6640 /* Load image IMG which will be displayed on frame F. Value is
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6641 non-zero if successful. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6642
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6643 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6644 xpm_load (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6645 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6646 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6647 {
34976
05c36b1fa618 (x_display_info_for_name): Cast 0 to "char *" in the call
Eli Zaretskii <eliz@gnu.org>
parents: 34911
diff changeset
6648 int rc;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6649 XpmAttributes attrs;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6650 Lisp_Object specified_file, color_symbols;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6651
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6652 /* Configure the XPM lib. Use the visual of frame F. Allocate
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6653 close colors. Return colors allocated. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6654 bzero (&attrs, sizeof attrs);
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
6655 attrs.visual = FRAME_X_VISUAL (f);
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
6656 attrs.colormap = FRAME_X_COLORMAP (f);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6657 attrs.valuemask |= XpmVisual;
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
6658 attrs.valuemask |= XpmColormap;
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6659
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6660 #ifdef ALLOC_XPM_COLORS
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6661 /* Allocate colors with our own functions which handle
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6662 failing color allocation more gracefully. */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6663 attrs.color_closure = f;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6664 attrs.alloc_color = xpm_alloc_color;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6665 attrs.free_colors = xpm_free_colors;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6666 attrs.valuemask |= XpmAllocColor | XpmFreeColors | XpmColorClosure;
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6667 #else /* not ALLOC_XPM_COLORS */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6668 /* Let the XPM lib allocate colors. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6669 attrs.valuemask |= XpmReturnAllocPixels;
25200
8ab4da818dc0 (xpm_load) [!XpmAllocCloseColors]:
Richard M. Stallman <rms@gnu.org>
parents: 25153
diff changeset
6670 #ifdef XpmAllocCloseColors
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6671 attrs.alloc_close_colors = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6672 attrs.valuemask |= XpmAllocCloseColors;
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6673 #else /* not XpmAllocCloseColors */
25200
8ab4da818dc0 (xpm_load) [!XpmAllocCloseColors]:
Richard M. Stallman <rms@gnu.org>
parents: 25153
diff changeset
6674 attrs.closeness = 600;
8ab4da818dc0 (xpm_load) [!XpmAllocCloseColors]:
Richard M. Stallman <rms@gnu.org>
parents: 25153
diff changeset
6675 attrs.valuemask |= XpmCloseness;
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6676 #endif /* not XpmAllocCloseColors */
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6677 #endif /* ALLOC_XPM_COLORS */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6678
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6679 /* If image specification contains symbolic color definitions, add
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6680 these to `attrs'. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6681 color_symbols = image_spec_value (img->spec, QCcolor_symbols, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6682 if (CONSP (color_symbols))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6683 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6684 Lisp_Object tail;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6685 XpmColorSymbol *xpm_syms;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6686 int i, size;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6687
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6688 attrs.valuemask |= XpmColorSymbols;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6689
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6690 /* Count number of symbols. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6691 attrs.numsymbols = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6692 for (tail = color_symbols; CONSP (tail); tail = XCDR (tail))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6693 ++attrs.numsymbols;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6694
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6695 /* Allocate an XpmColorSymbol array. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6696 size = attrs.numsymbols * sizeof *xpm_syms;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6697 xpm_syms = (XpmColorSymbol *) alloca (size);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6698 bzero (xpm_syms, size);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6699 attrs.colorsymbols = xpm_syms;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6700
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6701 /* Fill the color symbol array. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6702 for (tail = color_symbols, i = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6703 CONSP (tail);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6704 ++i, tail = XCDR (tail))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6705 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6706 Lisp_Object name = XCAR (XCAR (tail));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6707 Lisp_Object color = XCDR (XCAR (tail));
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6708 xpm_syms[i].name = (char *) alloca (SCHARS (name) + 1);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6709 strcpy (xpm_syms[i].name, SDATA (name));
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6710 xpm_syms[i].value = (char *) alloca (SCHARS (color) + 1);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6711 strcpy (xpm_syms[i].value, SDATA (color));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6712 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6713 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6714
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6715 /* Create a pixmap for the image, either from a file, or from a
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6716 string buffer containing data in the same format as an XPM file. */
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6717 #ifdef ALLOC_XPM_COLORS
31761
d9efa91b06ab (xpm_init_color_cache) [ALLOC_XPM_COLORS]: If color
Gerd Moellmann <gerd@gnu.org>
parents: 31693
diff changeset
6718 xpm_init_color_cache (f, &attrs);
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6719 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6720
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6721 specified_file = image_spec_value (img->spec, QCfile, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6722 if (STRINGP (specified_file))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6723 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6724 Lisp_Object file = x_find_image_file (specified_file);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6725 if (!STRINGP (file))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6726 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
6727 image_error ("Cannot find image file `%s'", specified_file, Qnil);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6728 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6729 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6730
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6731 rc = XpmReadFileToPixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6732 SDATA (file), &img->pixmap, &img->mask,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6733 &attrs);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6734 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6735 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6736 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6737 Lisp_Object buffer = image_spec_value (img->spec, QCdata, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6738 rc = XpmCreatePixmapFromBuffer (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
6739 SDATA (buffer),
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6740 &img->pixmap, &img->mask,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6741 &attrs);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6742 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6743
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6744 if (rc == XpmSuccess)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6745 {
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6746 #ifdef ALLOC_XPM_COLORS
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6747 img->colors = colors_in_color_table (&img->ncolors);
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6748 #else /* not ALLOC_XPM_COLORS */
35146
9b49ba6631c5 * xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I in inner block.
Ken Raeburn <raeburn@raeburn.org>
parents: 35068
diff changeset
6749 int i;
9b49ba6631c5 * xfns.c (xpm_load) [!ALLOC_XPM_COLORS]: Declare local variable I in inner block.
Ken Raeburn <raeburn@raeburn.org>
parents: 35068
diff changeset
6750
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6751 img->ncolors = attrs.nalloc_pixels;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6752 img->colors = (unsigned long *) xmalloc (img->ncolors
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6753 * sizeof *img->colors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6754 for (i = 0; i < attrs.nalloc_pixels; ++i)
28597
6bbcb7e674b1 (xpm_load) [DEBUG_X_COLORS]: Register colors.
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6755 {
6bbcb7e674b1 (xpm_load) [DEBUG_X_COLORS]: Register colors.
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6756 img->colors[i] = attrs.alloc_pixels[i];
6bbcb7e674b1 (xpm_load) [DEBUG_X_COLORS]: Register colors.
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6757 #ifdef DEBUG_X_COLORS
6bbcb7e674b1 (xpm_load) [DEBUG_X_COLORS]: Register colors.
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6758 register_color (img->colors[i]);
6bbcb7e674b1 (xpm_load) [DEBUG_X_COLORS]: Register colors.
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6759 #endif
6bbcb7e674b1 (xpm_load) [DEBUG_X_COLORS]: Register colors.
Gerd Moellmann <gerd@gnu.org>
parents: 28464
diff changeset
6760 }
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6761 #endif /* not ALLOC_XPM_COLORS */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6762
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6763 img->width = attrs.width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6764 img->height = attrs.height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6765 xassert (img->width > 0 && img->height > 0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6766
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6767 /* The call to XpmFreeAttributes below frees attrs.alloc_pixels. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6768 XpmFreeAttributes (&attrs);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6769 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6770 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6771 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6772 switch (rc)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6773 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6774 case XpmOpenFailed:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6775 image_error ("Error opening XPM file (%s)", img->spec, Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6776 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6777
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6778 case XpmFileInvalid:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6779 image_error ("Invalid XPM file (%s)", img->spec, Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6780 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6781
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6782 case XpmNoMemory:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6783 image_error ("Out of memory (%s)", img->spec, Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6784 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6785
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6786 case XpmColorFailed:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6787 image_error ("Color allocation error (%s)", img->spec, Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6788 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6789
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6790 default:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6791 image_error ("Unknown error (%s)", img->spec, Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6792 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6793 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6794 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6795
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6796 #ifdef ALLOC_XPM_COLORS
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6797 xpm_free_color_cache ();
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
6798 #endif
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6799 return rc == XpmSuccess;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6800 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6801
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6802 #endif /* HAVE_XPM != 0 */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6803
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6804
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6805 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6806 Color table
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6807 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6808
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6809 /* An entry in the color table mapping an RGB color to a pixel color. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6810
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6811 struct ct_color
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6812 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6813 int r, g, b;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6814 unsigned long pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6815
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6816 /* Next in color table collision list. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6817 struct ct_color *next;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6818 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6819
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6820 /* The bucket vector size to use. Must be prime. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6821
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6822 #define CT_SIZE 101
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6823
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6824 /* Value is a hash of the RGB color given by R, G, and B. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6825
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6826 #define CT_HASH_RGB(R, G, B) (((R) << 16) ^ ((G) << 8) ^ (B))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6827
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6828 /* The color hash table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6829
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6830 struct ct_color **ct_table;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6831
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6832 /* Number of entries in the color table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6833
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6834 int ct_colors_allocated;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6835
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6836 /* Initialize the color table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6837
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6838 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6839 init_color_table ()
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6840 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6841 int size = CT_SIZE * sizeof (*ct_table);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6842 ct_table = (struct ct_color **) xmalloc (size);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6843 bzero (ct_table, size);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6844 ct_colors_allocated = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6845 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6846
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6847
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6848 /* Free memory associated with the color table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6849
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6850 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6851 free_color_table ()
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6852 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6853 int i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6854 struct ct_color *p, *next;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6855
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6856 for (i = 0; i < CT_SIZE; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6857 for (p = ct_table[i]; p; p = next)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6858 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6859 next = p->next;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6860 xfree (p);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6861 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6862
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6863 xfree (ct_table);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6864 ct_table = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6865 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6866
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6867
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6868 /* Value is a pixel color for RGB color R, G, B on frame F. If an
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6869 entry for that color already is in the color table, return the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6870 pixel color of that entry. Otherwise, allocate a new color for R,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6871 G, B, and make an entry in the color table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6872
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6873 static unsigned long
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6874 lookup_rgb_color (f, r, g, b)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6875 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6876 int r, g, b;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6877 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6878 unsigned hash = CT_HASH_RGB (r, g, b);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6879 int i = hash % CT_SIZE;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6880 struct ct_color *p;
52387
2415f47f227a Fix pixel calculation for TrueVisuals.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52360
diff changeset
6881 struct x_display_info *dpyinfo;
52360
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6882
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6883 /* Handle TrueColor visuals specially, which improves performance by
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6884 two orders of magnitude. Freeing colors on TrueColor visuals is
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6885 a nop, and pixel colors specify RGB values directly. See also
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6886 the Xlib spec, chapter 3.1. */
52387
2415f47f227a Fix pixel calculation for TrueVisuals.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52360
diff changeset
6887 dpyinfo = FRAME_X_DISPLAY_INFO (f);
2415f47f227a Fix pixel calculation for TrueVisuals.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52360
diff changeset
6888 if (dpyinfo->red_bits > 0)
2415f47f227a Fix pixel calculation for TrueVisuals.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52360
diff changeset
6889 {
52360
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6890 unsigned long pr, pg, pb;
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6891
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6892 /* Apply gamma-correction like normal color allocation does. */
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6893 if (f->gamma)
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6894 {
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6895 XColor color;
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6896 color.red = r, color.green = g, color.blue = b;
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6897 gamma_correct (f, &color);
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6898 r = color.red, g = color.green, b = color.blue;
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6899 }
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6900
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6901 /* Scale down RGB values to the visual's bits per RGB, and shift
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6902 them to the right position in the pixel color. Note that the
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6903 original RGB values are 16-bit values, as usual in X. */
52387
2415f47f227a Fix pixel calculation for TrueVisuals.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52360
diff changeset
6904 pr = (r >> (16 - dpyinfo->red_bits)) << dpyinfo->red_offset;
2415f47f227a Fix pixel calculation for TrueVisuals.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52360
diff changeset
6905 pg = (g >> (16 - dpyinfo->green_bits)) << dpyinfo->green_offset;
2415f47f227a Fix pixel calculation for TrueVisuals.
Jan Djärv <jan.h.d@swipnet.se>
parents: 52360
diff changeset
6906 pb = (b >> (16 - dpyinfo->blue_bits)) << dpyinfo->blue_offset;
52360
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6907
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6908 /* Assemble the pixel color. */
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6909 return pr | pg | pb;
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6910 }
abd824b88c14 (lookup_rgb_color): Handle TrueColor visuals specially.
Gerd Moellmann <gerd@gnu.org>
parents: 52334
diff changeset
6911
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6912 for (p = ct_table[i]; p; p = p->next)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6913 if (p->r == r && p->g == g && p->b == b)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6914 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6915
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6916 if (p == NULL)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6917 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6918 XColor color;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6919 Colormap cmap;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6920 int rc;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6921
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6922 color.red = r;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6923 color.green = g;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6924 color.blue = b;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6925
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
6926 cmap = FRAME_X_COLORMAP (f);
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
6927 rc = x_alloc_nearest_color (f, cmap, &color);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6928
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6929 if (rc)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6930 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6931 ++ct_colors_allocated;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6932
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6933 p = (struct ct_color *) xmalloc (sizeof *p);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6934 p->r = r;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6935 p->g = g;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6936 p->b = b;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6937 p->pixel = color.pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6938 p->next = ct_table[i];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6939 ct_table[i] = p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6940 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6941 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6942 return FRAME_FOREGROUND_PIXEL (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6943 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6944
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6945 return p->pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6946 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6947
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6948
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6949 /* Look up pixel color PIXEL which is used on frame F in the color
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6950 table. If not already present, allocate it. Value is PIXEL. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6951
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6952 static unsigned long
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6953 lookup_pixel_color (f, pixel)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6954 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6955 unsigned long pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6956 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6957 int i = pixel % CT_SIZE;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6958 struct ct_color *p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6959
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6960 for (p = ct_table[i]; p; p = p->next)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6961 if (p->pixel == pixel)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6962 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6963
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6964 if (p == NULL)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6965 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6966 XColor color;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6967 Colormap cmap;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6968 int rc;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6969
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
6970 cmap = FRAME_X_COLORMAP (f);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6971 color.pixel = pixel;
32606
78b4e9f31087 (x_to_xcolors, x_set_mouse_color, lookup_pixel_color)
Gerd Moellmann <gerd@gnu.org>
parents: 32549
diff changeset
6972 x_query_color (f, &color);
25528
b5dd1bafd001 Include math.h. Add extern declaration for atof in case
Gerd Moellmann <gerd@gnu.org>
parents: 25511
diff changeset
6973 rc = x_alloc_nearest_color (f, cmap, &color);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6974
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6975 if (rc)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6976 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6977 ++ct_colors_allocated;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6978
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6979 p = (struct ct_color *) xmalloc (sizeof *p);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6980 p->r = color.red;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6981 p->g = color.green;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6982 p->b = color.blue;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6983 p->pixel = pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6984 p->next = ct_table[i];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6985 ct_table[i] = p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6986 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6987 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6988 return FRAME_FOREGROUND_PIXEL (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6989 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
6990
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6991 return p->pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6992 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6993
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6995 /* Value is a vector of all pixel colors contained in the color table,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6996 allocated via xmalloc. Set *N to the number of colors. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6997
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6998 static unsigned long *
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
6999 colors_in_color_table (n)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7000 int *n;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7001 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7002 int i, j;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7003 struct ct_color *p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7004 unsigned long *colors;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7005
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7006 if (ct_colors_allocated == 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7007 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7008 *n = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7009 colors = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7010 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7011 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7012 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7013 colors = (unsigned long *) xmalloc (ct_colors_allocated
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7014 * sizeof *colors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7015 *n = ct_colors_allocated;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7016
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7017 for (i = j = 0; i < CT_SIZE; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7018 for (p = ct_table[i]; p; p = p->next)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7019 colors[j++] = p->pixel;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7020 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7021
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7022 return colors;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7023 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7024
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7025
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7026
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7027 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7028 Algorithms
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7029 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7030
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7031 static XColor *x_to_xcolors P_ ((struct frame *, struct image *, int));
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7032 static void x_from_xcolors P_ ((struct frame *, struct image *, XColor *));
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7033 static void x_detect_edges P_ ((struct frame *, struct image *, int[9], int));
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7034
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
7035 /* Non-zero means draw a cross on images having `:conversion
31651
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7036 disabled'. */
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7037
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7038 int cross_disabled_images;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7039
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7040 /* Edge detection matrices for different edge-detection
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7041 strategies. */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7042
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7043 static int emboss_matrix[9] = {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7044 /* x - 1 x x + 1 */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7045 2, -1, 0, /* y - 1 */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7046 -1, 0, 1, /* y */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7047 0, 1, -2 /* y + 1 */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7048 };
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7049
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7050 static int laplace_matrix[9] = {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7051 /* x - 1 x x + 1 */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7052 1, 0, 0, /* y - 1 */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7053 0, 0, 0, /* y */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7054 0, 0, -1 /* y + 1 */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7055 };
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7056
31651
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7057 /* Value is the intensity of the color whose red/green/blue values
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7058 are R, G, and B. */
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7059
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7060 #define COLOR_INTENSITY(R, G, B) ((2 * (R) + 3 * (G) + (B)) / 6)
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7061
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7062
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7063 /* On frame F, return an array of XColor structures describing image
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7064 IMG->pixmap. Each XColor structure has its pixel color set. RGB_P
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7065 non-zero means also fill the red/green/blue members of the XColor
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7066 structures. Value is a pointer to the array of XColors structures,
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7067 allocated with xmalloc; it must be freed by the caller. */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7068
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7069 static XColor *
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7070 x_to_xcolors (f, img, rgb_p)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7071 struct frame *f;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7072 struct image *img;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7073 int rgb_p;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7074 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7075 int x, y;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7076 XColor *colors, *p;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7077 XImage *ximg;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7078
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7079 colors = (XColor *) xmalloc (img->width * img->height * sizeof *colors);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7080
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7081 /* Get the X image IMG->pixmap. */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7082 ximg = XGetImage (FRAME_X_DISPLAY (f), img->pixmap,
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7083 0, 0, img->width, img->height, ~0, ZPixmap);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7084
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7085 /* Fill the `pixel' members of the XColor array. I wished there
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7086 were an easy and portable way to circumvent XGetPixel. */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7087 p = colors;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7088 for (y = 0; y < img->height; ++y)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7089 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7090 XColor *row = p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7091
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7092 for (x = 0; x < img->width; ++x, ++p)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7093 p->pixel = XGetPixel (ximg, x, y);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7094
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7095 if (rgb_p)
32606
78b4e9f31087 (x_to_xcolors, x_set_mouse_color, lookup_pixel_color)
Gerd Moellmann <gerd@gnu.org>
parents: 32549
diff changeset
7096 x_query_colors (f, row, img->width);
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7097 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7098
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7099 XDestroyImage (ximg);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7100 return colors;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7101 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7102
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7103
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7104 /* Create IMG->pixmap from an array COLORS of XColor structures, whose
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7105 RGB members are set. F is the frame on which this all happens.
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7106 COLORS will be freed; an existing IMG->pixmap will be freed, too. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7107
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7108 static void
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7109 x_from_xcolors (f, img, colors)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7110 struct frame *f;
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7111 struct image *img;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7112 XColor *colors;
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7113 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7114 int x, y;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7115 XImage *oimg;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7116 Pixmap pixmap;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7117 XColor *p;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7118
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7119 init_color_table ();
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7120
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7121 x_create_x_image_and_pixmap (f, img->width, img->height, 0,
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7122 &oimg, &pixmap);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7123 p = colors;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7124 for (y = 0; y < img->height; ++y)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7125 for (x = 0; x < img->width; ++x, ++p)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7126 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7127 unsigned long pixel;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7128 pixel = lookup_rgb_color (f, p->red, p->green, p->blue);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7129 XPutPixel (oimg, x, y, pixel);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7130 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7131
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7132 xfree (colors);
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
7133 x_clear_image_1 (f, img, 1, 0, 1);
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7134
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7135 x_put_x_image (f, oimg, pixmap, img->width, img->height);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7136 x_destroy_x_image (oimg);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7137 img->pixmap = pixmap;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7138 img->colors = colors_in_color_table (&img->ncolors);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7139 free_color_table ();
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7140 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7141
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7142
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7143 /* On frame F, perform edge-detection on image IMG.
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7144
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7145 MATRIX is a nine-element array specifying the transformation
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7146 matrix. See emboss_matrix for an example.
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7147
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7148 COLOR_ADJUST is a color adjustment added to each pixel of the
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7149 outgoing image. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7150
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7151 static void
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7152 x_detect_edges (f, img, matrix, color_adjust)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7153 struct frame *f;
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7154 struct image *img;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7155 int matrix[9], color_adjust;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7156 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7157 XColor *colors = x_to_xcolors (f, img, 1);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7158 XColor *new, *p;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7159 int x, y, i, sum;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7160
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7161 for (i = sum = 0; i < 9; ++i)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7162 sum += abs (matrix[i]);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7163
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7164 #define COLOR(A, X, Y) ((A) + (Y) * img->width + (X))
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7165
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7166 new = (XColor *) xmalloc (img->width * img->height * sizeof *new);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7167
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7168 for (y = 0; y < img->height; ++y)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7169 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7170 p = COLOR (new, 0, y);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7171 p->red = p->green = p->blue = 0xffff/2;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7172 p = COLOR (new, img->width - 1, y);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7173 p->red = p->green = p->blue = 0xffff/2;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7174 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7175
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7176 for (x = 1; x < img->width - 1; ++x)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7177 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7178 p = COLOR (new, x, 0);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7179 p->red = p->green = p->blue = 0xffff/2;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7180 p = COLOR (new, x, img->height - 1);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7181 p->red = p->green = p->blue = 0xffff/2;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7182 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7183
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7184 for (y = 1; y < img->height - 1; ++y)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7185 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7186 p = COLOR (new, 1, y);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7187
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7188 for (x = 1; x < img->width - 1; ++x, ++p)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7189 {
31651
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7190 int r, g, b, y1, x1;
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7191
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7192 r = g = b = i = 0;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7193 for (y1 = y - 1; y1 < y + 2; ++y1)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7194 for (x1 = x - 1; x1 < x + 2; ++x1, ++i)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7195 if (matrix[i])
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7196 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7197 XColor *t = COLOR (colors, x1, y1);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7198 r += matrix[i] * t->red;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7199 g += matrix[i] * t->green;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7200 b += matrix[i] * t->blue;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7201 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7202
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7203 r = (r / sum + color_adjust) & 0xffff;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7204 g = (g / sum + color_adjust) & 0xffff;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7205 b = (b / sum + color_adjust) & 0xffff;
31651
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7206 p->red = p->green = p->blue = COLOR_INTENSITY (r, g, b);
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7207 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7208 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7209
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7210 xfree (colors);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7211 x_from_xcolors (f, img, new);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7212
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7213 #undef COLOR
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7214 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7215
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7216
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7217 /* Perform the pre-defined `emboss' edge-detection on image IMG
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7218 on frame F. */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7219
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7220 static void
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7221 x_emboss (f, img)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7222 struct frame *f;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7223 struct image *img;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7224 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7225 x_detect_edges (f, img, emboss_matrix, 0xffff / 2);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7226 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7227
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7228
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7229 /* Perform the pre-defined `laplace' edge-detection on image IMG
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7230 on frame F. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7231
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7232 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7233 x_laplace (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7234 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7235 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7236 {
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7237 x_detect_edges (f, img, laplace_matrix, 45000);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7238 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7239
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7240
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7241 /* Perform edge-detection on image IMG on frame F, with specified
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7242 transformation matrix MATRIX and color-adjustment COLOR_ADJUST.
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7243
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7244 MATRIX must be either
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7245
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7246 - a list of at least 9 numbers in row-major form
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7247 - a vector of at least 9 numbers
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7248
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7249 COLOR_ADJUST nil means use a default; otherwise it must be a
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7250 number. */
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7251
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7252 static void
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7253 x_edge_detection (f, img, matrix, color_adjust)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7254 struct frame *f;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7255 struct image *img;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7256 Lisp_Object matrix, color_adjust;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7257 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7258 int i = 0;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7259 int trans[9];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7260
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7261 if (CONSP (matrix))
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7262 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7263 for (i = 0;
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7264 i < 9 && CONSP (matrix) && NUMBERP (XCAR (matrix));
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7265 ++i, matrix = XCDR (matrix))
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7266 trans[i] = XFLOATINT (XCAR (matrix));
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7267 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7268 else if (VECTORP (matrix) && ASIZE (matrix) >= 9)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7269 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7270 for (i = 0; i < 9 && NUMBERP (AREF (matrix, i)); ++i)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7271 trans[i] = XFLOATINT (AREF (matrix, i));
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7272 }
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7273
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7274 if (NILP (color_adjust))
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7275 color_adjust = make_number (0xffff / 2);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7276
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7277 if (i == 9 && NUMBERP (color_adjust))
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7278 x_detect_edges (f, img, trans, (int) XFLOATINT (color_adjust));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7279 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7280
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7281
31651
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7282 /* Transform image IMG on frame F so that it looks disabled. */
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7283
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7284 static void
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7285 x_disable_image (f, img)
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7286 struct frame *f;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7287 struct image *img;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7288 {
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7289 struct x_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f);
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
7290
31651
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7291 if (dpyinfo->n_planes >= 2)
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7292 {
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7293 /* Color (or grayscale). Convert to gray, and equalize. Just
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7294 drawing such images with a stipple can look very odd, so
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7295 we're using this method instead. */
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7296 XColor *colors = x_to_xcolors (f, img, 1);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7297 XColor *p, *end;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7298 const int h = 15000;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7299 const int l = 30000;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7300
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7301 for (p = colors, end = colors + img->width * img->height;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7302 p < end;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7303 ++p)
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7304 {
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7305 int i = COLOR_INTENSITY (p->red, p->green, p->blue);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7306 int i2 = (0xffff - h - l) * i / 0xffff + l;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7307 p->red = p->green = p->blue = i2;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7308 }
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7309
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7310 x_from_xcolors (f, img, colors);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7311 }
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7312
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7313 /* Draw a cross over the disabled image, if we must or if we
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7314 should. */
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7315 if (dpyinfo->n_planes < 2 || cross_disabled_images)
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7316 {
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7317 Display *dpy = FRAME_X_DISPLAY (f);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7318 GC gc;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7319
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7320 gc = XCreateGC (dpy, img->pixmap, 0, NULL);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7321 XSetForeground (dpy, gc, BLACK_PIX_DEFAULT (f));
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7322 XDrawLine (dpy, img->pixmap, gc, 0, 0,
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7323 img->width - 1, img->height - 1);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7324 XDrawLine (dpy, img->pixmap, gc, 0, img->height - 1,
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7325 img->width - 1, 0);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7326 XFreeGC (dpy, gc);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7327
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7328 if (img->mask)
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7329 {
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7330 gc = XCreateGC (dpy, img->mask, 0, NULL);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7331 XSetForeground (dpy, gc, WHITE_PIX_DEFAULT (f));
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7332 XDrawLine (dpy, img->mask, gc, 0, 0,
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7333 img->width - 1, img->height - 1);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7334 XDrawLine (dpy, img->mask, gc, 0, img->height - 1,
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7335 img->width - 1, 0);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7336 XFreeGC (dpy, gc);
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7337 }
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7338 }
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7339 }
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7340
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
7341
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7342 /* Build a mask for image IMG which is used on frame F. FILE is the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7343 name of an image file, for error messages. HOW determines how to
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7344 determine the background color of IMG. If it is a list '(R G B)',
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7345 with R, G, and B being integers >= 0, take that as the color of the
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7346 background. Otherwise, determine the background color of IMG
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7347 heuristically. Value is non-zero if successful. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7348
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7349 static int
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7350 x_build_heuristic_mask (f, img, how)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7351 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7352 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7353 Lisp_Object how;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7354 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7355 Display *dpy = FRAME_X_DISPLAY (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7356 XImage *ximg, *mask_img;
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7357 int x, y, rc, use_img_background;
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
7358 unsigned long bg = 0;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7359
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7360 if (img->mask)
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7361 {
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7362 XFreePixmap (FRAME_X_DISPLAY (f), img->mask);
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
7363 img->mask = None;
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7364 img->background_transparent_valid = 0;
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
7365 }
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
7366
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7367 /* Create an image and pixmap serving as mask. */
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7368 rc = x_create_x_image_and_pixmap (f, img->width, img->height, 1,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7369 &mask_img, &img->mask);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7370 if (!rc)
31686
577372d71de8 (lookup_image): Block input while loading the image so
Gerd Moellmann <gerd@gnu.org>
parents: 31651
diff changeset
7371 return 0;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7372
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7373 /* Get the X image of IMG->pixmap. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7374 ximg = XGetImage (dpy, img->pixmap, 0, 0, img->width, img->height,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7375 ~0, ZPixmap);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7376
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7377 /* Determine the background color of ximg. If HOW is `(R G B)'
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7378 take that as color. Otherwise, use the image's background color. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7379 use_img_background = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7380
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7381 if (CONSP (how))
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7382 {
40421
1eec9125d32e (x_build_heuristic_mask): Fix a bug not incrementing
Gerd Moellmann <gerd@gnu.org>
parents: 40325
diff changeset
7383 int rgb[3], i;
1eec9125d32e (x_build_heuristic_mask): Fix a bug not incrementing
Gerd Moellmann <gerd@gnu.org>
parents: 40325
diff changeset
7384
1eec9125d32e (x_build_heuristic_mask): Fix a bug not incrementing
Gerd Moellmann <gerd@gnu.org>
parents: 40325
diff changeset
7385 for (i = 0; i < 3 && CONSP (how) && NATNUMP (XCAR (how)); ++i)
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7386 {
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7387 rgb[i] = XFASTINT (XCAR (how)) & 0xffff;
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7388 how = XCDR (how);
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7389 }
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7390
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7391 if (i == 3 && NILP (how))
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7392 {
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7393 char color_name[30];
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7394 sprintf (color_name, "#%04x%04x%04x", rgb[0], rgb[1], rgb[2]);
40427
979757645800 (x_build_heuristic_mask): Use x_alloc_image_color.
Gerd Moellmann <gerd@gnu.org>
parents: 40421
diff changeset
7395 bg = x_alloc_image_color (f, img, build_string (color_name), 0);
979757645800 (x_build_heuristic_mask): Use x_alloc_image_color.
Gerd Moellmann <gerd@gnu.org>
parents: 40421
diff changeset
7396 use_img_background = 0;
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7397 }
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
7398 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7399
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7400 if (use_img_background)
40608
134b236ad704 (x_build_heuristic_mask): Use four_corners_best
Gerd Moellmann <gerd@gnu.org>
parents: 40606
diff changeset
7401 bg = four_corners_best (ximg, img->width, img->height);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7402
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7403 /* Set all bits in mask_img to 1 whose color in ximg is different
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7404 from the background color bg. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7405 for (y = 0; y < img->height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7406 for (x = 0; x < img->width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7407 XPutPixel (mask_img, x, y, XGetPixel (ximg, x, y) != bg);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7408
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7409 /* Fill in the background_transparent field while we have the mask handy. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7410 image_background_transparent (img, f, mask_img);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7411
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7412 /* Put mask_img into img->mask. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7413 x_put_x_image (f, mask_img, img->mask, img->width, img->height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7414 x_destroy_x_image (mask_img);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7415 XDestroyImage (ximg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7416
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7417 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7418 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7419
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7420
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7421
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7422 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7423 PBM (mono, gray, color)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7424 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7425
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7426 static int pbm_image_p P_ ((Lisp_Object object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7427 static int pbm_load P_ ((struct frame *f, struct image *img));
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7428 static int pbm_scan_number P_ ((unsigned char **, unsigned char *));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7429
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7430 /* The symbol `pbm' identifying images of this type. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7431
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7432 Lisp_Object Qpbm;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7433
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7434 /* Indices of image specification fields in gs_format, below. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7435
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7436 enum pbm_keyword_index
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7437 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7438 PBM_TYPE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7439 PBM_FILE,
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7440 PBM_DATA,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7441 PBM_ASCENT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7442 PBM_MARGIN,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7443 PBM_RELIEF,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7444 PBM_ALGORITHM,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7445 PBM_HEURISTIC_MASK,
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7446 PBM_MASK,
32549
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7447 PBM_FOREGROUND,
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7448 PBM_BACKGROUND,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7449 PBM_LAST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7450 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7451
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7452 /* Vector of image_keyword structures describing the format
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7453 of valid user-defined image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7454
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7455 static struct image_keyword pbm_format[PBM_LAST] =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7456 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7457 {":type", IMAGE_SYMBOL_VALUE, 1},
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7458 {":file", IMAGE_STRING_VALUE, 0},
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7459 {":data", IMAGE_STRING_VALUE, 0},
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
7460 {":ascent", IMAGE_ASCENT_VALUE, 0},
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
7461 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7462 {":relief", IMAGE_INTEGER_VALUE, 0},
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
7463 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7464 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
32549
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7465 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
37946
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
7466 {":foreground", IMAGE_STRING_OR_NIL_VALUE, 0},
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
7467 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7468 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7469
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7470 /* Structure describing the image type `pbm'. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7471
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7472 static struct image_type pbm_type =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7473 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7474 &Qpbm,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7475 pbm_image_p,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7476 pbm_load,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7477 x_clear_image,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7478 NULL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7479 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7480
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7481
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7482 /* Return non-zero if OBJECT is a valid PBM image specification. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7483
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7484 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7485 pbm_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7486 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7487 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7488 struct image_keyword fmt[PBM_LAST];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7489
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7490 bcopy (pbm_format, fmt, sizeof fmt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7491
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
7492 if (!parse_image_spec (object, fmt, PBM_LAST, Qpbm))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7493 return 0;
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7494
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7495 /* Must specify either :data or :file. */
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7496 return fmt[PBM_DATA].count + fmt[PBM_FILE].count == 1;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7497 }
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7498
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7499
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7500 /* Scan a decimal number from *S and return it. Advance *S while
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7501 reading the number. END is the end of the string. Value is -1 at
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7502 end of input. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7503
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7504 static int
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7505 pbm_scan_number (s, end)
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7506 unsigned char **s, *end;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7507 {
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
7508 int c = 0, val = -1;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7509
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7510 while (*s < end)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7511 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7512 /* Skip white-space. */
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7513 while (*s < end && (c = *(*s)++, isspace (c)))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7514 ;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7515
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7516 if (c == '#')
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7517 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7518 /* Skip comment to end of line. */
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7519 while (*s < end && (c = *(*s)++, c != '\n'))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7520 ;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7521 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7522 else if (isdigit (c))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7523 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7524 /* Read decimal number. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7525 val = c - '0';
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7526 while (*s < end && (c = *(*s)++, isdigit (c)))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7527 val = 10 * val + c - '0';
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7528 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7529 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7530 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7531 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7532 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7533
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7534 return val;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7535 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7536
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7537
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7538 /* Load PBM image IMG for use on frame F. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7539
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7540 static int
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7541 pbm_load (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7542 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7543 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7544 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7545 int raw_p, x, y;
25715
feaedc03dbc8 (x_set_background_color): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents: 25691
diff changeset
7546 int width, height, max_color_idx = 0;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7547 XImage *ximg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7548 Lisp_Object file, specified_file;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7549 enum {PBM_MONO, PBM_GRAY, PBM_COLOR} type;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7550 struct gcpro gcpro1;
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7551 unsigned char *contents = NULL;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7552 unsigned char *end, *p;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7553 int size;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7554
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7555 specified_file = image_spec_value (img->spec, QCfile, NULL);
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7556 file = Qnil;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7557 GCPRO1 (file);
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7558
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7559 if (STRINGP (specified_file))
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7560 {
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7561 file = x_find_image_file (specified_file);
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7562 if (!STRINGP (file))
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7563 {
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7564 image_error ("Cannot find image file `%s'", specified_file, Qnil);
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7565 UNGCPRO;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7566 return 0;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7567 }
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7568
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
7569 contents = slurp_file (SDATA (file), &size);
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7570 if (contents == NULL)
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7571 {
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7572 image_error ("Error reading `%s'", file, Qnil);
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7573 UNGCPRO;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7574 return 0;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7575 }
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7576
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7577 p = contents;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7578 end = contents + size;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7579 }
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7580 else
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7581 {
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7582 Lisp_Object data;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7583 data = image_spec_value (img->spec, QCdata, NULL);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
7584 p = SDATA (data);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
7585 end = p + SBYTES (data);
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7586 }
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7587
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7588 /* Check magic number. */
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7589 if (end - p < 2 || *p++ != 'P')
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7590 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7591 image_error ("Not a PBM image: `%s'", img->spec, Qnil);
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7592 error:
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7593 xfree (contents);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7594 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7595 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7596 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7597
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7598 switch (*p++)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7599 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7600 case '1':
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7601 raw_p = 0, type = PBM_MONO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7602 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7603
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7604 case '2':
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7605 raw_p = 0, type = PBM_GRAY;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7606 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7607
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7608 case '3':
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7609 raw_p = 0, type = PBM_COLOR;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7610 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7611
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7612 case '4':
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7613 raw_p = 1, type = PBM_MONO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7614 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7615
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7616 case '5':
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7617 raw_p = 1, type = PBM_GRAY;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7618 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7619
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7620 case '6':
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7621 raw_p = 1, type = PBM_COLOR;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7622 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7623
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7624 default:
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7625 image_error ("Not a PBM image: `%s'", img->spec, Qnil);
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7626 goto error;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7627 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7628
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7629 /* Read width, height, maximum color-component. Characters
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7630 starting with `#' up to the end of a line are ignored. */
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7631 width = pbm_scan_number (&p, end);
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7632 height = pbm_scan_number (&p, end);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7633
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7634 if (type != PBM_MONO)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7635 {
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7636 max_color_idx = pbm_scan_number (&p, end);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7637 if (raw_p && max_color_idx > 255)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7638 max_color_idx = 255;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7639 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7640
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7641 if (width < 0
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7642 || height < 0
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7643 || (type != PBM_MONO && max_color_idx < 0))
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7644 goto error;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7645
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7646 if (!x_create_x_image_and_pixmap (f, width, height, 0,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7647 &ximg, &img->pixmap))
31686
577372d71de8 (lookup_image): Block input while loading the image so
Gerd Moellmann <gerd@gnu.org>
parents: 31651
diff changeset
7648 goto error;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7649
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7650 /* Initialize the color hash table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7651 init_color_table ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7652
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7653 if (type == PBM_MONO)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7654 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7655 int c = 0, g;
32549
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7656 struct image_keyword fmt[PBM_LAST];
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7657 unsigned long fg = FRAME_FOREGROUND_PIXEL (f);
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7658 unsigned long bg = FRAME_BACKGROUND_PIXEL (f);
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7659
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7660 /* Parse the image specification. */
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7661 bcopy (pbm_format, fmt, sizeof fmt);
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7662 parse_image_spec (img->spec, fmt, PBM_LAST, Qpbm);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7663
32549
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7664 /* Get foreground and background colors, maybe allocate colors. */
37946
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
7665 if (fmt[PBM_FOREGROUND].count
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
7666 && STRINGP (fmt[PBM_FOREGROUND].value))
32549
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7667 fg = x_alloc_image_color (f, img, fmt[PBM_FOREGROUND].value, fg);
37946
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
7668 if (fmt[PBM_BACKGROUND].count
fe4457964ac0 (enum image_value_type): New enumerator
Gerd Moellmann <gerd@gnu.org>
parents: 37762
diff changeset
7669 && STRINGP (fmt[PBM_BACKGROUND].value))
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7670 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7671 bg = x_alloc_image_color (f, img, fmt[PBM_BACKGROUND].value, bg);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7672 img->background = bg;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7673 img->background_valid = 1;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7674 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7675
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7676 for (y = 0; y < height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7677 for (x = 0; x < width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7678 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7679 if (raw_p)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7680 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7681 if ((x & 7) == 0)
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7682 c = *p++;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7683 g = c & 0x80;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7684 c <<= 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7685 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7686 else
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7687 g = pbm_scan_number (&p, end);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7688
32549
73521ea30674 (pbm_format): Add :foreground and :background keywords.
Gerd Moellmann <gerd@gnu.org>
parents: 32536
diff changeset
7689 XPutPixel (ximg, x, y, g ? fg : bg);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7690 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7691 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7692 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7693 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7694 for (y = 0; y < height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7695 for (x = 0; x < width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7696 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7697 int r, g, b;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7698
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7699 if (type == PBM_GRAY)
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7700 r = g = b = raw_p ? *p++ : pbm_scan_number (&p, end);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7701 else if (raw_p)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7702 {
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7703 r = *p++;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7704 g = *p++;
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7705 b = *p++;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7706 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7707 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7708 {
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7709 r = pbm_scan_number (&p, end);
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7710 g = pbm_scan_number (&p, end);
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7711 b = pbm_scan_number (&p, end);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7712 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7713
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7714 if (r < 0 || g < 0 || b < 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7715 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7716 xfree (ximg->data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7717 ximg->data = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7718 XDestroyImage (ximg);
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7719 image_error ("Invalid pixel value in image `%s'",
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7720 img->spec, Qnil);
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7721 goto error;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7722 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7723
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7724 /* RGB values are now in the range 0..max_color_idx.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7725 Scale this to the range 0..0xffff supported by X. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7726 r = (double) r * 65535 / max_color_idx;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7727 g = (double) g * 65535 / max_color_idx;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7728 b = (double) b * 65535 / max_color_idx;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7729 XPutPixel (ximg, x, y, lookup_rgb_color (f, r, g, b));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7730 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7731 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7732
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7733 /* Store in IMG->colors the colors allocated for the image, and
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7734 free the color table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7735 img->colors = colors_in_color_table (&img->ncolors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7736 free_color_table ();
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7737
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7738 /* Maybe fill in the background field while we have ximg handy. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7739 if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7740 IMAGE_BACKGROUND (img, f, ximg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7741
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7742 /* Put the image into a pixmap. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7743 x_put_x_image (f, ximg, img->pixmap, width, height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7744 x_destroy_x_image (ximg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7745
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7746 img->width = width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7747 img->height = height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7748
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7749 UNGCPRO;
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7750 xfree (contents);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7751 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7752 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7753
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7754
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7755
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7756 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7757 PNG
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7758 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7759
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7760 #if HAVE_PNG
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7761
52015
61f03c9c44c3 Don't check HAVE_PNG_H: autoconf doesn't seem to find it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52008
diff changeset
7762 #if defined HAVE_LIBPNG_PNG_H
61f03c9c44c3 Don't check HAVE_PNG_H: autoconf doesn't seem to find it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52008
diff changeset
7763 # include <libpng/png.h>
52008
66104cf372d8 Consider both png.h and libpng/png.h.
Dave Love <fx@gnu.org>
parents: 51898
diff changeset
7764 #else
52015
61f03c9c44c3 Don't check HAVE_PNG_H: autoconf doesn't seem to find it.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 52008
diff changeset
7765 # include <png.h>
52008
66104cf372d8 Consider both png.h and libpng/png.h.
Dave Love <fx@gnu.org>
parents: 51898
diff changeset
7766 #endif
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7767
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7768 /* Function prototypes. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7769
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7770 static int png_image_p P_ ((Lisp_Object object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7771 static int png_load P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7772
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7773 /* The symbol `png' identifying images of this type. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7774
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7775 Lisp_Object Qpng;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7776
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7777 /* Indices of image specification fields in png_format, below. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7778
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7779 enum png_keyword_index
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7780 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7781 PNG_TYPE,
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7782 PNG_DATA,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7783 PNG_FILE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7784 PNG_ASCENT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7785 PNG_MARGIN,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7786 PNG_RELIEF,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7787 PNG_ALGORITHM,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7788 PNG_HEURISTIC_MASK,
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7789 PNG_MASK,
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7790 PNG_BACKGROUND,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7791 PNG_LAST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7792 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7793
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7794 /* Vector of image_keyword structures describing the format
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7795 of valid user-defined image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7796
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7797 static struct image_keyword png_format[PNG_LAST] =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7798 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7799 {":type", IMAGE_SYMBOL_VALUE, 1},
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7800 {":data", IMAGE_STRING_VALUE, 0},
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7801 {":file", IMAGE_STRING_VALUE, 0},
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
7802 {":ascent", IMAGE_ASCENT_VALUE, 0},
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
7803 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7804 {":relief", IMAGE_INTEGER_VALUE, 0},
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
7805 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
7806 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
40279
1adbc1480e83 (png_load): Make sure SPECIFIED_BG is a string.
Miles Bader <miles@gnu.org>
parents: 40264
diff changeset
7807 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
7808 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7809 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7810
26032
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
7811 /* Structure describing the image type `png'. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7812
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7813 static struct image_type png_type =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7814 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7815 &Qpng,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7816 png_image_p,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7817 png_load,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7818 x_clear_image,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7819 NULL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7820 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7821
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7822
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7823 /* Return non-zero if OBJECT is a valid PNG image specification. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7824
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7825 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7826 png_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7827 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7828 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7829 struct image_keyword fmt[PNG_LAST];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7830 bcopy (png_format, fmt, sizeof fmt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7831
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
7832 if (!parse_image_spec (object, fmt, PNG_LAST, Qpng))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7833 return 0;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7834
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7835 /* Must specify either the :data or :file keyword. */
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
7836 return fmt[PNG_FILE].count + fmt[PNG_DATA].count == 1;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7837 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7838
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7839
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7840 /* Error and warning handlers installed when the PNG library
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7841 is initialized. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7842
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7843 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7844 my_png_error (png_ptr, msg)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7845 png_struct *png_ptr;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7846 char *msg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7847 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7848 xassert (png_ptr != NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7849 image_error ("PNG error: %s", build_string (msg), Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7850 longjmp (png_ptr->jmpbuf, 1);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7851 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7852
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7853
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7854 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7855 my_png_warning (png_ptr, msg)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7856 png_struct *png_ptr;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7857 char *msg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7858 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7859 xassert (png_ptr != NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7860 image_error ("PNG warning: %s", build_string (msg), Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7861 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7862
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7863 /* Memory source for PNG decoding. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7864
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7865 struct png_memory_storage
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7866 {
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7867 unsigned char *bytes; /* The data */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7868 size_t len; /* How big is it? */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7869 int index; /* Where are we? */
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7870 };
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7871
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7872
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7873 /* Function set as reader function when reading PNG image from memory.
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7874 PNG_PTR is a pointer to the PNG control structure. Copy LENGTH
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7875 bytes from the input to DATA. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7876
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7877 static void
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7878 png_read_from_memory (png_ptr, data, length)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7879 png_structp png_ptr;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7880 png_bytep data;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7881 png_size_t length;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7882 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7883 struct png_memory_storage *tbr
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7884 = (struct png_memory_storage *) png_get_io_ptr (png_ptr);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7885
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7886 if (length > tbr->len - tbr->index)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7887 png_error (png_ptr, "Read error");
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
7888
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7889 bcopy (tbr->bytes + tbr->index, data, length);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7890 tbr->index = tbr->index + length;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7891 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7892
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7893 /* Load PNG image IMG for use on frame F. Value is non-zero if
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7894 successful. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7895
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7896 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7897 png_load (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7898 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7899 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7900 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7901 Lisp_Object file, specified_file;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7902 Lisp_Object specified_data;
25715
feaedc03dbc8 (x_set_background_color): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents: 25691
diff changeset
7903 int x, y, i;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7904 XImage *ximg, *mask_img = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7905 struct gcpro gcpro1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7906 png_struct *png_ptr = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7907 png_info *info_ptr = NULL, *end_info = NULL;
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
7908 FILE *volatile fp = NULL;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7909 png_byte sig[8];
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
7910 png_byte * volatile pixels = NULL;
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
7911 png_byte ** volatile rows = NULL;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7912 png_uint_32 width, height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7913 int bit_depth, color_type, interlace_type;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7914 png_byte channels;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7915 png_uint_32 row_bytes;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7916 int transparent_p;
51236
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
7917 double screen_gamma;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7918 struct png_memory_storage tbr; /* Data to be read */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7919
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7920 /* Find out what file to load. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7921 specified_file = image_spec_value (img->spec, QCfile, NULL);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7922 specified_data = image_spec_value (img->spec, QCdata, NULL);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7923 file = Qnil;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7924 GCPRO1 (file);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7925
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7926 if (NILP (specified_data))
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7927 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7928 file = x_find_image_file (specified_file);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7929 if (!STRINGP (file))
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7930 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7931 image_error ("Cannot find image file `%s'", specified_file, Qnil);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7932 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7933 return 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7934 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7935
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7936 /* Open the image file. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
7937 fp = fopen (SDATA (file), "rb");
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7938 if (!fp)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7939 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7940 image_error ("Cannot open image file `%s'", file, Qnil);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7941 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7942 fclose (fp);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7943 return 0;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7944 }
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7945
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7946 /* Check PNG signature. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7947 if (fread (sig, 1, sizeof sig, fp) != sizeof sig
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7948 || !png_check_sig (sig, sizeof sig))
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7949 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7950 image_error ("Not a PNG file: `%s'", file, Qnil);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7951 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7952 fclose (fp);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7953 return 0;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7954 }
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7955 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7956 else
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7957 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7958 /* Read from memory. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
7959 tbr.bytes = SDATA (specified_data);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
7960 tbr.len = SBYTES (specified_data);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7961 tbr.index = 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7962
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7963 /* Check PNG signature. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7964 if (tbr.len < sizeof sig
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7965 || !png_check_sig (tbr.bytes, sizeof sig))
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7966 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
7967 image_error ("Not a PNG image: `%s'", img->spec, Qnil);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7968 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7969 return 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7970 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7971
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7972 /* Need to skip past the signature. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7973 tbr.bytes += sizeof (sig);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
7974 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7975
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7976 /* Initialize read and info structs for PNG lib. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7977 png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, NULL,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7978 my_png_error, my_png_warning);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7979 if (!png_ptr)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7980 {
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7981 if (fp) fclose (fp);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7982 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7983 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7984 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7985
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7986 info_ptr = png_create_info_struct (png_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7987 if (!info_ptr)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7988 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7989 png_destroy_read_struct (&png_ptr, NULL, NULL);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7990 if (fp) fclose (fp);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7991 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7992 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7993 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7995 end_info = png_create_info_struct (png_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7996 if (!end_info)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7997 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
7998 png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
7999 if (fp) fclose (fp);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8000 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8001 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8002 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8003
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8004 /* Set error jump-back. We come back here when the PNG library
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8005 detects an error. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8006 if (setjmp (png_ptr->jmpbuf))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8007 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8008 error:
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8009 if (png_ptr)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8010 png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8011 xfree (pixels);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8012 xfree (rows);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8013 if (fp) fclose (fp);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8014 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8015 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8016 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8017
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8018 /* Read image info. */
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8019 if (!NILP (specified_data))
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8020 png_set_read_fn (png_ptr, (void *) &tbr, png_read_from_memory);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8021 else
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8022 png_init_io (png_ptr, fp);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8023
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8024 png_set_sig_bytes (png_ptr, sizeof sig);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8025 png_read_info (png_ptr, info_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8026 png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8027 &interlace_type, NULL, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8028
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8029 /* If image contains simply transparency data, we prefer to
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8030 construct a clipping mask. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8031 if (png_get_valid (png_ptr, info_ptr, PNG_INFO_tRNS))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8032 transparent_p = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8033 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8034 transparent_p = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8035
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8036 /* This function is easier to write if we only have to handle
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8037 one data format: RGB or RGBA with 8 bits per channel. Let's
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8038 transform other formats into that format. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8039
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8040 /* Strip more than 8 bits per channel. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8041 if (bit_depth == 16)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8042 png_set_strip_16 (png_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8043
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8044 /* Expand data to 24 bit RGB, or 8 bit grayscale, with alpha channel
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8045 if available. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8046 png_set_expand (png_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8047
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8048 /* Convert grayscale images to RGB. */
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8049 if (color_type == PNG_COLOR_TYPE_GRAY
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8050 || color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8051 png_set_gray_to_rgb (png_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8052
43670
5505d571541b (png_load): Set screen_gamma based on f->gamma.
Richard M. Stallman <rms@gnu.org>
parents: 43452
diff changeset
8053 screen_gamma = (f->gamma ? 1 / f->gamma / 0.45455 : 2.2);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8054
48693
057cea5b1f68 *** empty log message ***
Francesco Potortì <pot@gnu.org>
parents: 48692
diff changeset
8055 #if 0 /* Avoid double gamma correction for PNG images. */
51236
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8056 { /* Tell the PNG lib to handle gamma correction for us. */
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8057 int intent;
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8058 double image_gamma;
26293
65861669b393 (png_load) [PNG_READ_sRGB_SUPPORTED]: Put code using
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
8059 #if defined(PNG_READ_sRGB_SUPPORTED) || defined(PNG_WRITE_sRGB_SUPPORTED)
51236
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8060 if (png_get_sRGB (png_ptr, info_ptr, &intent))
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8061 /* The libpng documentation says this is right in this case. */
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8062 png_set_gamma (png_ptr, screen_gamma, 0.45455);
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8063 else
26293
65861669b393 (png_load) [PNG_READ_sRGB_SUPPORTED]: Put code using
Gerd Moellmann <gerd@gnu.org>
parents: 26088
diff changeset
8064 #endif
51236
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8065 if (png_get_gAMA (png_ptr, info_ptr, &image_gamma))
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8066 /* Image contains gamma information. */
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8067 png_set_gamma (png_ptr, screen_gamma, image_gamma);
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8068 else
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8069 /* Use the standard default for the image gamma. */
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8070 png_set_gamma (png_ptr, screen_gamma, 0.45455);
29a68043c861 (png_load): Remove `unused vars intent, image_gamma' warning.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51211
diff changeset
8071 }
48692
b2929bf0de68 (png_load): Avoid double gamma correction for PNG images.
Francesco Potortì <pot@gnu.org>
parents: 48328
diff changeset
8072 #endif /* if 0 */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8073
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8074 /* Handle alpha channel by combining the image with a background
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8075 color. Do this only if a real alpha channel is supplied. For
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8076 simple transparency, we prefer a clipping mask. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8077 if (!transparent_p)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8078 {
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8079 png_color_16 *image_bg;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8080 Lisp_Object specified_bg
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8081 = image_spec_value (img->spec, QCbackground, NULL);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8082
40279
1adbc1480e83 (png_load): Make sure SPECIFIED_BG is a string.
Miles Bader <miles@gnu.org>
parents: 40264
diff changeset
8083 if (STRINGP (specified_bg))
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8084 /* The user specified `:background', use that. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8085 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8086 XColor color;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
8087 if (x_defined_color (f, SDATA (specified_bg), &color, 0))
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8088 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8089 png_color_16 user_bg;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8090
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8091 bzero (&user_bg, sizeof user_bg);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8092 user_bg.red = color.red;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8093 user_bg.green = color.green;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8094 user_bg.blue = color.blue;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8095
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8096 png_set_background (png_ptr, &user_bg,
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8097 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8098 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8099 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8100 else if (png_get_bKGD (png_ptr, info_ptr, &image_bg))
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8101 /* Image contains a background color with which to
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8102 combine the image. */
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8103 png_set_background (png_ptr, image_bg,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8104 PNG_BACKGROUND_GAMMA_FILE, 1, 1.0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8105 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8106 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8107 /* Image does not contain a background color with which
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8108 to combine the image data via an alpha channel. Use
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8109 the frame's background instead. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8110 XColor color;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8111 Colormap cmap;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8112 png_color_16 frame_background;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8113
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
8114 cmap = FRAME_X_COLORMAP (f);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8115 color.pixel = FRAME_BACKGROUND_PIXEL (f);
32606
78b4e9f31087 (x_to_xcolors, x_set_mouse_color, lookup_pixel_color)
Gerd Moellmann <gerd@gnu.org>
parents: 32549
diff changeset
8116 x_query_color (f, &color);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8117
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8118 bzero (&frame_background, sizeof frame_background);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8119 frame_background.red = color.red;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8120 frame_background.green = color.green;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8121 frame_background.blue = color.blue;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8122
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8123 png_set_background (png_ptr, &frame_background,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8124 PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8125 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8126 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8127
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8128 /* Update info structure. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8129 png_read_update_info (png_ptr, info_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8130
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8131 /* Get number of channels. Valid values are 1 for grayscale images
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8132 and images with a palette, 2 for grayscale images with transparency
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8133 information (alpha channel), 3 for RGB images, and 4 for RGB
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8134 images with alpha channel, i.e. RGBA. If conversions above were
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8135 sufficient we should only have 3 or 4 channels here. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8136 channels = png_get_channels (png_ptr, info_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8137 xassert (channels == 3 || channels == 4);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8138
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8139 /* Number of bytes needed for one row of the image. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8140 row_bytes = png_get_rowbytes (png_ptr, info_ptr);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8141
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8142 /* Allocate memory for the image. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8143 pixels = (png_byte *) xmalloc (row_bytes * height * sizeof *pixels);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8144 rows = (png_byte **) xmalloc (height * sizeof *rows);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8145 for (i = 0; i < height; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8146 rows[i] = pixels + i * row_bytes;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8147
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8148 /* Read the entire image. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8149 png_read_image (png_ptr, rows);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8150 png_read_end (png_ptr, info_ptr);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8151 if (fp)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8152 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8153 fclose (fp);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8154 fp = NULL;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8155 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8156
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8157 /* Create the X image and pixmap. */
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8158 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8159 &img->pixmap))
31686
577372d71de8 (lookup_image): Block input while loading the image so
Gerd Moellmann <gerd@gnu.org>
parents: 31651
diff changeset
8160 goto error;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8161
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8162 /* Create an image and pixmap serving as mask if the PNG image
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8163 contains an alpha channel. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8164 if (channels == 4
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8165 && !transparent_p
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8166 && !x_create_x_image_and_pixmap (f, width, height, 1,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8167 &mask_img, &img->mask))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8168 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8169 x_destroy_x_image (ximg);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8170 XFreePixmap (FRAME_X_DISPLAY (f), img->pixmap);
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
8171 img->pixmap = None;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8172 goto error;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8173 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8174
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8175 /* Fill the X image and mask from PNG data. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8176 init_color_table ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8177
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8178 for (y = 0; y < height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8179 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8180 png_byte *p = rows[y];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8181
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8182 for (x = 0; x < width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8183 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8184 unsigned r, g, b;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8185
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8186 r = *p++ << 8;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8187 g = *p++ << 8;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8188 b = *p++ << 8;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8189 XPutPixel (ximg, x, y, lookup_rgb_color (f, r, g, b));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8190
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8191 /* An alpha channel, aka mask channel, associates variable
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8192 transparency with an image. Where other image formats
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8193 support binary transparency---fully transparent or fully
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8194 opaque---PNG allows up to 254 levels of partial transparency.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8195 The PNG library implements partial transparency by combining
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8196 the image with a specified background color.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8197
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8198 I'm not sure how to handle this here nicely: because the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8199 background on which the image is displayed may change, for
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8200 real alpha channel support, it would be necessary to create
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8201 a new image for each possible background.
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8202
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8203 What I'm doing now is that a mask is created if we have
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8204 boolean transparency information. Otherwise I'm using
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8205 the frame's background color to combine the image with. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8206
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8207 if (channels == 4)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8208 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8209 if (mask_img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8210 XPutPixel (mask_img, x, y, *p > 0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8211 ++p;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8212 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8213 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8214 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8215
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8216 if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8217 /* Set IMG's background color from the PNG image, unless the user
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8218 overrode it. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8219 {
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8220 png_color_16 *bg;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8221 if (png_get_bKGD (png_ptr, info_ptr, &bg))
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8222 {
40279
1adbc1480e83 (png_load): Make sure SPECIFIED_BG is a string.
Miles Bader <miles@gnu.org>
parents: 40264
diff changeset
8223 img->background = lookup_rgb_color (f, bg->red, bg->green, bg->blue);
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8224 img->background_valid = 1;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8225 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8226 }
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8227
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8228 /* Remember colors allocated for this image. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8229 img->colors = colors_in_color_table (&img->ncolors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8230 free_color_table ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8231
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8232 /* Clean up. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8233 png_destroy_read_struct (&png_ptr, &info_ptr, &end_info);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8234 xfree (rows);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8235 xfree (pixels);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8236
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8237 img->width = width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8238 img->height = height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8239
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8240 /* Maybe fill in the background field while we have ximg handy. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8241 IMAGE_BACKGROUND (img, f, ximg);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8242
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8243 /* Put the image into the pixmap, then free the X image and its buffer. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8244 x_put_x_image (f, ximg, img->pixmap, width, height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8245 x_destroy_x_image (ximg);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8246
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8247 /* Same for the mask. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8248 if (mask_img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8249 {
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8250 /* Fill in the background_transparent field while we have the mask
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8251 handy. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8252 image_background_transparent (img, f, mask_img);
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8253
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8254 x_put_x_image (f, mask_img, img->mask, img->width, img->height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8255 x_destroy_x_image (mask_img);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8256 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8257
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8258 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8259 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8260 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8261
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8262 #endif /* HAVE_PNG != 0 */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8263
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8264
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8265
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8266 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8267 JPEG
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8268 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8269
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8270 #if HAVE_JPEG
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8271
25390
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8272 /* Work around a warning about HAVE_STDLIB_H being redefined in
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8273 jconfig.h. */
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8274 #ifdef HAVE_STDLIB_H
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8275 #define HAVE_STDLIB_H_1
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8276 #undef HAVE_STDLIB_H
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8277 #endif /* HAVE_STLIB_H */
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8278
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8279 #include <jpeglib.h>
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8280 #include <jerror.h>
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8281 #include <setjmp.h>
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8282
25390
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8283 #ifdef HAVE_STLIB_H_1
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8284 #define HAVE_STDLIB_H 1
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8285 #endif
4404ab9c802b [HAVE_JPEG]: Work around a warning about HAVE_STDLIB_H
Gerd Moellmann <gerd@gnu.org>
parents: 25363
diff changeset
8286
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8287 static int jpeg_image_p P_ ((Lisp_Object object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8288 static int jpeg_load P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8289
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8290 /* The symbol `jpeg' identifying images of this type. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8291
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8292 Lisp_Object Qjpeg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8293
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8294 /* Indices of image specification fields in gs_format, below. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8295
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8296 enum jpeg_keyword_index
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8297 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8298 JPEG_TYPE,
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8299 JPEG_DATA,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8300 JPEG_FILE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8301 JPEG_ASCENT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8302 JPEG_MARGIN,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8303 JPEG_RELIEF,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8304 JPEG_ALGORITHM,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8305 JPEG_HEURISTIC_MASK,
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
8306 JPEG_MASK,
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8307 JPEG_BACKGROUND,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8308 JPEG_LAST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8309 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8310
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8311 /* Vector of image_keyword structures describing the format
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8312 of valid user-defined image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8313
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8314 static struct image_keyword jpeg_format[JPEG_LAST] =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8315 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8316 {":type", IMAGE_SYMBOL_VALUE, 1},
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8317 {":data", IMAGE_STRING_VALUE, 0},
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8318 {":file", IMAGE_STRING_VALUE, 0},
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
8319 {":ascent", IMAGE_ASCENT_VALUE, 0},
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
8320 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8321 {":relief", IMAGE_INTEGER_VALUE, 0},
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
8322 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
8323 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8324 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8325 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8326 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8327
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8328 /* Structure describing the image type `jpeg'. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8329
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8330 static struct image_type jpeg_type =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8331 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8332 &Qjpeg,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8333 jpeg_image_p,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8334 jpeg_load,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8335 x_clear_image,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8336 NULL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8337 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8338
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8339
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8340 /* Return non-zero if OBJECT is a valid JPEG image specification. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8341
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8342 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8343 jpeg_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8344 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8345 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8346 struct image_keyword fmt[JPEG_LAST];
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8347
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8348 bcopy (jpeg_format, fmt, sizeof fmt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8349
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
8350 if (!parse_image_spec (object, fmt, JPEG_LAST, Qjpeg))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8351 return 0;
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8352
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
8353 /* Must specify either the :data or :file keyword. */
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
8354 return fmt[JPEG_FILE].count + fmt[JPEG_DATA].count == 1;
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8355 }
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8356
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8357
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8358 struct my_jpeg_error_mgr
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8359 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8360 struct jpeg_error_mgr pub;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8361 jmp_buf setjmp_buffer;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8362 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8363
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8364
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8365 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8366 my_error_exit (cinfo)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8367 j_common_ptr cinfo;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8368 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8369 struct my_jpeg_error_mgr *mgr = (struct my_jpeg_error_mgr *) cinfo->err;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8370 longjmp (mgr->setjmp_buffer, 1);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8371 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8372
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8373
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8374 /* Init source method for JPEG data source manager. Called by
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8375 jpeg_read_header() before any data is actually read. See
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8376 libjpeg.doc from the JPEG lib distribution. */
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8377
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8378 static void
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8379 our_init_source (cinfo)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8380 j_decompress_ptr cinfo;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8381 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8382 }
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8383
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8384
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8385 /* Fill input buffer method for JPEG data source manager. Called
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8386 whenever more data is needed. We read the whole image in one step,
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8387 so this only adds a fake end of input marker at the end. */
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8388
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8389 static boolean
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8390 our_fill_input_buffer (cinfo)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8391 j_decompress_ptr cinfo;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8392 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8393 /* Insert a fake EOI marker. */
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8394 struct jpeg_source_mgr *src = cinfo->src;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8395 static JOCTET buffer[2];
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8396
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8397 buffer[0] = (JOCTET) 0xFF;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8398 buffer[1] = (JOCTET) JPEG_EOI;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8399
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8400 src->next_input_byte = buffer;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8401 src->bytes_in_buffer = 2;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8402 return TRUE;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8403 }
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8404
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8405
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8406 /* Method to skip over NUM_BYTES bytes in the image data. CINFO->src
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8407 is the JPEG data source manager. */
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8408
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8409 static void
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8410 our_skip_input_data (cinfo, num_bytes)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8411 j_decompress_ptr cinfo;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8412 long num_bytes;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8413 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8414 struct jpeg_source_mgr *src = (struct jpeg_source_mgr *) cinfo->src;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8415
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8416 if (src)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8417 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8418 if (num_bytes > src->bytes_in_buffer)
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8419 ERREXIT (cinfo, JERR_INPUT_EOF);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8420
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8421 src->bytes_in_buffer -= num_bytes;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8422 src->next_input_byte += num_bytes;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8423 }
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8424 }
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8425
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8426
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8427 /* Method to terminate data source. Called by
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8428 jpeg_finish_decompress() after all data has been processed. */
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8429
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8430 static void
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8431 our_term_source (cinfo)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8432 j_decompress_ptr cinfo;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8433 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8434 }
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8435
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8436
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8437 /* Set up the JPEG lib for reading an image from DATA which contains
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8438 LEN bytes. CINFO is the decompression info structure created for
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8439 reading the image. */
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8440
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8441 static void
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8442 jpeg_memory_src (cinfo, data, len)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8443 j_decompress_ptr cinfo;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8444 JOCTET *data;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8445 unsigned int len;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8446 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8447 struct jpeg_source_mgr *src;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8448
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8449 if (cinfo->src == NULL)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8450 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8451 /* First time for this JPEG object? */
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8452 cinfo->src = (struct jpeg_source_mgr *)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8453 (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT,
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8454 sizeof (struct jpeg_source_mgr));
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8455 src = (struct jpeg_source_mgr *) cinfo->src;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8456 src->next_input_byte = data;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8457 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8458
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8459 src = (struct jpeg_source_mgr *) cinfo->src;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8460 src->init_source = our_init_source;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8461 src->fill_input_buffer = our_fill_input_buffer;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8462 src->skip_input_data = our_skip_input_data;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8463 src->resync_to_restart = jpeg_resync_to_restart; /* Use default method. */
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8464 src->term_source = our_term_source;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8465 src->bytes_in_buffer = len;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8466 src->next_input_byte = data;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8467 }
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8468
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8469
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8470 /* Load image IMG for use on frame F. Patterned after example.c
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8471 from the JPEG lib. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8472
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8473 static int
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8474 jpeg_load (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8475 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8476 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8477 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8478 struct jpeg_decompress_struct cinfo;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8479 struct my_jpeg_error_mgr mgr;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8480 Lisp_Object file, specified_file;
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8481 Lisp_Object specified_data;
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
8482 FILE * volatile fp = NULL;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8483 JSAMPARRAY buffer;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8484 int row_stride, x, y;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8485 XImage *ximg = NULL;
25715
feaedc03dbc8 (x_set_background_color): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents: 25691
diff changeset
8486 int rc;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8487 unsigned long *colors;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8488 int width, height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8489 struct gcpro gcpro1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8490
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8491 /* Open the JPEG file. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8492 specified_file = image_spec_value (img->spec, QCfile, NULL);
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8493 specified_data = image_spec_value (img->spec, QCdata, NULL);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8494 file = Qnil;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8495 GCPRO1 (file);
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8496
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8497 if (NILP (specified_data))
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8498 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8499 file = x_find_image_file (specified_file);
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8500 if (!STRINGP (file))
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8501 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8502 image_error ("Cannot find image file `%s'", specified_file, Qnil);
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8503 UNGCPRO;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8504 return 0;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8505 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8506
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
8507 fp = fopen (SDATA (file), "r");
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8508 if (fp == NULL)
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8509 {
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8510 image_error ("Cannot open `%s'", file, Qnil);
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8511 UNGCPRO;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8512 return 0;
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8513 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8514 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8515
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8516 /* Customize libjpeg's error handling to call my_error_exit when an
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8517 error is detected. This function will perform a longjmp. */
29728
f0f1e1365670 fix jpeg error-handling setup
Ken Raeburn <raeburn@raeburn.org>
parents: 29617
diff changeset
8518 cinfo.err = jpeg_std_error (&mgr.pub);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8519 mgr.pub.error_exit = my_error_exit;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8520
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8521 if ((rc = setjmp (mgr.setjmp_buffer)) != 0)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8522 {
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8523 if (rc == 1)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8524 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8525 /* Called from my_error_exit. Display a JPEG error. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8526 char buffer[JMSG_LENGTH_MAX];
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8527 cinfo.err->format_message ((j_common_ptr) &cinfo, buffer);
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8528 image_error ("Error reading JPEG image `%s': %s", img->spec,
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8529 build_string (buffer));
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8530 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8531
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8532 /* Close the input file and destroy the JPEG object. */
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8533 if (fp)
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
8534 fclose ((FILE *) fp);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8535 jpeg_destroy_decompress (&cinfo);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8536
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8537 /* If we already have an XImage, free that. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8538 x_destroy_x_image (ximg);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8539
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8540 /* Free pixmap and colors. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8541 x_clear_image (f, img);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8542
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8543 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8544 return 0;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8545 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8546
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8547 /* Create the JPEG decompression object. Let it read from fp.
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8548 Read the JPEG image header. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8549 jpeg_create_decompress (&cinfo);
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8550
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8551 if (NILP (specified_data))
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
8552 jpeg_stdio_src (&cinfo, (FILE *) fp);
27053
3995eec4287f (enum jpeg_keyword_index): Add JPEG_DATA.
Gerd Moellmann <gerd@gnu.org>
parents: 26980
diff changeset
8553 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
8554 jpeg_memory_src (&cinfo, SDATA (specified_data),
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
8555 SBYTES (specified_data));
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8556
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8557 jpeg_read_header (&cinfo, TRUE);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8558
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8559 /* Customize decompression so that color quantization will be used.
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8560 Start decompression. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8561 cinfo.quantize_colors = TRUE;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8562 jpeg_start_decompress (&cinfo);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8563 width = img->width = cinfo.output_width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8564 height = img->height = cinfo.output_height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8565
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8566 /* Create X image and pixmap. */
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8567 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
31686
577372d71de8 (lookup_image): Block input while loading the image so
Gerd Moellmann <gerd@gnu.org>
parents: 31651
diff changeset
8568 longjmp (mgr.setjmp_buffer, 2);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8569
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8570 /* Allocate colors. When color quantization is used,
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8571 cinfo.actual_number_of_colors has been set with the number of
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8572 colors generated, and cinfo.colormap is a two-dimensional array
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8573 of color indices in the range 0..cinfo.actual_number_of_colors.
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8574 No more than 255 colors will be generated. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8575 {
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8576 int i, ir, ig, ib;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8577
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8578 if (cinfo.out_color_components > 2)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8579 ir = 0, ig = 1, ib = 2;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8580 else if (cinfo.out_color_components > 1)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8581 ir = 0, ig = 1, ib = 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8582 else
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8583 ir = 0, ig = 0, ib = 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8584
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8585 /* Use the color table mechanism because it handles colors that
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8586 cannot be allocated nicely. Such colors will be replaced with
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8587 a default color, and we don't have to care about which colors
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8588 can be freed safely, and which can't. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8589 init_color_table ();
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8590 colors = (unsigned long *) alloca (cinfo.actual_number_of_colors
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8591 * sizeof *colors);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8592
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8593 for (i = 0; i < cinfo.actual_number_of_colors; ++i)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8594 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8595 /* Multiply RGB values with 255 because X expects RGB values
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8596 in the range 0..0xffff. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8597 int r = cinfo.colormap[ir][i] << 8;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8598 int g = cinfo.colormap[ig][i] << 8;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8599 int b = cinfo.colormap[ib][i] << 8;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8600 colors[i] = lookup_rgb_color (f, r, g, b);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8601 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8602
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8603 /* Remember those colors actually allocated. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8604 img->colors = colors_in_color_table (&img->ncolors);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8605 free_color_table ();
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8606 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8607
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8608 /* Read pixels. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8609 row_stride = width * cinfo.output_components;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8610 buffer = cinfo.mem->alloc_sarray ((j_common_ptr) &cinfo, JPOOL_IMAGE,
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8611 row_stride, 1);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8612 for (y = 0; y < height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8613 {
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8614 jpeg_read_scanlines (&cinfo, buffer, 1);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8615 for (x = 0; x < cinfo.output_width; ++x)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8616 XPutPixel (ximg, x, y, colors[buffer[0][x]]);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8617 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8618
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8619 /* Clean up. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8620 jpeg_finish_decompress (&cinfo);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8621 jpeg_destroy_decompress (&cinfo);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8622 if (fp)
31543
9c5e42fa3ba5 (png_load, jpeg_load): Declare some variables volatile
Gerd Moellmann <gerd@gnu.org>
parents: 30601
diff changeset
8623 fclose ((FILE *) fp);
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8624
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8625 /* Maybe fill in the background field while we have ximg handy. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8626 if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8627 IMAGE_BACKGROUND (img, f, ximg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8628
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8629 /* Put the image into the pixmap. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8630 x_put_x_image (f, ximg, img->pixmap, width, height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8631 x_destroy_x_image (ximg);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8632 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8633 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8634 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8635
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8636 #endif /* HAVE_JPEG */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8637
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8638
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8639
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8640 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8641 TIFF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8642 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8643
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8644 #if HAVE_TIFF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8645
25335
2de1796b006b remove tiff34 prefix from include.
Gerd Moellmann <gerd@gnu.org>
parents: 25320
diff changeset
8646 #include <tiffio.h>
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8647
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8648 static int tiff_image_p P_ ((Lisp_Object object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8649 static int tiff_load P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8650
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8651 /* The symbol `tiff' identifying images of this type. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8652
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8653 Lisp_Object Qtiff;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8654
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8655 /* Indices of image specification fields in tiff_format, below. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8656
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8657 enum tiff_keyword_index
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8658 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8659 TIFF_TYPE,
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8660 TIFF_DATA,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8661 TIFF_FILE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8662 TIFF_ASCENT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8663 TIFF_MARGIN,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8664 TIFF_RELIEF,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8665 TIFF_ALGORITHM,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8666 TIFF_HEURISTIC_MASK,
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
8667 TIFF_MASK,
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8668 TIFF_BACKGROUND,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8669 TIFF_LAST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8670 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8671
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8672 /* Vector of image_keyword structures describing the format
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8673 of valid user-defined image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8674
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8675 static struct image_keyword tiff_format[TIFF_LAST] =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8676 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8677 {":type", IMAGE_SYMBOL_VALUE, 1},
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8678 {":data", IMAGE_STRING_VALUE, 0},
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8679 {":file", IMAGE_STRING_VALUE, 0},
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
8680 {":ascent", IMAGE_ASCENT_VALUE, 0},
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
8681 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8682 {":relief", IMAGE_INTEGER_VALUE, 0},
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
8683 {":conversions", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
8684 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8685 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8686 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8687 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8688
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8689 /* Structure describing the image type `tiff'. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8690
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8691 static struct image_type tiff_type =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8692 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8693 &Qtiff,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8694 tiff_image_p,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8695 tiff_load,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8696 x_clear_image,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8697 NULL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8698 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8699
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8700
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8701 /* Return non-zero if OBJECT is a valid TIFF image specification. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8702
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8703 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8704 tiff_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8705 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8706 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8707 struct image_keyword fmt[TIFF_LAST];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8708 bcopy (tiff_format, fmt, sizeof fmt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8709
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
8710 if (!parse_image_spec (object, fmt, TIFF_LAST, Qtiff))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8711 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8712
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
8713 /* Must specify either the :data or :file keyword. */
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
8714 return fmt[TIFF_FILE].count + fmt[TIFF_DATA].count == 1;
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8715 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8716
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8717
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8718 /* Reading from a memory buffer for TIFF images Based on the PNG
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8719 memory source, but we have to provide a lot of extra functions.
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8720 Blah.
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8721
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8722 We really only need to implement read and seek, but I am not
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8723 convinced that the TIFF library is smart enough not to destroy
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8724 itself if we only hand it the function pointers we need to
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8725 override. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8726
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8727 typedef struct
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8728 {
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8729 unsigned char *bytes;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8730 size_t len;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8731 int index;
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8732 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8733 tiff_memory_source;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8734
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8735
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8736 static size_t
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8737 tiff_read_from_memory (data, buf, size)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8738 thandle_t data;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8739 tdata_t buf;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8740 tsize_t size;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8741 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8742 tiff_memory_source *src = (tiff_memory_source *) data;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8743
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8744 if (size > src->len - src->index)
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8745 return (size_t) -1;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8746 bcopy (src->bytes + src->index, buf, size);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8747 src->index += size;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8748 return size;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8749 }
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8750
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8751
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8752 static size_t
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8753 tiff_write_from_memory (data, buf, size)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8754 thandle_t data;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8755 tdata_t buf;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8756 tsize_t size;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8757 {
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8758 return (size_t) -1;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8759 }
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8760
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8761
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8762 static toff_t
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8763 tiff_seek_in_memory (data, off, whence)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8764 thandle_t data;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8765 toff_t off;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8766 int whence;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8767 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8768 tiff_memory_source *src = (tiff_memory_source *) data;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8769 int idx;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8770
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8771 switch (whence)
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8772 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8773 case SEEK_SET: /* Go from beginning of source. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8774 idx = off;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8775 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8776
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8777 case SEEK_END: /* Go from end of source. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8778 idx = src->len + off;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8779 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8780
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8781 case SEEK_CUR: /* Go from current position. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8782 idx = src->index + off;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8783 break;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8784
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8785 default: /* Invalid `whence'. */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8786 return -1;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8787 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8788
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8789 if (idx > src->len || idx < 0)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8790 return -1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8791
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8792 src->index = idx;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8793 return src->index;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8794 }
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8795
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8796
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8797 static int
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8798 tiff_close_memory (data)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8799 thandle_t data;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8800 {
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8801 /* NOOP */
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8802 return 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8803 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8804
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8805
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8806 static int
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8807 tiff_mmap_memory (data, pbase, psize)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8808 thandle_t data;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8809 tdata_t *pbase;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8810 toff_t *psize;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8811 {
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8812 /* It is already _IN_ memory. */
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8813 return 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8814 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8815
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8816
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8817 static void
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8818 tiff_unmap_memory (data, base, size)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8819 thandle_t data;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8820 tdata_t base;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8821 toff_t size;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8822 {
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8823 /* We don't need to do this. */
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8824 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8825
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8826
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8827 static toff_t
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8828 tiff_size_of_memory (data)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8829 thandle_t data;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8830 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8831 return ((tiff_memory_source *) data)->len;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8832 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8833
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
8834
39591
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8835 static void
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8836 tiff_error_handler (title, format, ap)
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8837 const char *title, *format;
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8838 va_list ap;
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8839 {
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8840 char buf[512];
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8841 int len;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8842
39591
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8843 len = sprintf (buf, "TIFF error: %s ", title);
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8844 vsprintf (buf + len, format, ap);
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8845 add_to_log (buf, Qnil, Qnil);
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8846 }
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8847
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8848
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8849 static void
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8850 tiff_warning_handler (title, format, ap)
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8851 const char *title, *format;
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8852 va_list ap;
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8853 {
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8854 char buf[512];
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8855 int len;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8856
39591
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8857 len = sprintf (buf, "TIFF warning: %s ", title);
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8858 vsprintf (buf + len, format, ap);
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8859 add_to_log (buf, Qnil, Qnil);
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8860 }
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8861
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8862
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8863 /* Load TIFF image IMG for use on frame F. Value is non-zero if
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8864 successful. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8865
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8866 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8867 tiff_load (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8868 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8869 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8870 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8871 Lisp_Object file, specified_file;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8872 Lisp_Object specified_data;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8873 TIFF *tiff;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8874 int width, height, x, y;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8875 uint32 *buf;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8876 int rc;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8877 XImage *ximg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8878 struct gcpro gcpro1;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8879 tiff_memory_source memsrc;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8880
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8881 specified_file = image_spec_value (img->spec, QCfile, NULL);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8882 specified_data = image_spec_value (img->spec, QCdata, NULL);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8883 file = Qnil;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8884 GCPRO1 (file);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8885
39591
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8886 TIFFSetErrorHandler (tiff_error_handler);
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8887 TIFFSetWarningHandler (tiff_warning_handler);
84263f0294b3 (tiff_error_handler, tiff_warning_handler): New functions.
Gerd Moellmann <gerd@gnu.org>
parents: 39442
diff changeset
8888
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8889 if (NILP (specified_data))
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8890 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8891 /* Read from a file */
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8892 file = x_find_image_file (specified_file);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8893 if (!STRINGP (file))
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8894 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8895 image_error ("Cannot find image file `%s'", file, Qnil);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8896 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8897 return 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8898 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8899
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8900 /* Try to open the image file. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
8901 tiff = TIFFOpen (SDATA (file), "r");
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8902 if (tiff == NULL)
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8903 {
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8904 image_error ("Cannot open `%s'", file, Qnil);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8905 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8906 return 0;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
8907 }
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8908 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8909 else
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8910 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8911 /* Memory source! */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
8912 memsrc.bytes = SDATA (specified_data);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
8913 memsrc.len = SBYTES (specified_data);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8914 memsrc.index = 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8915
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8916 tiff = TIFFClientOpen ("memory_source", "r", &memsrc,
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8917 (TIFFReadWriteProc) tiff_read_from_memory,
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8918 (TIFFReadWriteProc) tiff_write_from_memory,
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8919 tiff_seek_in_memory,
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8920 tiff_close_memory,
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8921 tiff_size_of_memory,
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8922 tiff_mmap_memory,
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8923 tiff_unmap_memory);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8924
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8925 if (!tiff)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8926 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8927 image_error ("Cannot open memory source for `%s'", img->spec, Qnil);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8928 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8929 return 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8930 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
8931 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8932
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8933 /* Get width and height of the image, and allocate a raster buffer
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8934 of width x height 32-bit values. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8935 TIFFGetField (tiff, TIFFTAG_IMAGEWIDTH, &width);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8936 TIFFGetField (tiff, TIFFTAG_IMAGELENGTH, &height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8937 buf = (uint32 *) xmalloc (width * height * sizeof *buf);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8938
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8939 rc = TIFFReadRGBAImage (tiff, width, height, buf, 0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8940 TIFFClose (tiff);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8941 if (!rc)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8942 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8943 image_error ("Error reading TIFF image `%s'", img->spec, Qnil);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8944 xfree (buf);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8945 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8946 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8947 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8948
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8949 /* Create the X image and pixmap. */
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
8950 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8951 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8952 xfree (buf);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8953 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8954 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8955 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8956
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8957 /* Initialize the color table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8958 init_color_table ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8959
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8960 /* Process the pixel raster. Origin is in the lower-left corner. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8961 for (y = 0; y < height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8962 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8963 uint32 *row = buf + y * width;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8964
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8965 for (x = 0; x < width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8966 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8967 uint32 abgr = row[x];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8968 int r = TIFFGetR (abgr) << 8;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8969 int g = TIFFGetG (abgr) << 8;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8970 int b = TIFFGetB (abgr) << 8;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8971 XPutPixel (ximg, x, height - 1 - y, lookup_rgb_color (f, r, g, b));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8972 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8973 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8974
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8975 /* Remember the colors allocated for the image. Free the color table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8976 img->colors = colors_in_color_table (&img->ncolors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8977 free_color_table ();
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
8978
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8979 img->width = width;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8980 img->height = height;
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8981
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8982 /* Maybe fill in the background field while we have ximg handy. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8983 if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
8984 IMAGE_BACKGROUND (img, f, ximg);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8985
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8986 /* Put the image into the pixmap, then free the X image and its buffer. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8987 x_put_x_image (f, ximg, img->pixmap, width, height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8988 x_destroy_x_image (ximg);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8989 xfree (buf);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8990
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8991 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8992 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8993 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8995 #endif /* HAVE_TIFF != 0 */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8996
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8997
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8998
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
8999 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9000 GIF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9001 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9002
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9003 #if HAVE_GIF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9004
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9005 #include <gif_lib.h>
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9006
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9007 static int gif_image_p P_ ((Lisp_Object object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9008 static int gif_load P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9009
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9010 /* The symbol `gif' identifying images of this type. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9011
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9012 Lisp_Object Qgif;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9013
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9014 /* Indices of image specification fields in gif_format, below. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9015
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9016 enum gif_keyword_index
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9017 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9018 GIF_TYPE,
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9019 GIF_DATA,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9020 GIF_FILE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9021 GIF_ASCENT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9022 GIF_MARGIN,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9023 GIF_RELIEF,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9024 GIF_ALGORITHM,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9025 GIF_HEURISTIC_MASK,
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
9026 GIF_MASK,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9027 GIF_IMAGE,
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9028 GIF_BACKGROUND,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9029 GIF_LAST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9030 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9031
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9032 /* Vector of image_keyword structures describing the format
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9033 of valid user-defined image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9034
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9035 static struct image_keyword gif_format[GIF_LAST] =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9036 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9037 {":type", IMAGE_SYMBOL_VALUE, 1},
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9038 {":data", IMAGE_STRING_VALUE, 0},
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9039 {":file", IMAGE_STRING_VALUE, 0},
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
9040 {":ascent", IMAGE_ASCENT_VALUE, 0},
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
9041 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9042 {":relief", IMAGE_INTEGER_VALUE, 0},
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
9043 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9044 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
9045 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
40279
1adbc1480e83 (png_load): Make sure SPECIFIED_BG is a string.
Miles Bader <miles@gnu.org>
parents: 40264
diff changeset
9046 {":image", IMAGE_NON_NEGATIVE_INTEGER_VALUE, 0},
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9047 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9048 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9049
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9050 /* Structure describing the image type `gif'. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9051
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9052 static struct image_type gif_type =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9053 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9054 &Qgif,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9055 gif_image_p,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9056 gif_load,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9057 x_clear_image,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9058 NULL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9059 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9060
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
9061
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9062 /* Return non-zero if OBJECT is a valid GIF image specification. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9063
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9064 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9065 gif_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9066 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9067 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9068 struct image_keyword fmt[GIF_LAST];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9069 bcopy (gif_format, fmt, sizeof fmt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9070
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
9071 if (!parse_image_spec (object, fmt, GIF_LAST, Qgif))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9072 return 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9073
27069
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
9074 /* Must specify either the :data or :file keyword. */
b2934c683b5e (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27066
diff changeset
9075 return fmt[GIF_FILE].count + fmt[GIF_DATA].count == 1;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9076 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9077
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
9078
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9079 /* Reading a GIF image from memory
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9080 Based on the PNG memory stuff to a certain extent. */
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9081
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9082 typedef struct
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9083 {
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9084 unsigned char *bytes;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9085 size_t len;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9086 int index;
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9087 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9088 gif_memory_source;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9089
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
9090
27153
31b7a2a8ea20 (current_gif_memory_src): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27071
diff changeset
9091 /* Make the current memory source available to gif_read_from_memory.
31b7a2a8ea20 (current_gif_memory_src): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27071
diff changeset
9092 It's done this way because not all versions of libungif support
31b7a2a8ea20 (current_gif_memory_src): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27071
diff changeset
9093 a UserData field in the GifFileType structure. */
31b7a2a8ea20 (current_gif_memory_src): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27071
diff changeset
9094 static gif_memory_source *current_gif_memory_src;
31b7a2a8ea20 (current_gif_memory_src): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27071
diff changeset
9095
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9096 static int
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9097 gif_read_from_memory (file, buf, len)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9098 GifFileType *file;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9099 GifByteType *buf;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9100 int len;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9101 {
27153
31b7a2a8ea20 (current_gif_memory_src): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27071
diff changeset
9102 gif_memory_source *src = current_gif_memory_src;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9103
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9104 if (len > src->len - src->index)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9105 return -1;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9106
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9107 bcopy (src->bytes + src->index, buf, len);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9108 src->index += len;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9109 return len;
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9110 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9111
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9112
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9113 /* Load GIF image IMG for use on frame F. Value is non-zero if
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9114 successful. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9115
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9116 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9117 gif_load (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9118 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9119 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9120 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9121 Lisp_Object file, specified_file;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9122 Lisp_Object specified_data;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9123 int rc, width, height, x, y, i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9124 XImage *ximg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9125 ColorMapObject *gif_color_map;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9126 unsigned long pixel_colors[256];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9127 GifFileType *gif;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9128 struct gcpro gcpro1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9129 Lisp_Object image;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9130 int ino, image_left, image_top, image_width, image_height;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9131 gif_memory_source memsrc;
27066
30697e7cb5a2 (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27060
diff changeset
9132 unsigned char *raster;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9133
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9134 specified_file = image_spec_value (img->spec, QCfile, NULL);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9135 specified_data = image_spec_value (img->spec, QCdata, NULL);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9136 file = Qnil;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9137 GCPRO1 (file);
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9138
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9139 if (NILP (specified_data))
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9140 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9141 file = x_find_image_file (specified_file);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9142 if (!STRINGP (file))
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9143 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
9144 image_error ("Cannot find image file `%s'", specified_file, Qnil);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9145 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9146 return 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9147 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9148
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9149 /* Open the GIF file. */
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
9150 gif = DGifOpenFileName (SDATA (file));
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9151 if (gif == NULL)
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9152 {
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9153 image_error ("Cannot open `%s'", file, Qnil);
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9154 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9155 return 0;
27058
209b24ba8ddf Changes to xfns.c to support reading images from a memory buffer instead of forcing them to be on disk. GIF/JPEG/PNG/TIFF currently support this.
William M. Perry <wmperry@aventail.com>
parents: 27053
diff changeset
9156 }
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9157 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9158 else
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9159 {
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9160 /* Read from memory! */
27153
31b7a2a8ea20 (current_gif_memory_src): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 27071
diff changeset
9161 current_gif_memory_src = &memsrc;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
9162 memsrc.bytes = SDATA (specified_data);
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
9163 memsrc.len = SBYTES (specified_data);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9164 memsrc.index = 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9165
53069
1218a42792ea Implement multiple display handling for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 53027
diff changeset
9166 gif = DGifOpen (&memsrc, gif_read_from_memory);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9167 if (!gif)
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9168 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
9169 image_error ("Cannot open memory source `%s'", img->spec, Qnil);
27060
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9170 UNGCPRO;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9171 return 0;
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9172 }
4960164efd1c New image functions adapted to Emacs conventions.
Gerd Moellmann <gerd@gnu.org>
parents: 27058
diff changeset
9173 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9174
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9175 /* Read entire contents. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9176 rc = DGifSlurp (gif);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9177 if (rc == GIF_ERROR)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9178 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
9179 image_error ("Error reading `%s'", img->spec, Qnil);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9180 DGifCloseFile (gif);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9181 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9182 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9183 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9184
25620
1c991744ce13 (QCindex): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25593
diff changeset
9185 image = image_spec_value (img->spec, QCindex, NULL);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9186 ino = INTEGERP (image) ? XFASTINT (image) : 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9187 if (ino >= gif->ImageCount)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9188 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
9189 image_error ("Invalid image number `%s' in image `%s'",
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
9190 image, img->spec);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9191 DGifCloseFile (gif);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9192 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9193 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9194 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9195
43426
f260f08997bc (gif_load): Use correct width and height for GIF images.
Pavel Janík <Pavel@Janik.cz>
parents: 42894
diff changeset
9196 width = img->width = max (gif->SWidth, gif->Image.Left + gif->Image.Width);
f260f08997bc (gif_load): Use correct width and height for GIF images.
Pavel Janík <Pavel@Janik.cz>
parents: 42894
diff changeset
9197 height = img->height = max (gif->SHeight, gif->Image.Top + gif->Image.Height);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9198
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9199 /* Create the X image and pixmap. */
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
9200 if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9201 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9202 DGifCloseFile (gif);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9203 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9204 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9205 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9206
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9207 /* Allocate colors. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9208 gif_color_map = gif->SavedImages[ino].ImageDesc.ColorMap;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9209 if (!gif_color_map)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9210 gif_color_map = gif->SColorMap;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9211 init_color_table ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9212 bzero (pixel_colors, sizeof pixel_colors);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9213
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9214 for (i = 0; i < gif_color_map->ColorCount; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9215 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9216 int r = gif_color_map->Colors[i].Red << 8;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9217 int g = gif_color_map->Colors[i].Green << 8;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9218 int b = gif_color_map->Colors[i].Blue << 8;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9219 pixel_colors[i] = lookup_rgb_color (f, r, g, b);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9220 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9221
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9222 img->colors = colors_in_color_table (&img->ncolors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9223 free_color_table ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9224
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9225 /* Clear the part of the screen image that are not covered by
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9226 the image from the GIF file. Full animated GIF support
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9227 requires more than can be done here (see the gif89 spec,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9228 disposal methods). Let's simply assume that the part
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9229 not covered by a sub-image is in the frame's background color. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9230 image_top = gif->SavedImages[ino].ImageDesc.Top;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9231 image_left = gif->SavedImages[ino].ImageDesc.Left;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9232 image_width = gif->SavedImages[ino].ImageDesc.Width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9233 image_height = gif->SavedImages[ino].ImageDesc.Height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9234
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9235 for (y = 0; y < image_top; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9236 for (x = 0; x < width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9237 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9238
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9239 for (y = image_top + image_height; y < height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9240 for (x = 0; x < width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9241 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9242
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9243 for (y = image_top; y < image_top + image_height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9244 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9245 for (x = 0; x < image_left; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9246 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9247 for (x = image_left + image_width; x < width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9248 XPutPixel (ximg, x, y, FRAME_BACKGROUND_PIXEL (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9249 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9250
27066
30697e7cb5a2 (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27060
diff changeset
9251 /* Read the GIF image into the X image. We use a local variable
30697e7cb5a2 (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27060
diff changeset
9252 `raster' here because RasterBits below is a char *, and invites
30697e7cb5a2 (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27060
diff changeset
9253 problems with bytes >= 0x80. */
30697e7cb5a2 (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27060
diff changeset
9254 raster = (unsigned char *) gif->SavedImages[ino].RasterBits;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9255
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9256 if (gif->SavedImages[ino].ImageDesc.Interlace)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9257 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9258 static int interlace_start[] = {0, 4, 2, 1};
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9259 static int interlace_increment[] = {8, 8, 4, 2};
34976
05c36b1fa618 (x_display_info_for_name): Cast 0 to "char *" in the call
Eli Zaretskii <eliz@gnu.org>
parents: 34911
diff changeset
9260 int pass;
26032
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9261 int row = interlace_start[0];
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9262
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9263 pass = 0;
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9264
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9265 for (y = 0; y < image_height; y++)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9266 {
26032
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9267 if (row >= image_height)
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9268 {
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9269 row = interlace_start[++pass];
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9270 while (row >= image_height)
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9271 row = interlace_start[++pass];
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9272 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9273
26032
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9274 for (x = 0; x < image_width; x++)
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9275 {
27066
30697e7cb5a2 (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27060
diff changeset
9276 int i = raster[(y * image_width) + x];
26032
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9277 XPutPixel (ximg, x + image_left, row + image_top,
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9278 pixel_colors[i]);
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9279 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9280
26032
6a349a18b1ad (gif_load): Fix handling of interlaced GIFs.
Gerd Moellmann <gerd@gnu.org>
parents: 25955
diff changeset
9281 row += interlace_increment[pass];
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9282 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9283 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9284 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9285 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9286 for (y = 0; y < image_height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9287 for (x = 0; x < image_width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9288 {
27066
30697e7cb5a2 (gif_load): Avoid sign extension and thus out of bounds
Gerd Moellmann <gerd@gnu.org>
parents: 27060
diff changeset
9289 int i = raster[y * image_width + x];
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9290 XPutPixel (ximg, x + image_left, y + image_top, pixel_colors[i]);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9291 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9292 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9293
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9294 DGifCloseFile (gif);
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9295
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9296 /* Maybe fill in the background field while we have ximg handy. */
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9297 if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9298 IMAGE_BACKGROUND (img, f, ximg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9299
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9300 /* Put the image into the pixmap, then free the X image and its buffer. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9301 x_put_x_image (f, ximg, img->pixmap, width, height);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9302 x_destroy_x_image (ximg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9303
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9304 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9305 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9306 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9307
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9308 #endif /* HAVE_GIF != 0 */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9309
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9310
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9311
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9312 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9313 Ghostscript
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9314 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9315
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9316 static int gs_image_p P_ ((Lisp_Object object));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9317 static int gs_load P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9318 static void gs_clear_image P_ ((struct frame *f, struct image *img));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9319
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
9320 /* The symbol `postscript' identifying images of this type. */
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
9321
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
9322 Lisp_Object Qpostscript;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9323
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9324 /* Keyword symbols. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9325
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9326 Lisp_Object QCloader, QCbounding_box, QCpt_width, QCpt_height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9327
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9328 /* Indices of image specification fields in gs_format, below. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9329
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9330 enum gs_keyword_index
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9331 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9332 GS_TYPE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9333 GS_PT_WIDTH,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9334 GS_PT_HEIGHT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9335 GS_FILE,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9336 GS_LOADER,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9337 GS_BOUNDING_BOX,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9338 GS_ASCENT,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9339 GS_MARGIN,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9340 GS_RELIEF,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9341 GS_ALGORITHM,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9342 GS_HEURISTIC_MASK,
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
9343 GS_MASK,
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9344 GS_BACKGROUND,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9345 GS_LAST
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9346 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9347
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9348 /* Vector of image_keyword structures describing the format
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9349 of valid user-defined image specifications. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9350
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9351 static struct image_keyword gs_format[GS_LAST] =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9352 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9353 {":type", IMAGE_SYMBOL_VALUE, 1},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9354 {":pt-width", IMAGE_POSITIVE_INTEGER_VALUE, 1},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9355 {":pt-height", IMAGE_POSITIVE_INTEGER_VALUE, 1},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9356 {":file", IMAGE_STRING_VALUE, 1},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9357 {":loader", IMAGE_FUNCTION_VALUE, 0},
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9358 {":bounding-box", IMAGE_DONT_CHECK_VALUE_TYPE, 1},
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
9359 {":ascent", IMAGE_ASCENT_VALUE, 0},
35275
38e58f530a1a (Fimage_size, image_ascent): Adapt to the change of image
Gerd Moellmann <gerd@gnu.org>
parents: 35261
diff changeset
9360 {":margin", IMAGE_POSITIVE_INTEGER_VALUE_OR_PAIR, 0},
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9361 {":relief", IMAGE_INTEGER_VALUE, 0},
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
9362 {":conversion", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
9363 {":heuristic-mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
40264
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9364 {":mask", IMAGE_DONT_CHECK_VALUE_TYPE, 0},
04766dd416bb (image_background, image_background_transparent)
Miles Bader <miles@gnu.org>
parents: 40204
diff changeset
9365 {":background", IMAGE_STRING_OR_NIL_VALUE, 0}
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9366 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9367
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9368 /* Structure describing the image type `ghostscript'. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9369
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9370 static struct image_type gs_type =
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9371 {
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
9372 &Qpostscript,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9373 gs_image_p,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9374 gs_load,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9375 gs_clear_image,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9376 NULL
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9377 };
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9378
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9379
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9380 /* Free X resources of Ghostscript image IMG which is used on frame F. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9381
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9382 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9383 gs_clear_image (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9384 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9385 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9386 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9387 /* IMG->data.ptr_val may contain a recorded colormap. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9388 xfree (img->data.ptr_val);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9389 x_clear_image (f, img);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9390 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9391
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9392
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9393 /* Return non-zero if OBJECT is a valid Ghostscript image
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9394 specification. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9395
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9396 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9397 gs_image_p (object)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9398 Lisp_Object object;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9399 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9400 struct image_keyword fmt[GS_LAST];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9401 Lisp_Object tem;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9402 int i;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9403
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9404 bcopy (gs_format, fmt, sizeof fmt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9405
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
9406 if (!parse_image_spec (object, fmt, GS_LAST, Qpostscript))
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9407 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9408
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9409 /* Bounding box must be a list or vector containing 4 integers. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9410 tem = fmt[GS_BOUNDING_BOX].value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9411 if (CONSP (tem))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9412 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9413 for (i = 0; i < 4; ++i, tem = XCDR (tem))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9414 if (!CONSP (tem) || !INTEGERP (XCAR (tem)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9415 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9416 if (!NILP (tem))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9417 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9418 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9419 else if (VECTORP (tem))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9420 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9421 if (XVECTOR (tem)->size != 4)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9422 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9423 for (i = 0; i < 4; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9424 if (!INTEGERP (XVECTOR (tem)->contents[i]))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9425 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9426 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9427 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9428 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9429
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9430 return 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9431 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9432
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9433
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9434 /* Load Ghostscript image IMG for use on frame F. Value is non-zero
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9435 if successful. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9436
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9437 static int
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9438 gs_load (f, img)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9439 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9440 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9441 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9442 char buffer[100];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9443 Lisp_Object window_and_pixmap_id = Qnil, loader, pt_height, pt_width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9444 struct gcpro gcpro1, gcpro2;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9445 Lisp_Object frame;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9446 double in_width, in_height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9447 Lisp_Object pixel_colors = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9448
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9449 /* Compute pixel size of pixmap needed from the given size in the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9450 image specification. Sizes in the specification are in pt. 1 pt
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9451 = 1/72 in, xdpi and ydpi are stored in the frame's X display
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9452 info. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9453 pt_width = image_spec_value (img->spec, QCpt_width, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9454 in_width = XFASTINT (pt_width) / 72.0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9455 img->width = in_width * FRAME_X_DISPLAY_INFO (f)->resx;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9456 pt_height = image_spec_value (img->spec, QCpt_height, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9457 in_height = XFASTINT (pt_height) / 72.0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9458 img->height = in_height * FRAME_X_DISPLAY_INFO (f)->resy;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9459
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9460 /* Create the pixmap. */
31693
8e9fb2a048ac (x_clear_image_1): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 31688
diff changeset
9461 xassert (img->pixmap == None);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9462 img->pixmap = XCreatePixmap (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9463 img->width, img->height,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9464 DefaultDepthOfScreen (FRAME_X_SCREEN (f)));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9465
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9466 if (!img->pixmap)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9467 {
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
9468 image_error ("Unable to create pixmap for `%s'", img->spec, Qnil);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9469 return 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9470 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9471
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9472 /* Call the loader to fill the pixmap. It returns a process object
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9473 if successful. We do not record_unwind_protect here because
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9474 other places in redisplay like calling window scroll functions
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9475 don't either. Let the Lisp loader use `unwind-protect' instead. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9476 GCPRO2 (window_and_pixmap_id, pixel_colors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9477
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9478 sprintf (buffer, "%lu %lu",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9479 (unsigned long) FRAME_X_WINDOW (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9480 (unsigned long) img->pixmap);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9481 window_and_pixmap_id = build_string (buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9482
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9483 sprintf (buffer, "%lu %lu",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9484 FRAME_FOREGROUND_PIXEL (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9485 FRAME_BACKGROUND_PIXEL (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9486 pixel_colors = build_string (buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9487
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9488 XSETFRAME (frame, f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9489 loader = image_spec_value (img->spec, QCloader, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9490 if (NILP (loader))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9491 loader = intern ("gs-load-image");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9492
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9493 img->data.lisp_val = call6 (loader, frame, img->spec,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9494 make_number (img->width),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9495 make_number (img->height),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9496 window_and_pixmap_id,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9497 pixel_colors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9498 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9499 return PROCESSP (img->data.lisp_val);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9500 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9501
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9502
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9503 /* Kill the Ghostscript process that was started to fill PIXMAP on
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9504 frame F. Called from XTread_socket when receiving an event
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9505 telling Emacs that Ghostscript has finished drawing. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9506
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9507 void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9508 x_kill_gs_process (pixmap, f)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9509 Pixmap pixmap;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9510 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9511 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9512 struct image_cache *c = FRAME_X_IMAGE_CACHE (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9513 int class, i;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9514 struct image *img;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9515
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9516 /* Find the image containing PIXMAP. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9517 for (i = 0; i < c->used; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9518 if (c->images[i]->pixmap == pixmap)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9519 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9520
39442
0e0c30478fe3 (x_kill_gs_process): Recognize if someone has cleared
Gerd Moellmann <gerd@gnu.org>
parents: 39277
diff changeset
9521 /* Should someone in between have cleared the image cache, for
0e0c30478fe3 (x_kill_gs_process): Recognize if someone has cleared
Gerd Moellmann <gerd@gnu.org>
parents: 39277
diff changeset
9522 instance, give up. */
0e0c30478fe3 (x_kill_gs_process): Recognize if someone has cleared
Gerd Moellmann <gerd@gnu.org>
parents: 39277
diff changeset
9523 if (i == c->used)
0e0c30478fe3 (x_kill_gs_process): Recognize if someone has cleared
Gerd Moellmann <gerd@gnu.org>
parents: 39277
diff changeset
9524 return;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9525
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9526 /* Kill the GS process. We should have found PIXMAP in the image
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9527 cache and its image should contain a process object. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9528 img = c->images[i];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9529 xassert (PROCESSP (img->data.lisp_val));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9530 Fkill_process (img->data.lisp_val, Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9531 img->data.lisp_val = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9532
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9533 /* On displays with a mutable colormap, figure out the colors
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9534 allocated for the image by looking at the pixels of an XImage for
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9535 img->pixmap. */
28144
71ebba3566ec (X_I18N_INHIBITED): Don't define.
Gerd Moellmann <gerd@gnu.org>
parents: 28096
diff changeset
9536 class = FRAME_X_VISUAL (f)->class;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9537 if (class != StaticColor && class != StaticGray && class != TrueColor)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9538 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9539 XImage *ximg;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9540
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9541 BLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9542
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9543 /* Try to get an XImage for img->pixmep. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9544 ximg = XGetImage (FRAME_X_DISPLAY (f), img->pixmap,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9545 0, 0, img->width, img->height, ~0, ZPixmap);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9546 if (ximg)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9547 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9548 int x, y;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9549
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9550 /* Initialize the color table. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9551 init_color_table ();
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9552
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9553 /* For each pixel of the image, look its color up in the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9554 color table. After having done so, the color table will
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9555 contain an entry for each color used by the image. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9556 for (y = 0; y < img->height; ++y)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9557 for (x = 0; x < img->width; ++x)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9558 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9559 unsigned long pixel = XGetPixel (ximg, x, y);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9560 lookup_pixel_color (f, pixel);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9561 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9562
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9563 /* Record colors in the image. Free color table and XImage. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9564 img->colors = colors_in_color_table (&img->ncolors);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9565 free_color_table ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9566 XDestroyImage (ximg);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9567
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9568 #if 0 /* This doesn't seem to be the case. If we free the colors
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9569 here, we get a BadAccess later in x_clear_image when
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9570 freeing the colors. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9571 /* We have allocated colors once, but Ghostscript has also
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9572 allocated colors on behalf of us. So, to get the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9573 reference counts right, free them once. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9574 if (img->ncolors)
27963
0e2c6e5cca6e (x_clear_image, x_kill_gs_process): Use x_free_colors.
Gerd Moellmann <gerd@gnu.org>
parents: 27915
diff changeset
9575 x_free_colors (f, img->colors, img->ncolors);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9576 #endif
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9577 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9578 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9579 image_error ("Cannot get X image of `%s'; colors will not be freed",
27071
d647366b1464 (x_create_x_image_and_pixmap): Remove parameter file.
Gerd Moellmann <gerd@gnu.org>
parents: 27069
diff changeset
9580 img->spec, Qnil);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9581
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9582 UNBLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9583 }
37173
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
9584
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
9585 /* Now that we have the pixmap, compute mask and transform the
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
9586 image if requested. */
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
9587 BLOCK_INPUT;
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
9588 postprocess_image (f, img);
2a637d514525 (postprocess_image): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 36869
diff changeset
9589 UNBLOCK_INPUT;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9590 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9591
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9592
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9593
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9594 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9595 Window properties
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9596 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9597
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9598 DEFUN ("x-change-window-property", Fx_change_window_property,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9599 Sx_change_window_property, 2, 3, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9600 doc: /* Change window property PROP to VALUE on the X window of FRAME.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
9601 PROP and VALUE must be strings. FRAME nil or omitted means use the
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9602 selected frame. Value is VALUE. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9603 (prop, value, frame)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9604 Lisp_Object frame, prop, value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9605 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9606 struct frame *f = check_x_frame (frame);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9607 Atom prop_atom;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9608
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
9609 CHECK_STRING (prop);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
9610 CHECK_STRING (value);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9611
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9612 BLOCK_INPUT;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
9613 prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SDATA (prop), False);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9614 XChangeProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9615 prop_atom, XA_STRING, 8, PropModeReplace,
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
9616 SDATA (value), SCHARS (value));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9617
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9618 /* Make sure the property is set when we return. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9619 XFlush (FRAME_X_DISPLAY (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9620 UNBLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9621
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9622 return value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9623 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9624
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9625
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9626 DEFUN ("x-delete-window-property", Fx_delete_window_property,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9627 Sx_delete_window_property, 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9628 doc: /* Remove window property PROP from X window of FRAME.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9629 FRAME nil or omitted means use the selected frame. Value is PROP. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9630 (prop, frame)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9631 Lisp_Object prop, frame;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9632 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9633 struct frame *f = check_x_frame (frame);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9634 Atom prop_atom;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9635
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
9636 CHECK_STRING (prop);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9637 BLOCK_INPUT;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
9638 prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SDATA (prop), False);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9639 XDeleteProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f), prop_atom);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9640
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9641 /* Make sure the property is removed when we return. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9642 XFlush (FRAME_X_DISPLAY (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9643 UNBLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9644
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9645 return prop;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9646 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9647
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9648
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9649 DEFUN ("x-window-property", Fx_window_property, Sx_window_property,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9650 1, 2, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9651 doc: /* Value is the value of window property PROP on FRAME.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
9652 If FRAME is nil or omitted, use the selected frame. Value is nil
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
9653 if FRAME hasn't a property with name PROP or if PROP has no string
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9654 value. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
9655 (prop, frame)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9656 Lisp_Object prop, frame;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9657 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9658 struct frame *f = check_x_frame (frame);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9659 Atom prop_atom;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9660 int rc;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9661 Lisp_Object prop_value = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9662 char *tmp_data = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9663 Atom actual_type;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9664 int actual_format;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9665 unsigned long actual_size, bytes_remaining;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9666
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
9667 CHECK_STRING (prop);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9668 BLOCK_INPUT;
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
9669 prop_atom = XInternAtom (FRAME_X_DISPLAY (f), SDATA (prop), False);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9670 rc = XGetWindowProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9671 prop_atom, 0, 0, False, XA_STRING,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9672 &actual_type, &actual_format, &actual_size,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9673 &bytes_remaining, (unsigned char **) &tmp_data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9674 if (rc == Success)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9675 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9676 int size = bytes_remaining;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9677
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9678 XFree (tmp_data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9679 tmp_data = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9680
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9681 rc = XGetWindowProperty (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9682 prop_atom, 0, bytes_remaining,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9683 False, XA_STRING,
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9684 &actual_type, &actual_format,
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9685 &actual_size, &bytes_remaining,
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9686 (unsigned char **) &tmp_data);
39277
df33715cdcf8 (Fx_window_property): Handle case that property gets
Gerd Moellmann <gerd@gnu.org>
parents: 39159
diff changeset
9687 if (rc == Success && tmp_data)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9688 prop_value = make_string (tmp_data, size);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9689
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9690 XFree (tmp_data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9691 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9692
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9693 UNBLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9694 return prop_value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9695 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9696
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9697
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9698
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9699 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9700 Busy cursor
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9701 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9702
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9703 /* If non-null, an asynchronous timer that, when it expires, displays
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9704 an hourglass cursor on all frames. */
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9705
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9706 static struct atimer *hourglass_atimer;
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9707
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9708 /* Non-zero means an hourglass cursor is currently shown. */
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9709
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9710 static int hourglass_shown_p;
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9711
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9712 /* Number of seconds to wait before displaying an hourglass cursor. */
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9713
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9714 static Lisp_Object Vhourglass_delay;
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9715
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9716 /* Default number of seconds to wait before displaying an hourglass
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9717 cursor. */
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9718
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9719 #define DEFAULT_HOURGLASS_DELAY 1
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9720
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9721 /* Function prototypes. */
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9722
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9723 static void show_hourglass P_ ((struct atimer *));
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9724 static void hide_hourglass P_ ((void));
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9725
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9726
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9727 /* Cancel a currently active hourglass timer, and start a new one. */
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9728
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9729 void
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9730 start_hourglass ()
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9731 {
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9732 EMACS_TIME delay;
27915
e5b8e194d279 (start_busy_cursor): Allow floats for busy-cursor-delay.
Gerd Moellmann <gerd@gnu.org>
parents: 27902
diff changeset
9733 int secs, usecs = 0;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9734
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9735 cancel_hourglass ();
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9736
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9737 if (INTEGERP (Vhourglass_delay)
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9738 && XINT (Vhourglass_delay) > 0)
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9739 secs = XFASTINT (Vhourglass_delay);
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9740 else if (FLOATP (Vhourglass_delay)
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9741 && XFLOAT_DATA (Vhourglass_delay) > 0)
27915
e5b8e194d279 (start_busy_cursor): Allow floats for busy-cursor-delay.
Gerd Moellmann <gerd@gnu.org>
parents: 27902
diff changeset
9742 {
e5b8e194d279 (start_busy_cursor): Allow floats for busy-cursor-delay.
Gerd Moellmann <gerd@gnu.org>
parents: 27902
diff changeset
9743 Lisp_Object tem;
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9744 tem = Ftruncate (Vhourglass_delay, Qnil);
27915
e5b8e194d279 (start_busy_cursor): Allow floats for busy-cursor-delay.
Gerd Moellmann <gerd@gnu.org>
parents: 27902
diff changeset
9745 secs = XFASTINT (tem);
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9746 usecs = (XFLOAT_DATA (Vhourglass_delay) - secs) * 1000000;
27915
e5b8e194d279 (start_busy_cursor): Allow floats for busy-cursor-delay.
Gerd Moellmann <gerd@gnu.org>
parents: 27902
diff changeset
9747 }
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9748 else
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9749 secs = DEFAULT_HOURGLASS_DELAY;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9750
27915
e5b8e194d279 (start_busy_cursor): Allow floats for busy-cursor-delay.
Gerd Moellmann <gerd@gnu.org>
parents: 27902
diff changeset
9751 EMACS_SET_SECS_USECS (delay, secs, usecs);
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9752 hourglass_atimer = start_atimer (ATIMER_RELATIVE, delay,
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9753 show_hourglass, NULL);
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9754 }
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9755
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9756
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9757 /* Cancel the hourglass cursor timer if active, hide a busy cursor if
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9758 shown. */
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9759
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9760 void
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9761 cancel_hourglass ()
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9762 {
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9763 if (hourglass_atimer)
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9764 {
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9765 cancel_atimer (hourglass_atimer);
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9766 hourglass_atimer = NULL;
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9767 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9768
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9769 if (hourglass_shown_p)
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9770 hide_hourglass ();
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9771 }
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9772
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9773
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9774 /* Timer function of hourglass_atimer. TIMER is equal to
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9775 hourglass_atimer.
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9776
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9777 Display an hourglass pointer on all frames by mapping the frames'
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9778 hourglass_window. Set the hourglass_p flag in the frames'
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9779 output_data.x structure to indicate that an hourglass cursor is
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9780 shown on the frames. */
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9781
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9782 static void
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9783 show_hourglass (timer)
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9784 struct atimer *timer;
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9785 {
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9786 /* The timer implementation will cancel this timer automatically
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9787 after this function has run. Set hourglass_atimer to null
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9788 so that we know the timer doesn't have to be canceled. */
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9789 hourglass_atimer = NULL;
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9790
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9791 if (!hourglass_shown_p)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9792 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9793 Lisp_Object rest, frame;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9794
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9795 BLOCK_INPUT;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9796
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9797 FOR_EACH_FRAME (rest, frame)
34662
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9798 {
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9799 struct frame *f = XFRAME (frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9800
34662
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9801 if (FRAME_LIVE_P (f) && FRAME_X_P (f) && FRAME_X_DISPLAY (f))
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9802 {
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9803 Display *dpy = FRAME_X_DISPLAY (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9804
34662
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9805 #ifdef USE_X_TOOLKIT
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9806 if (f->output_data.x->widget)
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9807 #else
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9808 if (FRAME_OUTER_WINDOW (f))
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9809 #endif
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9810 {
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9811 f->output_data.x->hourglass_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9812
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9813 if (!f->output_data.x->hourglass_window)
34662
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9814 {
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9815 unsigned long mask = CWCursor;
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9816 XSetWindowAttributes attrs;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9817
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9818 attrs.cursor = f->output_data.x->hourglass_cursor;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9819
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9820 f->output_data.x->hourglass_window
34662
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9821 = XCreateWindow (dpy, FRAME_OUTER_WINDOW (f),
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9822 0, 0, 32000, 32000, 0, 0,
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9823 InputOnly,
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9824 CopyFromParent,
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9825 mask, &attrs);
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9826 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9827
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9828 XMapRaised (dpy, f->output_data.x->hourglass_window);
34662
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9829 XFlush (dpy);
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9830 }
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9831 }
d8005f5e0a23 (show_busy_cursor): Check for live frames more
Gerd Moellmann <gerd@gnu.org>
parents: 34638
diff changeset
9832 }
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9833
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9834 hourglass_shown_p = 1;
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9835 UNBLOCK_INPUT;
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9836 }
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9837 }
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9838
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9839
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9840 /* Hide the hourglass pointer on all frames, if it is currently
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9841 shown. */
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9842
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9843 static void
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9844 hide_hourglass ()
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9845 {
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9846 if (hourglass_shown_p)
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9847 {
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9848 Lisp_Object rest, frame;
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9849
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9850 BLOCK_INPUT;
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9851 FOR_EACH_FRAME (rest, frame)
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9852 {
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9853 struct frame *f = XFRAME (frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9854
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9855 if (FRAME_X_P (f)
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9856 /* Watch out for newly created frames. */
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9857 && f->output_data.x->hourglass_window)
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9858 {
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9859 XUnmapWindow (FRAME_X_DISPLAY (f),
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9860 f->output_data.x->hourglass_window);
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9861 /* Sync here because XTread_socket looks at the
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9862 hourglass_p flag that is reset to zero below. */
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9863 XSync (FRAME_X_DISPLAY (f), False);
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9864 f->output_data.x->hourglass_p = 0;
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9865 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9866 }
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9867
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
9868 hourglass_shown_p = 0;
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9869 UNBLOCK_INPUT;
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
9870 }
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9871 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9872
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9873
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9874
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9875 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9876 Tool tips
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9877 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9878
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9879 static Lisp_Object x_create_tip_frame P_ ((struct x_display_info *,
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9880 Lisp_Object, Lisp_Object));
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
9881 static void compute_tip_xy P_ ((struct frame *, Lisp_Object, Lisp_Object,
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
9882 Lisp_Object, int, int, int *, int *));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9883
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
9884 /* The frame of a currently visible tooltip. */
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
9885
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
9886 Lisp_Object tip_frame;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9887
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9888 /* If non-nil, a timer started that hides the last tooltip when it
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9889 fires. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9890
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9891 Lisp_Object tip_timer;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9892 Window tip_window;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9893
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
9894 /* If non-nil, a vector of 3 elements containing the last args
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
9895 with which x-show-tip was called. See there. */
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
9896
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
9897 Lisp_Object last_show_tip_args;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
9898
38574
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
9899 /* Maximum size for tooltips; a cons (COLUMNS . ROWS). */
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
9900
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
9901 Lisp_Object Vx_max_tooltip_size;
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
9902
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9903
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9904 static Lisp_Object
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9905 unwind_create_tip_frame (frame)
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9906 Lisp_Object frame;
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9907 {
34638
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9908 Lisp_Object deleted;
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9909
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9910 deleted = unwind_create_frame (frame);
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9911 if (EQ (deleted, Qt))
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9912 {
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9913 tip_window = None;
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9914 tip_frame = Qnil;
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9915 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9916
34638
abb4510a89f6 (unwind_create_frame): Return t if frame was deleted.
Gerd Moellmann <gerd@gnu.org>
parents: 34598
diff changeset
9917 return deleted;
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9918 }
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9919
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9920
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9921 /* Create a frame for a tooltip on the display described by DPYINFO.
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9922 PARMS is a list of frame parameters. TEXT is the string to
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9923 display in the tip frame. Value is the frame.
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9924
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9925 Note that functions called here, esp. x_default_parameter can
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9926 signal errors, for instance when a specified color name is
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9927 undefined. We have to make sure that we're in a consistent state
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9928 when this happens. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9929
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9930 static Lisp_Object
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9931 x_create_tip_frame (dpyinfo, parms, text)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9932 struct x_display_info *dpyinfo;
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9933 Lisp_Object parms, text;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9934 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9935 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9936 Lisp_Object frame, tem;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9937 Lisp_Object name;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9938 long window_prompting = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9939 int width, height;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45968
diff changeset
9940 int count = SPECPDL_INDEX ();
25715
feaedc03dbc8 (x_set_background_color): Remove unused variable(s).
Gerd Moellmann <gerd@gnu.org>
parents: 25691
diff changeset
9941 struct gcpro gcpro1, gcpro2, gcpro3;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9942 struct kboard *kb;
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
9943 int face_change_count_before = face_change_count;
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9944 Lisp_Object buffer;
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9945 struct buffer *old_buffer;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9946
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9947 check_x ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9948
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9949 /* Use this general default value to start with until we know if
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9950 this frame has a specified name. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9951 Vx_resource_name = Vinvocation_name;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9952
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9953 #ifdef MULTI_KBOARD
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9954 kb = dpyinfo->kboard;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9955 #else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9956 kb = &the_only_kboard;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9957 #endif
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9958
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9959 /* Get the name of the frame to use for resource lookup. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9960 name = x_get_arg (dpyinfo, parms, Qname, "name", "Name", RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9961 if (!STRINGP (name)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9962 && !EQ (name, Qunbound)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9963 && !NILP (name))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9964 error ("Invalid frame name--not a string or nil");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9965 Vx_resource_name = name;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9966
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9967 frame = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9968 GCPRO3 (parms, name, frame);
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
9969 f = make_frame (1);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9970 XSETFRAME (frame, f);
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9971
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9972 buffer = Fget_buffer_create (build_string (" *tip*"));
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
9973 Fset_window_buffer (FRAME_ROOT_WINDOW (f), buffer, Qnil);
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9974 old_buffer = current_buffer;
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9975 set_buffer_internal_1 (XBUFFER (buffer));
38574
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
9976 current_buffer->truncate_lines = Qnil;
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9977 Ferase_buffer ();
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9978 Finsert (1, &text);
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
9979 set_buffer_internal_1 (old_buffer);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
9980
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9981 FRAME_CAN_HAVE_SCROLL_BARS (f) = 0;
34598
afd90be3ed75 (x_create_tip_frame): Use unwind_create_tip_frame,
Gerd Moellmann <gerd@gnu.org>
parents: 34549
diff changeset
9982 record_unwind_protect (unwind_create_tip_frame, frame);
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9983
82990
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 53339
diff changeset
9984 f->display_method = &x_display_method;
2ecd1f669db9 Fixed X support, preliminary support for X-tty combo sessions.
Karoly Lorentey <lorentey@elte.hu>
parents: 53339
diff changeset
9985
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9986 /* By setting the output method, we're essentially saying that
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9987 the frame is live, as per FRAME_LIVE_P. If we get a signal
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9988 from this point on, x_destroy_window might screw up reference
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
9989 counts etc. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9990 f->output_method = output_x_window;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9991 f->output_data.x = (struct x_output *) xmalloc (sizeof (struct x_output));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9992 bzero (f->output_data.x, sizeof (struct x_output));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
9993 f->output_data.x->icon_bitmap = -1;
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
9994 FRAME_FONTSET (f) = -1;
29882
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
9995 f->output_data.x->scroll_bar_foreground_pixel = -1;
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
9996 f->output_data.x->scroll_bar_background_pixel = -1;
39619
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
9997 #ifdef USE_TOOLKIT_SCROLL_BARS
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
9998 f->output_data.x->scroll_bar_top_shadow_pixel = -1;
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
9999 f->output_data.x->scroll_bar_bottom_shadow_pixel = -1;
1e12db2b25f0 (x_set_scroll_bar_background) [USE_TOOLKIT_SCROLL_BARS]:
Miles Bader <miles@gnu.org>
parents: 39591
diff changeset
10000 #endif /* USE_TOOLKIT_SCROLL_BARS */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10001 f->icon_name = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10002 FRAME_X_DISPLAY_INFO (f) = dpyinfo;
34895
53e52b3525bf Use #if GLYPH_DEBUG instead of #ifdef GLYPH_DEBUG.
Gerd Moellmann <gerd@gnu.org>
parents: 34662
diff changeset
10003 #if GLYPH_DEBUG
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
10004 image_cache_refcount = FRAME_X_IMAGE_CACHE (f)->refcount;
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
10005 dpyinfo_refcount = dpyinfo->reference_count;
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
10006 #endif /* GLYPH_DEBUG */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10007 #ifdef MULTI_KBOARD
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10008 FRAME_KBOARD (f) = kb;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10009 #endif
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10010 f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10011 f->output_data.x->explicit_parent = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10012
29882
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10013 /* These colors will be set anyway later, but it's important
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10014 to get the color reference counts right, so initialize them! */
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10015 {
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10016 Lisp_Object black;
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10017 struct gcpro gcpro1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10018
29882
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10019 black = build_string ("black");
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10020 GCPRO1 (black);
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10021 f->output_data.x->foreground_pixel
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10022 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10023 f->output_data.x->background_pixel
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10024 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10025 f->output_data.x->cursor_pixel
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10026 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10027 f->output_data.x->cursor_foreground_pixel
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10028 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10029 f->output_data.x->border_pixel
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10030 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10031 f->output_data.x->mouse_pixel
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10032 = x_decode_color (f, black, BLACK_PIX_DEFAULT (f));
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10033 UNGCPRO;
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10034 }
c12b0f070cd1 (x_create_tip_frame): Initialize frame's colors like
Gerd Moellmann <gerd@gnu.org>
parents: 29866
diff changeset
10035
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10036 /* Set the name; the functions to which we pass f expect the name to
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10037 be set. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10038 if (EQ (name, Qunbound) || NILP (name))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10039 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10040 f->name = build_string (dpyinfo->x_id_name);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10041 f->explicit_name = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10042 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10043 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10044 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10045 f->name = name;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10046 f->explicit_name = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10047 /* use the frame's title when getting resources for this frame. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10048 specbind (Qx_resource_name, name);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10049 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10050
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
10051 /* Extract the window parameters from the supplied values that are
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
10052 needed to determine window geometry. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10053 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10054 Lisp_Object font;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10055
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10056 font = x_get_arg (dpyinfo, parms, Qfont, "font", "Font", RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10057
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10058 BLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10059 /* First, try whatever font the caller has specified. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10060 if (STRINGP (font))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10061 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10062 tem = Fquery_fontset (font, Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10063 if (STRINGP (tem))
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
10064 font = x_new_fontset (f, SDATA (tem));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10065 else
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
10066 font = x_new_font (f, SDATA (font));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10067 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10068
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10069 /* Try out a font which we hope has bold and italic variations. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10070 if (!STRINGP (font))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10071 font = x_new_font (f, "-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-1");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10072 if (!STRINGP (font))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10073 font = x_new_font (f, "-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-1");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10074 if (! STRINGP (font))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10075 font = x_new_font (f, "-*-*-medium-r-normal-*-*-140-*-*-c-*-iso8859-1");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10076 if (! STRINGP (font))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10077 /* This was formerly the first thing tried, but it finds too many fonts
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10078 and takes too long. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10079 font = x_new_font (f, "-*-*-medium-r-*-*-*-*-*-*-c-*-iso8859-1");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10080 /* If those didn't work, look for something which will at least work. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10081 if (! STRINGP (font))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10082 font = x_new_font (f, "-*-fixed-*-*-*-*-*-140-*-*-c-*-iso8859-1");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10083 UNBLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10084 if (! STRINGP (font))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10085 font = build_string ("fixed");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10086
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10087 x_default_parameter (f, parms, Qfont, font,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10088 "font", "Font", RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10089 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10090
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10091 x_default_parameter (f, parms, Qborder_width, make_number (2),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10092 "borderWidth", "BorderWidth", RES_TYPE_NUMBER);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10093
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10094 /* This defaults to 2 in order to match xterm. We recognize either
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10095 internalBorderWidth or internalBorder (which is what xterm calls
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10096 it). */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10097 if (NILP (Fassq (Qinternal_border_width, parms)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10098 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10099 Lisp_Object value;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10100
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10101 value = x_get_arg (dpyinfo, parms, Qinternal_border_width,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10102 "internalBorder", "internalBorder", RES_TYPE_NUMBER);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10103 if (! EQ (value, Qunbound))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10104 parms = Fcons (Fcons (Qinternal_border_width, value),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10105 parms);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10106 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10107
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10108 x_default_parameter (f, parms, Qinternal_border_width, make_number (1),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10109 "internalBorderWidth", "internalBorderWidth",
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10110 RES_TYPE_NUMBER);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10111
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10112 /* Also do the stuff which must be set before the window exists. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10113 x_default_parameter (f, parms, Qforeground_color, build_string ("black"),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10114 "foreground", "Foreground", RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10115 x_default_parameter (f, parms, Qbackground_color, build_string ("white"),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10116 "background", "Background", RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10117 x_default_parameter (f, parms, Qmouse_color, build_string ("black"),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10118 "pointerColor", "Foreground", RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10119 x_default_parameter (f, parms, Qcursor_color, build_string ("black"),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10120 "cursorColor", "Foreground", RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10121 x_default_parameter (f, parms, Qborder_color, build_string ("black"),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10122 "borderColor", "BorderColor", RES_TYPE_STRING);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10123
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10124 /* Init faces before x_default_parameter is called for scroll-bar
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10125 parameters because that function calls x_set_scroll_bar_width,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10126 which calls change_frame_size, which calls Fset_window_buffer,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10127 which runs hooks, which call Fvertical_motion. At the end, we
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10128 end up in init_iterator with a null face cache, which should not
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10129 happen. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10130 init_frame_faces (f);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10131
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10132 f->output_data.x->parent_desc = FRAME_X_DISPLAY_INFO (f)->root_window;
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10133
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10134 window_prompting = x_figure_window_size (f, parms, 0);
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10135
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10136 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10137 XSetWindowAttributes attrs;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10138 unsigned long mask;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10139
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10140 BLOCK_INPUT;
33657
e9cf01c7cda6 (x_create_tip_frame): Use CWSaveUnder only if the
Gerd Moellmann <gerd@gnu.org>
parents: 33601
diff changeset
10141 mask = CWBackPixel | CWOverrideRedirect | CWEventMask;
e9cf01c7cda6 (x_create_tip_frame): Use CWSaveUnder only if the
Gerd Moellmann <gerd@gnu.org>
parents: 33601
diff changeset
10142 if (DoesSaveUnders (dpyinfo->screen))
e9cf01c7cda6 (x_create_tip_frame): Use CWSaveUnder only if the
Gerd Moellmann <gerd@gnu.org>
parents: 33601
diff changeset
10143 mask |= CWSaveUnder;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10144
27987
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
10145 /* Window managers look at the override-redirect flag to determine
ce9edc646960 (x_defined_color, x_set_mouse_color, lookup_rgb_color)
Gerd Moellmann <gerd@gnu.org>
parents: 27963
diff changeset
10146 whether or net to give windows a decoration (Xlib spec, chapter
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10147 3.2.8). */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10148 attrs.override_redirect = True;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10149 attrs.save_under = True;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10150 attrs.background_pixel = FRAME_BACKGROUND_PIXEL (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10151 /* Arrange for getting MapNotify and UnmapNotify events. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10152 attrs.event_mask = StructureNotifyMask;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10153 tip_window
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10154 = FRAME_X_WINDOW (f)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10155 = XCreateWindow (FRAME_X_DISPLAY (f),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10156 FRAME_X_DISPLAY_INFO (f)->root_window,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10157 /* x, y, width, height */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10158 0, 0, 1, 1,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10159 /* Border. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10160 1,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10161 CopyFromParent, InputOutput, CopyFromParent,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10162 mask, &attrs);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10163 UNBLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10164 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10165
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10166 x_make_gc (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10167
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10168 x_default_parameter (f, parms, Qauto_raise, Qnil,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10169 "autoRaise", "AutoRaiseLower", RES_TYPE_BOOLEAN);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10170 x_default_parameter (f, parms, Qauto_lower, Qnil,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10171 "autoLower", "AutoRaiseLower", RES_TYPE_BOOLEAN);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10172 x_default_parameter (f, parms, Qcursor_type, Qbox,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10173 "cursorType", "CursorType", RES_TYPE_SYMBOL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10174
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10175 /* Dimensions, especially FRAME_LINES (f), must be done via change_frame_size.
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10176 Change will not be effected unless different from the current
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10177 FRAME_LINES (f). */
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10178 width = FRAME_COLS (f);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10179 height = FRAME_LINES (f);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10180 SET_FRAME_COLS (f, 0);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10181 FRAME_LINES (f) = 0;
25363
bf0488244270 Call change_frame_size and do_pending_window_change with
Gerd Moellmann <gerd@gnu.org>
parents: 25335
diff changeset
10182 change_frame_size (f, height, width, 1, 0, 0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10183
47731
755c4233cfba * frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents: 47434
diff changeset
10184 /* Add `tooltip' frame parameter's default value. */
755c4233cfba * frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents: 47434
diff changeset
10185 if (NILP (Fframe_parameter (frame, intern ("tooltip"))))
755c4233cfba * frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents: 47434
diff changeset
10186 Fmodify_frame_parameters (frame, Fcons (Fcons (intern ("tooltip"), Qt),
755c4233cfba * frame.c (Vdelete_frame_functions): New variable.
John Paul Wallington <jpw@pobox.com>
parents: 47434
diff changeset
10187 Qnil));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10188
35042
3088c9745e92 (x_create_tip_frame): Call face-set-after-frame-default,
Gerd Moellmann <gerd@gnu.org>
parents: 34976
diff changeset
10189 /* Set up faces after all frame parameters are known. This call
35508
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10190 also merges in face attributes specified for new frames.
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10191
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10192 Frame parameters may be changed if .Xdefaults contains
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10193 specifications for the default font. For example, if there is an
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10194 `Emacs.default.attributeBackground: pink', the `background-color'
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10195 attribute of the frame get's set, which let's the internal border
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10196 of the tooltip frame appear in pink. Prevent this. */
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10197 {
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10198 Lisp_Object bg = Fframe_parameter (frame, Qbackground_color);
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10199
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10200 /* Set tip_frame here, so that */
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10201 tip_frame = frame;
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10202 call1 (Qface_set_after_frame_default, frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10203
35508
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10204 if (!EQ (bg, Fframe_parameter (frame, Qbackground_color)))
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10205 Fmodify_frame_parameters (frame, Fcons (Fcons (Qbackground_color, bg),
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10206 Qnil));
0bd627ce1af8 (x_create_tip_frame): Prevent changing the tooltip's
Gerd Moellmann <gerd@gnu.org>
parents: 35402
diff changeset
10207 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10208
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10209 f->no_split = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10210
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10211 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10212
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10213 /* It is now ok to make the frame official even if we get an error
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10214 below. And the frame needs to be on Vframe_list or making it
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10215 visible won't work. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10216 Vframe_list = Fcons (frame, Vframe_list);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10217
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10218 /* Now that the frame is official, it counts as a reference to
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10219 its display. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10220 FRAME_X_DISPLAY_INFO (f)->reference_count++;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10221
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10222 /* Setting attributes of faces of the tooltip frame from resources
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10223 and similar will increment face_change_count, which leads to the
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10224 clearing of all current matrices. Since this isn't necessary
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10225 here, avoid it by resetting face_change_count to the value it
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10226 had before we created the tip frame. */
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10227 face_change_count = face_change_count_before;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10228
34524
d4b8782e7f7b (image_cache_refcount, dpyinfo_refcount) [GLYPH_DEBUG]:
Gerd Moellmann <gerd@gnu.org>
parents: 34512
diff changeset
10229 /* Discard the unwind_protect. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10230 return unbind_to (count, frame);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10231 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10232
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10233
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10234 /* Compute where to display tip frame F. PARMS is the list of frame
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10235 parameters for F. DX and DY are specified offsets from the current
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10236 location of the mouse. WIDTH and HEIGHT are the width and height
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10237 of the tooltip. Return coordinates relative to the root window of
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10238 the display in *ROOT_X, and *ROOT_Y. */
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10239
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10240 static void
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10241 compute_tip_xy (f, parms, dx, dy, width, height, root_x, root_y)
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10242 struct frame *f;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10243 Lisp_Object parms, dx, dy;
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10244 int width, height;
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10245 int *root_x, *root_y;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10246 {
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10247 Lisp_Object left, top;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10248 int win_x, win_y;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10249 Window root, child;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10250 unsigned pmask;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10251
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10252 /* User-specified position? */
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10253 left = Fcdr (Fassq (Qleft, parms));
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10254 top = Fcdr (Fassq (Qtop, parms));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10255
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10256 /* Move the tooltip window where the mouse pointer is. Resize and
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10257 show it. */
41449
4416668397d7 (compute_tip_xy): Initialize root_x and root_y from
Jason Rumney <jasonr@gnu.org>
parents: 41132
diff changeset
10258 if (!INTEGERP (left) || !INTEGERP (top))
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10259 {
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10260 BLOCK_INPUT;
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10261 XQueryPointer (FRAME_X_DISPLAY (f), FRAME_X_DISPLAY_INFO (f)->root_window,
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10262 &root, &child, root_x, root_y, &win_x, &win_y, &pmask);
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10263 UNBLOCK_INPUT;
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10264 }
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10265
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10266 if (INTEGERP (top))
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10267 *root_y = XINT (top);
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10268 else if (*root_y + XINT (dy) - height < 0)
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10269 *root_y -= XINT (dy);
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10270 else
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10271 {
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10272 *root_y -= height;
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10273 *root_y += XINT (dy);
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10274 }
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10275
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10276 if (INTEGERP (left))
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10277 *root_x = XINT (left);
42247
35dd407f04cd (compute_tip_xy): If tooltip won't fit on the screen
Richard M. Stallman <rms@gnu.org>
parents: 42123
diff changeset
10278 else if (*root_x + XINT (dx) + width <= FRAME_X_DISPLAY_INFO (f)->width)
35dd407f04cd (compute_tip_xy): If tooltip won't fit on the screen
Richard M. Stallman <rms@gnu.org>
parents: 42123
diff changeset
10279 /* It fits to the right of the pointer. */
35dd407f04cd (compute_tip_xy): If tooltip won't fit on the screen
Richard M. Stallman <rms@gnu.org>
parents: 42123
diff changeset
10280 *root_x += XINT (dx);
35dd407f04cd (compute_tip_xy): If tooltip won't fit on the screen
Richard M. Stallman <rms@gnu.org>
parents: 42123
diff changeset
10281 else if (width + XINT (dx) <= *root_x)
35dd407f04cd (compute_tip_xy): If tooltip won't fit on the screen
Richard M. Stallman <rms@gnu.org>
parents: 42123
diff changeset
10282 /* It fits to the left of the pointer. */
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10283 *root_x -= width + XINT (dx);
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10284 else
42247
35dd407f04cd (compute_tip_xy): If tooltip won't fit on the screen
Richard M. Stallman <rms@gnu.org>
parents: 42123
diff changeset
10285 /* Put it left-justified on the screen--it ought to fit that way. */
35dd407f04cd (compute_tip_xy): If tooltip won't fit on the screen
Richard M. Stallman <rms@gnu.org>
parents: 42123
diff changeset
10286 *root_x = 0;
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10287 }
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10288
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10289
30224
b9f781194989 (Fx_show_tip): If frame parameters contain a position,
Gerd Moellmann <gerd@gnu.org>
parents: 29947
diff changeset
10290 DEFUN ("x-show-tip", Fx_show_tip, Sx_show_tip, 1, 6, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10291 doc: /* Show STRING in a "tooltip" window on frame FRAME.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10292 A tooltip window is a small X window displaying a string.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10293
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10294 FRAME nil or omitted means use the selected frame.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10295
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10296 PARMS is an optional list of frame parameters which can be used to
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10297 change the tooltip's appearance.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10298
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10299 Automatically hide the tooltip after TIMEOUT seconds. TIMEOUT nil
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10300 means use the default timeout of 5 seconds.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10301
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10302 If the list of frame parameters PARAMS contains a `left' parameters,
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10303 the tooltip is displayed at that x-position. Otherwise it is
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10304 displayed at the mouse position, with offset DX added (default is 5 if
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10305 DX isn't specified). Likewise for the y-position; if a `top' frame
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10306 parameter is specified, it determines the y-position of the tooltip
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10307 window, otherwise it is displayed at the mouse position, with offset
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10308 DY added (default is -10).
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10309
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10310 A tooltip's maximum size is specified by `x-max-tooltip-size'.
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10311 Text larger than the specified size is clipped. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10312 (string, frame, parms, timeout, dx, dy)
30224
b9f781194989 (Fx_show_tip): If frame parameters contain a position,
Gerd Moellmann <gerd@gnu.org>
parents: 29947
diff changeset
10313 Lisp_Object string, frame, parms, timeout, dx, dy;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10314 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10315 struct frame *f;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10316 struct window *w;
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10317 int root_x, root_y;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10318 struct buffer *old_buffer;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10319 struct text_pos pos;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10320 int i, width, height;
26980
f0d5e95ccce9 (Fx_show_tip): Gcpro `timeout' too.
Dave Love <fx@gnu.org>
parents: 26978
diff changeset
10321 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10322 int old_windows_or_buffers_changed = windows_or_buffers_changed;
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45968
diff changeset
10323 int count = SPECPDL_INDEX ();
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10324
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10325 specbind (Qinhibit_redisplay, Qt);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10326
26980
f0d5e95ccce9 (Fx_show_tip): Gcpro `timeout' too.
Dave Love <fx@gnu.org>
parents: 26978
diff changeset
10327 GCPRO4 (string, parms, frame, timeout);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10328
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
10329 CHECK_STRING (string);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10330 f = check_x_frame (frame);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10331 if (NILP (timeout))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10332 timeout = make_number (5);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10333 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
10334 CHECK_NATNUM (timeout);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10335
30224
b9f781194989 (Fx_show_tip): If frame parameters contain a position,
Gerd Moellmann <gerd@gnu.org>
parents: 29947
diff changeset
10336 if (NILP (dx))
b9f781194989 (Fx_show_tip): If frame parameters contain a position,
Gerd Moellmann <gerd@gnu.org>
parents: 29947
diff changeset
10337 dx = make_number (5);
b9f781194989 (Fx_show_tip): If frame parameters contain a position,
Gerd Moellmann <gerd@gnu.org>
parents: 29947
diff changeset
10338 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
10339 CHECK_NUMBER (dx);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10340
30224
b9f781194989 (Fx_show_tip): If frame parameters contain a position,
Gerd Moellmann <gerd@gnu.org>
parents: 29947
diff changeset
10341 if (NILP (dy))
33589
5832e9020859 (Fx_show_tip): Use default y-offset of -10 so that
Gerd Moellmann <gerd@gnu.org>
parents: 33443
diff changeset
10342 dy = make_number (-10);
30224
b9f781194989 (Fx_show_tip): If frame parameters contain a position,
Gerd Moellmann <gerd@gnu.org>
parents: 29947
diff changeset
10343 else
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
10344 CHECK_NUMBER (dy);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10345
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10346 if (NILP (last_show_tip_args))
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10347 last_show_tip_args = Fmake_vector (make_number (3), Qnil);
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10348
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10349 if (!NILP (tip_frame))
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10350 {
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10351 Lisp_Object last_string = AREF (last_show_tip_args, 0);
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10352 Lisp_Object last_frame = AREF (last_show_tip_args, 1);
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10353 Lisp_Object last_parms = AREF (last_show_tip_args, 2);
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10354
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10355 if (EQ (frame, last_frame)
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10356 && !NILP (Fequal (last_string, string))
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10357 && !NILP (Fequal (last_parms, parms)))
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10358 {
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10359 struct frame *f = XFRAME (tip_frame);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10360
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10361 /* Only DX and DY have changed. */
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10362 if (!NILP (tip_timer))
35402
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
10363 {
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
10364 Lisp_Object timer = tip_timer;
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
10365 tip_timer = Qnil;
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
10366 call1 (Qcancel_timer, timer);
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
10367 }
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10368
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10369 BLOCK_INPUT;
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10370 compute_tip_xy (f, parms, dx, dy, FRAME_PIXEL_WIDTH (f),
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10371 FRAME_PIXEL_HEIGHT (f), &root_x, &root_y);
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10372 XMoveWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10373 root_x, root_y);
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10374 UNBLOCK_INPUT;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10375 goto start_timer;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10376 }
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10377 }
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10378
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10379 /* Hide a previous tip, if any. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10380 Fx_hide_tip ();
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10381
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10382 ASET (last_show_tip_args, 0, string);
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10383 ASET (last_show_tip_args, 1, frame);
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10384 ASET (last_show_tip_args, 2, parms);
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10385
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10386 /* Add default values to frame parameters. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10387 if (NILP (Fassq (Qname, parms)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10388 parms = Fcons (Fcons (Qname, build_string ("tooltip")), parms);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10389 if (NILP (Fassq (Qinternal_border_width, parms)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10390 parms = Fcons (Fcons (Qinternal_border_width, make_number (3)), parms);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10391 if (NILP (Fassq (Qborder_width, parms)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10392 parms = Fcons (Fcons (Qborder_width, make_number (1)), parms);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10393 if (NILP (Fassq (Qborder_color, parms)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10394 parms = Fcons (Fcons (Qborder_color, build_string ("lightyellow")), parms);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10395 if (NILP (Fassq (Qbackground_color, parms)))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10396 parms = Fcons (Fcons (Qbackground_color, build_string ("lightyellow")),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10397 parms);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10398
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10399 /* Create a frame for the tooltip, and record it in the global
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10400 variable tip_frame. */
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
10401 frame = x_create_tip_frame (FRAME_X_DISPLAY_INFO (f), parms, string);
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10402 f = XFRAME (frame);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10403
38574
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10404 /* Set up the frame's root window. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10405 w = XWINDOW (FRAME_ROOT_WINDOW (f));
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10406 w->left_col = w->top_line = make_number (0);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10407
38574
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10408 if (CONSP (Vx_max_tooltip_size)
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10409 && INTEGERP (XCAR (Vx_max_tooltip_size))
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10410 && XINT (XCAR (Vx_max_tooltip_size)) > 0
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10411 && INTEGERP (XCDR (Vx_max_tooltip_size))
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10412 && XINT (XCDR (Vx_max_tooltip_size)) > 0)
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10413 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10414 w->total_cols = XCAR (Vx_max_tooltip_size);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10415 w->total_lines = XCDR (Vx_max_tooltip_size);
38574
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10416 }
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10417 else
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10418 {
51211
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10419 w->total_cols = make_number (80);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10420 w->total_lines = make_number (40);
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10421 }
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10422
28ea05de2dc5 Make (many) trivial substitutions for renamed and
Kim F. Storm <storm@cua.dk>
parents: 51175
diff changeset
10423 FRAME_TOTAL_COLS (f) = XINT (w->total_cols);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10424 adjust_glyphs (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10425 w->pseudo_window_p = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10426
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10427 /* Display the tooltip text in a temporary buffer. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10428 old_buffer = current_buffer;
36869
a9cbe17061fc (x_create_tip_frame): Add parameter TEXT. Set the
Gerd Moellmann <gerd@gnu.org>
parents: 36594
diff changeset
10429 set_buffer_internal_1 (XBUFFER (XWINDOW (FRAME_ROOT_WINDOW (f))->buffer));
38574
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10430 current_buffer->truncate_lines = Qnil;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10431 clear_glyph_matrix (w->desired_matrix);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10432 clear_glyph_matrix (w->current_matrix);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10433 SET_TEXT_POS (pos, BEGV, BEGV_BYTE);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10434 try_window (FRAME_ROOT_WINDOW (f), pos);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10435
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10436 /* Compute width and height of the tooltip. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10437 width = height = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10438 for (i = 0; i < w->desired_matrix->nrows; ++i)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10439 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10440 struct glyph_row *row = &w->desired_matrix->rows[i];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10441 struct glyph *last;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10442 int row_width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10443
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10444 /* Stop at the first empty row at the end. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10445 if (!row->enabled_p || !row->displays_text_p)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10446 break;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10447
25082
ba6bf065b287 (x_create_tip_frame): Don't set bitmapIcon resource.
Gerd Moellmann <gerd@gnu.org>
parents: 25075
diff changeset
10448 /* Let the row go over the full width of the frame. */
ba6bf065b287 (x_create_tip_frame): Don't set bitmapIcon resource.
Gerd Moellmann <gerd@gnu.org>
parents: 25075
diff changeset
10449 row->full_width_p = 1;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10450
28410
2812a333e746 (free_image_cache): Free the cache structure itself
Gerd Moellmann <gerd@gnu.org>
parents: 28355
diff changeset
10451 /* There's a glyph at the end of rows that is used to place
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10452 the cursor there. Don't include the width of this glyph. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10453 if (row->used[TEXT_AREA])
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10454 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10455 last = &row->glyphs[TEXT_AREA][row->used[TEXT_AREA] - 1];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10456 row_width = row->pixel_width - last->pixel_width;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10457 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10458 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10459 row_width = row->pixel_width;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10460
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10461 height += row->height;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10462 width = max (width, row_width);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10463 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10464
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10465 /* Add the frame's internal border to the width and height the X
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10466 window should have. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10467 height += 2 * FRAME_INTERNAL_BORDER_WIDTH (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10468 width += 2 * FRAME_INTERNAL_BORDER_WIDTH (f);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10469
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10470 /* Move the tooltip window where the mouse pointer is. Resize and
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10471 show it. */
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10472 compute_tip_xy (f, parms, dx, dy, width, height, &root_x, &root_y);
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10473
30224
b9f781194989 (Fx_show_tip): If frame parameters contain a position,
Gerd Moellmann <gerd@gnu.org>
parents: 29947
diff changeset
10474 BLOCK_INPUT;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10475 XMoveResizeWindow (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f),
37253
7c3a00620335 (compute_tip_xy): Add parameters WIDTH and HEIGHT.
Gerd Moellmann <gerd@gnu.org>
parents: 37210
diff changeset
10476 root_x, root_y, width, height);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10477 XMapRaised (FRAME_X_DISPLAY (f), FRAME_X_WINDOW (f));
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10478 UNBLOCK_INPUT;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10479
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10480 /* Draw into the window. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10481 w->must_be_updated_p = 1;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10482 update_single_window (w, 1);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10483
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10484 /* Restore original current buffer. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10485 set_buffer_internal_1 (old_buffer);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10486 windows_or_buffers_changed = old_windows_or_buffers_changed;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10487
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
10488 start_timer:
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10489 /* Let the tip disappear after timeout seconds. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10490 tip_timer = call3 (intern ("run-at-time"), timeout, Qnil,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10491 intern ("x-hide-tip"));
26954
e388d69f4269 (Fx_show_tip): Add missing UNGCPRO.
Dave Love <fx@gnu.org>
parents: 26876
diff changeset
10492
e388d69f4269 (Fx_show_tip): Add missing UNGCPRO.
Dave Love <fx@gnu.org>
parents: 26876
diff changeset
10493 UNGCPRO;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10494 return unbind_to (count, Qnil);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10495 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10496
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10497
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10498 DEFUN ("x-hide-tip", Fx_hide_tip, Sx_hide_tip, 0, 0, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10499 doc: /* Hide the current tooltip window, if there is any.
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10500 Value is t if tooltip was open, nil otherwise. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10501 ()
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10502 {
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10503 int count;
34476
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10504 Lisp_Object deleted, frame, timer;
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10505 struct gcpro gcpro1, gcpro2;
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10506
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10507 /* Return quickly if nothing to do. */
34476
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10508 if (NILP (tip_timer) && NILP (tip_frame))
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10509 return Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10510
34476
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10511 frame = tip_frame;
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10512 timer = tip_timer;
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10513 GCPRO2 (frame, timer);
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10514 tip_frame = tip_timer = deleted = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10515
46285
3f111801efb4 Rename BINDING_STACK_SIZE to SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 45968
diff changeset
10516 count = SPECPDL_INDEX ();
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10517 specbind (Qinhibit_redisplay, Qt);
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10518 specbind (Qinhibit_quit, Qt);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10519
34476
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10520 if (!NILP (timer))
35402
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
10521 call1 (Qcancel_timer, timer);
34476
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10522
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10523 if (FRAMEP (frame))
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10524 {
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10525 Fdelete_frame (frame, Qnil);
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10526 deleted = Qt;
33713
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10527
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10528 #ifdef USE_LUCID
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10529 /* Bloodcurdling hack alert: The Lucid menu bar widget's
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10530 redisplay procedure is not called when a tip frame over menu
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10531 items is unmapped. Redisplay the menu manually... */
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10532 {
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10533 struct frame *f = SELECTED_FRAME ();
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10534 Widget w = f->output_data.x->menubar_widget;
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10535 extern void xlwmenu_redisplay P_ ((Widget));
39675
a4def4204419 *** empty log message ***
Pavel Janík <Pavel@Janik.cz>
parents: 39619
diff changeset
10536
33713
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10537 if (!DoesSaveUnders (FRAME_X_DISPLAY_INFO (f)->screen)
36441
861557fe5809 (Fx_hide_tip): Don't use `None' with widgets; use
Gerd Moellmann <gerd@gnu.org>
parents: 36252
diff changeset
10538 && w != NULL)
33713
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10539 {
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10540 BLOCK_INPUT;
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10541 xlwmenu_redisplay (w);
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10542 UNBLOCK_INPUT;
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10543 }
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10544 }
91b2daa9479f (Fx_hide_tip) [USE_LUCID]: Add a hack to redisplay
Gerd Moellmann <gerd@gnu.org>
parents: 33657
diff changeset
10545 #endif /* USE_LUCID */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10546 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10547
34476
329225ae6b61 (Fx_hide_tip): Simplified.
Gerd Moellmann <gerd@gnu.org>
parents: 34452
diff changeset
10548 UNGCPRO;
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
10549 return unbind_to (count, deleted);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10550 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10551
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10552
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10553
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10554 /***********************************************************************
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10555 File selection dialog
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10556 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10557
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10558 #ifdef USE_MOTIF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10559
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10560 /* Callback for "OK" and "Cancel" on file selection dialog. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10561
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10562 static void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10563 file_dialog_cb (widget, client_data, call_data)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10564 Widget widget;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10565 XtPointer call_data, client_data;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10566 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10567 int *result = (int *) client_data;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10568 XmAnyCallbackStruct *cb = (XmAnyCallbackStruct *) call_data;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10569 *result = cb->reason;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10570 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10571
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10572
37556
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10573 /* Callback for unmapping a file selection dialog. This is used to
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10574 capture the case where a dialog is closed via a window manager's
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10575 closer button, for example. Using a XmNdestroyCallback didn't work
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10576 in this case. */
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10577
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10578 static void
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10579 file_dialog_unmap_cb (widget, client_data, call_data)
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10580 Widget widget;
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10581 XtPointer call_data, client_data;
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10582 {
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10583 int *result = (int *) client_data;
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10584 *result = XmCR_CANCEL;
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10585 }
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10586
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10587
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10588 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 4, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10589 doc: /* Read file name, prompting with PROMPT in directory DIR.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10590 Use a file selection dialog.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10591 Select DEFAULT-FILENAME in the dialog's file selection box, if
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10592 specified. Don't let the user enter a file name in the file
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10593 selection dialog's entry field, if MUSTMATCH is non-nil. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10594 (prompt, dir, default_filename, mustmatch)
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10595 Lisp_Object prompt, dir, default_filename, mustmatch;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10596 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10597 int result;
25679
8b09c5927f1c (QCfile): Moved to xdisp.c.
Gerd Moellmann <gerd@gnu.org>
parents: 25646
diff changeset
10598 struct frame *f = SELECTED_FRAME ();
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10599 Lisp_Object file = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10600 Widget dialog, text, list, help;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10601 Arg al[10];
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10602 int ac = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10603 extern XtAppContext Xt_app_con;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10604 XmString dir_xmstring, pattern_xmstring;
46295
b77ef572e1c9 Use macro SPECPDL_INDEX.
Juanma Barranquero <lekktu@gmail.com>
parents: 46285
diff changeset
10605 int count = SPECPDL_INDEX ();
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10606 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10607
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10608 GCPRO5 (prompt, dir, default_filename, mustmatch, file);
40656
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
10609 CHECK_STRING (prompt);
cdfd4d09b79a Update usage of CHECK_ macros (remove unused second argument).
Pavel Janík <Pavel@Janik.cz>
parents: 40608
diff changeset
10610 CHECK_STRING (dir);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10611
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10612 /* Prevent redisplay. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10613 specbind (Qinhibit_redisplay, Qt);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10614
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10615 BLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10616
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10617 /* Create the dialog with PROMPT as title, using DIR as initial
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10618 directory and using "*" as pattern. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10619 dir = Fexpand_file_name (dir, Qnil);
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
10620 dir_xmstring = XmStringCreateLocalized (SDATA (dir));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10621 pattern_xmstring = XmStringCreateLocalized ("*");
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10622
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
10623 XtSetArg (al[ac], XmNtitle, SDATA (prompt)); ++ac;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10624 XtSetArg (al[ac], XmNdirectory, dir_xmstring); ++ac;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10625 XtSetArg (al[ac], XmNpattern, pattern_xmstring); ++ac;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10626 XtSetArg (al[ac], XmNresizePolicy, XmRESIZE_GROW); ++ac;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10627 XtSetArg (al[ac], XmNdialogStyle, XmDIALOG_APPLICATION_MODAL); ++ac;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10628 dialog = XmCreateFileSelectionDialog (f->output_data.x->widget,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10629 "fsb", al, ac);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10630 XmStringFree (dir_xmstring);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10631 XmStringFree (pattern_xmstring);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10632
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10633 /* Add callbacks for OK and Cancel. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10634 XtAddCallback (dialog, XmNokCallback, file_dialog_cb,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10635 (XtPointer) &result);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10636 XtAddCallback (dialog, XmNcancelCallback, file_dialog_cb,
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10637 (XtPointer) &result);
37556
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10638 XtAddCallback (dialog, XmNunmapCallback, file_dialog_unmap_cb,
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10639 (XtPointer) &result);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10640
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10641 /* Disable the help button since we can't display help. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10642 help = XmFileSelectionBoxGetChild (dialog, XmDIALOG_HELP_BUTTON);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10643 XtSetSensitive (help, False);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10644
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10645 /* Mark OK button as default. */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10646 XtVaSetValues (XmFileSelectionBoxGetChild (dialog, XmDIALOG_OK_BUTTON),
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10647 XmNshowAsDefault, True, NULL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10648
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10649 /* If MUSTMATCH is non-nil, disable the file entry field of the
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10650 dialog, so that the user must select a file from the files list
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10651 box. We can't remove it because we wouldn't have a way to get at
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10652 the result file name, then. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10653 text = XmFileSelectionBoxGetChild (dialog, XmDIALOG_TEXT);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10654 if (!NILP (mustmatch))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10655 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10656 Widget label;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10657 label = XmFileSelectionBoxGetChild (dialog, XmDIALOG_SELECTION_LABEL);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10658 XtSetSensitive (text, False);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10659 XtSetSensitive (label, False);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10660 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10661
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10662 /* Manage the dialog, so that list boxes get filled. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10663 XtManageChild (dialog);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10664
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10665 /* Select DEFAULT_FILENAME in the files list box. DEFAULT_FILENAME
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10666 must include the path for this to work. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10667 list = XmFileSelectionBoxGetChild (dialog, XmDIALOG_LIST);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10668 if (STRINGP (default_filename))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10669 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10670 XmString default_xmstring;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10671 int item_pos;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10672
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10673 default_xmstring
46370
40db0673e6f0 Most uses of XSTRING combined with STRING_BYTES or indirection changed to
Ken Raeburn <raeburn@raeburn.org>
parents: 46295
diff changeset
10674 = XmStringCreateLocalized (SDATA (default_filename));
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10675
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10676 if (!XmListItemExists (list, default_xmstring))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10677 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10678 /* Add a new item if DEFAULT_FILENAME is not in the list. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10679 XmListAddItem (list, default_xmstring, 0);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10680 item_pos = 0;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10681 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10682 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10683 item_pos = XmListItemPos (list, default_xmstring);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10684 XmStringFree (default_xmstring);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10685
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10686 /* Select the item and scroll it into view. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10687 XmListSelectPos (list, item_pos, True);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10688 XmListSetPos (list, item_pos);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10689 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10690
49117
f8288cd7d1cd *** empty log message ***
Jan Djärv <jan.h.d@swipnet.se>
parents: 49080
diff changeset
10691 /* Process events until the user presses Cancel or OK. */
29866
c31c4d7dd0e0 (Fx_file_dialog) [HAVE_MOTIF_2_1]: Handle events
Gerd Moellmann <gerd@gnu.org>
parents: 29728
diff changeset
10692 result = 0;
37556
171c0f4964a9 (file_dialog_unmap_cb): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 37253
diff changeset
10693 while (result == 0)
38548
58603538f196 (Fx_file_dialog): Block/unblock input while processing
Gerd Moellmann <gerd@gnu.org>
parents: 38542
diff changeset
10694 {
49117
f8288cd7d1cd *** empty log message ***
Jan Djärv <jan.h.d@swipnet.se>
parents: 49080
diff changeset
10695 XEvent event;
f8288cd7d1cd *** empty log message ***
Jan Djärv <jan.h.d@swipnet.se>
parents: 49080
diff changeset
10696 XtAppNextEvent (Xt_app_con, &event);
49434
a4d0ee33dcce Fix input methods for GTK.
Jan Djärv <jan.h.d@swipnet.se>
parents: 49322
diff changeset
10697 (void) x_dispatch_event (&event, FRAME_X_DISPLAY (f) );
49117
f8288cd7d1cd *** empty log message ***
Jan Djärv <jan.h.d@swipnet.se>
parents: 49080
diff changeset
10698 }
29866
c31c4d7dd0e0 (Fx_file_dialog) [HAVE_MOTIF_2_1]: Handle events
Gerd Moellmann <gerd@gnu.org>
parents: 29728
diff changeset
10699
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10700 /* Get the result. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10701 if (result == XmCR_OK)
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10702 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10703 XmString text;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10704 String data;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10705
30573
3bb43339533c (Fx_file_dialog): Use NULL instead of 0 at the end of
Gerd Moellmann <gerd@gnu.org>
parents: 30383
diff changeset
10706 XtVaGetValues (dialog, XmNtextString, &text, NULL);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10707 XmStringGetLtoR (text, XmFONTLIST_DEFAULT_TAG, &data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10708 XmStringFree (text);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10709 file = build_string (data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10710 XtFree (data);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10711 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10712 else
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10713 file = Qnil;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10714
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10715 /* Clean up. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10716 XtUnmanageChild (dialog);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10717 XtDestroyWidget (dialog);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10718 UNBLOCK_INPUT;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10719 UNGCPRO;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10720
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10721 /* Make "Cancel" equivalent to C-g. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10722 if (NILP (file))
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10723 Fsignal (Qquit, Qnil);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10724
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10725 return unbind_to (count, file);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10726 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10727
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10728 #endif /* USE_MOTIF */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10729
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10730 #ifdef USE_GTK
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10731
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10732 DEFUN ("x-file-dialog", Fx_file_dialog, Sx_file_dialog, 2, 4, 0,
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10733 "Read file name, prompting with PROMPT in directory DIR.\n\
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10734 Use a file selection dialog.\n\
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10735 Select DEFAULT-FILENAME in the dialog's file selection box, if\n\
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10736 specified. Don't let the user enter a file name in the file\n\
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10737 selection dialog's entry field, if MUSTMATCH is non-nil.")
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10738 (prompt, dir, default_filename, mustmatch)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10739 Lisp_Object prompt, dir, default_filename, mustmatch;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10740 {
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10741 FRAME_PTR f = SELECTED_FRAME ();
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10742 char *fn;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10743 Lisp_Object file = Qnil;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10744 int count = specpdl_ptr - specpdl;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10745 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10746 char *cdef_file;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10747 char *cprompt;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10748
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10749 GCPRO5 (prompt, dir, default_filename, mustmatch, file);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10750 CHECK_STRING (prompt);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10751 CHECK_STRING (dir);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10752
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10753 /* Prevent redisplay. */
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10754 specbind (Qinhibit_redisplay, Qt);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10755
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10756 BLOCK_INPUT;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10757
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10758 if (STRINGP (default_filename))
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10759 cdef_file = SDATA (default_filename);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10760 else
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10761 cdef_file = SDATA (dir);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10762
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10763 fn = xg_get_file_name (f, SDATA (prompt), cdef_file, ! NILP (mustmatch));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10764
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10765 if (fn)
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10766 {
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10767 file = build_string (fn);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10768 xfree (fn);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10769 }
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10770
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10771 UNBLOCK_INPUT;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10772 UNGCPRO;
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10773
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10774 /* Make "Cancel" equivalent to C-g. */
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10775 if (NILP (file))
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10776 Fsignal (Qquit, Qnil);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10777
49322
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10778 return unbind_to (count, file);
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10779 }
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10780
2cbb0b823e83 GTK version
Jan Djärv <jan.h.d@swipnet.se>
parents: 49117
diff changeset
10781 #endif /* USE_GTK */
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10782
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10783
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10784 /***********************************************************************
34549
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10785 Keyboard
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10786 ***********************************************************************/
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10787
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10788 #ifdef HAVE_XKBGETKEYBOARD
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10789 #include <X11/XKBlib.h>
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10790 #include <X11/keysym.h>
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10791 #endif
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10792
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10793 DEFUN ("x-backspace-delete-keys-p", Fx_backspace_delete_keys_p,
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10794 Sx_backspace_delete_keys_p, 0, 1, 0,
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10795 doc: /* Check if both Backspace and Delete keys are on the keyboard of FRAME.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10796 FRAME nil means use the selected frame.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10797 Value is t if we know that both keys are present, and are mapped to the
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10798 usual X keysyms. */)
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10799 (frame)
34549
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10800 Lisp_Object frame;
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10801 {
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10802 #ifdef HAVE_XKBGETKEYBOARD
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10803 XkbDescPtr kb;
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10804 struct frame *f = check_x_frame (frame);
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10805 Display *dpy = FRAME_X_DISPLAY (f);
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10806 Lisp_Object have_keys;
34911
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10807 int major, minor, op, event, error;
34549
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10808
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10809 BLOCK_INPUT;
34911
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10810
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10811 /* Check library version in case we're dynamically linked. */
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10812 major = XkbMajorVersion;
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10813 minor = XkbMinorVersion;
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10814 if (!XkbLibraryVersion (&major, &minor))
35191
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10815 {
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10816 UNBLOCK_INPUT;
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10817 return Qnil;
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10818 }
34911
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10819
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10820 /* Check that the server supports XKB. */
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10821 major = XkbMajorVersion;
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10822 minor = XkbMinorVersion;
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10823 if (!XkbQueryExtension (dpy, &op, &event, &error, &major, &minor))
35191
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10824 {
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10825 UNBLOCK_INPUT;
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10826 return Qnil;
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10827 }
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10828
34911
4cdfcac861d7 (Fx_backspace_delete_keys_p): Check library and server
Gerd Moellmann <gerd@gnu.org>
parents: 34895
diff changeset
10829 have_keys = Qnil;
35191
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10830 kb = XkbGetMap (dpy, XkbAllMapComponentsMask, XkbUseCoreKbd);
34549
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10831 if (kb)
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10832 {
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10833 int delete_keycode = 0, backspace_keycode = 0, i;
35191
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10834
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10835 if (XkbGetNames (dpy, XkbAllNamesMask, kb) == Success)
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10836 {
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10837 for (i = kb->min_key_code;
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10838 (i < kb->max_key_code
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10839 && (delete_keycode == 0 || backspace_keycode == 0));
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10840 ++i)
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10841 {
38574
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10842 /* The XKB symbolic key names can be seen most easily in
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10843 the PS file generated by `xkbprint -label name
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
10844 $DISPLAY'. */
35191
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10845 if (bcmp ("DELE", kb->names->keys[i].name, 4) == 0)
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10846 delete_keycode = i;
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10847 else if (bcmp ("BKSP", kb->names->keys[i].name, 4) == 0)
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10848 backspace_keycode = i;
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10849 }
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10850
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10851 XkbFreeNames (kb, 0, True);
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10852 }
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10853
3de883052d49 (Fx_backspace_delete_keys_p): Use XkbGetMap and
Gerd Moellmann <gerd@gnu.org>
parents: 35146
diff changeset
10854 XkbFreeClientMap (kb, 0, True);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10855
34549
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10856 if (delete_keycode
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10857 && backspace_keycode
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10858 && XKeysymToKeycode (dpy, XK_Delete) == delete_keycode
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10859 && XKeysymToKeycode (dpy, XK_BackSpace) == backspace_keycode)
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10860 have_keys = Qt;
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10861 }
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10862 UNBLOCK_INPUT;
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10863 return have_keys;
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10864 #else /* not HAVE_XKBGETKEYBOARD */
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10865 return Qnil;
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10866 #endif /* not HAVE_XKBGETKEYBOARD */
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10867 }
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10868
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10869
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10870
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
10871 /***********************************************************************
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10872 Initialization
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10873 ***********************************************************************/
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10874
51175
a072cc265dff (x_window): Fix typo.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 51130
diff changeset
10875 /* Keep this list in the same order as frame_parms in frame.c.
50370
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10876 Use 0 for unsupported frame parameters. */
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10877
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10878 frame_parm_handler x_frame_parm_handlers[] =
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10879 {
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10880 x_set_autoraise,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10881 x_set_autolower,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10882 x_set_background_color,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10883 x_set_border_color,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10884 x_set_border_width,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10885 x_set_cursor_color,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10886 x_set_cursor_type,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10887 x_set_font,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10888 x_set_foreground_color,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10889 x_set_icon_name,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10890 x_set_icon_type,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10891 x_set_internal_border_width,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10892 x_set_menu_bar_lines,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10893 x_set_mouse_color,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10894 x_explicitly_set_name,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10895 x_set_scroll_bar_width,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10896 x_set_title,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10897 x_set_unsplittable,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10898 x_set_vertical_scroll_bars,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10899 x_set_visibility,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10900 x_set_tool_bar_lines,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10901 x_set_scroll_bar_foreground,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10902 x_set_scroll_bar_background,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10903 x_set_screen_gamma,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10904 x_set_line_spacing,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10905 x_set_fringe_width,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10906 x_set_fringe_width,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10907 x_set_wait_for_wm,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10908 x_set_fullscreen,
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10909 };
0c01548d7ed3 The following changes consolidates the common code related to
Kim F. Storm <storm@cua.dk>
parents: 50236
diff changeset
10910
21846
486ac68ce051 Fix -Wimplicit warnings.
Andreas Schwab <schwab@suse.de>
parents: 21779
diff changeset
10911 void
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10912 syms_of_xfns ()
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10913 {
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10914 /* This is zero if not using X windows. */
9653
cfc5e15e0baf (x_sync): Take frame ptr as arg.
Richard M. Stallman <rms@gnu.org>
parents: 9580
diff changeset
10915 x_in_use = 0;
9014
7b805f79f3b4 (Fx_list_fonts): Use a cache stored in FRAME_X_SCREEN.
Richard M. Stallman <rms@gnu.org>
parents: 8961
diff changeset
10916
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
10917 /* The section below is built by the lisp expression at the top of the file,
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
10918 just above where these variables are declared. */
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
10919 /*&&& init symbols here &&&*/
1874
19cf50641d6c * frame.c (Fframe_parameters): Report the `minibuffer' parameter of
Jim Blandy <jimb@redhat.com>
parents: 1821
diff changeset
10920 Qnone = intern ("none");
19cf50641d6c * frame.c (Fframe_parameters): Report the `minibuffer' parameter of
Jim Blandy <jimb@redhat.com>
parents: 1821
diff changeset
10921 staticpro (&Qnone);
2328
82e4fed9cdd6 * xfns.c (Fx_parse_geometry): Renamed from Fx_geometry.
Jim Blandy <jimb@redhat.com>
parents: 2295
diff changeset
10922 Qsuppress_icon = intern ("suppress-icon");
82e4fed9cdd6 * xfns.c (Fx_parse_geometry): Renamed from Fx_geometry.
Jim Blandy <jimb@redhat.com>
parents: 2295
diff changeset
10923 staticpro (&Qsuppress_icon);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10924 Qundefined_color = intern ("undefined-color");
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
10925 staticpro (&Qundefined_color);
28787
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
10926 Qcenter = intern ("center");
90e5b2abbd10 (Qcenter): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 28747
diff changeset
10927 staticpro (&Qcenter);
30351
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
10928 Qcompound_text = intern ("compound-text");
a67fcab978bb (x_encode_text): New function.
Kenichi Handa <handa@m17n.org>
parents: 30224
diff changeset
10929 staticpro (&Qcompound_text);
35402
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
10930 Qcancel_timer = intern ("cancel-timer");
302fbe91e359 (Qcancel_timer): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 35360
diff changeset
10931 staticpro (&Qcancel_timer);
974
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
10932 /* This is the end of symbol initialization. */
4f88a1b78a46 * xfns.c (x_get_arg): Return Qunbound for an unspecified
Jim Blandy <jimb@redhat.com>
parents: 833
diff changeset
10933
26876
578acd06aa3b Include intervals.h.
Kenichi Handa <handa@m17n.org>
parents: 26808
diff changeset
10934 /* Text property `display' should be nonsticky by default. */
578acd06aa3b Include intervals.h.
Kenichi Handa <handa@m17n.org>
parents: 26808
diff changeset
10935 Vtext_property_default_nonsticky
578acd06aa3b Include intervals.h.
Kenichi Handa <handa@m17n.org>
parents: 26808
diff changeset
10936 = Fcons (Fcons (Qdisplay, Qt), Vtext_property_default_nonsticky);
578acd06aa3b Include intervals.h.
Kenichi Handa <handa@m17n.org>
parents: 26808
diff changeset
10937
578acd06aa3b Include intervals.h.
Kenichi Handa <handa@m17n.org>
parents: 26808
diff changeset
10938
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10939 Qlaplace = intern ("laplace");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
10940 staticpro (&Qlaplace);
31633
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10941 Qemboss = intern ("emboss");
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10942 staticpro (&Qemboss);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10943 Qedge_detection = intern ("edge-detection");
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10944 staticpro (&Qedge_detection);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10945 Qheuristic = intern ("heuristic");
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10946 staticpro (&Qheuristic);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10947 QCmatrix = intern (":matrix");
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10948 staticpro (&QCmatrix);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10949 QCcolor_adjustment = intern (":color-adjustment");
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10950 staticpro (&QCcolor_adjustment);
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10951 QCmask = intern (":mask");
829ed9cc42da (QCmatrix, QCcolor_adjustment, QCmask, Qemboss)
Gerd Moellmann <gerd@gnu.org>
parents: 31543
diff changeset
10952 staticpro (&QCmask);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10953
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10954 Fput (Qundefined_color, Qerror_conditions,
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10955 Fcons (Qundefined_color, Fcons (Qerror, Qnil)));
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10956 Fput (Qundefined_color, Qerror_message,
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10957 build_string ("Undefined color"));
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10958
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10959 DEFVAR_BOOL ("cross-disabled-images", &cross_disabled_images,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10960 doc: /* Non-nil means always draw a cross over disabled images.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10961 Disabled images are those having an `:conversion disabled' property.
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10962 A cross is always drawn on black & white displays. */);
31651
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
10963 cross_disabled_images = 0;
aef83f9e7dac (lookup_image): Build mask before applying an algorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 31637
diff changeset
10964
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10965 DEFVAR_LISP ("x-bitmap-file-path", &Vx_bitmap_file_path,
49080
ec331b35847e (syms_of_xfns) <Vx_bitmap_file_path>: Doc fix.
Dave Love <fx@gnu.org>
parents: 48693
diff changeset
10966 doc: /* List of directories to search for window system bitmap files. */);
12036
035d4ee6cc80 (syms_of_xfns): Allow PATH_BITMAPS to be a colon-separated list.
Karl Heuer <kwzh@gnu.org>
parents: 12019
diff changeset
10967 Vx_bitmap_file_path = decode_env_path ((char *) 0, PATH_BITMAPS);
9563
ca99ee51077f Include paths.h.
Richard M. Stallman <rms@gnu.org>
parents: 9543
diff changeset
10968
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10969 DEFVAR_LISP ("x-pointer-shape", &Vx_pointer_shape,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10970 doc: /* The shape of the pointer when over text.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10971 Changing the value does not affect existing frames
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10972 unless you set the mouse color. */);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10973 Vx_pointer_shape = Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10974
7683
be3423efbdce (Vx_sensitive_text_pointer_shape):
Richard M. Stallman <rms@gnu.org>
parents: 7599
diff changeset
10975 #if 0 /* This doesn't really do anything. */
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10976 DEFVAR_LISP ("x-nontext-pointer-shape", &Vx_nontext_pointer_shape,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10977 doc: /* The shape of the pointer when not over text.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10978 This variable takes effect when you create a new frame
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10979 or when you set the mouse color. */);
2936
f9956cdb0d1d (syms_of_xfns): Don't make Lisp vars
Richard M. Stallman <rms@gnu.org>
parents: 2885
diff changeset
10980 #endif
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10981 Vx_nontext_pointer_shape = Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
10982
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10983 DEFVAR_LISP ("x-hourglass-pointer-shape", &Vx_hourglass_pointer_shape,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10984 doc: /* The shape of the pointer when Emacs is busy.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10985 This variable takes effect when you create a new frame
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10986 or when you set the mouse color. */);
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
10987 Vx_hourglass_pointer_shape = Qnil;
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
10988
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10989 DEFVAR_BOOL ("display-hourglass", &display_hourglass_p,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10990 doc: /* Non-zero means Emacs displays an hourglass pointer on window systems. */);
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
10991 display_hourglass_p = 1;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
10992
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10993 DEFVAR_LISP ("hourglass-delay", &Vhourglass_delay,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10994 doc: /* *Seconds to wait before displaying an hourglass pointer.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
10995 Value must be an integer or float. */);
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
10996 Vhourglass_delay = make_number (DEFAULT_HOURGLASS_DELAY);
27864
ea05cbe65943 (inhibit_busy_cursor, busy_count): Removed.
Gerd Moellmann <gerd@gnu.org>
parents: 27798
diff changeset
10997
7683
be3423efbdce (Vx_sensitive_text_pointer_shape):
Richard M. Stallman <rms@gnu.org>
parents: 7599
diff changeset
10998 #if 0 /* This doesn't really do anything. */
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
10999 DEFVAR_LISP ("x-mode-pointer-shape", &Vx_mode_pointer_shape,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11000 doc: /* The shape of the pointer when over the mode line.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11001 This variable takes effect when you create a new frame
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11002 or when you set the mouse color. */);
2936
f9956cdb0d1d (syms_of_xfns): Don't make Lisp vars
Richard M. Stallman <rms@gnu.org>
parents: 2885
diff changeset
11003 #endif
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11004 Vx_mode_pointer_shape = Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11005
16396
4e4cc27b2a2a (x_set_internal_border_width): Only change
Richard M. Stallman <rms@gnu.org>
parents: 16357
diff changeset
11006 DEFVAR_LISP ("x-sensitive-text-pointer-shape",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11007 &Vx_sensitive_text_pointer_shape,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11008 doc: /* The shape of the pointer when over mouse-sensitive text.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11009 This variable takes effect when you create a new frame
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11010 or when you set the mouse color. */);
7683
be3423efbdce (Vx_sensitive_text_pointer_shape):
Richard M. Stallman <rms@gnu.org>
parents: 7599
diff changeset
11011 Vx_sensitive_text_pointer_shape = Qnil;
6759
e0938c42218c (syms_of_xfns): Define Vx_cross_pointer_shape.
Fred Pierresteguy <F.Pierresteguy@frcl.bull.fr>
parents: 6610
diff changeset
11012
33960
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
11013 DEFVAR_LISP ("x-window-horizontal-drag-cursor",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11014 &Vx_window_horizontal_drag_shape,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11015 doc: /* Pointer shape to use for indicating a window can be dragged horizontally.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11016 This variable takes effect when you create a new frame
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11017 or when you set the mouse color. */);
33960
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
11018 Vx_window_horizontal_drag_shape = Qnil;
1f92a2d65681 (Vx_window_horizontal_drag_shape): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 33747
diff changeset
11019
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11020 DEFVAR_LISP ("x-cursor-fore-pixel", &Vx_cursor_fore_pixel,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11021 doc: /* A string indicating the foreground color of the cursor box. */);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11022 Vx_cursor_fore_pixel = Qnil;
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11023
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11024 DEFVAR_LISP ("x-max-tooltip-size", &Vx_max_tooltip_size,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11025 doc: /* Maximum size for tooltips. Value is a pair (COLUMNS . ROWS).
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11026 Text larger than this is clipped. */);
38574
79a0d7b341b3 (Vx_max_tooltip_size): New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 38548
diff changeset
11027 Vx_max_tooltip_size = Fcons (make_number (80), make_number (40));
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11028
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11029 DEFVAR_LISP ("x-no-window-manager", &Vx_no_window_manager,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11030 doc: /* Non-nil if no X window manager is in use.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11031 Emacs doesn't try to figure this out; this is always nil
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11032 unless you set it to something else. */);
12209
5537ed125771 (syms_of_xfns): Initialize Vx_no_window_manager. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 12190
diff changeset
11033 /* We don't have any way to find this out, so set it to nil
5537ed125771 (syms_of_xfns): Initialize Vx_no_window_manager. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 12190
diff changeset
11034 and maybe the user would like to set it to t. */
5537ed125771 (syms_of_xfns): Initialize Vx_no_window_manager. Doc fix.
Richard M. Stallman <rms@gnu.org>
parents: 12190
diff changeset
11035 Vx_no_window_manager = Qnil;
8170
d92a24366b22 (x_toolkit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8103
diff changeset
11036
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11037 DEFVAR_LISP ("x-pixel-size-width-font-regexp",
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11038 &Vx_pixel_size_width_font_regexp,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11039 doc: /* Regexp matching a font name whose width is the same as `PIXEL_SIZE'.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11040
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11041 Since Emacs gets width of a font matching with this regexp from
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11042 PIXEL_SIZE field of the name, font finding mechanism gets faster for
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11043 such a font. This is especially effective for such large fonts as
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11044 Chinese, Japanese, and Korean. */);
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11045 Vx_pixel_size_width_font_regexp = Qnil;
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11046
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11047 DEFVAR_LISP ("image-cache-eviction-delay", &Vimage_cache_eviction_delay,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11048 doc: /* Time after which cached images are removed from the cache.
39905
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11049 When an image has not been displayed this many seconds, remove it
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11050 from the image cache. Value must be an integer or nil with nil
542a86892257 Put doc strings in comments.
Gerd Moellmann <gerd@gnu.org>
parents: 39862
diff changeset
11051 meaning don't clear the cache. */);
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
11052 Vimage_cache_eviction_delay = make_number (30 * 60);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11053
8170
d92a24366b22 (x_toolkit): New variable.
Richard M. Stallman <rms@gnu.org>
parents: 8103
diff changeset
11054 #ifdef USE_X_TOOLKIT
39862
da336e9d1ab5 (syms_of_xfns): Update calls to Fprovide.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39812
diff changeset
11055 Fprovide (intern ("x-toolkit"), Qnil);
12094
a9fda5417acf (syms_of_xfns): Provide motif in Motif version.
Karl Heuer <kwzh@gnu.org>
parents: 12080
diff changeset
11056 #ifdef USE_MOTIF
39862
da336e9d1ab5 (syms_of_xfns): Update calls to Fprovide.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 39812
diff changeset
11057 Fprovide (intern ("motif"), Qnil);
37210
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
11058
39988
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11059 DEFVAR_LISP ("motif-version-string", &Vmotif_version_string,
eac4e9ae201c Change doc-string comments to `new style' [w/`doc:' keyword].
Miles Bader <miles@gnu.org>
parents: 39907
diff changeset
11060 doc: /* Version info for LessTif/Motif. */);
37210
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
11061 Vmotif_version_string = build_string (XmVERSION_STRING);
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
11062 #endif /* USE_MOTIF */
8b47704e0150 (Vmotif_version_string) [USE_MOTIF]: New variable.
Gerd Moellmann <gerd@gnu.org>
parents: 37173
diff changeset
11063 #endif /* USE_X_TOOLKIT */
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11064
52334
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11065 #ifdef USE_GTK
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11066 Fprovide (intern ("gtk"), Qnil);
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11067
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11068 DEFVAR_LISP ("gtk-version-string", &Vgtk_version_string,
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11069 doc: /* Version info for GTK+. */);
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11070 {
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11071 char gtk_version[40];
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11072 g_snprintf (gtk_version, sizeof (gtk_version), "%u.%u.%u",
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11073 GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11074 Vgtk_version_string = build_string (gtk_version);
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11075 }
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11076 #endif /* USE_GTK */
a721547105d6 (Vgtk_version_string): New variable.
Lute Kamstra <lute@gnu.org>
parents: 52298
diff changeset
11077
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11078 /* X window properties. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11079 defsubr (&Sx_change_window_property);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11080 defsubr (&Sx_delete_window_property);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11081 defsubr (&Sx_window_property);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11082
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
11083 defsubr (&Sxw_display_color_p);
8779
12c6296bbb4b (Fx_display_grayscale_p): New function.
Richard M. Stallman <rms@gnu.org>
parents: 8758
diff changeset
11084 defsubr (&Sx_display_grayscale_p);
26729
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
11085 defsubr (&Sxw_color_defined_p);
f5dded41adcc Changes for automatic remapping of X colors on terminal frames:
Eli Zaretskii <eliz@gnu.org>
parents: 26571
diff changeset
11086 defsubr (&Sxw_color_values);
4279
d69483b37e0a (MAXREQUEST): Defined.
Richard M. Stallman <rms@gnu.org>
parents: 4269
diff changeset
11087 defsubr (&Sx_server_max_request_size);
2276
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11088 defsubr (&Sx_server_vendor);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11089 defsubr (&Sx_server_version);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11090 defsubr (&Sx_display_pixel_width);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11091 defsubr (&Sx_display_pixel_height);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11092 defsubr (&Sx_display_mm_width);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11093 defsubr (&Sx_display_mm_height);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11094 defsubr (&Sx_display_screens);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11095 defsubr (&Sx_display_planes);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11096 defsubr (&Sx_display_color_cells);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11097 defsubr (&Sx_display_visual_class);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11098 defsubr (&Sx_display_backing_store);
68328c3af38f (x_screen): Make this var file scope.
Richard M. Stallman <rms@gnu.org>
parents: 2197
diff changeset
11099 defsubr (&Sx_display_save_under);
771
538c0bcb418e *** empty log message ***
Jim Blandy <jimb@redhat.com>
parents: 727
diff changeset
11100 defsubr (&Sx_create_frame);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11101 defsubr (&Sx_open_connection);
9690
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
11102 defsubr (&Sx_close_connection);
f6d4e1acb5a1 (Fx_create_frame): Don't increment refernce_count
Richard M. Stallman <rms@gnu.org>
parents: 9653
diff changeset
11103 defsubr (&Sx_display_list);
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11104 defsubr (&Sx_synchronize);
52762
1ae6e2780dd9 * xfns.c (Fx_send_client_event): New function as a base for
Jan Djärv <jan.h.d@swipnet.se>
parents: 52753
diff changeset
11105 defsubr (&Sx_send_client_message);
28044
88db4c84b6fd Remove a buch of really old code in #if 0.
Gerd Moellmann <gerd@gnu.org>
parents: 28010
diff changeset
11106 defsubr (&Sx_focus_frame);
34549
708ea44ef3c0 (Fx_backspace_delete_keys_p): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 34524
diff changeset
11107 defsubr (&Sx_backspace_delete_keys_p);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11108
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11109 /* Setting callback functions for fontset handler. */
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11110 get_font_info_func = x_get_font_info;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11111
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11112 #if 0 /* This function pointer doesn't seem to be used anywhere.
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11113 And the pointer assigned has the wrong type, anyway. */
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11114 list_fonts_func = x_list_fonts;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11115 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11116
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11117 load_font_func = x_load_font;
21549
3b63301ea296 (syms_of_xfns): Initialize find_ccl_program_func.
Kenichi Handa <handa@m17n.org>
parents: 21536
diff changeset
11118 find_ccl_program_func = x_find_ccl_program;
17048
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11119 query_font_func = x_query_font;
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11120 set_frame_fontset_func = x_set_font;
2da4e24ceee5 Include charset.h and fontset.h.
Karl Heuer <kwzh@gnu.org>
parents: 16966
diff changeset
11121 check_window_system_func = check_x;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11122
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11123 /* Images. */
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11124 Qxbm = intern ("xbm");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11125 staticpro (&Qxbm);
35360
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
11126 QCconversion = intern (":conversion");
ba490eed8f66 (QCconversion): Replaces QCalgorithm.
Gerd Moellmann <gerd@gnu.org>
parents: 35275
diff changeset
11127 staticpro (&QCconversion);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11128 QCheuristic_mask = intern (":heuristic-mask");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11129 staticpro (&QCheuristic_mask);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11130 QCcolor_symbols = intern (":color-symbols");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11131 staticpro (&QCcolor_symbols);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11132 QCascent = intern (":ascent");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11133 staticpro (&QCascent);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11134 QCmargin = intern (":margin");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11135 staticpro (&QCmargin);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11136 QCrelief = intern (":relief");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11137 staticpro (&QCrelief);
25628
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
11138 Qpostscript = intern ("postscript");
98e238950125 (x_build_heuristic_mask): Accept a list `(R G B)'
Gerd Moellmann <gerd@gnu.org>
parents: 25620
diff changeset
11139 staticpro (&Qpostscript);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11140 QCloader = intern (":loader");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11141 staticpro (&QCloader);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11142 QCbounding_box = intern (":bounding-box");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11143 staticpro (&QCbounding_box);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11144 QCpt_width = intern (":pt-width");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11145 staticpro (&QCpt_width);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11146 QCpt_height = intern (":pt-height");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11147 staticpro (&QCpt_height);
25620
1c991744ce13 (QCindex): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25593
diff changeset
11148 QCindex = intern (":index");
1c991744ce13 (QCindex): New.
Gerd Moellmann <gerd@gnu.org>
parents: 25593
diff changeset
11149 staticpro (&QCindex);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11150 Qpbm = intern ("pbm");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11151 staticpro (&Qpbm);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11152
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11153 #if HAVE_XPM
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11154 Qxpm = intern ("xpm");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11155 staticpro (&Qxpm);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11156 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11157
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11158 #if HAVE_JPEG
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11159 Qjpeg = intern ("jpeg");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11160 staticpro (&Qjpeg);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11161 #endif
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11162
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11163 #if HAVE_TIFF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11164 Qtiff = intern ("tiff");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11165 staticpro (&Qtiff);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11166 #endif
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11167
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11168 #if HAVE_GIF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11169 Qgif = intern ("gif");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11170 staticpro (&Qgif);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11171 #endif
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11172
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11173 #if HAVE_PNG
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11174 Qpng = intern ("png");
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11175 staticpro (&Qpng);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11176 #endif
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11177
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11178 defsubr (&Sclear_image_cache);
29938
be81ae7e0218 (Fimage_size): New function.
Gerd Moellmann <gerd@gnu.org>
parents: 29882
diff changeset
11179 defsubr (&Simage_size);
31637
c1f4bdbf8465 (ALLOC_XPM_COLORS): Define if we can use Emacs' color
Gerd Moellmann <gerd@gnu.org>
parents: 31633
diff changeset
11180 defsubr (&Simage_mask_p);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11181
36252
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
11182 hourglass_atimer = NULL;
a8630c63f7d5 Rename everything containing *busy_cursor* and similar
Gerd Moellmann <gerd@gnu.org>
parents: 35859
diff changeset
11183 hourglass_shown_p = 0;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11184
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11185 defsubr (&Sx_show_tip);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11186 defsubr (&Sx_hide_tip);
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
11187 tip_timer = Qnil;
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11188 staticpro (&tip_timer);
34450
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
11189 tip_frame = Qnil;
5de00bff5de3 (Fx_hide_tip): Avoid unnecessary work when there's
Gerd Moellmann <gerd@gnu.org>
parents: 34321
diff changeset
11190 staticpro (&tip_frame);
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11191
35067
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
11192 last_show_tip_args = Qnil;
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
11193 staticpro (&last_show_tip_args);
7ca0048f8615 (x_create_tip_frame): Preserve the value of
Gerd Moellmann <gerd@gnu.org>
parents: 35042
diff changeset
11194
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11195 #ifdef USE_MOTIF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11196 defsubr (&Sx_file_dialog);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11197 #endif
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11198 }
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11199
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11200
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11201 void
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11202 init_xfns ()
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11203 {
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11204 image_types = NULL;
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11205 Vimage_types = Qnil;
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11206
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11207 define_image_type (&xbm_type);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11208 define_image_type (&gs_type);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11209 define_image_type (&pbm_type);
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11210
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11211 #if HAVE_XPM
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11212 define_image_type (&xpm_type);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11213 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11214
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11215 #if HAVE_JPEG
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11216 define_image_type (&jpeg_type);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11217 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11218
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11219 #if HAVE_TIFF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11220 define_image_type (&tiff_type);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11221 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11222
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11223 #if HAVE_GIF
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11224 define_image_type (&gif_type);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11225 #endif
49600
23a1cea22d13 Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents: 49473
diff changeset
11226
24994
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11227 #if HAVE_PNG
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11228 define_image_type (&png_type);
d549b7ac676d (x_real_positions): Don't subtract window borders
Gerd Moellmann <gerd@gnu.org>
parents: 24905
diff changeset
11229 #endif
389
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11230 }
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11231
6e0510766e66 Initial revision
Jim Blandy <jimb@redhat.com>
parents:
diff changeset
11232 #endif /* HAVE_X_WINDOWS */
52401
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52387
diff changeset
11233
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52387
diff changeset
11234 /* arch-tag: 55040d02-5485-4d58-8b22-95a7a05f3288
695cf19ef79e Add arch taglines
Miles Bader <miles@gnu.org>
parents: 52387
diff changeset
11235 (do not change this comment) */